refactor: Put back explicit acct tracking outside of 7702 delegation path

Author: fselmo

src/ethereum/forks/amsterdam/vm/eoa_delegation.py

@@ -133,13 +133,13 @@ def access_delegation(
     """
     state = evm.message.block_env.state
 
-    # EIP-7928: Track the authority address (delegated account being called)
-    track_address_access(state.change_tracker, address)
-
     code = get_account(state, address).code
     if not is_valid_delegation(code):
         return False, address, code, Uint(0)
 
+    # EIP-7928: Track the authority address (delegated account being called)
+    track_address_access(state.change_tracker, address)
+
     address = Address(code[EOA_DELEGATION_MARKER_LENGTH:])
     if address in evm.accessed_addresses:
         access_gas_cost = GAS_WARM_ACCESS
@@ -149,7 +149,6 @@ def access_delegation(
     code = get_account(state, address).code
 
     # EIP-7928: Track delegation target when loaded as call target
-    # `address` here is now the delegation target account
     track_address_access(state.change_tracker, address)
 
     return True, address, code, access_gas_cost

src/ethereum/forks/amsterdam/vm/instructions/system.py

@@ -494,6 +494,10 @@ def callcode(evm: Evm) -> None:
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
+    track_address_access(
+        evm.message.block_env.state.change_tracker, code_address
+    )
+
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     sender_balance = get_account(
@@ -632,6 +636,10 @@ def delegatecall(evm: Evm) -> None:
     )
     charge_gas(evm, message_call_gas.cost + extend_memory.cost)
 
+    track_address_access(
+        evm.message.block_env.state.change_tracker, code_address
+    )
+
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     generic_call(