Fix event log order & delegatecall noaddr return true & precompiled c…

…odeHash
JimmyShi22 · Nov 17, 2023 · 501097f · 501097f
1 parent 43858f8
commit 501097f
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 18 deletions.
diff --git a/bcos-executor/src/executive/CoroutineTransactionExecutive.cpp b/bcos-executor/src/executive/CoroutineTransactionExecutive.cpp
@@ -76,15 +76,27 @@ CallParameters::UniquePtr CoroutineTransactionExecutive::externalCall(
 
     if (output->delegateCall && output->type != CallParameters::FINISHED)
     {
-        EXECUTIVE_LOG(DEBUG) << "Could not getCode during DMC externalCall"
-                             << LOG_KV("codeAddress", output->codeAddress);
         output->data = bytes();
-        output->status = (int32_t)bcos::protocol::TransactionStatus::RevertInstruction;
-        output->evmStatus = EVMC_REVERT;
+        if (m_blockContext.features().get(
+                ledger::Features::Flag::bugfix_delegatecall_noaddr_return))
+        {
+            // This is eth's bug, but we still need to compat with it :)
+            // https://docs.soliditylang.org/en/v0.8.17/control-structures.html#error-handling-assert-require-revert-and-exceptions
+            output->status = (int32_t)bcos::protocol::TransactionStatus::None;
+            output->evmStatus = EVMC_SUCCESS;
+        }
+        else
+        {
+            output->status = (int32_t)bcos::protocol::TransactionStatus::RevertInstruction;
+            output->evmStatus = EVMC_REVERT;
+        }
+        EXECUTIVE_LOG(DEBUG) << "Could not getCode during DMC externalCall"
+                             << LOG_KV("codeAddress", output->codeAddress)
+                             << LOG_KV("status", output->status)
+                             << LOG_KV("evmStatus", output->evmStatus);
     }
 
-    if (versionCompareTo(
-            m_blockContext.blockVersion(), protocol::BlockVersion::V3_3_VERSION) >= 0)
+    if (versionCompareTo(m_blockContext.blockVersion(), protocol::BlockVersion::V3_3_VERSION) >= 0)
     {
         if (output->type == CallParameters::REVERT)
         {

diff --git a/bcos-executor/src/executive/TransactionExecutive.cpp b/bcos-executor/src/executive/TransactionExecutive.cpp
@@ -129,9 +129,21 @@ CallParameters::UniquePtr TransactionExecutive::externalCall(CallParameters::Uni
             auto& output = input;
             EXECUTIVE_LOG(DEBUG) << "Could not getCodeHash during externalCall"
                                  << LOG_KV("codeAddress", input->codeAddress);
+
             output->data = bytes();
-            output->status = (int32_t)TransactionStatus::RevertInstruction;
-            output->evmStatus = EVMC_REVERT;
+            if (m_blockContext.features().get(
+                    ledger::Features::Flag::bugfix_delegatecall_noaddr_return))
+            {
+                // This is eth's bug, but we still need to compat with it :)
+                // https://docs.soliditylang.org/en/v0.8.17/control-structures.html#error-handling-assert-require-revert-and-exceptions
+                output->status = (int32_t)TransactionStatus::None;
+                output->evmStatus = EVMC_SUCCESS;
+            }
+            else
+            {
+                output->status = (int32_t)TransactionStatus::RevertInstruction;
+                output->evmStatus = EVMC_REVERT;
+            }
             return std::move(output);
         }
 
@@ -186,7 +198,8 @@ CallParameters::UniquePtr TransactionExecutive::externalCall(CallParameters::Uni
     }
 
 
-    auto executive = buildChildExecutive(input->codeAddress, m_contextID, newSeq, ExecutiveType::common);
+    auto executive =
+        buildChildExecutive(input->codeAddress, m_contextID, newSeq, ExecutiveType::common);
 
     m_childExecutives.push_back(executive);  // add child executive for revert() if needed
 

diff --git a/bcos-executor/src/vm/HostContext.cpp b/bcos-executor/src/vm/HostContext.cpp
@@ -237,6 +237,11 @@ evmc_result HostContext::externalRequest(const evmc_message* _msg)
         .create_address = toEvmC(boost::algorithm::unhex(response->newEVMContractAddress)),
         .padding = {}};
 
+    if (features().get(ledger::Features::Flag::bugfix_event_log_order))
+    {
+        // put event log by stack(dfs) order
+        m_callParameters->logEntries = std::move(response->logEntries);
+    }
     // Put response to store in order to avoid data lost
     m_responseStore.emplace_back(std::move(response));
 
@@ -474,6 +479,15 @@ h256 HostContext::codeHashAt(const std::string_view& address)
             return {0};
         }
         auto code = externalCodeRequest(address);
+
+        if (code.empty())
+        {
+            if (features().get(ledger::Features::Flag::bugfix_precompiled_codehash))
+            {
+                return {0};
+            }
+        }
+
         auto hash = hashImpl()->hash(code).asBytes();
         return h256(hash);
     }

diff --git a/bcos-framework/bcos-framework/ledger/Features.h b/bcos-framework/bcos-framework/ledger/Features.h
@@ -33,6 +33,9 @@ class Features
         bugfix_revert,  // https://github.com/FISCO-BCOS/FISCO-BCOS/issues/3629
         bugfix_statestorage_hash,
         bugfix_evm_create2_delegatecall_staticcall_codecopy,
+        bugfix_event_log_order,
+        bugfix_delegatecall_noaddr_return,
+        bugfix_precompiled_codehash,
         feature_dmc2serial,
         feature_sharding,
         feature_rpbft,
@@ -63,7 +66,7 @@ class Features
         {
             BOOST_THROW_EXCEPTION(NoSuchFeatureError{});
         }
-        
+
         validate(*value);
     }
 
@@ -122,6 +125,13 @@ class Features
             set(Flag::bugfix_statestorage_hash);
             set(Flag::bugfix_evm_create2_delegatecall_staticcall_codecopy);
         }
+        if (version >= protocol::BlockVersion::V3_6_VERSION)
+        {
+            set(Flag::bugfix_event_log_order);
+            set(Flag::bugfix_delegatecall_noaddr_return);
+            set(Flag::bugfix_precompiled_codehash);
+        }
+
         setToShardingDefault(version);
     }
 

diff --git a/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp b/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp
@@ -127,17 +127,20 @@ BOOST_AUTO_TEST_CASE(feature)
 
     auto keys = Features::featureKeys();
 
-    BOOST_CHECK_EQUAL(keys.size(), 10);
+    BOOST_CHECK_EQUAL(keys.size(), 13);
     BOOST_CHECK_EQUAL(keys[0], "bugfix_revert");
     BOOST_CHECK_EQUAL(keys[1], "bugfix_statestorage_hash");
     BOOST_CHECK_EQUAL(keys[2], "bugfix_evm_create2_delegatecall_staticcall_codecopy");
-    BOOST_CHECK_EQUAL(keys[3], "feature_dmc2serial");
-    BOOST_CHECK_EQUAL(keys[4], "feature_sharding");
-    BOOST_CHECK_EQUAL(keys[5], "feature_rpbft");
-    BOOST_CHECK_EQUAL(keys[6], "feature_paillier");
-    BOOST_CHECK_EQUAL(keys[7], "feature_balance");
-    BOOST_CHECK_EQUAL(keys[8], "feature_balance_precompiled");
-    BOOST_CHECK_EQUAL(keys[9], "feature_balance_policy1");
+    BOOST_CHECK_EQUAL(keys[3], "bugfix_event_log_order");
+    BOOST_CHECK_EQUAL(keys[4], "bugfix_delegatecall_noaddr_return");
+    BOOST_CHECK_EQUAL(keys[5], "bugfix_precompiled_codehash");
+    BOOST_CHECK_EQUAL(keys[6], "feature_dmc2serial");
+    BOOST_CHECK_EQUAL(keys[7], "feature_sharding");
+    BOOST_CHECK_EQUAL(keys[8], "feature_rpbft");
+    BOOST_CHECK_EQUAL(keys[9], "feature_paillier");
+    BOOST_CHECK_EQUAL(keys[10], "feature_balance");
+    BOOST_CHECK_EQUAL(keys[11], "feature_balance_precompiled");
+    BOOST_CHECK_EQUAL(keys[12], "feature_balance_policy1");
 }
 
 BOOST_AUTO_TEST_SUITE_END()