chore(fix) revert call changes and add target to bal

Author: qu0b

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

@@ -402,19 +402,6 @@ def call(evm: Evm) -> None:
         evm,
         access_gas_cost + transfer_gas_cost + extend_memory.cost,
     )
-    # Early balance check - before accessing target state.
-    # This ensures target is NOT in BAL when call fails due to insufficient funds.
-    sender_balance = get_account(
-        evm.message.block_env.state, evm.message.current_target
-    ).balance
-    if sender_balance < value:
-        # Only charge transfer + memory (not cold access, since we didn't access)
-        charge_gas(evm, transfer_gas_cost + extend_memory.cost)
-        evm.memory += b"\x00" * extend_memory.expand_by
-        push(evm.stack, U256(0))
-        evm.return_data = b""
-        evm.pc += Uint(1)
-        return
 
     # need to access account to check if account is alive, check gas before
     create_gas_cost = GAS_NEW_ACCOUNT
@@ -465,23 +452,30 @@ def call(evm: Evm) -> None:
     if evm.message.is_static and value != U256(0):
         raise WriteInStaticContext
     evm.memory += b"\x00" * extend_memory.expand_by
-
-    generic_call(
-        evm,
-        message_call_gas.sub_call,
-        value,
-        evm.message.current_target,
-        to,
-        code_address,
-        True,
-        False,
-        memory_input_start_position,
-        memory_input_size,
-        memory_output_start_position,
-        memory_output_size,
-        code,
-        disable_precompiles,
-    )
+    sender_balance = get_account(
+        evm.message.block_env.state, evm.message.current_target
+    ).balance
+    if sender_balance < value:
+        push(evm.stack, U256(0))
+        evm.return_data = b""
+        evm.gas_left += message_call_gas.sub_call
+    else:
+        generic_call(
+            evm,
+            message_call_gas.sub_call,
+            value,
+            evm.message.current_target,
+            to,
+            code_address,
+            True,
+            False,
+            memory_input_start_position,
+            memory_input_size,
+            memory_output_start_position,
+            memory_output_size,
+            code,
+            disable_precompiles,
+        )
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)

tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py

@@ -2804,7 +2804,7 @@ def test_bal_revert_insufficient_funds(
 
     Expected BAL:
     - Contract: storage_reads [0x01], storage_changes slot 0x02 (value=0)
-    - Target: MUST NOT appear (balance check fails before target access)
+    - Target: appears in BAL (accessed before balance check fails)
     """
     alice = pre.fund_eoa()
 
@@ -2868,8 +2868,8 @@ def test_bal_revert_insufficient_funds(
                         )
                     ],
                 ),
-                # Target MUST NOT appear in BAL - balance check fails before
-                # target state is accessed, so no witness is needed for target
+                # Target appears in BAL - accessed before balance check fails
+                target_address: BalAccountExpectation.empty(),
             }
         ),
     )