Merge branch 'master' into HEAD

Author: moskvanaft

.gitmodules

@@ -21,3 +21,6 @@
 	path = externals/binaryen
 	url = https://github.com/EOSIO/binaryen
 
+[submodule "libraries/softfloat"]
+	path = libraries/softfloat
+	url = https://github.com/eosio/berkeley-softfloat-3

CMakeLists.txt

@@ -1,14 +1,17 @@
 # Defines EOS library target.
 project( EOS )
+
 cmake_minimum_required( VERSION 2.8.12 )
 
 enable_testing()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 
-INCLUDE( VersionMacros )
-INCLUDE( SetupTargetMacros )
+include( GNUInstallDirs )
+include( VersionMacros )
+include( SetupTargetMacros )
+include( InstallDirectoryPermissions )
 
 set( BLOCKCHAIN_NAME "Eos" )
 set( CMAKE_CXX_STANDARD 14 )
@@ -17,8 +20,8 @@ set(VERSION_MAJOR 3)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 1)
 
-set( CLI_CLIENT_EXECUTABLE_NAME eos_client )
-set( GUI_CLIENT_EXECUTABLE_NAME eos )
+set( CLI_CLIENT_EXECUTABLE_NAME eosioc )
+set( GUI_CLIENT_EXECUTABLE_NAME eosio )
 set( CUSTOM_URL_SCHEME "gcs" )
 set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
 
@@ -45,6 +48,33 @@ if (USE_PCH)
   include (cotire)
 endif(USE_PCH)
 
+# add defaults for openssl
+if ("${OPENSSL_ROOT_DIR}" STREQUAL "")
+   if (NOT "$ENV{OPENSSL_ROOT_DIR}" STREQUAL "")
+      set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
+      set(OPENSSL_INCLUDE_DIR ${OPENSSL_ROOT_DIR}/include)
+   elseif (APPLE)
+      set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
+      set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include")
+   elseif(UNIX AND NOT APPLE)
+      set(OPENSSL_ROOT_DIR "/usr/include/openssl")
+      set(OPENSSL_INCLUDE_DIR "/usr/include/openssl/include")
+   else()
+      message(FATAL_ERROR "openssl not found and don't know where to look, please specify OPENSSL_ROOT_DIR")
+   endif()
+endif()
+
+if ("${OPENSSL_LIBRARIES}" STREQUAL "")
+   if (NOT "$ENV{OPENSSL_LIBRARIES}" STREQUAL "")
+      set(OPENSSL_LIBRARIES $ENV{OPENSSL_LIBRARIES})
+   elseif (APPLE)
+      set(OPENSSL_LIBRARIES "/usr/local/opt/openssl/lib")
+   elseif(UNIX AND NOT APPLE)
+      set(OPENSSL_LIBRARIES "/usr/include/openssl")
+   else()
+      message(FATAL_ERROR "openssl libs not found and don't know where to look, please specify OPENSSL_LIBRARIES")
+   endif()
+endif()
 
 if(UNIX)
   if(APPLE)
@@ -114,12 +144,6 @@ if( WIN32 )
 
 else( WIN32 ) # Apple AND Linux
 
-    find_library(READLINE_LIBRARIES NAMES readline)
-    find_path(READLINE_INCLUDE_DIR readline/readline.h)
-    #if(NOT READLINE_INCLUDE_DIR OR NOT READLINE_LIBRARIES)
-    #  MESSAGE(FATAL_ERROR "Could not find lib readline.")
-    #endif()
-
     if( APPLE )
         # Apple Specific Options Here
         message( STATUS "Configuring Eos on OS X" )
@@ -164,19 +188,24 @@ if(ENABLE_COVERAGE_TESTING)
   find_program( GENHTML_PATH NAMES genhtml)
 endif()
 
+add_subdirectory( externals )
+
 include(wasm)
-include(installer)
 
-add_subdirectory( externals )
-add_subdirectory( contracts )
 add_subdirectory( libraries )
+add_subdirectory( contracts )
 add_subdirectory( plugins )
 add_subdirectory( programs )
 add_subdirectory( scripts )
 add_subdirectory( tests )
 add_subdirectory( tools )
+add_subdirectory( debian )
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/genesis.json ${CMAKE_CURRENT_BINARY_DIR}/genesis.json COPYONLY)
+install(FILES genesis.json DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/eosio/node_00)
+install_directory_permissions(DIRECTORY ${CMAKE_INSTALL_FULL_SYSCONFDIR}/eosio)
+install_directory_permissions(DIRECTORY ${CMAKE_INSTALL_FULL_SYSCONFDIR}/eosio/node_00)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/genesis.json ${CMAKE_CURRENT_BINARY_DIR}/etc/eosio/node_00/genesis.json COPYONLY)
 
+include(installer)
 
 include(doxygen)

CMakeModules/FindWasm.cmake

@@ -1,7 +1,15 @@
 # - Try to find WASM
 
 # TODO: Check if compiler is able to generate wasm32
-
+if ("${WASM_ROOT}" STREQUAL "")
+   if (APPLE)
+      set( WASM_ROOT "/usr/local/wasm" )
+   elseif (UNIX AND NOT APPLE)
+      set( WASM_ROOT "$ENV{HOME}/opt/wasm" )
+   else()
+      message(FATAL_ERROR "WASM not found and don't know where to look, please specify WASM_ROOT")
+   endif()
+endif()
 find_program(WASM_CLANG clang PATHS ${WASM_ROOT}/bin NO_DEFAULT_PATH)
 find_program(WASM_LLC llc PATHS ${WASM_ROOT}/bin NO_DEFAULT_PATH)
 find_program(WASM_LLVM_LINK llvm-link PATHS ${WASM_ROOT}/bin NO_DEFAULT_PATH)

CMakeModules/InstallDirectoryPermissions.cmake

@@ -0,0 +1,14 @@
+# Fix directory permissions after installation of header files (primarily).
+macro(install_directory_permissions)
+  cmake_parse_arguments(ARG "" "DIRECTORY" "" ${ARGN})
+  set(dir ${ARG_DIRECTORY})
+  install(DIRECTORY DESTINATION ${dir}
+          DIRECTORY_PERMISSIONS OWNER_READ
+                                OWNER_WRITE
+                                OWNER_EXECUTE
+                                GROUP_READ
+                                GROUP_EXECUTE
+                                WORLD_READ
+                                WORLD_EXECUTE
+  )
+endmacro(install_directory_permissions)

CMakeModules/installer.cmake

@@ -1,36 +1,49 @@
 include(InstallRequiredSystemLibraries)
 
+#install_directory_permissions( DIRECTORY usr/${CMAKE_INSTALL_INCLUDEDIR}/eosio )
+
 set(CPACK_PACKAGE_CONTACT "[email protected]")
 set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_BINARY_DIR}/packages)
-set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
+if(NOT DEFINED CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
+endif()
 
-SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_INSTALL_PREFIX}")
+SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/install")
 set(CPACK_PACKAGE_NAME "EOS.IO")
 set(CPACK_PACKAGE_VENDOR "block.one")
 set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_DESCRIPTION "A client for the EOS.IO network")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the EOS.IO network")
+set(CPACK_PACKAGE_DESCRIPTION "Software for the EOS.IO network")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Software for the EOS.IO network")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "EOS.IO ${CPACK_PACKAGE_VERSION}")
 
 if(WIN32)
- set(CPACK_GENERATOR "ZIP;NSIS")
- set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
- set(CPACK_NSIS_PACKAGE_NAME "EOS.IO v${CPACK_PACKAGE_VERSION}")
- set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
- set(CPACK_NSIS_DEFINES "  !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"EOS.IO\\\"")
- # it seems like windows zip files usually don't have a single directory inside them, unix tgz frequently do
- SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
+  set(CPACK_GENERATOR "ZIP;NSIS")
+  set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
+  set(CPACK_NSIS_PACKAGE_NAME "EOS.IO v${CPACK_PACKAGE_VERSION}")
+  set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
+  set(CPACK_NSIS_DEFINES "  !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"EOS.IO\\\"")
+  # windows zip files usually don't have a single directory inside them, unix tgz usually do
+  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
 elseif(APPLE)
   set(CPACK_GENERATOR "DragNDrop")
 else()
-  # Linux gets a .tgz
-  SET(CPACK_GENERATOR "TGZ;DEB")
-  SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-  SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
+  set(CPACK_GENERATOR "DEB")
+  set(CPACK_DEBIAN_PACKAGE_RELEASE 0)
+  if(CMAKE_VERSION VERSION_GREATER 3.6.0) # Buggy in 3.5, behaves like VERSION_GREATER_EQUAL
+    set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+  else()
+    string(TOLOWER ${CPACK_PACKAGE_NAME} CPACK_DEBIAN_PACKAGE_NAME)
+    execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
+    SET(CPACK_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE})
+  endif()
+  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE)
+  set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE)
+  set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/EOSIO/eos")
 endif()
 
 include(CPack)

CMakeModules/wasm.cmake

@@ -54,7 +54,7 @@ macro(compile_wast)
     endif()
 
     set(WASM_COMMAND ${WASM_CLANG} -emit-llvm -O3 ${STDFLAG} --target=wasm32 -ffreestanding
-              -nostdlib -nostdlibinc -fno-threadsafe-statics -fno-rtti -fno-exceptions
+              -nostdlib -nostdlibinc -fno-threadsafe-statics -fno-rtti -fno-exceptions 
               -c ${infile} -o ${outfile}.bc
     )
     if (${ARG_NOWARNINGS})
@@ -111,6 +111,8 @@ macro(add_wast_library)
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     VERBATIM
   )
+  #TODO: Fix this path on pending cmake install changes
+  install(FILES ${${ARG_TARGET}_BC_FILENAME} DESTINATION usr/share/eosio/contractsdk/lib)
 
 endmacro(add_wast_library)
 
@@ -188,4 +190,7 @@ macro(add_wast_executable)
 
   set(extra_target_dependency)
 
+  add_test(NAME "validate_${target}_abi"
+           COMMAND ${CMAKE_BINARY_DIR}/scripts/abi_is_json.py ${ABI_FILES})
+
 endmacro(add_wast_executable)

Docker/Dockerfile

@@ -30,61 +30,66 @@ RUN wget https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.
     && cd boost_1_64_0 \
     && ./bootstrap.sh --prefix=/usr/local \
     && echo 'using clang : 4.0 : clang++-4.0 ;' >> project-config.jam \
-    && ./b2 -d0 -j4 --with-thread --with-date_time --with-system --with-filesystem --with-program_options \
+    && ./b2 -d0 -j$(nproc) --with-thread --with-date_time --with-system --with-filesystem --with-program_options \
        --with-signals --with-serialization --with-chrono --with-test --with-context --with-locale --with-coroutine --with-iostreams toolset=clang link=static install \
-    && cd .. && rm -rf boost_1_64_0
+    && cd - && rm -rf boost_1_64_0
 
-RUN wget https://github.com/mongodb/mongo-c-driver/releases/download/1.8.0/mongo-c-driver-1.8.0.tar.gz -O - | tar -xz \
-    && cd mongo-c-driver-1.8.0 \
+RUN wget https://github.com/mongodb/mongo-c-driver/releases/download/1.9.3/mongo-c-driver-1.9.3.tar.gz -O - | tar -xz \
+    && cd mongo-c-driver-1.9.3 \
     && ./configure --disable-automatic-init-and-cleanup --prefix=/usr/local \
-    && make install \
-    && cd .. && rm -rf mongo-c-driver-1.8.0
+    && make -j$(nproc) install \
+    && cd - && rm -rf mongo-c-driver-1.9.3
 
 RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/llvm.git \
     && git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/clang.git llvm/tools/clang \
     && cd llvm \
     && cmake -H. -Bbuild -GNinja -DCMAKE_INSTALL_PREFIX=/opt/wasm -DLLVM_TARGETS_TO_BUILD= -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly -DCMAKE_BUILD_TYPE=Release  \
     && cmake --build build --target install \
-    && cd .. && rm -rf llvm
+    && cd - && rm -rf llvm
 
 RUN wget https://github.com/WebAssembly/binaryen/archive/1.37.21.tar.gz -O - | tar -xz \
   && cd binaryen-1.37.21 \
   && cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release \
   && cmake --build build --target install \
-  && cd .. && rm -rf binaryen-1.37.21
+  && cd - && rm -rf binaryen-1.37.21
 
 
 RUN git clone --depth 1 git://github.com/cryptonomex/secp256k1-zkp \
     && cd secp256k1-zkp \
     && ./autogen.sh \
     && ./configure --prefix=/usr/local \
-    && make install \
-    && cd .. && rm -rf secp256k1-zkp
+    && make -j$(nproc) install \
+    && cd - && rm -rf secp256k1-zkp
 
 RUN git clone --depth 1 -b releases/stable git://github.com/mongodb/mongo-cxx-driver \
     && cd mongo-cxx-driver \
     && cmake -H. -Bbuild -G Ninja -DCMAKE_BUILD_TYPE=Release  -DCMAKE_INSTALL_PREFIX=/usr/local\
-    && cmake --build build --target install
+    && cmake --build build --target install && cd - && rm -rf mongo-cxx-driver
 
+RUN git clone --depth 1 --single-branch --branch master https://github.com/ucb-bar/berkeley-softfloat-3.git \
+    && cd berkeley-softfloat-3/build/Linux-x86_64-GCC \
+    && make -j${nproc} SPECIALIZE_TYPE="8086-SSE" SOFTFLOAT_OPS="-DSOFTFLOAT_ROUND_EVEN -DINLINE_LEVEL=5 -DSOFTFLOAT_FAST_DIV32TO16 -DSOFTFLOAT_FAST_DIV64TO32" \
+    && mkdir -p /opt/berkeley-softfloat-3 && cp softfloat.a /opt/berkeley-softfloat-3/libsoftfloat.a \
+    && mv ../../source/include /opt/berkeley-softfloat-3/include && cd - && rm -rf berkeley-softfloat-3
+ENV SOFTFLOAT_ROOT /opt/berkeley-softfloat-3
 
 ### If you don't want to change the depedencies, you can comment out above lines and uncomnent the following line to get faster build time.
 # FROM huangminghuang/eos_builder as builder
 
 RUN git clone -b master --depth 1 https://github.com/EOSIO/eos.git --recursive \
     && cd eos \
     && cmake -H. -B"/tmp/build" -GNinja -DCMAKE_BUILD_TYPE=Release -DWASM_ROOT=/opt/wasm -DCMAKE_CXX_COMPILER=clang++ \
-       -DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/opt/eos  -DSecp256k1_ROOT_DIR=/usr/local \
+       -DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/tmp/build  -DSecp256k1_ROOT_DIR=/usr/local \
     && cmake --build /tmp/build --target install
 
-
-
 FROM ubuntu:16.04
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install openssl && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/local/lib/* /usr/local/lib/
-COPY --from=builder /tmp/build/install/bin /opt/eosio/bin
+COPY --from=builder /tmp/build/bin /opt/eosio/bin
 COPY --from=builder /tmp/build/contracts /contracts
 COPY --from=builder /eos/Docker/config.ini /eos/genesis.json /
 COPY start_eosiod.sh /opt/eosio/bin/start_eosiod.sh
+ENV EOSIO_ROOT=/opt/eosio
 RUN chmod +x /opt/eosio/bin/start_eosiod.sh
 ENV LD_LIBRARY_PATH /usr/local/lib
 VOLUME /opt/eosio/bin/data-dir