feat(spec-specs, tests): Add EIP-7976 Increase Calldata Floor Cost (#2861)

* feat(tests): adds EIP-7976 test and required framework changes (#2115)

* feat(tests): adds tests and src changes for 7976

Co-authored-by: Toni Wahrstätter <51536394+nerolation@users.noreply.github.com>

* feat: EIP got updated

* fix: ruff

* feat: implemented PR feedback

* fix: make eip-7934 block-size filler fork-aware for amsterdam by enforcing tx gas caps and adaptive calldata sizing so --until=amsterdam fills pass

* fix: fix

* fix: fix

* fix: mypy

---------

Co-authored-by: Toni Wahrstätter <51536394+nerolation@users.noreply.github.com>

* refactor(tests-eip-7976): Condition tests to EIP inclusion

* chores: update refspec

* fix(tests): drop GAS_ prefix from gas_costs attribute references

Align the EIP-7976 mixin and tests with the GasCosts dataclass rename
on forks/amsterdam (GAS_TX_BASE -> TX_BASE, GAS_TX_DATA_TOKEN_FLOOR ->
TX_DATA_TOKEN_FLOOR, GAS_VERY_LOW -> VERY_LOW, etc.).

* 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.

* fix: ci fails due to static tests out of gas

* fix: mario feedback

* fix: remove duplicate test

---------

Co-authored-by: Toni Wahrstätter <51536394+nerolation@users.noreply.github.com>
Co-authored-by: marioevz <marioevz@gmail.com>
Co-authored-by: spencer-tb <spencer.tb@ethereum.org>

Author: 4 people

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

@@ -0,0 +1,47 @@
+"""
+EIP-7976: Increase Calldata Floor Cost.
+
+Increase the calldata floor cost to 64/64 gas per byte to reduce maximum block
+size.
+
+https://eips.ethereum.org/EIPS/eip-7976
+"""
+
+from dataclasses import replace
+
+from execution_testing.base_types import Bytes
+from execution_testing.base_types.conversions import BytesConvertible
+
+from ....base_fork import BaseFork, CalldataGasCalculator
+from ....gas_costs import GasCosts
+
+
+class EIP7976(BaseFork):
+    """EIP-7976 class."""
+
+    @classmethod
+    def gas_costs(cls) -> GasCosts:
+        """Transaction data floor token cost is increased from 10 to 16."""
+        return replace(
+            super(EIP7976, cls).gas_costs(),
+            TX_DATA_TOKEN_FLOOR=16,
+        )
+
+    @classmethod
+    def calldata_gas_calculator(cls) -> CalldataGasCalculator:
+        """
+        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, 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

src/ethereum/forks/amsterdam/transactions.py

@@ -611,8 +611,8 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
             GasCosts.AUTH_PER_EMPTY_ACCOUNT * len(tx.authorizations)
         )
 
-    # Floor tokens from calldata.
-    floor_tokens_in_calldata = tokens_in_calldata
+    # EIP-7976 floor tokens: all calldata bytes count uniformly.
+    floor_tokens_in_calldata = ulen(tx.data) * GasCosts.TX_DATA_TOKEN_STANDARD
 
     # Total floor tokens.
     total_floor_tokens = floor_tokens_in_calldata + tokens_in_access_list

src/ethereum/forks/amsterdam/vm/gas.py

@@ -106,7 +106,7 @@ class GasCosts:
     TX_BASE = Uint(21000)
     TX_CREATE = Uint(32000)
     TX_DATA_TOKEN_STANDARD = Uint(4)
-    TX_DATA_TOKEN_FLOOR = Uint(10)
+    TX_DATA_TOKEN_FLOOR = Uint(16)
     TX_ACCESS_LIST_ADDRESS = Uint(2400)
     TX_ACCESS_LIST_STORAGE_KEY = Uint(1900)
 

tests/amsterdam/eip7976_increase_calldata_floor_cost/__init__.py

@@ -0,0 +1,3 @@
+"""
+Test [EIP-7976: Increase calldata floor cost](https://eips.ethereum.org/EIPS/eip-7976).
+"""