Release/v1.12.1

CMakeLists.txt

@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.20)
 
 # Set current version of the project
 set(TARAXA_MAJOR_VERSION 1)
-set(TARAXA_MINOR_VERSION 11)
-set(TARAXA_PATCH_VERSION 4)
+set(TARAXA_MINOR_VERSION 12)
+set(TARAXA_PATCH_VERSION 1)
 set(TARAXA_VERSION ${TARAXA_MAJOR_VERSION}.${TARAXA_MINOR_VERSION}.${TARAXA_PATCH_VERSION})
 
 # Any time a change in the network protocol is introduced this version should be increased
-set(TARAXA_NET_VERSION 3)
+set(TARAXA_NET_VERSION 5)
 # Major version is modified when DAG blocks, pbft blocks and any basic building blocks of our blockchain is modified
 # in the db
 set(TARAXA_DB_MAJOR_VERSION 1)
@@ -32,7 +32,8 @@ add_compile_options(-Wall
                     -Wextra-semi
                     -Wnull-dereference
                     -Wno-unknown-pragmas
-                    -Wno-overlength-strings)
+                    -Wno-overlength-strings
+                    -Wno-switch)
 # Set the position independent code property on all targets
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -217,9 +218,6 @@ find_package(MPFR)
 set(JSONCPP_INCLUDE_DIR ${CONAN_INCLUDE_DIRS_JSONCPP})
 include(ProjectJSONRPCCPP)
 
-# rocksdb build
-include(${PROJECT_SOURCE_DIR}/CMakeModules/rocksdb.cmake)
-
 # Add sub-directories cmakes
 add_subdirectory(submodules)
 add_subdirectory(libraries)

CMakeModules/cpp_graphql_gen.cmake

@@ -6,7 +6,7 @@ set(Boost_NO_WARN_NEW_VERSIONS 1)
 FetchContent_Declare(
   cppgraphqlgen
   GIT_REPOSITORY https://github.com/microsoft/cppgraphqlgen.git
-  GIT_TAG v4.5.6
+  GIT_TAG v4.5.8
   GIT_SHALLOW TRUE
 )
 set(GRAPHQL_BUILD_TESTS OFF)

CMakeModules/cppcheck.cmake

@@ -10,6 +10,7 @@ else ()
             COMMAND ${CPP_CHECK_EXE}
             --error-exitcode=1
             --enable=all
+            --check-level=exhaustive
             --suppress=missingInclude
             --suppress=missingIncludeSystem
             # find_if - useless here
@@ -19,14 +20,20 @@ else ()
             # false positive
             --suppress=uninitMemberVar:${PROJECT_SOURCE_DIR}/*/UPnP.cpp
             # This is only enabled because of test functions and false positives
-            --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/Eth.cpp
             --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/Common.cpp
             --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/Base64.cpp
             --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/util.cpp
             --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/vrf_wrapper.cpp
             --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/UPnP.cpp
             --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/logger.cpp
             --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/state_api.cpp
+            --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/watches.hpp
+            --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/vector_ref.h
+            --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/RLP.h
+            --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/FixedHash.h
+            --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/CommonData.h
+            --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/Common.h
+            --suppress=unusedFunction:${PROJECT_SOURCE_DIR}/*/Log.h
             # TODO remove this when we solve correct exit of programs
             --suppress=localMutex:${PROJECT_SOURCE_DIR}/*/main.cpp
             # Just style warning
@@ -38,6 +45,7 @@ else ()
             --suppress=unmatchedSuppression:${PROJECT_SOURCE_DIR}/*/Common.h
             --suppress=cstyleCast:${PROJECT_SOURCE_DIR}/*/vector_ref.h
             --suppress=cstyleCast:${PROJECT_SOURCE_DIR}/*/Common.h
+            --suppress=cstyleCast:${PROJECT_SOURCE_DIR}/*/transaction.cpp
             # not an issue here
             --suppress=virtualCallInConstructor:${PROJECT_SOURCE_DIR}/*/final_chain.cpp
             # just a warning

conanfile.py

@@ -13,13 +13,14 @@ class TaraxaConan(ConanFile):
     generators = "cmake"
 
     def requirements(self):
-        self.requires("boost/1.85.0")
-        self.requires("cppcheck/2.12") #TODO(2.14.1)
-        self.requires("openssl/3.2.1")
+        self.requires("boost/1.86.0")
+        self.requires("cppcheck/2.15.0")
+        self.requires("openssl/3.3.2")
         self.requires("cryptopp/8.9.0")
-        self.requires("gtest/1.14.0")
-        self.requires("lz4/1.9.4")
-        self.requires("prometheus-cpp/1.1.0")
+        self.requires("gtest/1.15.0")
+        self.requires("lz4/1.10.0")
+        self.requires("rocksdb/9.2.1")
+        self.requires("prometheus-cpp/1.2.4")
         self.requires("jsoncpp/1.9.5")
 
     def _configure_boost_libs(self):
@@ -60,6 +61,8 @@ def configure(self):
         self.options["gtest"].build_gmock = False
         # this links cppcheck to prce library
         self.options["cppcheck"].have_rules = False
+        self.options["rocksdb"].use_rtti = True
+        self.options["rocksdb"].with_lz4 = True
         # mpir is required by cppcheck and it causing gmp confict
         self.options["mpir"].enable_gmpcompat = False
 

for_devs/local-net

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-
 import click
 import subprocess
 import threading
@@ -313,7 +312,7 @@ def faucet_worker(tps):
     time.sleep(10)
     web3 = Web3(Web3.HTTPProvider('http://127.0.0.1:7017'))
     nonce = web3.eth.get_transaction_count(
-        Web3.to_checksum_address(faucet_public_address))
+        Web3.toChecksumAddress(faucet_public_address))
 
     consensus_nodes = list(consensus_nodes_public_addresses.keys())
 
@@ -323,10 +322,10 @@ def faucet_worker(tps):
             0, len(consensus_nodes)-1)]]
         tx = {
             'nonce': nonce,
-            'to': Web3.to_checksum_address(to),
-            'value': web3.to_wei(100000000, 'gwei'),
+            'to': Web3.toChecksumAddress(to),
+            'value': web3.toWei(100000000, 'gwei'),
             'gas': 21000,
-            'gasPrice': web3.to_wei(1, 'gwei'),
+            'gasPrice': web3.toWei(1, 'gwei'),
             'chainId': int(chain_id)
         }
         nonce = nonce + 1
@@ -338,7 +337,7 @@ def faucet_worker(tps):
         try:
             tx_hash = web3.eth.send_raw_transaction(signed_tx.rawTransaction)
             log_format(
-                'faucet', f'{t} Dripped to {to}, tx_hash: {web3.to_hex(tx_hash)}')
+                'faucet', f'{t} Dripped to {to}, tx_hash: {web3.toHex(tx_hash)}')
         except Exception as e:
             log_format('faucet', f'{t} Failed to drip to {to}. Error: {str(e)}')
             pass

libraries/aleth/libdevcore/Base64.h

@@ -31,7 +31,7 @@
 
 #include <string>
 
-#include "FixedHash.h"
+#include "Common.h"
 
 namespace dev {
 std::string toBase64(bytesConstRef _in);

libraries/aleth/libdevcore/Common.cpp

@@ -4,7 +4,6 @@
 
 #include "Common.h"
 
-#include "Exceptions.h"
 #include "Log.h"
 
 #if defined(_WIN32)

libraries/aleth/libdevcore/Common.h

@@ -12,7 +12,6 @@
 #include <set>
 #include <string>
 #include <unordered_map>
-#include <unordered_set>
 #include <vector>
 #pragma warning(push)
 #pragma GCC diagnostic push
@@ -128,33 +127,6 @@ using strings = std::vector<std::string>;
 // Null/Invalid values for convenience.
 extern bytes const NullBytes;
 
-/// Interprets @a _u as a two's complement signed number and returns the
-/// resulting s256.
-inline s256 u2s(u256 _u) {
-  static const bigint c_end = bigint(1) << 256;
-  if (boost::multiprecision::bit_test(_u, 255))
-    return s256(-(c_end - _u));
-  else
-    return s256(_u);
-}
-
-/// @returns the two's complement signed representation of the signed number _u.
-inline u256 s2u(s256 _u) {
-  static const bigint c_end = bigint(1) << 256;
-  if (_u >= 0)
-    return u256(_u);
-  else
-    return u256(c_end + _u);
-}
-
-/// @returns the smallest n >= 0 such that (1 << n) >= _x
-inline unsigned int toLog2(u256 _x) {
-  unsigned ret;
-  for (ret = 0; _x >>= 1; ++ret) {
-  }
-  return ret;
-}
-
 template <size_t n>
 inline u256 exp10() {
   return exp10<n - 1>() * u256(10);
@@ -165,12 +137,6 @@ inline u256 exp10<0>() {
   return u256(1);
 }
 
-/// @returns the absolute distance between _a and _b.
-template <class N>
-inline N diff(N const& _a, N const& _b) {
-  return std::max(_a, _b) - std::min(_a, _b);
-}
-
 /// RAII utility class whose destructor calls a given function.
 class ScopeGuard {
  public:

libraries/aleth/libdevcore/CommonData.cpp

@@ -4,7 +4,9 @@
 
 #include "CommonData.h"
 
-#include <random>
+#include <libdevcore/Common.h>
+
+#include <boost/throw_exception.hpp>
 
 #include "Exceptions.h"
 

libraries/aleth/libdevcore/CommonIO.h

@@ -10,8 +10,6 @@
 #include <boost/filesystem.hpp>
 #include <chrono>
 #include <iosfwd>
-#include <list>
-#include <map>
 #include <set>
 #include <sstream>
 #include <string>

libraries/aleth/libdevcore/CommonJS.h

@@ -8,7 +8,6 @@
 #include <string>
 
 #include "CommonData.h"
-#include "CommonIO.h"
 #include "FixedHash.h"
 
 namespace dev {

libraries/aleth/libdevcore/Guards.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <atomic>
 #include <condition_variable>
 #include <mutex>
 #pragma warning(push)

libraries/aleth/libdevcore/Log.h

@@ -11,7 +11,6 @@
 #include <string>
 #include <vector>
 
-#include "CommonIO.h"
 #include "FixedHash.h"
 #include "Terminal.h"
 

libraries/aleth/libdevcore/RLP.cpp

@@ -2,6 +2,14 @@
 // Copyright 2013-2019 Aleth Authors.
 // Licensed under the GNU General Public License, Version 3.
 #include "RLP.h"
+
+#include <libdevcore/Exceptions.h>
+#include <libdevcore/vector_ref.h>
+
+#include <boost/exception/detail/error_info_impl.hpp>
+#include <boost/exception/info_tuple.hpp>
+#include <sstream>
+
 using namespace std;
 using namespace dev;
 

libraries/aleth/libdevcore/RLP.h

@@ -7,8 +7,6 @@
 #pragma once
 
 #include <array>
-#include <exception>
-#include <iomanip>
 #include <iosfwd>
 #include <type_traits>
 #include <vector>

libraries/aleth/libdevcore/SHA3.cpp

@@ -6,6 +6,8 @@
 
 #include <ethash/keccak.hpp>
 
+#include "ethash/hash_types.hpp"
+
 namespace dev {
 
 bool sha3(bytesConstRef _input, bytesRef o_output) noexcept {

libraries/aleth/libdevcrypto/AES.cpp

@@ -9,9 +9,9 @@
 #include <cryptopp/modes.h>
 #include <cryptopp/pwdbased.h>
 #include <cryptopp/sha.h>
+#include <libdevcore/CommonData.h>
 
 using namespace dev;
-using namespace dev::crypto;
 
 bytes dev::aesDecrypt(bytesConstRef _ivCipher, std::string const& _password, unsigned _rounds, bytesConstRef _salt) {
   bytes pw = asBytes(_password);

libraries/aleth/libdevcrypto/AES.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include <libdevcore/Common.h>
 
 namespace dev {
 

libraries/aleth/libdevcrypto/Common.cpp

@@ -6,8 +6,6 @@
 
 #include <cryptopp/aes.h>
 #include <cryptopp/modes.h>
-#include <cryptopp/pwdbased.h>
-#include <cryptopp/sha.h>
 #include <libdevcore/Guards.h>  // <boost/thread> conflicts with <thread>
 #include <libdevcore/SHA3.h>
 #include <secp256k1.h>
@@ -17,7 +15,6 @@
 
 #include "AES.h"
 #include "CryptoPP.h"
-#include "Exceptions.h"
 using namespace std;
 using namespace dev;
 using namespace dev::crypto;

libraries/aleth/libdevcrypto/CryptoPP.cpp

@@ -7,9 +7,7 @@
 #include <cryptopp/eccrypto.h>
 #include <cryptopp/oids.h>
 #include <cryptopp/osrng.h>
-#include <libdevcore/Assertions.h>
 #include <libdevcore/Guards.h>  // <boost/thread> conflicts with <thread>
-#include <libdevcore/SHA3.h>
 
 static_assert(CRYPTOPP_VERSION >= 565, "Wrong Crypto++ version");