Skip to content

Commit

Permalink
update feature name
Browse files Browse the repository at this point in the history
  • Loading branch information
JimmyShi22 committed Mar 14, 2024
1 parent d6c6513 commit d6d55bf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions bcos-framework/bcos-framework/ledger/Features.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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}},
});
Expand Down
6 changes: 3 additions & 3 deletions bcos-framework/test/unittests/interfaces/FeaturesTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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<std::string_view>(
{"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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion bcos-scheduler/src/BlockExecutive.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion bcos-scheduler/test/testBlockExecutive.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d6d55bf

Please sign in to comment.