feat(tests): EIP-8037 create OOG state gas boundary coverage (#2847)

Author: spencer-tb

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_ordering.py

@@ -17,7 +17,10 @@
 from execution_testing import (
     Account,
     Alloc,
+    Block,
+    BlockchainTestFiller,
     Fork,
+    Header,
     Initcode,
     Op,
     StateTestFiller,
@@ -30,6 +33,8 @@
 REFERENCE_SPEC_GIT_PATH = ref_spec_8037.git_path
 REFERENCE_SPEC_VERSION = ref_spec_8037.version
 
+WORD_SIZE = 32
+
 
 def _single_sstore_probe_gas(fork: Fork) -> int:
     """
@@ -253,36 +258,61 @@ def test_selfdestruct_oog_reservoir_inflation_detection(
     state_test(pre=pre, tx=tx, post=post)
 
 
+@pytest.mark.parametrize(
+    "oog_step",
+    [
+        pytest.param("create_base", id="oog_on_create_base"),
+        pytest.param("init_code_word_cost", id="oog_on_init_code_word_cost"),
+    ],
+)
 @pytest.mark.with_all_create_opcodes()
 @pytest.mark.valid_from("EIP8037")
 def test_create_oog_reservoir_inflation_detection(
     state_test: StateTestFiller,
     pre: Alloc,
     fork: Fork,
     create_opcode: Op,
+    oog_step: str,
 ) -> None:
     """
-    Detect CREATE/CREATE2 state gas ordering via reservoir inflation.
-
-    A child does CREATE (or CREATE2) with size=0 and gas tuned so the
-    regular gas charge OOGs by 1. CREATE/CREATE2 already have the
-    correct ordering (regular before state), so this is a regression
-    test ensuring it stays that way.
-
-    Single-SSTORE probe detects potential inflation.
+    Detect CREATE/CREATE2 state-gas ordering via parent-reservoir
+    inflation. Two OOG boundaries are exercised: `oog_on_create_base`
+    (empty initcode) and `oog_on_init_code_word_cost` (32-byte
+    initcode).
     """
     gas_costs = fork.gas_costs()
     new_account_state_gas = gas_costs.NEW_ACCOUNT
 
+    if oog_step == "create_base":
+        initcode_size = 0
+        setup_gas = 0
+        init_code_word_cost = 0
+    else:
+        initcode_size = WORD_SIZE
+        setup_gas = (
+            Op.MSTORE.popped_stack_items * gas_costs.VERY_LOW
+            + gas_costs.OPCODE_MSTORE_BASE
+            + gas_costs.MEMORY_PER_WORD
+        )
+        init_code_word_cost = gas_costs.CODE_INIT_PER_WORD
+
     if create_opcode == Op.CREATE:
-        child_code = create_opcode(value=0, offset=0, size=0)
-        pushes_gas = 3 * gas_costs.VERY_LOW
+        create_op = create_opcode(value=0, offset=0, size=initcode_size)
     else:
-        child_code = create_opcode(value=0, offset=0, size=0, salt=0)
-        pushes_gas = 4 * gas_costs.VERY_LOW
+        create_op = create_opcode(
+            value=0, offset=0, size=initcode_size, salt=0
+        )
+    pushes_gas = create_opcode.popped_stack_items * gas_costs.VERY_LOW
 
-    create_regular_gas = gas_costs.OPCODE_CREATE_BASE
-    child_gas = pushes_gas + create_regular_gas + new_account_state_gas - 1
+    if oog_step == "create_base":
+        child_code = create_op
+    else:
+        child_code = Op.MSTORE(0, 0) + create_op
+
+    create_regular_gas = gas_costs.OPCODE_CREATE_BASE + init_code_word_cost
+    child_gas = (
+        setup_gas + pushes_gas + create_regular_gas + new_account_state_gas - 1
+    )
     child = pre.deploy_contract(child_code)
 
     probe = pre.deploy_contract(Op.SSTORE(0, 1))
@@ -306,3 +336,79 @@ def test_create_oog_reservoir_inflation_detection(
 
     post = {caller: Account(storage=caller_storage)}
     state_test(pre=pre, tx=tx, post=post)
+
+
+@pytest.mark.parametrize(
+    "oog_step",
+    [
+        pytest.param("create_base", id="oog_on_create_base"),
+        pytest.param("init_code_word_cost", id="oog_on_init_code_word_cost"),
+    ],
+)
+@pytest.mark.with_all_create_opcodes()
+@pytest.mark.valid_from("EIP8037")
+def test_create_oog_full_burn_no_state_credit(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    create_opcode: Op,
+    oog_step: str,
+) -> None:
+    """
+    Verify a CREATE OOG inside a non-creation tx burns the whole
+    tx gas_limit — no state-gas leftover is credited at tx-end.
+    """
+    gas_costs = fork.gas_costs()
+    new_account_state_gas = gas_costs.NEW_ACCOUNT
+
+    if oog_step == "create_base":
+        initcode_size = 0
+        setup_gas = 0
+        init_code_word_cost = 0
+    else:
+        initcode_size = WORD_SIZE
+        setup_gas = (
+            2 * gas_costs.VERY_LOW
+            + gas_costs.OPCODE_MSTORE_BASE
+            + gas_costs.MEMORY_PER_WORD
+        )
+        init_code_word_cost = gas_costs.CODE_INIT_PER_WORD
+
+    if create_opcode == Op.CREATE:
+        create_op = create_opcode(value=0, offset=0, size=initcode_size)
+    else:
+        create_op = create_opcode(
+            value=0, offset=0, size=initcode_size, salt=0
+        )
+    pushes_gas = create_opcode.popped_stack_items * gas_costs.VERY_LOW
+
+    if oog_step == "create_base":
+        factory_code = create_op
+    else:
+        factory_code = Op.MSTORE(0, 0) + create_op
+    factory = pre.deploy_contract(factory_code)
+
+    create_regular_gas = gas_costs.OPCODE_CREATE_BASE + init_code_word_cost
+    body_gas = (
+        setup_gas + pushes_gas + create_regular_gas + new_account_state_gas - 1
+    )
+
+    intrinsic_calc = fork.transaction_intrinsic_cost_calculator()
+    tx_gas_limit = intrinsic_calc() + body_gas
+
+    tx = Transaction(
+        sender=pre.fund_eoa(),
+        to=factory,
+        gas_limit=tx_gas_limit,
+    )
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=[tx],
+                header_verify=Header(gas_used=tx_gas_limit),
+            ),
+        ],
+        post={},
+    )