fix(tests): Broken tests due to gas cost change

Author: marioevz

tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py

@@ -38,6 +38,7 @@
 from ethereum_test_forks import Fork
 from ethereum_test_tools import (
     EOA,
+    AccessList,
     Account,
     Address,
     Alloc,
@@ -559,9 +560,15 @@ def test_tx_entry_point(
     start_balance = 10**18
     sender = pre.fund_eoa(amount=start_balance)
 
+    # Starting from EIP-7623, we need to use an access list to raise the intrinsic gas cost to be
+    # above the floor data cost.
+    access_list = [AccessList(address=Address(i), storage_keys=[]) for i in range(1, 10)]
+
     # Gas is appended the intrinsic gas cost of the transaction
     tx_intrinsic_gas_cost_calculator = fork.transaction_intrinsic_cost_calculator()
-    intrinsic_gas_cost = tx_intrinsic_gas_cost_calculator(calldata=precompile_input)
+    intrinsic_gas_cost = tx_intrinsic_gas_cost_calculator(
+        calldata=precompile_input, access_list=access_list
+    )
 
     # Consumed gas will only be the precompile gas if the proof is correct and
     # the call gas is sufficient.
@@ -570,13 +577,17 @@ def test_tx_entry_point(
         Spec.POINT_EVALUATION_PRECOMPILE_GAS
         if call_gas >= Spec.POINT_EVALUATION_PRECOMPILE_GAS and proof_correct
         else call_gas
-    ) + intrinsic_gas_cost
-
+    ) + tx_intrinsic_gas_cost_calculator(
+        calldata=precompile_input,
+        access_list=access_list,
+        return_cost_deducted_prior_execution=True,
+    )
     fee_per_gas = 7
 
     tx = Transaction(
         sender=sender,
         data=precompile_input,
+        access_list=access_list,
         to=Address(Spec.POINT_EVALUATION_PRECOMPILE_ADDRESS),
         gas_limit=call_gas + intrinsic_gas_cost,
         gas_price=fee_per_gas,

tests/cancun/eip5656_mcopy/test_mcopy_memory_expansion.py

@@ -5,12 +5,12 @@
 
 """  # noqa: E501
 import itertools
-from typing import Mapping
+from typing import List, Mapping
 
 import pytest
 
 from ethereum_test_forks import Fork
-from ethereum_test_tools import Account, Address, Alloc, Bytecode, Environment
+from ethereum_test_tools import AccessList, Account, Address, Alloc, Bytecode, Environment
 from ethereum_test_tools import Opcodes as Op
 from ethereum_test_tools import StateTestFiller, Transaction
 
@@ -51,16 +51,27 @@ def callee_bytecode(dest: int, src: int, length: int) -> Bytecode:
     return bytecode
 
 
+@pytest.fixture
+def tx_access_list() -> List[AccessList]:
+    """
+    Access list for the transaction.
+    """
+    return [AccessList(address=Address(i), storage_keys=[]) for i in range(1, 10)]
+
+
 @pytest.fixture
 def call_exact_cost(
     fork: Fork,
     initial_memory: bytes,
     dest: int,
     length: int,
+    tx_access_list: List[AccessList],
 ) -> int:
     """
     Returns the exact cost of the subcall, based on the initial memory and the length of the copy.
     """
+    # Starting from EIP-7623, we need to use an access list to raise the intrinsic gas cost to be
+    # above the floor data cost.
     cost_memory_bytes = fork.memory_expansion_gas_calculator()
     gas_costs = fork.gas_costs()
     tx_intrinsic_gas_cost_calculator = fork.transaction_intrinsic_cost_calculator()
@@ -81,7 +92,7 @@ def call_exact_cost(
 
     sstore_cost = 22100
     return (
-        tx_intrinsic_gas_cost_calculator(calldata=initial_memory)
+        tx_intrinsic_gas_cost_calculator(calldata=initial_memory, access_list=tx_access_list)
         + mcopy_cost
         + calldatacopy_cost
         + pushes_cost
@@ -133,10 +144,12 @@ def tx(  # noqa: D103
     initial_memory: bytes,
     tx_max_fee_per_gas: int,
     tx_gas_limit: int,
+    tx_access_list: List[AccessList],
 ) -> Transaction:
     return Transaction(
         sender=sender,
         to=caller_address,
+        access_list=tx_access_list,
         data=initial_memory,
         gas_limit=tx_gas_limit,
         max_fee_per_gas=tx_max_fee_per_gas,

tests/shanghai/eip3860_initcode/test_initcode.py

@@ -7,11 +7,14 @@
     - [ethereum/tests/pull/1012](https://github.com/ethereum/tests/pull/990)
 """
 
+from typing import List
+
 import pytest
 
 from ethereum_test_forks import Fork
 from ethereum_test_tools import (
     EOA,
+    AccessList,
     Account,
     Address,
     Alloc,
@@ -208,14 +211,35 @@ class TestContractCreationGasUsage:
     """
 
     @pytest.fixture
-    def exact_intrinsic_gas(self, fork: Fork, initcode: Initcode) -> int:
+    def tx_access_list(self) -> List[AccessList]:
+        """
+        Starting from EIP-7623, we need to use an access list to raise the intrinsic gas cost to
+        be above the floor data cost.
+        """
+        return [AccessList(address=Address(i), storage_keys=[]) for i in range(1, 478)]
+
+    @pytest.fixture
+    def exact_intrinsic_gas(
+        self, fork: Fork, initcode: Initcode, tx_access_list: List[AccessList]
+    ) -> int:
         """
         Calculates the intrinsic tx gas cost.
         """
         tx_intrinsic_gas_cost_calculator = fork.transaction_intrinsic_cost_calculator()
+        assert tx_intrinsic_gas_cost_calculator(
+            calldata=initcode,
+            contract_creation=True,
+            access_list=tx_access_list,
+        ) == tx_intrinsic_gas_cost_calculator(
+            calldata=initcode,
+            contract_creation=True,
+            access_list=tx_access_list,
+            return_cost_deducted_prior_execution=True,
+        )
         return tx_intrinsic_gas_cost_calculator(
             calldata=initcode,
             contract_creation=True,
+            access_list=tx_access_list,
         )
 
     @pytest.fixture
@@ -241,6 +265,7 @@ def tx(
         sender: EOA,
         initcode: Initcode,
         gas_test_case: str,
+        tx_access_list: List[AccessList],
         tx_error: TransactionException | None,
         exact_intrinsic_gas: int,
         exact_execution_gas: int,
@@ -264,6 +289,7 @@ def tx(
         return Transaction(
             nonce=0,
             to=None,
+            access_list=tx_access_list,
             data=initcode,
             gas_limit=gas_limit,
             gas_price=10,