fix(tests): compose EIP-7976 floor cost via calldata_gas_calculator

Override `calldata_gas_calculator` (floor mode only) instead of
`transaction_data_floor_cost_calculator`. The previous override
shadowed EIP-7981's `transaction_data_floor_cost_calculator` in the
Amsterdam MRO (auto-loader sorts by EIP number ascending, so EIP7976
is more derived and its method wins without calling super), dropping
the access list floor contribution. Routing the change through
`calldata_gas_calculator` lets EIP-7623's data floor calculator pick
it up, which EIP-7981 then extends via super.

Author: spencer-tb

packages/testing/src/execution_testing/forks/forks/eips/amsterdam/eip_7976.py

@@ -12,7 +12,7 @@
 from execution_testing.base_types import Bytes
 from execution_testing.base_types.conversions import BytesConvertible
 
-from ....base_fork import BaseFork, TransactionDataFloorCostCalculator
+from ....base_fork import BaseFork, CalldataGasCalculator
 from ....gas_costs import GasCosts
 
 
@@ -28,20 +28,20 @@ def gas_costs(cls) -> GasCosts:
         )
 
     @classmethod
-    def transaction_data_floor_cost_calculator(
-        cls,
-    ) -> TransactionDataFloorCostCalculator:
+    def calldata_gas_calculator(cls) -> CalldataGasCalculator:
         """
-        The data floor uses floor tokens based on calldata bytes:
-        ``4 * bytes`` (64/64 per byte), not EIP-7623 calldata tokens.
+        In floor mode, count four tokens per calldata byte uniformly so
+        the data floor cost becomes ``4 * bytes * TX_DATA_TOKEN_FLOOR``
+        (64/64 gas per byte). Standard mode keeps EIP-7623 semantics so
+        that composition with downstream EIPs (e.g. EIP-7981) stays
+        intact via ``super().transaction_data_floor_cost_calculator()``.
         """
+        super_fn = super(EIP7976, cls).calldata_gas_calculator()
         gas_costs = cls.gas_costs()
 
-        def fn(*, data: BytesConvertible) -> int:
-            floor_tokens = len(Bytes(data)) * 4
-            return (
-                floor_tokens * gas_costs.TX_DATA_TOKEN_FLOOR
-                + gas_costs.TX_BASE
-            )
+        def fn(*, data: BytesConvertible, floor: bool = False) -> int:
+            if floor:
+                return len(Bytes(data)) * 4 * gas_costs.TX_DATA_TOKEN_FLOOR
+            return super_fn(data=data, floor=False)
 
         return fn