From e489f4e8547d7ac8b569d57d931ab6849def0571 Mon Sep 17 00:00:00 2001 From: wenlinli <1574249665@qq.com> Date: Thu, 27 Jun 2024 17:39:57 +0800 Subject: [PATCH 1/3] add log_level debug setup for build_chain.sh (#4511) --- tools/BcosAirBuilder/build_chain.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/BcosAirBuilder/build_chain.sh b/tools/BcosAirBuilder/build_chain.sh index 7434f66e78..3aa1478a1f 100755 --- a/tools/BcosAirBuilder/build_chain.sh +++ b/tools/BcosAirBuilder/build_chain.sh @@ -67,6 +67,7 @@ modify_node_path="" multi_ca_path="" consensus_type="pbft" supported_consensus=(pbft rpbft) +log_level="info" # for pro or max default setting bcos_builder_package=BcosBuilder.tgz @@ -577,6 +578,7 @@ air -c [Required when expand node] Specify the path of the expanded node config.ini, config.genesis and p2p connection file nodes.json -d [Required when expand node] When expanding the node, specify the path where the CA certificate and private key are located -D Default off. If set -D, build with docker + -E Default off. If set -E, enable debug log -a [Optional] when Auth mode Specify the admin account address. -w [Optional] Whether to use the wasm virtual machine engine, default is false -R [Optional] Whether to use serial execute,default is true @@ -647,7 +649,7 @@ EOF } parse_params() { - while getopts "l:C:c:o:e:t:p:d:g:G:L:v:i:I:M:k:zwDshHmn:R:a:N:u:y:r:V:6T:" option; do + while getopts "l:C:c:o:e:t:p:d:g:G:L:v:i:I:M:k:zwDshHmEn:R:a:N:u:y:r:V:6T:" option; do case $option in 6) use_ipv6="true" && default_listen_ip="::" ;; @@ -699,6 +701,9 @@ parse_params() { m) monitor_mode="true" ;; + E) + log_level="debug" + ;; n) node_key_dir="${OPTARG}" dir_must_exists "${node_key_dir}" @@ -1534,7 +1539,7 @@ generate_common_ini() { enable_console_output = false log_path=./log ; info debug trace - level=info + level=${log_level} ; MB max_log_file_size=1024 ; rotate the log every hour From f4ccfbf1f8523eeb5a956e2890d96d1e0fddc76c Mon Sep 17 00:00:00 2001 From: Kyon <32325790+kyonRay@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:59:07 +0800 Subject: [PATCH 2/3] (precompiled): fix web3_chain_id set config bug. (#4513) --- bcos-executor/src/precompiled/SystemConfigPrecompiled.cpp | 5 +++-- bcos-tool/bcos-tool/Exceptions.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bcos-executor/src/precompiled/SystemConfigPrecompiled.cpp b/bcos-executor/src/precompiled/SystemConfigPrecompiled.cpp index 93e7ac18f6..d888296f66 100644 --- a/bcos-executor/src/precompiled/SystemConfigPrecompiled.cpp +++ b/bcos-executor/src/precompiled/SystemConfigPrecompiled.cpp @@ -146,8 +146,8 @@ SystemConfigPrecompiled::SystemConfigPrecompiled(crypto::Hash::Ptr hashImpl) : P SYSTEM_KEY_WEB3_CHAIN_ID, [](const std::string& _value, uint32_t blockVersion) -> uint64_t { if (blockVersion < BlockVersion::V3_9_0_VERSION) { - BOOST_THROW_EXCEPTION( - PrecompiledError(fmt::format("unsupported key {}", SYSTEM_KEY_WEB3_CHAIN_ID))); + BOOST_THROW_EXCEPTION(bcos::tool::InvalidVersion( + fmt::format("unsupported key {}", SYSTEM_KEY_WEB3_CHAIN_ID))); } uint64_t number = 0; try @@ -304,6 +304,7 @@ int64_t SystemConfigPrecompiled::validate( } catch (bcos::tool::InvalidSetFeature const& e) { + /// PRECOMPILED_LOG(INFO) << LOG_DESC("SystemConfigPrecompiled: set feature failed") << LOG_KV("info", boost::diagnostic_information(e)); BOOST_THROW_EXCEPTION(PrecompiledError(*boost::get_error_info(e))); diff --git a/bcos-tool/bcos-tool/Exceptions.h b/bcos-tool/bcos-tool/Exceptions.h index 2b6738bcb0..527b8b6b52 100644 --- a/bcos-tool/bcos-tool/Exceptions.h +++ b/bcos-tool/bcos-tool/Exceptions.h @@ -27,6 +27,7 @@ namespace tool DERIVE_BCOS_EXCEPTION(LedgerConfigFetcherException); DERIVE_BCOS_EXCEPTION(InvalidConfig); DERIVE_BCOS_EXCEPTION(InvalidVersion); +/// NOTE: only use it when the compatibility version >= 3.6.0 DERIVE_BCOS_EXCEPTION(InvalidSetFeature); class ExceptionHolder From f4e3772e35ad60600f4c6c074302d7b9f4be71d1 Mon Sep 17 00:00:00 2001 From: kyonRay Date: Tue, 2 Jul 2024 16:51:21 +0800 Subject: [PATCH 3/3] (readme): update readme to 3.9.0. --- README.md | 2 +- transaction-scheduler/tests/testMultiLayerStorage.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bbfc88f7fd..41a4db1298 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ FISCO BCOS（读作/ˈfɪskl bi:ˈkɒz/） 是一个稳定、高效、安全的 ## 版本信息 - 稳定版本（生产环境使用）：v3.2.7，版本内容可参考[《FISCO-BCOS v3.2.7版本说明》](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.2.7) -- 最新版本（用户体验新特性）：v3.8.0，版本内容可参考 [《FISCO-BCOS v3.8.0版本说明》](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.8.0) +- 最新版本（用户体验新特性）：v3.9.0，版本内容可参考 [《FISCO-BCOS v3.9.0版本说明》](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.9.0) ## 系统概述 FISCO BCOS系统架构包括基础层、核心层、服务层、用户层和接入层提供稳定、安全的区块链底层服务。中间件层通过可视化界面，简化了用户管理区块链系统的流程。右侧配套相关开发、运维、安全控制的组件，辅助应用落地过程中不同角色的需要；同时，提供隐私保护和跨链相关的技术组件，满足不同场景的应用诉求。 diff --git a/transaction-scheduler/tests/testMultiLayerStorage.cpp b/transaction-scheduler/tests/testMultiLayerStorage.cpp index 30ed4a58bf..7905280156 100644 --- a/transaction-scheduler/tests/testMultiLayerStorage.cpp +++ b/transaction-scheduler/tests/testMultiLayerStorage.cpp @@ -75,8 +75,9 @@ BOOST_AUTO_TEST_CASE(merge) task::syncWait([this]() -> task::Task { auto view = std::make_optional(multiLayerStorage.fork()); view->newMutable(); - auto toKey = RANGES::views::transform( - [](int num) { return StateKey{"test_table"sv, fmt::format("key: {}", num)}; }); + auto toKey = RANGES::views::transform([](int num) { + return StateKey{"test_table"sv, fmt::format("key: {}", num)}; + }); auto toValue = RANGES::views::transform([](int num) { storage::Entry entry; entry.set(fmt::format("value: {}", num));