From a7aeee7bcb22cc78f14893bff719a1739107787e Mon Sep 17 00:00:00 2001 From: Matus Kysel Date: Tue, 23 Jan 2024 21:41:16 +0100 Subject: [PATCH 1/4] Update building.md --- doc/building.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/building.md b/doc/building.md index ee9b3f8d1b..ff593887ac 100644 --- a/doc/building.md +++ b/doc/building.md @@ -38,7 +38,7 @@ will build out of the box without further effort: sudo apt install solc # Install conan package manager - sudo python3 -m pip install conan==1.59.0 + sudo python3 -m pip install conan==1.60.0 # Setup clang as default compiler either in your IDE or by env. variables" export CC="clang-14" @@ -94,7 +94,7 @@ will build out of the box without further effort: # Install conan package manager # >= 1.36.0 version is required to work properly with clang-14 - sudo python3 -m pip install conan==1.59.0 + sudo python3 -m pip install conan==1.60.0 # Install cmake # >= 3.20 version is required for JSON subcommand From 893379f31b85245a650cd27ca92d292feb11c77f Mon Sep 17 00:00:00 2001 From: Matus Kysel Date: Fri, 26 Jan 2024 13:20:28 +0100 Subject: [PATCH 2/4] chore: terminate on wrong genesis --- libraries/core_libs/node/src/node.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/core_libs/node/src/node.cpp b/libraries/core_libs/node/src/node.cpp index 7018488cf0..078002f29c 100644 --- a/libraries/core_libs/node/src/node.cpp +++ b/libraries/core_libs/node/src/node.cpp @@ -119,12 +119,12 @@ void FullNode::init() { auto genesis_hash_from_db = db_->getGenesisHash(); if (!genesis_hash_from_db.has_value()) { LOG(log_er_) << "Genesis hash was not found in DB. Something is wrong"; - assert(false); + std::terminate(); } if (genesis_hash != genesis_hash_from_db) { LOG(log_er_) << "Genesis hash " << genesis_hash << " is different with " << (genesis_hash_from_db.has_value() ? *genesis_hash_from_db : h256(0)) << " in DB"; - assert(false); + std::terminate(); } pbft_chain_ = std::make_shared(node_addr, db_); From 3f15e59047e6363298a5e55035a559919f87498b Mon Sep 17 00:00:00 2001 From: Matus Kysel Date: Fri, 26 Jan 2024 13:26:06 +0100 Subject: [PATCH 3/4] update evm --- submodules/taraxa-evm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm index 69bb3cf7de..df57b1e2b1 160000 --- a/submodules/taraxa-evm +++ b/submodules/taraxa-evm @@ -1 +1 @@ -Subproject commit 69bb3cf7dedff04085a1226abf3fda97a6139f00 +Subproject commit df57b1e2b15d651de0956e00358ef68395f60ec9 From 1dd21fcbcf5375ed9161d82e6a873022a686f313 Mon Sep 17 00:00:00 2001 From: Matus Kysel Date: Fri, 26 Jan 2024 16:14:26 +0100 Subject: [PATCH 4/4] chore: increase version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c1b9db04a..9262b827c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.20) # Set current version of the project set(TARAXA_MAJOR_VERSION 1) set(TARAXA_MINOR_VERSION 6) -set(TARAXA_PATCH_VERSION 0) +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