refactor(spec-specs): Move net-zero filtering inside commit tx frame

Author: fselmo

src/ethereum/forks/amsterdam/fork.py

@@ -679,12 +679,9 @@ def process_system_transaction(
 
     system_tx_output = process_message_call(system_tx_message)
 
-    # EIP-7928: Filter net-zero changes before committing to block frame.
-    filter_net_zero_frame_changes(tx_env.state_changes, block_env.state)
-
     # Commit system transaction changes to block frame
     # System transactions always succeed (or block is invalid)
-    commit_transaction_frame(tx_env.state_changes)
+    commit_transaction_frame(tx_env.state_changes, block_env.state)
 
     return system_tx_output
 
@@ -1095,11 +1092,9 @@ def process_transaction(
     for address in tx_output.accounts_to_delete:
         destroy_account(block_env.state, address)
 
-    # EIP-7928: Filter net-zero changes before committing to block frame.
+    # EIP-7928: Commit transaction frame (includes net-zero filtering).
     # Must happen AFTER destroy_account so filtering sees correct state.
-    filter_net_zero_frame_changes(tx_env.state_changes, block_env.state)
-
-    commit_transaction_frame(tx_env.state_changes)
+    commit_transaction_frame(tx_env.state_changes, block_env.state)
 
     # EIP-7928: Track in-transaction self-destruct normalization AFTER merge
     # Convert storage writes to reads and remove nonce/code changes

src/ethereum/forks/amsterdam/state_tracker.py

@@ -436,22 +436,30 @@ def merge_on_failure(child_frame: StateChanges) -> None:
     # merged on failure - they are discarded
 
 
-def commit_transaction_frame(tx_frame: StateChanges) -> None:
+def commit_transaction_frame(
+    tx_frame: StateChanges,
+    state: "State",
+) -> None:
     """
     Commit transaction frame to block frame.
 
-    Unlike merge_on_success(), this merges ALL changes without net-zero
-    filtering (each tx's changes recorded at their respective index).
+    Filters net-zero changes before merging to ensure only actual state
+    modifications are recorded in the block access list.
 
     Parameters
     ----------
     tx_frame :
         The transaction frame to commit.
+    state :
+        The current state (used for net-zero filtering).
 
     """
     assert tx_frame.parent is not None
     block_frame = tx_frame.parent
 
+    # Filter net-zero changes before committing
+    filter_net_zero_frame_changes(tx_frame, state)
+
     # Merge address accesses
     block_frame.touched_addresses.update(tx_frame.touched_addresses)
 
@@ -468,7 +476,7 @@ def commit_transaction_frame(tx_frame: StateChanges) -> None:
     for addr, idx, nonce in tx_frame.nonce_changes:
         block_frame.nonce_changes.add((addr, idx, nonce))
 
-    # Merge code changes (net-zero filtering done in normalize_transaction)
+    # Merge code changes
     for (addr, idx), final_code in tx_frame.code_changes.items():
         block_frame.code_changes[(addr, idx)] = final_code