From d6d55bf55724b40ff491556218de815210469007 Mon Sep 17 00:00:00 2001 From: JimmyShi22 <417711026@qq.com> Date: Thu, 14 Mar 2024 20:50:58 +0800 Subject: [PATCH] update feature name --- bcos-framework/bcos-framework/ledger/Features.h | 4 ++-- bcos-framework/test/unittests/interfaces/FeaturesTest.cpp | 6 +++--- bcos-scheduler/src/BlockExecutive.cpp | 2 +- bcos-scheduler/test/testBlockExecutive.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bcos-framework/bcos-framework/ledger/Features.h b/bcos-framework/bcos-framework/ledger/Features.h index be017e9a64..8cf3afbc02 100644 --- a/bcos-framework/bcos-framework/ledger/Features.h +++ b/bcos-framework/bcos-framework/ledger/Features.h @@ -40,7 +40,7 @@ class Features bugfix_internal_create_permission_denied, bugfix_sharding_call_in_child_executive, bugfix_empty_abi_reset, // support empty abi reset of same code - bugfix_uppercase_addr, + bugfix_eip55_addr, feature_dmc2serial, feature_sharding, feature_rpbft, @@ -150,7 +150,7 @@ class Features {Flag::bugfix_keypage_system_entry_hash, Flag::bugfix_internal_create_redundant_storage}}, {protocol::BlockVersion::V3_7_0_VERSION, - {Flag::bugfix_empty_abi_reset, Flag::bugfix_uppercase_addr, + {Flag::bugfix_empty_abi_reset, Flag::bugfix_eip55_addr, Flag::bugfix_sharding_call_in_child_executive, Flag::bugfix_internal_create_permission_denied}}, }); diff --git a/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp b/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp index 9245d69248..ce0868290a 100644 --- a/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp +++ b/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp @@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE(feature) "bugfix_internal_create_permission_denied", "bugfix_sharding_call_in_child_executive", "bugfix_empty_abi_reset", - "bugfix_uppercase_addr", + "bugfix_eip55_addr", "feature_dmc2serial", "feature_sharding", "feature_rpbft", @@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(upgrade) bcos::protocol::BlockVersion::V3_6_VERSION, bcos::protocol::BlockVersion::V3_7_0_VERSION); auto expect9 = std::to_array( {"bugfix_keypage_system_entry_hash", "bugfix_internal_create_redundant_storage", - "bugfix_empty_abi_reset", "bugfix_uppercase_addr", + "bugfix_empty_abi_reset", "bugfix_eip55_addr", "bugfix_sharding_call_in_child_executive", "bugfix_internal_create_permission_denied"}); BOOST_CHECK_EQUAL(validFlags(features11).size(), expect9.size()); for (auto feature : expect9) @@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE(genesis) "bugfix_evm_create2_delegatecall_staticcall_codecopy", "bugfix_event_log_order", "bugfix_call_noaddr_return", "bugfix_precompiled_codehash", "bugfix_dmc_revert", "bugfix_keypage_system_entry_hash", "bugfix_internal_create_redundant_storage", - "bugfix_empty_abi_reset", "bugfix_uppercase_addr", + "bugfix_empty_abi_reset", "bugfix_eip55_addr", "bugfix_sharding_call_in_child_executive", "bugfix_internal_create_permission_denied"}); BOOST_CHECK_EQUAL(validFlags(features37).size(), expect37.size()); for (auto feature : expect37) diff --git a/bcos-scheduler/src/BlockExecutive.cpp b/bcos-scheduler/src/BlockExecutive.cpp index c2d1cae5e1..bf9a5361ac 100644 --- a/bcos-scheduler/src/BlockExecutive.cpp +++ b/bcos-scheduler/src/BlockExecutive.cpp @@ -1715,7 +1715,7 @@ std::string BlockExecutive::preprocessAddress(const std::string_view& address) out = std::string(address); } - if (m_scheduler->ledgerConfig().features().get(ledger::Features::Flag::bugfix_uppercase_addr)) + if (m_scheduler->ledgerConfig().features().get(ledger::Features::Flag::bugfix_eip55_addr)) { boost::to_lower(out); // support sdk pass EIP55 address } diff --git a/bcos-scheduler/test/testBlockExecutive.cpp b/bcos-scheduler/test/testBlockExecutive.cpp index 9f3b6c85d2..ed80db2259 100644 --- a/bcos-scheduler/test/testBlockExecutive.cpp +++ b/bcos-scheduler/test/testBlockExecutive.cpp @@ -510,7 +510,7 @@ BOOST_AUTO_TEST_CASE(executeWithSystemError) block->blockHeader()->calculateHash(*blockFactory->cryptoSuite()->hashImpl()); auto tx = blockFactory->transactionFactory()->createTransaction( - 0, "0xAaBbCcDd", {}, std::to_string(1), 500, "chainId", "groupId", utcTime()); + 0, "0xaabbccdd", {}, std::to_string(1), 500, "chainId", "groupId", utcTime()); block->appendTransaction(std::move(tx)); // Add Executor