fix(tests): EIP-7825: Pre-Osaka tests consuming tx gas above cap (#1928)

* fix(tests): EIP-7825: Pre-Osaka tests consuming more than the tx gas limit cap

* fix(tests): EIP-7825: Pre-Osaka BLS tests consuming more than the tx gas limit cap

* fix: tox

* docs: changelog

* chore(tests): make blake2 use dynamic tx limit.

* chore(tests): update slow deposit tests.

* chore(tests): tstore run until out of gas test.

---------

Co-authored-by: spencer-tb <[email protected]>

Author: marioevz

docs/CHANGELOG.md

@@ -135,6 +135,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - ✨ [EIP-7939](https://eips.ethereum.org/EIPS/eip-7939) Add count leading zeros (CLZ) opcode tests for Osaka ([#1733](https://github.com/ethereum/execution-spec-tests/pull/1733)).
 - ✨ [EIP-7918](https://eips.ethereum.org/EIPS/eip-7918): Blob base fee bounded by execution cost test cases (initial), includes some adjustments to [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844) tests ([#1685](https://github.com/ethereum/execution-spec-tests/pull/1685)). Update the blob_base_cost ([#1915](https://github.com/ethereum/EIPs/pull/1915)).
 - ✨ [EIP-7934](https://eips.ethereum.org/EIPS/eip-7934): Add additional test cases for block RLP max limit with all typed transactions and for a log-creating transactions ([#1890](https://github.com/ethereum/execution-spec-tests/pull/1890)).
+- ✨ [EIP-7825](https://eips.ethereum.org/EIPS/eip-7825): Pre-Osaka tests have been updated to either (1) dynamically adapt to the transaction gas limit cap, or (2) reduce overall gas consumption to fit the new limit ([#1928](https://github.com/ethereum/EIPs/pull/1928)).
 
 ## [v4.5.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.5.0) - 2025-05-14
 

tests/cancun/eip1153_tstore/test_tstorage.py

@@ -262,25 +262,27 @@ class LoopRunUntilOutOfGasCases(PytestParameterEnum):
     }
 
 
+def max_tx_gas_limit(fork):
+    """Return the maximum transaction gas limit for the given fork."""
+    tx_limit = fork.transaction_gas_limit_cap()
+    return [tx_limit if tx_limit is not None else Environment().gas_limit]
+
+
 @LoopRunUntilOutOfGasCases.parametrize()
 @pytest.mark.slow()
+@pytest.mark.parametrize_by_fork("tx_gas_limit", max_tx_gas_limit)
 def test_run_until_out_of_gas(
     state_test: StateTestFiller,
     pre: Alloc,
+    tx_gas_limit: int,
     repeat_bytecode: Bytecode,
     bytecode_repeat_times: int,
 ):
     """Use TSTORE over and over to different keys until we run out of gas."""
-    env = Environment()
-
     bytecode = Op.JUMPDEST + repeat_bytecode * bytecode_repeat_times + Op.JUMP(Op.PUSH0)
     code_address = pre.deploy_contract(code=bytecode)
-    tx = Transaction(
-        sender=pre.fund_eoa(),
-        to=code_address,
-        gas_limit=env.gas_limit,
-    )
+    tx = Transaction(sender=pre.fund_eoa(), to=code_address, gas_limit=tx_gas_limit)
     post = {
         code_address: Account(code=bytecode, storage={}),
     }
-    state_test(env=env, pre=pre, tx=tx, post=post)
+    state_test(pre=pre, tx=tx, post=post)

tests/cancun/eip6780_selfdestruct/test_selfdestruct_revert.py

@@ -18,7 +18,7 @@
     Transaction,
     compute_create_address,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_tools import Opcodes as Op
 
 REFERENCE_SPEC_GIT_PATH = "EIPS/eip-6780.md"
 REFERENCE_SPEC_VERSION = "1b6a0e94cc47e859b9866e570391cf37dc55059a"
@@ -414,7 +414,7 @@ def test_selfdestruct_created_in_same_tx_with_revert(  # noqa SC200
         data=entry_code,
         sender=sender,
         to=None,
-        gas_limit=20_000_000,
+        gas_limit=500_000,
     )
 
     state_test(env=env, pre=pre, post=post, tx=tx)
@@ -507,7 +507,7 @@ def test_selfdestruct_not_created_in_same_tx_with_revert(
         data=entry_code,
         sender=sender,
         to=None,
-        gas_limit=20_000_000,
+        gas_limit=500_000,
     )
 
     state_test(env=env, pre=pre, post=post, tx=tx)

tests/istanbul/eip1344_chainid/test_chainid.py

@@ -15,13 +15,7 @@
 @pytest.mark.valid_from("Istanbul")
 def test_chainid(state_test: StateTestFiller, pre: Alloc):
     """Test CHAINID opcode."""
-    env = Environment(
-        fee_recipient="0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-        difficulty=0x20000,
-        gas_limit=10000000000,
-        number=1,
-        timestamp=1000,
-    )
+    env = Environment()
 
     contract_address = pre.deploy_contract(Op.SSTORE(1, Op.CHAINID) + Op.STOP)
     sender = pre.fund_eoa()
@@ -30,8 +24,7 @@ def test_chainid(state_test: StateTestFiller, pre: Alloc):
         ty=0x0,
         chain_id=0x01,
         to=contract_address,
-        gas_limit=100000000,
-        gas_price=10,
+        gas_limit=100_000,
         sender=sender,
     )
 

tests/istanbul/eip152_blake2/test_blake2.py

@@ -3,8 +3,11 @@
     Test cases for [EIP-152: BLAKE2b compression precompile](https://eips.ethereum.org/EIPS/eip-152).
 """
 
+from typing import List
+
 import pytest
 
+from ethereum_test_forks import Fork
 from ethereum_test_tools import (
     Account,
     Alloc,
@@ -546,9 +549,22 @@ def test_blake2b_invalid_gas(
     state_test(env=env, pre=pre, post=post, tx=tx)
 
 
+def max_tx_gas_limit(fork: Fork) -> int:
+    """Maximum gas limit for a transaction (fork agnostic)."""
+    tx_limit = fork.transaction_gas_limit_cap()
+    if tx_limit is not None:
+        return tx_limit
+    return Environment().gas_limit
+
+
+def tx_gas_limits(fork: Fork) -> List[int]:
+    """List of tx gas limits."""
+    return [max_tx_gas_limit(fork), 90_000, 110_000, 200_000]
+
+
 @pytest.mark.valid_from("Istanbul")
 @pytest.mark.parametrize("call_opcode", [Op.CALL, Op.CALLCODE])
-@pytest.mark.parametrize("gas_limit", [Environment().gas_limit, 90_000, 110_000, 200_000])
+@pytest.mark.parametrize_by_fork("gas_limit", tx_gas_limits)
 @pytest.mark.parametrize(
     ["data", "output"],
     [
@@ -658,6 +674,7 @@ def test_blake2b_gas_limit(
 
 @pytest.mark.valid_from("Istanbul")
 @pytest.mark.parametrize("call_opcode", [Op.CALL, Op.CALLCODE])
+@pytest.mark.parametrize_by_fork("gas_limit", lambda fork: [max_tx_gas_limit(fork)])
 @pytest.mark.parametrize(
     ["data", "output"],
     [
@@ -742,13 +759,12 @@ def test_blake2b_large_gas_limit(
     state_test: StateTestFiller,
     pre: Alloc,
     call_opcode: Op,
+    gas_limit: int,
     blake2b_contract_bytecode: Bytecode,
     data: Blake2bInput | str | bytes,
     output: ExpectedOutput,
 ):
     """Test BLAKE2b precompile with large gas limit."""
-    env = Environment()
-
     account = pre.deploy_contract(blake2b_contract_bytecode, storage={0: 0xDEADBEEF})
     sender = pre.fund_eoa()
 
@@ -761,7 +777,7 @@ def test_blake2b_large_gas_limit(
         ty=0x0,
         to=account,
         data=data,
-        gas_limit=env.gas_limit,
+        gas_limit=gas_limit,
         protected=True,
         sender=sender,
         value=0,
@@ -776,4 +792,4 @@ def test_blake2b_large_gas_limit(
             }
         )
     }
-    state_test(env=env, pre=pre, post=post, tx=tx)
+    state_test(pre=pre, post=post, tx=tx)

tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py

@@ -154,7 +154,8 @@ def test_valid_multi_inf(
     memory_expansion_gas_calculator = fork.memory_expansion_gas_calculator()
     extra_gas = 100_000
 
-    environment_gas_limit = Environment().gas_limit
+    tx_gas_limit_cap = fork.transaction_gas_limit_cap()
+    max_gas_limit = Environment().gas_limit if tx_gas_limit_cap is None else tx_gas_limit_cap
 
     inf_data = Spec.INF_G1 + Spec.INF_G2
     input_data = inf_data
@@ -167,7 +168,7 @@ def test_valid_multi_inf(
             + memory_expansion_gas_calculator(new_bytes=len(input_data + inf_data))
             + precompile_gas
         )
-        if new_tx_gas_limit > environment_gas_limit:
+        if new_tx_gas_limit > max_gas_limit:
             break
         tx_gas_limit = new_tx_gas_limit
         input_data += inf_data
@@ -303,7 +304,8 @@ def test_invalid_multi_inf(
     memory_expansion_gas_calculator = fork.memory_expansion_gas_calculator()
     extra_gas = 100_000
 
-    environment_gas_limit = Environment().gas_limit
+    tx_gas_limit_cap = fork.transaction_gas_limit_cap()
+    max_gas_limit = Environment().gas_limit if tx_gas_limit_cap is None else tx_gas_limit_cap
 
     inf_data = Spec.INF_G1 + Spec.INF_G2
     input_data = PointG1(Spec.P, 0) + Spec.INF_G2
@@ -316,7 +318,7 @@ def test_invalid_multi_inf(
             + memory_expansion_gas_calculator(new_bytes=len(input_data + inf_data))
             + precompile_gas
         )
-        if new_tx_gas_limit > environment_gas_limit:
+        if new_tx_gas_limit > max_gas_limit:
             break
         tx_gas_limit = new_tx_gas_limit
         input_data = inf_data + input_data