update feature name

JimmyShi22 · Nov 3, 2023 · 871921c · 871921c
1 parent 0aa679d
commit 871921c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/bcos-executor/src/vm/DelegateHostContext.cpp b/bcos-executor/src/vm/DelegateHostContext.cpp
@@ -38,7 +38,7 @@ h256 DelegateHostContext::codeHash()
 
 std::string_view DelegateHostContext::myAddress() const
 {
-    if (this->features().get(ledger::Features::Flag::bugfix_evm))
+    if (this->features().get(ledger::Features::Flag::bugfix_evm_create2_delegatecall_staticcall_codecopy))
     {
         return m_thisAddress;
     }

diff --git a/bcos-executor/src/vm/EVMHostInterface.cpp b/bcos-executor/src/vm/EVMHostInterface.cpp
@@ -118,7 +118,7 @@ size_t copyCode(evmc_host_context* _context, const evmc_address* _addr, size_t _
     uint8_t* _bufferData, size_t _bufferSize)
 {
     auto& hostContext = static_cast<HostContext&>(*_context);
-    if (hostContext.features().get(ledger::Features::Flag::bugfix_evm))
+    if (hostContext.features().get(ledger::Features::Flag::bugfix_evm_create2_delegatecall_staticcall_codecopy))
     {
         auto addr = fromEvmC(*_addr);
         bytes const& code = hostContext.codeAt(addr);

diff --git a/bcos-executor/src/vm/HostContext.cpp b/bcos-executor/src/vm/HostContext.cpp
@@ -136,7 +136,7 @@ evmc_result HostContext::externalRequest(const evmc_message* _msg)
     {
     case EVMC_CREATE2:
         request->createSalt = fromEvmC(_msg->create2_salt);
-        if (features().get(ledger::Features::Flag::bugfix_evm))
+        if (features().get(ledger::Features::Flag::bugfix_evm_create2_delegatecall_staticcall_codecopy))
         {
             request->data.assign(_msg->input_data, _msg->input_data + _msg->input_size);
             request->create = true;
@@ -218,7 +218,7 @@ evmc_result HostContext::externalRequest(const evmc_message* _msg)
 
     request->staticCall = m_callParameters->staticCall;
 
-    if (features().get(ledger::Features::Flag::bugfix_evm))
+    if (features().get(ledger::Features::Flag::bugfix_evm_create2_delegatecall_staticcall_codecopy))
     {
         // EVM STATICCALL opcode support
         if (_msg->flags & EVMC_STATIC)

diff --git a/bcos-framework/bcos-framework/ledger/Features.h b/bcos-framework/bcos-framework/ledger/Features.h
@@ -28,7 +28,7 @@ class Features
     {
         bugfix_revert,  // https://github.com/FISCO-BCOS/FISCO-BCOS/issues/3629
         bugfix_statestorage_hash,
-        bugfix_evm,
+        bugfix_evm_create2_delegatecall_staticcall_codecopy,
         feature_dmc2serial,
     };
 
@@ -83,7 +83,7 @@ class Features
         if (version >= protocol::BlockVersion::V3_2_4_VERSION)
         {
             set(Flag::bugfix_statestorage_hash);
-            set(Flag::bugfix_evm);
+            set(Flag::bugfix_evm_create2_delegatecall_staticcall_codecopy);
         }
     }
 

diff --git a/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp b/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(feature)
     BOOST_CHECK_EQUAL(keys.size(), 3);
     BOOST_CHECK_EQUAL(keys[0], "bugfix_revert");
     BOOST_CHECK_EQUAL(keys[1], "bugfix_statestorage_hash");
-    BOOST_CHECK_EQUAL(keys[2], "bugfix_evm");
+    BOOST_CHECK_EQUAL(keys[2], "bugfix_evm_create2_delegatecall_staticcall_codecopy");
     BOOST_CHECK_EQUAL(keys[3], "feature_dmc2serial");
 }