merge v3.0.8 into develop branch (#169)

* check llvm version >= 7 and install automatically * Remove bytes in flight * Upgrade: name apply context transaction context and plugins * FIX: unittests * fix a potential crash in fetching lib. * emit lib in ascending order. * fix a potential crash in fetching lib. * emit lib in ascending order. * Change abi-serializer-max-time-us to abi-serializer-max-time-ms * Fix: TODO * Fix: mongodb plugin * Fix: cleos name issue * Fix: tests * Add back get block detail in history plugin * update connected lib channels of plugins * Fix: state history plugin issues * Change: applied transaction channel for statehistory plugin * fix: exclude invalid cert; shuffle view changes before generation; add debug functions in pbft api plugin * Fix: state history get block from forkdb null * reset docker file * prepare v3.0.8 Co-authored-by: Frank-AFN <[email protected]> Co-authored-by: oldcold <[email protected]>
boscore · Jun 6, 2020 · fba8580 · fba8580
1 parent c09d025
commit fba8580
Show file tree

Hide file tree

Showing 74 changed files with 2,200 additions and 2,241 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 7)
+set(VERSION_PATCH 8)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")
@@ -55,8 +55,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
        add_compile_options(-fdiagnostics-color=always)
     endif()
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-        message(FATAL_ERROR "Clang version must be at least 6.0!")
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+        message(FATAL_ERROR "Clang version must be at least 7.0!")
     endif()
 endif()
 

diff --git a/Docker/README.md b/Docker/README.md
@@ -20,10 +20,10 @@ cd bos/Docker
 docker build . -t boscore/bos -s BOS
 ```
 
-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 v3.0.7 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 v3.0.8 tag, you could do the following:
 
 ```bash
-docker build -t boscore/bos:v3.0.7 --build-arg branch=v3.0.7 .
+docker build -t boscore/bos:v3.0.8 --build-arg branch=v3.0.8 .
 
 ```
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # BOSCore - Blockchain financial center building a trusted business ecosystem.
 
-## BOSCore Version: v3.0.7
-### Basic EOSIO Version: v1.6.6 (support REX & EOSVM, part 2.0.x)
+## BOSCore Version: v3.0.8
+### Basic EOSIO Version: v2.0 (support REX & EOSVM, llvm v90)
 
 # Background
 The emergence of EOS has brought new imagination to the blockchain. In just a few months since the main network was launched, the version has undergone dozens of upgrades, not only the stability has been greatly improved, but also the new functions have been gradually realized. The node team is also actively involved in building the EOSIO ecosystem. What is even more exciting is that EOS has attracted more and more development teams. There are already hundreds of DApp running on the EOS main network. The transaction volume and circulation market value far exceed Ethereum, and the space for development is growing broader.

diff --git a/README_CN.md b/README_CN.md
@@ -1,7 +1,7 @@
 # BOSCore - 区块链自由港，构建可信商业生态。
 
-## BOSCore Version: v3.0.7
-### Basic EOSIO Version: v1.6.6 (support REX & EOSVM, part 2.0.x)
+## BOSCore Version: v3.0.8
+### Basic EOSIO Version: v2.0 (support REX & EOSVM, llvm v90)
 
 # 背景
 EOS的出现给区块链带来了新的想象力，主网启动短短几个月以来，版本经历了几十次升级，不仅稳定性得到了很大提高，并且新功能也逐步实现，各个节点团队也积极参与建设EOSIO生态。让人更加兴奋的是，EOS已经吸引了越来越多的开发团队，当前已经有数百个DApp在EOS主网上面运行，其交易量和流通市值远超以太坊，可发展的空间愈来愈广阔。

diff --git a/eosio_build.sh b/eosio_build.sh
@@ -63,7 +63,7 @@
    fi
    START_MAKE=true
    TIME_BEGIN=$( date -u +%s )
-   VERSION=1.2
+   VERSION=3.0.7
 
    txtbld=$(tput bold)
    bldred=${txtbld}$(tput setaf 1)
@@ -174,7 +174,7 @@
             MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
             export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm
             export CMAKE=${HOME}/opt/cmake/bin/cmake
-            export PATH=${HOME}/opt/mongodb/bin:$PATH
+            export PATH=${HOME}/opt/mongodb/bin:${HOME}/opt/wasm/bin:$PATH
          ;;
          "CentOS Linux")
             FILE="${SOURCE_DIR}/scripts/eosio_build_centos.sh"
@@ -183,14 +183,14 @@
             MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
             export LLVM_DIR=${HOME}/opt/wasm/lib/cmake/llvm
             export CMAKE=${HOME}/opt/cmake/bin/cmake
-            export PATH=${HOME}/opt/mongodb/bin:$PATH
+            export PATH=${HOME}/opt/mongodb/bin:${HOME}/opt/wasm/bin:$PATH
          ;;
          "elementary OS")
             FILE="${SOURCE_DIR}/scripts/eosio_build_ubuntu.sh"
             CXX_COMPILER=clang++
             C_COMPILER=clang
             MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
-            export PATH=${HOME}/opt/mongodb/bin:$PATH
+            export PATH=${HOME}/opt/mongodb/bin:${HOME}/opt/wasm/bin:$PATH
          ;;
          "Fedora")
             FILE="${SOURCE_DIR}/scripts/eosio_build_fedora.sh"
@@ -204,21 +204,21 @@
             CXX_COMPILER=clang++
             C_COMPILER=clang
             MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
-            export PATH=${HOME}/opt/mongodb/bin:$PATH
+            export PATH=${HOME}/opt/mongodb/bin:${HOME}/opt/wasm/bin:$PATH
          ;;
          "Ubuntu")
             FILE="${SOURCE_DIR}/scripts/eosio_build_ubuntu.sh"
             CXX_COMPILER=clang++
             C_COMPILER=clang
             MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
-            export PATH=${HOME}/opt/mongodb/bin:$PATH
+            export PATH=${HOME}/opt/mongodb/bin:${HOME}/opt/wasm/bin:$PATH
          ;;
          "Debian GNU/Linux")
             FILE=${SOURCE_DIR}/scripts/eosio_build_ubuntu.sh
             CXX_COMPILER=clang++
             C_COMPILER=clang
             MONGOD_CONF=${HOME}/opt/mongodb/mongod.conf
-            export PATH=${HOME}/opt/mongodb/bin:$PATH
+            export PATH=${HOME}/opt/mongodb/bin:${HOME}/opt/wasm/bin:$PATH
          ;;
          *)
             printf "\\n\\tUnsupported Linux Distribution. Exiting now.\\n\\n"
@@ -274,7 +274,7 @@
       -DENABLE_COVERAGE_TESTING="${ENABLE_COVERAGE_TESTING}" -DBUILD_DOXYGEN="${DOXYGEN}" \
       -DCMAKE_CXX_STANDARD_LIBRARIES="-lpthread" \
       -DCMAKE_INSTALL_PREFIX="/usr/local/eosio" ${LOCAL_CMAKE_FLAGS} "${SOURCE_DIR}" \
-      -DENABLE_TOOLS=OFF
+      -DENABLE_TOOLS=OFF 
    then
       printf "\\n\\t>>>>>>>>>>>>>>>>>>>> CMAKE building BOSCore has exited with the above error.\\n\\n"
       exit -1

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
@@ -95,6 +95,7 @@ add_library( eosio_chain
 #             global_property_object.cpp
 #
 #             contracts/chain_initializer.cpp
+              trace.cpp
               protocol_state_object.cpp
               genesis_intrinsics.cpp
               whitelisted_intrinsics.cpp