fix: merge fixes

Carsons-Eels · Carsons-Eels · commit c612ae45fc5c · 2026-04-20T13:51:06.000+02:00
diff --git a/src/ethereum/forks/amsterdam/transactions.py b/src/ethereum/forks/amsterdam/transactions.py
@@ -603,7 +603,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
             )
 
     # Data token floor cost for access list bytes.
-    access_list_cost += tokens_in_access_list * GAS_TX_DATA_TOKEN_FLOOR
+    access_list_cost += tokens_in_access_list * GasCosts.TX_DATA_TOKEN_FLOOR
 
     auth_cost = Uint(0)
     if isinstance(tx, SetCodeTransaction):
@@ -619,7 +619,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:
 
     # Floor gas cost (EIP-7623: minimum gas for data-heavy transactions).
     data_floor_gas_cost = (
-        total_floor_tokens * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE
+        total_floor_tokens * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE
     )
 
     return (

Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:`
`603`	`603`	`)`
`604`	`604`
`605`	`605`	`# Data token floor cost for access list bytes.`
`606`		`- access_list_cost += tokens_in_access_list * GAS_TX_DATA_TOKEN_FLOOR`
	`606`	`+ access_list_cost += tokens_in_access_list * GasCosts.TX_DATA_TOKEN_FLOOR`
`607`	`607`
`608`	`608`	`auth_cost = Uint(0)`
`609`	`609`	`if isinstance(tx, SetCodeTransaction):`
`@@ -619,7 +619,7 @@ def calculate_intrinsic_cost(tx: Transaction) -> Tuple[Uint, Uint]:`
`619`	`619`
`620`	`620`	`# Floor gas cost (EIP-7623: minimum gas for data-heavy transactions).`
`621`	`621`	`data_floor_gas_cost = (`
`622`		`- total_floor_tokens * GAS_TX_DATA_TOKEN_FLOOR + GAS_TX_BASE`
	`622`	`+ total_floor_tokens * GasCosts.TX_DATA_TOKEN_FLOOR + GasCosts.TX_BASE`
`623`	`623`	`)`
`624`	`624`
`625`	`625`	`return (`