feat(tests): add CALLCODE no state gas and receipt vs header divergence tests

Author: spencer-tb

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_block_2d_gas_accounting.py

@@ -583,3 +583,47 @@ def test_block_2d_gas_tx_gas_limit_exceeds_regular_remaining(
         ],
         post={sstore_contract: Account(storage=storage)},
     )
+
+
+@pytest.mark.valid_from("Amsterdam")
+def test_receipt_cumulative_differs_from_header_gas_used(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Verify receipt cumulative_gas_used can differ from header gas_used.
+
+    Under 2D accounting, header gas_used = max(sum_regular, sum_state)
+    while receipt cumulative_gas_used = sum of per-tx (regular + state).
+    A block with SSTORE txs where state dominates produces a header
+    gas_used less than the receipt cumulative, because the header uses
+    the 2D max, not the 1D sum.
+
+    A client that uses receipt cumulative for header validation (or
+    vice versa) would reject valid blocks.
+    """
+    tx_regular, tx_state = sstore_tx_gas(fork)
+    num_txs = 3
+
+    txs, post = sstore_txs(pre, fork, num_txs)
+
+    block_regular = num_txs * tx_regular
+    block_state = num_txs * tx_state
+    header_gas_used = max(block_regular, block_state)
+    receipt_cumulative = num_txs * (tx_regular + tx_state)
+
+    # State dominates, so header < receipt cumulative
+    assert block_state > block_regular
+    assert header_gas_used < receipt_cumulative
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=txs,
+                header_verify=Header(gas_used=header_gas_used),
+            ),
+        ],
+        post=post,
+    )

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_call.py

@@ -933,7 +933,7 @@ def test_call_new_account_header_gas_used(
         pytest.param("halt", id="child_halt"),
     ],
 )
-@pytest.mark.valid_from("EIP8037")
+@pytest.mark.valid_from("Amsterdam")
 def test_top_level_halt_preserves_restored_reservoir(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -991,3 +991,47 @@ def test_top_level_halt_preserves_restored_reservoir(
         ],
         post={child: Account(storage={0: 0})},
     )
+
+
+@pytest.mark.valid_from("Amsterdam")
+def test_callcode_value_no_new_account_state_gas(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    fork: Fork,
+) -> None:
+    """
+    Verify CALLCODE with value does not charge GAS_NEW_ACCOUNT.
+
+    CALLCODE transfers value to the caller, not the target. No new
+    account is created regardless of whether the target exists. The
+    reservoir should be fully available for a subsequent SSTORE.
+    """
+    gas_limit_cap = fork.transaction_gas_limit_cap()
+    assert gas_limit_cap is not None
+    sstore_state_gas = fork.sstore_state_gas()
+
+    target = pre.fund_eoa(amount=0)
+
+    storage = Storage()
+    contract = pre.deploy_contract(
+        code=(
+            Op.POP(
+                Op.CALLCODE(
+                    gas=Op.GAS,
+                    address=target,
+                    value=1,
+                )
+            )
+            + Op.SSTORE(storage.store_next(1, "reservoir_ok"), 1)
+        ),
+        balance=10**18,
+    )
+
+    tx = Transaction(
+        to=contract,
+        gas_limit=gas_limit_cap + sstore_state_gas,
+        sender=pre.fund_eoa(),
+    )
+
+    post = {contract: Account(storage=storage)}
+    state_test(pre=pre, post=post, tx=tx)

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_create.py

@@ -1696,7 +1696,7 @@ def test_create_oog_during_state_gas_charge(
     state_test(pre=pre, post=post, tx=tx)
 
 
-@pytest.mark.valid_from("EIP8037")
+@pytest.mark.valid_from("Amsterdam")
 def test_create_nonce_overflow_state_gas_consumed(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -1742,7 +1742,7 @@ def test_create_nonce_overflow_state_gas_consumed(
     state_test(pre=pre, post=post, tx=tx)
 
 
-@pytest.mark.valid_from("EIP8037")
+@pytest.mark.valid_from("Amsterdam")
 def test_create_stack_depth_state_gas_consumed(
     state_test: StateTestFiller,
     pre: Alloc,
@@ -1788,7 +1788,7 @@ def test_create_stack_depth_state_gas_consumed(
     state_test(pre=pre, post=post, tx=tx)
 
 
-@pytest.mark.valid_from("EIP8037")
+@pytest.mark.valid_from("Amsterdam")
 def test_create2_collision_state_gas_block_accounting(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_reservoir.py

@@ -432,7 +432,7 @@ def test_create_tx_reservoir(
         pytest.param(3, id="with_storage_keys"),
     ],
 )
-@pytest.mark.valid_from("EIP8037")
+@pytest.mark.valid_from("Amsterdam")
 def test_access_list_gas_is_regular_not_state(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -484,7 +484,7 @@ def test_access_list_gas_is_regular_not_state(
     )
 
 
-@pytest.mark.valid_from("EIP8037")
+@pytest.mark.valid_from("Amsterdam")
 def test_access_list_warm_savings_stay_regular(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_selfdestruct.py

@@ -252,7 +252,7 @@ def test_selfdestruct_new_beneficiary_header_gas_used(
 
 
 @pytest.mark.with_all_create_opcodes()
-@pytest.mark.valid_from("EIP8037")
+@pytest.mark.valid_from("Amsterdam")
 def test_create_selfdestruct_same_tx_no_state_gas_refund(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,
@@ -311,7 +311,7 @@ def test_create_selfdestruct_same_tx_no_state_gas_refund(
 
 
 @pytest.mark.with_all_create_opcodes()
-@pytest.mark.valid_from("EIP8037")
+@pytest.mark.valid_from("Amsterdam")
 def test_call_value_to_selfdestructed_same_tx_account(
     blockchain_test: BlockchainTestFiller,
     pre: Alloc,