fix(tests): Fix previous fork test fails

Author: kclowes

tests/cancun/create/test_create_oog_from_eoa_refunds.py

@@ -326,12 +326,16 @@ def test_create_oog_from_eoa_refunds(
             )
         post[sender] = Account(nonce=1)
     else:
-        # OOG case: contract not created, sender balance is fully consumed
+        # OOG case: contract not created
         post[created_address] = Account.NONEXISTENT
-        post[sender] = Account(
-            nonce=1,
-            balance=0,
-        )
+        if fork.is_eip_enabled(8037):
+            # EIP-8037: execution state gas is returned to the
+            # reservoir on top-level failure, so the sender retains
+            # some balance (the refunded state gas × gas_price).
+            post[sender] = Account(nonce=1)
+        else:
+            # Pre-EIP-8037: sender balance is fully consumed
+            post[sender] = Account(nonce=1, balance=0)
 
     if refund_type == RefundType.SELFDESTRUCT:
         selfdestruct_code = Op.SELFDESTRUCT(Op.ORIGIN) + Op.STOP

tests/cancun/eip5656_mcopy/test_mcopy_memory_expansion.py

@@ -128,14 +128,22 @@ def tx(  # noqa: D103
     initial_memory: bytes,
     tx_gas_limit: int,
     tx_access_list: List[AccessList],
+    fork: Fork,
+    successful: bool,
 ) -> Transaction:
+    # EIP-8037: on top-level OOG, execution state gas is returned to the
+    # reservoir and not billed. The callee's SSTORE contributes state
+    # gas that gets refunded on failure.
+    expected_gas = tx_gas_limit
+    if not successful and fork.is_eip_enabled(8037):
+        expected_gas -= fork.sstore_state_gas()
     return Transaction(
         sender=sender,
         to=caller_address,
         access_list=tx_access_list,
         data=initial_memory,
         gas_limit=tx_gas_limit,
-        expected_receipt=TransactionReceipt(cumulative_gas_used=tx_gas_limit),
+        expected_receipt=TransactionReceipt(cumulative_gas_used=expected_gas),
     )