Fix tests after rebase

ethereum · Oct 10, 2024 · 7c8e0b8 · 7c8e0b8
1 parent a4be51e
commit 7c8e0b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/test/state/account.hpp b/test/state/account.hpp
@@ -73,6 +73,9 @@ struct Account
     /// The account has been created in the current transaction.
     bool just_created = false;
 
+    // This account's code changed due to setting EIP-7702 delegation.
+    bool code_changed = false;
+
     evmc_access_status access_status = EVMC_ACCESS_COLD;
 
     [[nodiscard]] bool is_empty() const noexcept

diff --git a/test/state/state.cpp b/test/state/state.cpp
@@ -123,7 +123,7 @@ StateDiff State::build_diff(evmc_revision rev) const
 
         // Output only the new code.
         // TODO: Output also the code hash. It will be needed for DB update and MPT hash.
-        if (m.just_created && !m.code.empty())
+        if ((m.just_created && !m.code.empty()) || m.code_changed)
             a.code = m.code;
 
         for (const auto& [k, v] : m.storage)
@@ -454,6 +454,8 @@ std::variant<TransactionReceipt, std::error_code> transition(const StateView& st
 {
     State state{state_view};
     auto* sender_ptr = state.find(tx.sender);
+    // TODO hack to load full code into sender_ptr account
+    state.get_code(tx.sender);
 
     // Validate transaction. The validation needs the sender account, so in case
     // it doesn't exist provide an empty one. The account isn't created in the state
@@ -490,7 +492,8 @@ std::variant<TransactionReceipt, std::error_code> transition(const StateView& st
             authority_ptr->access_status = EVMC_ACCESS_WARM;
 
             // Skip if authority has non-delegated code.
-            if (!authority_ptr->code.empty() && !is_code_delegated(authority_ptr->code))
+            if (authority_ptr->code_hash != Account::EMPTY_CODE_HASH &&
+                !is_code_delegated(state.get_code(*auth.signer)))
                 continue;
 
             // Skip if authorization nonce is incorrect.
@@ -517,6 +520,8 @@ std::variant<TransactionReceipt, std::error_code> transition(const StateView& st
         authority_ptr->code.reserve(std::size(DELEGATION_MAGIC) + std::size(auth.addr.bytes));
         authority_ptr->code = DELEGATION_MAGIC;
         authority_ptr->code += auth.addr;
+        // TODO set only if code is changed to another delegation
+        authority_ptr->code_changed = true;
 
         ++authority_ptr->nonce;
     }
@@ -563,7 +568,7 @@ std::variant<TransactionReceipt, std::error_code> transition(const StateView& st
     if (tx.to.has_value())
     {
         const auto* to_ptr = state.find(*tx.to);
-        if (to_ptr != nullptr && is_code_delegated(to_ptr->code))
+        if (to_ptr != nullptr && is_code_delegated(state.get_code(*tx.to)))
         {
             assert(rev >= EVMC_PRAGUE);
             assert(to_ptr->code.size() ==