Merge from eos/master

Author: learnforpractice

.buildkite/long_running_tests.yml

@@ -97,17 +97,14 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -L long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":darwin: Tests"
     agents:
       - "role=macos-tester"
     artifact_paths:
       - "mongod.log"
       - "build/genesis.json"
       - "build/config.ini"
-    timeout: 60
+    timeout: 100
     
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
@@ -117,9 +114,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":ubuntu: Tests"
     agents:
       - "role=linux-tester"
@@ -131,7 +125,7 @@ steps:
       docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
-    timeout: 60
+    timeout: 100
   
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
@@ -141,9 +135,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":ubuntu: 18.04 Tests"
     agents:
       - "role=linux-tester"
@@ -155,7 +146,7 @@ steps:
       docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
-    timeout: 60
+    timeout: 100
 
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
@@ -165,9 +156,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":fedora: Tests"
     agents:
       - "role=linux-tester"
@@ -179,7 +167,7 @@ steps:
       docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
-    timeout: 60
+    timeout: 100
 
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
@@ -189,9 +177,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":centos: Tests"
     agents:
       - "role=linux-tester"
@@ -203,7 +188,7 @@ steps:
       docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
-    timeout: 60
+    timeout: 100
 
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
@@ -213,9 +198,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L long_running_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":aws: Tests"
     agents:
       - "role=linux-tester"
@@ -227,4 +209,4 @@ steps:
       docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
-    timeout: 60
+    timeout: 100

.buildkite/pipeline.yml

@@ -97,9 +97,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":darwin: Tests"
     agents:
       - "role=macos-tester"
@@ -117,9 +114,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":darwin: NP Tests"
     agents:
       - "role=macos-tester"
@@ -137,9 +131,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":ubuntu: Tests"
     agents:
       - "role=linux-tester"
@@ -161,9 +152,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":ubuntu: NP Tests"
     agents:
       - "role=linux-tester"
@@ -185,9 +173,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":ubuntu: 18.04 Tests"
     agents:
       - "role=linux-tester"
@@ -209,9 +194,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":ubuntu: 18.04 NP Tests"
     agents:
       - "role=linux-tester"
@@ -233,9 +215,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":fedora: Tests"
     agents:
       - "role=linux-tester"
@@ -257,9 +236,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":fedora: NP Tests"
     agents:
       - "role=linux-tester"
@@ -281,9 +257,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":centos: Tests"
     agents:
       - "role=linux-tester"
@@ -305,9 +278,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":centos: NP Tests"
     agents:
       - "role=linux-tester"
@@ -329,9 +299,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":aws: Tests"
     agents:
       - "role=linux-tester"
@@ -353,9 +320,6 @@ steps:
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
         cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
-    retry:
-      automatic:
-        limit: 1
     label: ":aws: NP Tests"
     agents:
       - "role=linux-tester"

.buildkite/sanitizers.yml

@@ -0,0 +1,66 @@
+steps:
+  - command: |
+        echo "--- :hammer: Building with Undefined Sanitizer" && \
+        /usr/bin/cmake -GNinja \
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DCMAKE_CXX_COMPILER=clang++-4.0 \
+        -DCMAKE_C_COMPILER=clang-4.0 \
+        -DBOOST_ROOT="${BOOST_ROOT}" \
+        -DWASM_ROOT="${WASM_ROOT}" \
+        -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" \
+        -DBUILD_MONGO_DB_PLUGIN=true \
+        -DENABLE_COVERAGE_TESTING=true\
+        -DBUILD_DOXYGEN=false -DCMAKE_CXX_FLAGS="-fsanitize=undefined -fsanitize-recover=all -g -fno-omit-frame-pointer" \
+        -DCMAKE_C_FLAGS="-fsanitize=undefined -fsanitize-recover=all -g -fno-omit-frame-pointer" \
+        -DCMAKE_EXE_LINKER_FLAGS="-fsanitize=undefined -fsanitize-recover=all -rtlib=compiler-rt -lgcc_s -pthread" \
+        -DCMAKE_MODULE_LINKER_FLAGS="-fsanitize=undefined -fsanitize-recover=all -rtlib=compiler-rt -lgcc_s -pthread" && \
+        echo "--- :shinto_shrine: Running ninja" && \
+        /usr/bin/ninja | tee ninja.log && \
+        echo "--- :compression: Compressing build directory" && \
+        tar -pczf build.tar.gz *
+        echo "--- :beers: Done"
+    label: ":_: Undefined Sanitizer"
+    agents:
+      - "role=automation-builder-large"
+    artifact_paths:
+      - "build.tar.gz"
+      - "ninja.log"
+    plugins:
+      docker#v1.4.0:
+        image: "eosio/ci:ubuntu18"
+        command: ["--privileged"]
+        workdir: /data/job
+        mounts:
+          - /etc/buildkite-agent/config:/config
+        environment:
+          - BOOST_ROOT=/root/opt/boost
+          - OPENSSL_ROOT_DIR=/usr/include/openssl
+          - WASM_ROOT=/root/opt/wasm
+          - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/wasm/bin
+          - CI=true
+          - UBSAN_OPTIONS=print_stacktrace=1
+    timeout: 60
+
+  - wait
+
+  - command: |
+        echo "--- :arrow_down: Downloading build directory" && \
+        buildkite-agent artifact download "build.tar.gz" . --step ":_: Undefined Sanitizer" && \
+        tar -zxf build.tar.gz --no-same-owner && \
+        echo "--- :m: Starting MongoDB" && \
+        $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
+        echo "+++ :microscope: Running tests" && \
+        ctest -j8 -LE _tests -V -O sanitizer.log
+    label: ":_: Undefined Sanitizer Tests"
+    agents:
+      - "role=automation-builder-large"
+    artifact_paths:
+      - "mongod.log"
+      - "sanitizer.log"
+    plugins:
+      docker#v1.4.0:
+        image: "eosio/ci:ubuntu18"
+        workdir: /data/job
+        mounts:
+          - /etc/buildkite-agent/config:/config
+    timeout: 120

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+<!-- PLEASE FILL OUT THE FOLLOWING MARKDOWN TEMPLATE -->
+<!-- Give your PR a title that is sufficient to understand what is being changed. -->
+
+**Change Description**
+
+<!-- Describe the change you made, the motivation for it, and the impact it will have. Reference issues or pull requests where possible (use '#XX' or 'GH-XX' where XX is the issue or pull request number). -->
+
+**Consensus Changes**
+
+<!-- If this PR introduces a change to the validation of blocks in the chain or consensus in general, please describe the impact. -->
+
+
+**API Changes**
+
+<!-- If this PR introduces API changes, please describe the changes here. What will developers need to know before upgrading to this version? -->
+
+
+**Documentation Additions**
+
+<!-- List all the information that needs to be added to the documentation after merge. -->

CMakeLists.txt

@@ -71,8 +71,8 @@ set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH 0)
+set(VERSION_MINOR 4)
+set(VERSION_PATCH 1)
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )
@@ -262,6 +262,7 @@ if(ENABLE_COVERAGE_TESTING)
   find_program( GENHTML_PATH NAMES genhtml)
 endif()
 
+include(utils)
 add_subdirectory( externals )
 
 set( CORE_SYMBOL_NAME "EOS" )
@@ -282,7 +283,6 @@ endif()
 message( STATUS "Using '${EOSIO_ROOT_KEY}' as public key for 'eosio' account" )
 
 include(wasm)
-
 add_subdirectory( libraries )
 add_subdirectory( contracts )
 add_subdirectory( plugins )
@@ -303,10 +303,38 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testnet.template ${CMAKE_CURRENT_BINA
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/eosio.version.in ${CMAKE_CURRENT_BINARY_DIR}/eosio.version.hpp)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eosio.version.hpp DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/EosioTester.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/EosioTester.cmake @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/EosioTesterBuild.cmake.in ${CMAKE_BINARY_DIR}/lib/cmake/EosioTester.cmake @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/EosioTester.cmake DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/)
-
-include(installer)
-
+set(EOS_ROOT_DIR ${CMAKE_BINARY_DIR})
+configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/eosio-config.cmake.in ${CMAKE_BINARY_DIR}/lib/cmake/eosio/eosio-config.cmake @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/EosioTesterBuild.cmake.in ${CMAKE_BINARY_DIR}/lib/cmake/eosio/EosioTester.cmake @ONLY)
+
+set(EOS_ROOT_DIR ${CMAKE_INSTALL_PREFIX})
+configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/eosio-config.cmake.in ${CMAKE_BINARY_DIR}/modules/eosio-config.cmake @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/modules/eosio-config.cmake DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/eosio)
+configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/EosioTester.cmake.in ${CMAKE_BINARY_DIR}/modules/EosioTester.cmake @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/modules/EosioTester.cmake DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/eosio)
+
+configure_file(${CMAKE_SOURCE_DIR}/LICENSE 
+               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/libraries/wabt/LICENSE 
+               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.wabt COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/libraries/softfloat/COPYING.txt 
+               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.softfloat COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/libraries/wasm-jit/LICENSE 
+               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.wavm COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/libraries/fc/secp256k1/upstream/COPYING 
+               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.secp256k1 COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/libraries/fc/src/network/LICENSE.go 
+               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.go COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/externals/binaryen/LICENSE 
+               ${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.binaryen COPYONLY)
+
+install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/)
+install(FILES libraries/wabt/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.wabt)
+install(FILES libraries/softfloat/COPYING.txt DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.softfloat)
+install(FILES libraries/wasm-jit/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.wavm)
+install(FILES libraries/fc/secp256k1/upstream/COPYING DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.secp256k1)
+install(FILES externals/binaryen/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.binaryen)
+install(FILES libraries/fc/src/network/LICENSE.go DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ )
+
+include(package)
 include(doxygen)