fix(fill): use fork_at(), use is_eip_enabled(eip_number=7976) to pick the correct token formula

Author: felix314159

src/ethereum/forks/amsterdam/transactions.py

@@ -676,10 +676,8 @@ def calculate_intrinsic_cost(
     # Data token floor cost for access list bytes.
     access_list_gas += tokens_in_access_list * GAS_TX_DATA_TOKEN_FLOOR
 
-    # Data token floor cost for access list bytes.
-    access_list_cost += tokens_in_access_list * GAS_TX_DATA_TOKEN_FLOOR
-
-    auth_cost = Uint(0)
+    auth_regular_gas = Uint(0)
+    auth_state_gas = Uint(0)
     if isinstance(tx, SetCodeTransaction):
         auth_regular_gas = PER_AUTH_BASE_COST * ulen(tx.authorizations)
         auth_state_gas = (

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_calldata_floor.py

@@ -161,24 +161,26 @@ def test_calldata_floor_exceeding_tx_gas_limit_cap(
     gas_limit_cap = fork.transaction_gas_limit_cap()
     assert gas_limit_cap is not None
 
-    # calldata_floor = tokens * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
-    # Non-zero bytes contribute 4 tokens each, zero bytes 1 token.
-    # Exact equality with the cap is not always reachable because
-    # the floor advances in steps of GAS_TX_DATA_TOKEN_FLOOR.
-    # Use nonzero bytes for bulk tokens, then zero bytes (1 token
-    # each) to get as close to the cap as possible.
     floor_token = gas_costs.GAS_TX_DATA_TOKEN_FLOOR
     tx_base = gas_costs.GAS_TX_BASE
-    tokens_per_nonzero = 4
-
     max_tokens = (gas_limit_cap - tx_base) // floor_token
-    nonzero_bytes = max_tokens // tokens_per_nonzero
-    zero_bytes = max_tokens - nonzero_bytes * tokens_per_nonzero
-
-    if exceeds_cap:
-        zero_bytes += 1
 
-    calldata = b"\x01" * nonzero_bytes + b"\x00" * zero_bytes
+    if fork.is_eip_enabled(eip_number=7976):
+        # EIP-7976: all bytes contribute 4 floor tokens regardless of
+        # value, so the token count is len(data) * 4.
+        tokens_per_byte = 4
+        max_bytes = max_tokens // tokens_per_byte
+        if exceeds_cap:
+            max_bytes += 1
+        calldata = b"\x01" * max_bytes
+    else:
+        # EIP-7623: non-zero bytes contribute 4 tokens, zero bytes 1.
+        tokens_per_nonzero = 4
+        nonzero_bytes = max_tokens // tokens_per_nonzero
+        zero_bytes = max_tokens - nonzero_bytes * tokens_per_nonzero
+        if exceeds_cap:
+            zero_bytes += 1
+        calldata = b"\x01" * nonzero_bytes + b"\x00" * zero_bytes
     contract = pre.deploy_contract(Op.STOP)
 
     tx = Transaction(

tests/amsterdam/eip8037_state_creation_gas_cost_increase/test_state_gas_fork_transition.py

@@ -52,7 +52,8 @@ def test_sstore_state_gas_at_transition(
     operation requires state gas. Both blocks use TX_MAX_GAS_LIMIT
     which provides enough gas in either regime.
     """
-    gas_limit_cap = fork.transaction_gas_limit_cap()
+    after_fork = fork.fork_at(timestamp=15_000)
+    gas_limit_cap = after_fork.transaction_gas_limit_cap()
     assert gas_limit_cap is not None
     contract_before = pre.deploy_contract(
         code=Op.SSTORE(0, 1),
@@ -123,7 +124,8 @@ def test_tx_gas_above_cap_at_transition(
     reservoir. This test sends a tx at the cap (always valid) and one
     above the cap (rejected before, accepted after).
     """
-    gas_limit_cap = fork.transaction_gas_limit_cap()
+    after_fork = fork.fork_at(timestamp=15_000)
+    gas_limit_cap = after_fork.transaction_gas_limit_cap()
     assert gas_limit_cap is not None
     storage_before = Storage()
     contract_before = pre.deploy_contract(
@@ -193,9 +195,10 @@ def test_reservoir_available_after_transition(
     no reservoir. After the fork, gas above the cap feeds the reservoir,
     which child calls can draw from for state operations.
     """
-    gas_limit_cap = fork.transaction_gas_limit_cap()
+    after_fork = fork.fork_at(timestamp=15_000)
+    gas_limit_cap = after_fork.transaction_gas_limit_cap()
     assert gas_limit_cap is not None
-    sstore_state_gas = fork.sstore_state_gas()
+    sstore_state_gas = after_fork.sstore_state_gas()
 
     child_storage = Storage()
     child = pre.deploy_contract(