fix: type 4 transaction accessed address addition in wrong place (#1255)

* add fix for accessing address in type 4 tx

* remove unnecessary import

* reformat

Author: JereSalo

src/ethereum/prague/utils/message.py

@@ -12,14 +12,14 @@
 Message specific functions used in this prague version of
 specification.
 """
+
 from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import Uint
 
 from ..fork_types import Address
 from ..state import get_account
 from ..transactions import Transaction
 from ..vm import BlockEnvironment, Message, TransactionEnvironment
-from ..vm.eoa_delegation import get_delegated_code_address
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from .address import compute_contract_address
 
@@ -51,8 +51,6 @@ def prepare_message(
     accessed_addresses.update(PRE_COMPILED_CONTRACTS.keys())
     accessed_addresses.update(tx_env.access_list_addresses)
 
-    disable_precompiles = False
-
     if isinstance(tx.to, Bytes0):
         current_target = compute_contract_address(
             tx_env.origin,
@@ -65,13 +63,6 @@ def prepare_message(
         current_target = tx.to
         msg_data = tx.data
         code = get_account(block_env.state, tx.to).code
-
-        delegated_address = get_delegated_code_address(code)
-        if delegated_address is not None:
-            disable_precompiles = True
-            accessed_addresses.add(delegated_address)
-            code = get_account(block_env.state, delegated_address).code
-
         code_address = tx.to
     else:
         raise AssertionError("Target must be address or empty bytes")
@@ -94,6 +85,6 @@ def prepare_message(
         is_static=False,
         accessed_addresses=accessed_addresses,
         accessed_storage_keys=set(tx_env.access_list_storage_keys),
-        disable_precompiles=disable_precompiles,
+        disable_precompiles=False,
         parent_evm=None,
     )

src/ethereum/prague/vm/eoa_delegation.py

@@ -201,15 +201,5 @@ def set_delegation(message: Message) -> U256:
 
     if message.code_address is None:
         raise InvalidBlock("Invalid type 4 transaction: no target")
-    message.code = get_account(state, message.code_address).code
-
-    if is_valid_delegation(message.code):
-        message.disable_precompiles = True
-        message.code_address = Address(
-            message.code[EOA_DELEGATION_MARKER_LENGTH:]
-        )
-        message.accessed_addresses.add(message.code_address)
-
-        message.code = get_account(state, message.code_address).code
 
     return refund_counter

src/ethereum/prague/vm/interpreter.py

@@ -11,6 +11,7 @@
 
 A straightforward interpreter that executes EVM code.
 """
+
 from dataclasses import dataclass
 from typing import Optional, Set, Tuple
 
@@ -37,14 +38,15 @@
     begin_transaction,
     commit_transaction,
     destroy_storage,
+    get_account,
     increment_nonce,
     mark_account_created,
     move_ether,
     rollback_transaction,
     set_code,
 )
 from ..vm import Message
-from ..vm.eoa_delegation import set_delegation
+from ..vm.eoa_delegation import get_delegated_code_address, set_delegation
 from ..vm.gas import GAS_CODE_DEPOSIT, charge_gas
 from ..vm.precompiled_contracts.mapping import PRE_COMPILED_CONTRACTS
 from . import Evm
@@ -122,6 +124,14 @@ def process_message_call(message: Message) -> MessageCallOutput:
     else:
         if message.tx_env.authorizations != ():
             refund_counter += set_delegation(message)
+
+        delegated_address = get_delegated_code_address(message.code)
+        if delegated_address is not None:
+            message.disable_precompiles = True
+            message.accessed_addresses.add(delegated_address)
+            message.code = get_account(block_env.state, delegated_address).code
+            message.code_address = delegated_address
+
         evm = process_message(message)
 
     if evm.error: