Merge branch 'develop' of gitlab.peersafe.cn:chainsql/chainsqld into develop

Author: luleigreat

Builds/CMake/ChainsqldCore.cmake

@@ -731,6 +731,7 @@ target_sources (chainsqld PRIVATE
   src/peersafe/precompiled/TableOpPrecompiled.cpp
   src/peersafe/precompiled/ToolsPrecompiled.cpp
   src/peersafe/precompiled/Utils.cpp
+  src/peersafe/precompiled/ripemd160.cpp
   src/peersafe/protocol/impl/Contract.cpp
   src/peersafe/protocol/impl/STEntry.cpp
   src/peersafe/protocol/impl/STMap256.cpp

Builds/CMake/deps/Mysql.cmake

@@ -12,6 +12,7 @@
       FIND_LIBRARY(MYSQL_LIBRARY
         NAMES ${MYSQL_NAMES}
         PATHS ${MYSQL_LIBRARY_DIR}
+        NO_DEFAULT_PATH
       )
     else()
       find_program(HOMEBREW brew)

Builds/CMake/deps/Secp256k1.cmake

@@ -22,6 +22,7 @@ if(secp256k1)
 
 else()
   set(INSTALL_SECP256K1 true)
+  add_definitions(-DENABLE_MODULE_RECOVERY)
 
   add_library (secp256k1 STATIC
     src/secp256k1/src/secp256k1.c)

Builds/CMake/deps/Soci.cmake

@@ -42,8 +42,8 @@ else()
   ExternalProject_Add (soci
     PREFIX ${nih_cache_path}
     GIT_REPOSITORY https://github.com/ChainSQL/soci.git
-    GIT_TAG chainsql
-    GIT_SHALLOW ON
+    GIT_TAG c6e581399415d6bc366a83532e85ae64e0204ef4
+    #GIT_SHALLOW ON
     # We had an issue with soci integer range checking for boost::optional
     # and needed to remove the exception that SOCI throws in this case.
     # This is *probably* a bug in SOCI, but has never been investigated more

Builds/WinVS/README.md

@@ -10,7 +10,7 @@
 | [Git for Windows](README.md#install-git-for-windows)| 2.16.1 |
 | [OpenSSL Library](README.md#install-openssl) | 1.0.2u或者1.1.0+ |
 | [Goole Protocol Buffers Complier](README.md#install-protocol) | 2.5 |
-| [Boost library](README.md#build-boost) | 1.70.0 |
+| [Boost library](README.md#build-boost) | 1.73.0 |
 | [CMake for Windows](README.md#optional-install-cmake-for-windows)* | 3.12 |
 | [mysql](README.md#install-mysql) | 5.6 |
 
@@ -38,14 +38,14 @@
 > 2. 安装完 OpenSSL 后，并将 OPENSSL_ROOT_DIR 环境变量设置为 OpenSSL 安装路径
 
 ### install boost
-> 1. 下载 [boost 1.70 ](http://www.boost.org/users/news/)
+> 1. 下载 [boost 1.73 ](http://www.boost.org/users/news/)
 > 2. 编译 boost，注意下面的Num Parallel需要指定一个并行编译数量，如：2
 ```cmd
-> cd C:\lib\boost_1_70_0
+> cd C:\lib\boost_1_73_0
 > bootstrap
 > bjam -j<Num Parallel> --toolset=msvc-14.1 address-model=64 architecture=x86 link=static threading=multi runtime-link=shared,static stage --stagedir=stage64
 ```
-> 3. 将 BOOST_ROOT 环境变量设置为 C:\lib\boost_1_70_0
+> 3. 将 BOOST_ROOT 环境变量设置为 C:\lib\boost_1_73_0
 
 ### install mysql
 > 1. 下载 [mysql8.0 for windows](https://dev.mysql.com/downloads/installer/)。建议优先选择 x86，64-bit 的压缩包并安装。

Builds/linux/README.md

@@ -7,7 +7,7 @@
 |-----------|-----------------------|
 | gcc | 7.4.0+ |
 | cmake | 3.12+ |
-| boost | 1.70.0+ |
+| boost | 1.73.0+ |
 
 
 ## 安装开发环境依赖
@@ -41,9 +41,9 @@ apt-get install -y gcc g++ wget git cmake pkg-config protobuf-compiler libprotob
 ### Boost安装
 - 进入编译目录
 ```bash
-wget https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.gz
-tar -xzf boost_1_70_0.tar.gz
-cd boost_1_70_0
+wget https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz
+tar -xzf boost_1_73_0.tar.gz
+cd boost_1_73_0
 ./bootstrap.sh
 ./b2 headers
 ./b2 -j<Num Parallel>
@@ -52,7 +52,7 @@ cd boost_1_70_0
 - 在 ~/.bashrc 文件中保存 BOOST_ROOT 环境变量
 
 ```bash
-export BOOST_ROOT=/home/dbliu/work/chainSQL/Builds/Ubuntu/boost_1_70_0
+export BOOST_ROOT=/home/dbliu/work/chainSQL/Builds/Ubuntu/boost_1_73_0
 ```
 - 让 BOOST_ROOT 环境变量生效
 ```bash

Builds/macos/README.md

@@ -61,11 +61,11 @@ brew install git cmake pkg-config protobuf openssl mysql-client@5.7
 
 ### Build Boost
 
-Boost 1.70 or later is required.
+Boost 1.73 or later is required.
 
 We want to compile boost with clang/libc++
 
-Download [a release](https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2)
+Download [a release](https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz)
 
 Extract it to a folder, making note of where, open a terminal, then:
 
@@ -87,11 +87,11 @@ If you didn't persistently set the `BOOST_ROOT` environment variable to the
 root of the extracted directory above, then you should set it temporarily.
 
 For example, assuming your username were `Abigail` and you extracted Boost
-1.70.0 in `/Users/Abigail/Downloads/boost_1_70_0`, you would do for any
+1.73.0 in `/Users/Abigail/Downloads/boost_1_73_0`, you would do for any
 shell in which you want to build:
 
 ```
-echo 'export BOOST_ROOT=/Users/Abigail/Downloads/boost_1_70_0' >> ~/.zshrc
+echo 'export BOOST_ROOT=/Users/Abigail/Downloads/boost_1_73_0' >> ~/.zshrc
 ```
 
 You need to specify the mysql-client lib path for `MYSQL_DIR` environment variable.

src/eth/vm/Common.h

@@ -19,7 +19,9 @@ namespace eth {
 	bytes const NullBytes;
 
 	using bigint = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<>>;
-	//using u256 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<256, 256, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>;
+	using u256 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<256, 256, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>;
+    using s256 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<256, 256,
+        boost::multiprecision::signed_magnitude, boost::multiprecision::unchecked, void>>;
 
     struct Exception : virtual std::exception, virtual boost::exception
     {

src/eth/vm/ExtVMFace.cpp

@@ -263,23 +263,23 @@ namespace eth {
         evmcResult.output_data = result.output.data();
         evmcResult.output_size = result.output.size();
 
-#ifdef DEBUG
-        if (evmcResult.output_size) {
-            // fix an issue that Stack around the variable 'result' was corrupted
-            evmc_get_optional_storage(&evmcResult)->pointer = std::malloc(evmcResult.output_size);
-            new(evmc_get_optional_storage(&evmcResult)->pointer) bytes(result.output.takeBytes());
-
-            evmcResult.release = [](evmc_result const* _result)
-            {
-                uint8_t* data = (uint8_t*)evmc_get_const_optional_storage(_result)->pointer;
-                auto& output = reinterpret_cast<bytes const&>(*data);
-                // Explicitly call vector's destructor to release its data.
-                // This is normal pattern when placement new operator is used.
-                output.~bytes();
-                std::free(data);
-            };
-        }
-#else
+//#ifdef DEBUG
+//        if (evmcResult.output_size) {
+//            // fix an issue that Stack around the variable 'result' was corrupted
+//            evmc_get_optional_storage(&evmcResult)->pointer = std::malloc(evmcResult.output_size);
+//            new(evmc_get_optional_storage(&evmcResult)->pointer) bytes(result.output.takeBytes());
+//
+//            evmcResult.release = [](evmc_result const* _result)
+//            {
+//                uint8_t* data = (uint8_t*)evmc_get_const_optional_storage(_result)->pointer;
+//                auto& output = reinterpret_cast<bytes const&>(*data);
+//                // Explicitly call vector's destructor to release its data.
+//                // This is normal pattern when placement new operator is used.
+//                output.~bytes();
+//                std::free(data);
+//            };
+//        }
+//#else
         // Place a new vector of bytes containing output in result's reserved memory.
         auto* data = evmc_get_optional_storage(&evmcResult);
         //static_assert(sizeof(bytes) <= sizeof(*data), "Vector is too big");
@@ -294,7 +294,7 @@ namespace eth {
             // This is normal pattern when placement new operator is used.
             output.~bytes();
         };
-#endif
+//#endif
         return evmc::result{ evmcResult };
     }
 

src/eth/vm/utils/keccak.cpp

@@ -154,4 +154,9 @@ void keccak(uint8_t const* _data, uint64_t _size, uint8_t* o_hash)
 	keccak_256(o_hash, 32, _data, _size);
 }
 
-}
+void sha3(uint8_t const* _data, uint64_t _size, uint8_t* o_hash)
+{
+    keccak_256(o_hash, 32, _data, _size);
+}
+
+}