From c3075f2fa47a1c3ef761948b4b01c0232a07f152 Mon Sep 17 00:00:00 2001 From: JimmyShi22 <417711026@qq.com> Date: Mon, 22 Apr 2024 19:15:42 +0800 Subject: [PATCH] update version to 3.7.3 --- CMakeLists.txt | 2 +- bcos-framework/bcos-framework/ledger/Features.h | 2 +- bcos-framework/bcos-framework/protocol/Protocol.h | 5 +++-- bcos-sdk/SWIG/build.gradle | 2 +- tools/BcosAirBuilder/build_chain.sh | 2 +- tools/BcosBuilder/max/conf/config-build-example.toml | 2 +- tools/BcosBuilder/max/conf/config-deploy-example.toml | 2 +- tools/BcosBuilder/pro/conf/config-build-example.toml | 2 +- tools/BcosBuilder/pro/conf/config-deploy-example.toml | 2 +- tools/BcosBuilder/src/tpl/config.genesis | 2 +- vcpkg.json | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 001dc0651b..172abcf1d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ endif() list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -set(VERSION "3.7.1") +set(VERSION "3.7.3") set(VERSION_SUFFIX "") include(Options) configure_project() diff --git a/bcos-framework/bcos-framework/ledger/Features.h b/bcos-framework/bcos-framework/ledger/Features.h index 5e912b1cfe..e7bb50259c 100644 --- a/bcos-framework/bcos-framework/ledger/Features.h +++ b/bcos-framework/bcos-framework/ledger/Features.h @@ -154,7 +154,7 @@ class Features {Flag::bugfix_empty_abi_reset, Flag::bugfix_eip55_addr, Flag::bugfix_sharding_call_in_child_executive, Flag::bugfix_internal_create_permission_denied}}, - {protocol::BlockVersion::V3_7_2_VERSION, {Flag::bugfix_eoa_as_contract}}}); + {protocol::BlockVersion::V3_7_3_VERSION, {Flag::bugfix_eoa_as_contract}}}); for (const auto& upgradeFeatures : upgradeRoadmap) { if (((to < protocol::BlockVersion::V3_2_7_VERSION) && (to >= upgradeFeatures.to)) || diff --git a/bcos-framework/bcos-framework/protocol/Protocol.h b/bcos-framework/bcos-framework/protocol/Protocol.h index b866894794..cdbd1f50e3 100644 --- a/bcos-framework/bcos-framework/protocol/Protocol.h +++ b/bcos-framework/bcos-framework/protocol/Protocol.h @@ -115,6 +115,7 @@ enum ProtocolVersion : uint32_t enum class BlockVersion : uint32_t { + V3_7_3_VERSION = 0x03070300, V3_7_2_VERSION = 0x03070200, V3_7_1_VERSION = 0x03070100, V3_7_0_VERSION = 0x03070000, @@ -134,7 +135,7 @@ enum class BlockVersion : uint32_t V3_0_VERSION = 0x03000000, RC4_VERSION = 4, MIN_VERSION = RC4_VERSION, - MAX_VERSION = V3_7_1_VERSION, + MAX_VERSION = V3_7_3_VERSION, }; enum class TransactionVersion : uint32_t @@ -149,7 +150,7 @@ const std::string RC4_VERSION_STR = "3.0.0-rc4"; const std::string RC_VERSION_PREFIX = "3.0.0-rc"; const BlockVersion DEFAULT_VERSION = bcos::protocol::BlockVersion::V3_7_1_VERSION; -const std::string DEFAULT_VERSION_STR = "3.7.1"; +const std::string DEFAULT_VERSION_STR = "3.7.3"; const uint8_t MAX_MAJOR_VERSION = std::numeric_limits::max(); const uint8_t MIN_MAJOR_VERSION = 3; diff --git a/bcos-sdk/SWIG/build.gradle b/bcos-sdk/SWIG/build.gradle index c7a684bf2b..16506d0ccc 100644 --- a/bcos-sdk/SWIG/build.gradle +++ b/bcos-sdk/SWIG/build.gradle @@ -8,7 +8,7 @@ println("Notice: current gradle version is " + gradle.gradleVersion) allprojects { group = 'org.fisco-bcos' - version = '3.7.1' + version = '3.7.3' apply plugin: 'maven-publish' apply plugin: 'java' diff --git a/tools/BcosAirBuilder/build_chain.sh b/tools/BcosAirBuilder/build_chain.sh index 17a43d5599..5d18b1abeb 100755 --- a/tools/BcosAirBuilder/build_chain.sh +++ b/tools/BcosAirBuilder/build_chain.sh @@ -39,7 +39,7 @@ ca_dir="" prometheus_dir="" config_path="" docker_mode= -default_version="v3.7.1" +default_version="v3.7.3" compatibility_version=${default_version} default_mtail_version="3.0.0-rc49" compatibility_mtail_version=${default_mtail_version} diff --git a/tools/BcosBuilder/max/conf/config-build-example.toml b/tools/BcosBuilder/max/conf/config-build-example.toml index cefb16b93f..1f709e74a0 100644 --- a/tools/BcosBuilder/max/conf/config-build-example.toml +++ b/tools/BcosBuilder/max/conf/config-build-example.toml @@ -36,7 +36,7 @@ consensus_type = "pbft" # transaction gas limit gas_limit = "3000000000" # compatible version, can be dynamically upgraded through setSystemConfig -compatibility_version="3.7.1" +compatibility_version="3.7.3" [[agency]] name = "agencyA" diff --git a/tools/BcosBuilder/max/conf/config-deploy-example.toml b/tools/BcosBuilder/max/conf/config-deploy-example.toml index 382dc024ad..61138d97fc 100644 --- a/tools/BcosBuilder/max/conf/config-deploy-example.toml +++ b/tools/BcosBuilder/max/conf/config-deploy-example.toml @@ -36,7 +36,7 @@ consensus_type = "pbft" # transaction gas limit gas_limit = "3000000000" # compatible version, can be dynamically upgraded through setSystemConfig -compatibility_version="3.7.1" +compatibility_version="3.7.3" [[agency]] name = "agencyA" diff --git a/tools/BcosBuilder/pro/conf/config-build-example.toml b/tools/BcosBuilder/pro/conf/config-build-example.toml index 95d03f182c..8dd952dbf4 100644 --- a/tools/BcosBuilder/pro/conf/config-build-example.toml +++ b/tools/BcosBuilder/pro/conf/config-build-example.toml @@ -34,7 +34,7 @@ consensus_type = "pbft" # transaction gas limit gas_limit = "3000000000" # compatible version, can be dynamically upgraded through setSystemConfig -compatibility_version="3.7.1" +compatibility_version="3.7.3" [[agency]] name = "agencyA" diff --git a/tools/BcosBuilder/pro/conf/config-deploy-example.toml b/tools/BcosBuilder/pro/conf/config-deploy-example.toml index 69ced70999..42b7f29f36 100644 --- a/tools/BcosBuilder/pro/conf/config-deploy-example.toml +++ b/tools/BcosBuilder/pro/conf/config-deploy-example.toml @@ -36,7 +36,7 @@ consensus_type = "pbft" # transaction gas limit gas_limit = "3000000000" # compatible version, can be dynamically upgraded through setSystemConfig -compatibility_version="3.7.1" +compatibility_version="3.7.3" [[agency]] name = "agencyA" diff --git a/tools/BcosBuilder/src/tpl/config.genesis b/tools/BcosBuilder/src/tpl/config.genesis index 38918194eb..8d216016ef 100644 --- a/tools/BcosBuilder/src/tpl/config.genesis +++ b/tools/BcosBuilder/src/tpl/config.genesis @@ -22,7 +22,7 @@ [version] ; compatible version, can be dynamically upgraded through setSystemConfig - compatibility_version=3.7.1 + compatibility_version=3.7.3 [tx] ; transaction gas limit diff --git a/vcpkg.json b/vcpkg.json index be2cc6f43c..cb8cc3514b 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fiscobcos", - "version-string": "3.7.1", + "version-string": "3.7.3", "homepage": "https://github.com/FISCO-BCOS/FISCO-BCOS", "description": "FISCO BCOS", "dependencies": [