Merge branch 'develop'

EOSIO · Sep 18, 2018 · 0f6695c · 0f6695c
2 parents 3e6d766 + 58f28b1
commit 0f6695c
Show file tree

Hide file tree

Showing 121 changed files with 5,444 additions and 3,119 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -96,7 +96,7 @@ steps:
         echo "--- :m: Starting MongoDB" && \
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
-        ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -LE long_running_tests --output-on-failure
+        ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
     retry:
       automatic:
         limit: 1
@@ -108,6 +108,26 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     timeout: 60
+
+  - command: |
+        echo "--- :arrow_down: Downloading build directory" && \
+        buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Build" && \
+        tar -zxf build.tar.gz && \
+        echo "--- :m: Starting MongoDB" && \
+        $(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"
+    artifact_paths:
+      - "mongod.log"
+      - "build/genesis.json"
+      - "build/config.ini"
+    timeout: 60
     
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
@@ -116,7 +136,7 @@ steps:
         echo "--- :m: Starting MongoDB" && \
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
+        cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
     retry:
       automatic:
         limit: 1
@@ -132,6 +152,30 @@ steps:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
+
+  - command: |
+        echo "--- :arrow_down: Downloading build directory" && \
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Build" && \
+        tar -zxf build.tar.gz && \
+        echo "--- :m: Starting MongoDB" && \
+        $(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"
+    artifact_paths:
+      - "mongod.log"
+      - "build/genesis.json"
+      - "build/config.ini"
+    plugins:
+      docker#v1.4.0:
+        image: "eosio/ci:ubuntu"
+        workdir: /data/job
+    timeout: 60
   
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
@@ -140,7 +184,7 @@ steps:
         echo "--- :m: Starting MongoDB" && \
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
+        cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
     retry:
       automatic:
         limit: 1
@@ -157,14 +201,38 @@ steps:
         workdir: /data/job
     timeout: 60
 
+  - command: |
+        echo "--- :arrow_down: Downloading build directory" && \
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build" && \
+        tar -zxf build.tar.gz && \
+        echo "--- :m: Starting MongoDB" && \
+        $(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"
+    artifact_paths:
+      - "mongod.log"
+      - "build/genesis.json"
+      - "build/config.ini"
+    plugins:
+      docker#v1.4.0:
+        image: "eosio/ci:ubuntu18"
+        workdir: /data/job
+    timeout: 60
+
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
         buildkite-agent artifact download "build.tar.gz" . --step ":fedora: Build" && \
         tar -zxf build.tar.gz && \
         echo "--- :m: Starting MongoDB" && \
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
+        cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
     retry:
       automatic:
         limit: 1
@@ -181,14 +249,38 @@ steps:
         workdir: /data/job
     timeout: 60
 
+  - command: |
+        echo "--- :arrow_down: Downloading build directory" && \
+        buildkite-agent artifact download "build.tar.gz" . --step ":fedora: Build" && \
+        tar -zxf build.tar.gz && \
+        echo "--- :m: Starting MongoDB" && \
+        $(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"
+    artifact_paths:
+      - "mongod.log"
+      - "build/genesis.json"
+      - "build/config.ini"
+    plugins:
+      docker#v1.4.0:
+        image: "eosio/ci:fedora"
+        workdir: /data/job
+    timeout: 60
+
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
         buildkite-agent artifact download "build.tar.gz" . --step ":centos: Build" && \
         tar -zxf build.tar.gz && \
         echo "--- :m: Starting MongoDB" && \
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
+        cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
     retry:
       automatic:
         limit: 1
@@ -205,14 +297,38 @@ steps:
         workdir: /data/job
     timeout: 60
 
+  - command: |
+        echo "--- :arrow_down: Downloading build directory" && \
+        buildkite-agent artifact download "build.tar.gz" . --step ":centos: Build" && \
+        tar -zxf build.tar.gz && \
+        echo "--- :m: Starting MongoDB" && \
+        $(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"
+    artifact_paths:
+      - "mongod.log"
+      - "build/genesis.json"
+      - "build/config.ini"
+    plugins:
+      docker#v1.4.0:
+        image: "eosio/ci:centos"
+        workdir: /data/job
+    timeout: 60
+
   - command: |
         echo "--- :arrow_down: Downloading build directory" && \
         buildkite-agent artifact download "build.tar.gz" . --step ":aws: Build" && \
         tar -zxf build.tar.gz && \
         echo "--- :m: Starting MongoDB" && \
         $(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
         echo "+++ :microscope: Running tests" && \
-        cd /data/job/build && ctest -LE long_running_tests --output-on-failure
+        cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
     retry:
       automatic:
         limit: 1
@@ -228,3 +344,27 @@ steps:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
+
+  - command: |
+        echo "--- :arrow_down: Downloading build directory" && \
+        buildkite-agent artifact download "build.tar.gz" . --step ":aws: Build" && \
+        tar -zxf build.tar.gz && \
+        echo "--- :m: Starting MongoDB" && \
+        $(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"
+    artifact_paths:
+      - "mongod.log"
+      - "build/genesis.json"
+      - "build/config.ini"
+    plugins:
+      docker#v1.4.0:
+        image: "eosio/ci:amazonlinux"
+        workdir: /data/job
+    timeout: 60
diff --git a/.gitmodules b/.gitmodules
@@ -27,3 +27,6 @@
 [submodule "libraries/fc"]
 	path = libraries/fc
 	url = https://github.com/EOSIO/fc
+[submodule "libraries/wabt"]
+	path = libraries/wabt
+	url = http://github.com/EOSIO/wabt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,8 +26,8 @@ set( CMAKE_CXX_EXTENSIONS ON )
 set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 2)
-set(VERSION_PATCH 6)
+set(VERSION_MINOR 3)
+set(VERSION_PATCH 0)
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )
@@ -74,8 +74,6 @@ if ("${OPENSSL_ROOT_DIR}" STREQUAL "")
    endif()
 endif()
 
-find_package(Secp256k1 REQUIRED)
-
 if(UNIX)
   if(APPLE)
     set(whole_archive_flag "-force_load")

diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in
@@ -50,6 +50,7 @@ endif()
 find_library(libbinaryen binaryen @CMAKE_INSTALL_FULL_LIBDIR@)
 find_library(libwasm WASM @CMAKE_INSTALL_FULL_LIBDIR@)
 find_library(libwast WAST @CMAKE_INSTALL_FULL_LIBDIR@)
+find_library(libwabt wabt @CMAKE_INSTALL_FULL_LIBDIR@)
 find_library(libir IR     @CMAKE_INSTALL_FULL_LIBDIR@)
 find_library(libplatform Platform @CMAKE_INSTALL_FULL_LIBDIR@)
 find_library(liblogging Logging @CMAKE_INSTALL_FULL_LIBDIR@)
@@ -59,7 +60,13 @@ find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
 find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
 find_library(libchainbase chainbase @CMAKE_INSTALL_FULL_LIBDIR@)
 find_library(libbuiltins builtins @CMAKE_INSTALL_FULL_LIBDIR@)
-find_library(libsecp256k1 secp256k1 @Secp256k1_ROOT_DIR@/lib)
+find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_FULL_LIBDIR@)
+find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
+    HINTS ENV GMP_LIB_DIR
+          ENV GMP_DIR
+    PATH_SUFFIXES lib
+    DOC "Path to the GMP library"
+)
 
 macro(add_eosio_test test_name)
    add_executable( ${test_name} ${ARGN} )
@@ -71,6 +78,7 @@ macro(add_eosio_test test_name)
        ${libbinaryen}
        ${libwast}
        ${libwasm}
+       ${libwabt}
        ${libruntime}
        ${libplatform}
        ${libir}
@@ -80,6 +88,7 @@ macro(add_eosio_test test_name)
        ${liblogging}
        ${libchainbase}
        ${libbuiltins}
+       ${GMP_LIBRARIES}
        ${libsecp256k1}
 
        LLVMX86Disassembler

diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in
@@ -51,6 +51,7 @@ find_library(libbinaryen binaryen @CMAKE_BINARY_DIR@/externals/binaryen/lib)
 find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM)
 find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST)
 find_library(libir IR     @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR)
+find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt)
 find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform)
 find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging)
 find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime)
@@ -59,7 +60,13 @@ find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
 find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
 find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase)
 find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins)
-find_library(libsecp256k1 secp256k1 @Secp256k1_ROOT_DIR@/lib)
+find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1)
+find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
+    HINTS ENV GMP_LIB_DIR
+          ENV GMP_DIR
+    PATH_SUFFIXES lib
+    DOC "Path to the GMP library"
+)
 
 macro(add_eosio_test test_name)
    add_executable( ${test_name} ${ARGN} )
@@ -71,6 +78,7 @@ macro(add_eosio_test test_name)
        ${libbinaryen}
        ${libwast}
        ${libwasm}
+       ${libwabt}
        ${libruntime}
        ${libplatform}
        ${libir}
@@ -80,6 +88,7 @@ macro(add_eosio_test test_name)
        ${liblogging}
        ${libchainbase}
        ${libbuiltins}
+       ${GMP_LIBRARIES}
        ${libsecp256k1}
 
        LLVMX86Disassembler

diff --git a/Docker/Dockerfile b/Docker/Dockerfile
@@ -5,7 +5,7 @@ ARG symbol=SYS
 RUN git clone -b $branch https://github.com/EOSIO/eos.git --recursive \
     && cd eos && echo "$branch:$(git rev-parse HEAD)" > /etc/eosio-version \
     && 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=/tmp/build  -DSecp256k1_ROOT_DIR=/usr/local -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
+       -DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/tmp/build -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
     && cmake --build /tmp/build --target install && rm /tmp/build/bin/eosiocpp
 
 
@@ -21,5 +21,4 @@ COPY --from=builder /eos/Docker/nodeosd.sh /opt/eosio/bin/nodeosd.sh
 ENV EOSIO_ROOT=/opt/eosio
 RUN chmod +x /opt/eosio/bin/nodeosd.sh
 ENV LD_LIBRARY_PATH /usr/local/lib
-VOLUME /opt/eosio/bin/data-dir
 ENV PATH /opt/eosio/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/Docker/README.md b/Docker/README.md
@@ -20,10 +20,10 @@ cd eos/Docker
 docker build . -t eosio/eos
 ```
 
-The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.2.6 tag, you could do the following:
+The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.3.0 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.2.6 --build-arg branch=v1.2.6 .
+docker build -t eosio/eos:v1.3.0 --build-arg branch=v1.3.0 .
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.

diff --git a/Docker/builder/Dockerfile b/Docker/builder/Dockerfile
@@ -50,13 +50,6 @@ RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/l
     && cmake --build build --target install \
     && cd .. && rm -rf llvm
 
-RUN git clone --depth 1 https://github.com/cryptonomex/secp256k1-zkp \
-    && cd secp256k1-zkp \
-    && ./autogen.sh \
-    && ./configure --prefix=/usr/local \
-    && make -j$(nproc) install \
-    && cd .. && rm -rf secp256k1-zkp
-
 RUN git clone --depth 1 -b releases/v3.3 https://github.com/mongodb/mongo-cxx-driver \
     && cd mongo-cxx-driver/build \
     && cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \

diff --git a/Docker/dev/Dockerfile b/Docker/dev/Dockerfile
@@ -5,7 +5,7 @@ ARG symbol=SYS
 RUN git clone -b $branch https://github.com/EOSIO/eos.git --recursive \
     && cd eos && echo "$branch:$(git rev-parse HEAD)" > /etc/eosio-version \
     && cmake -H. -B"/opt/eosio" -GNinja -DCMAKE_BUILD_TYPE=Release -DWASM_ROOT=/opt/wasm -DCMAKE_CXX_COMPILER=clang++ \
-       -DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/opt/eosio  -DSecp256k1_ROOT_DIR=/usr/local -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
+       -DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/opt/eosio -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
     && cmake --build /opt/eosio --target install \
     && cp /eos/Docker/config.ini / && ln -s /opt/eosio/contracts /contracts && cp /eos/Docker/nodeosd.sh /opt/eosio/bin/nodeosd.sh && ln -s /eos/tutorials /tutorials
 
@@ -14,5 +14,4 @@ RUN pip3 install numpy
 ENV EOSIO_ROOT=/opt/eosio
 RUN chmod +x /opt/eosio/bin/nodeosd.sh
 ENV LD_LIBRARY_PATH /usr/local/lib
-VOLUME /opt/eosio/bin/data-dir
 ENV PATH /opt/eosio/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin