refactor(anvil): replace gas_price by max_fee_per_gas

Author: mablr

crates/anvil/core/src/eth/transaction/mod.rs

@@ -663,7 +663,7 @@ impl TypedTransaction {
     /// and if the transaction is EIP-4844, the result of (total blob gas cost * max fee per blob
     /// gas) is also added
     pub fn max_cost(&self) -> u128 {
-        let mut max_cost = (self.gas_limit() as u128).saturating_mul(self.gas_price().unwrap_or(0));
+        let mut max_cost = (self.gas_limit() as u128).saturating_mul(self.max_fee_per_gas());
 
         if self.is_eip4844() {
             max_cost = max_cost.saturating_add(

crates/anvil/src/eth/api.rs

@@ -2780,10 +2780,10 @@ impl EthApi {
         fn convert(tx: Arc<PoolTransaction>) -> TxpoolInspectSummary {
             let tx = &tx.pending_transaction.transaction;
             let to = tx.to();
-            let gas_price = tx.gas_price();
+            let gas_price = tx.max_fee_per_gas();
             let value = tx.value();
             let gas = tx.gas_limit();
-            TxpoolInspectSummary { to, value, gas, gas_price: gas_price.unwrap_or(0) }
+            TxpoolInspectSummary { to, value, gas, gas_price }
         }
 
         // Note: naming differs geth vs anvil:

crates/anvil/src/eth/backend/mem/mod.rs

@@ -3727,10 +3727,8 @@ impl TransactionValidator for Backend {
 
             // EIP-1559 fee validation (London hard fork and later).
             if env.evm_env.cfg_env.spec >= SpecId::LONDON {
-                if tx.gas_price().unwrap_or(0) < env.evm_env.block_env.basefee.into()
-                    && !is_deposit_tx
-                {
-                    warn!(target: "backend", "max fee per gas={}, too low, block basefee={}", tx.gas_price().unwrap_or(0), env.evm_env.block_env.basefee);
+                if tx.max_fee_per_gas() < env.evm_env.block_env.basefee.into() && !is_deposit_tx {
+                    warn!(target: "backend", "max fee per gas={}, too low, block basefee={}", tx.max_fee_per_gas(), env.evm_env.block_env.basefee);
                     return Err(InvalidTransactionError::FeeCapTooLow);
                 }
 

crates/anvil/src/eth/pool/transactions.rs

@@ -40,7 +40,7 @@ impl TransactionOrder {
     pub fn priority(&self, tx: &TypedTransaction) -> TransactionPriority {
         match self {
             Self::Fifo => TransactionPriority::default(),
-            Self::Fees => TransactionPriority(tx.gas_price().unwrap_or(0)),
+            Self::Fees => TransactionPriority(tx.max_fee_per_gas()),
         }
     }
 }
@@ -95,9 +95,9 @@ impl PoolTransaction {
         *self.pending_transaction.hash()
     }
 
-    /// Returns the gas pric of this transaction
-    pub fn gas_price(&self) -> Option<u128> {
-        self.pending_transaction.transaction.gas_price()
+    /// Returns the max fee per gas of this transaction
+    pub fn max_fee_per_gas(&self) -> u128 {
+        self.pending_transaction.transaction.max_fee_per_gas()
     }
 
     /// Returns the type of the transaction
@@ -182,7 +182,7 @@ impl PendingTransactions {
             .and_then(|hash| self.waiting_queue.get(hash))
         {
             // check if underpriced
-            if tx.transaction.gas_price() < replace.transaction.gas_price() {
+            if tx.transaction.max_fee_per_gas() < replace.transaction.max_fee_per_gas() {
                 warn!(target: "txpool", "pending replacement transaction underpriced [{:?}]", tx.transaction.hash());
                 return Err(PoolError::ReplacementUnderpriced(Box::new(
                     tx.transaction.as_ref().clone(),
@@ -514,7 +514,9 @@ impl ReadyTransactions {
                 // (addr + nonce) then we check for gas price
                 if to_remove.provides() == tx.provides {
                     // check if underpriced
-                    if tx.pending_transaction.transaction.gas_price() <= to_remove.gas_price() {
+                    if tx.pending_transaction.transaction.max_fee_per_gas()
+                        <= to_remove.max_fee_per_gas()
+                    {
                         warn!(target: "txpool", "ready replacement transaction underpriced [{:?}]", tx.hash());
                         return Err(PoolError::ReplacementUnderpriced(Box::new(tx.clone())));
                     } else {
@@ -712,8 +714,8 @@ impl ReadyTransaction {
         &self.transaction.transaction.provides
     }
 
-    pub fn gas_price(&self) -> Option<u128> {
-        self.transaction.transaction.gas_price()
+    pub fn max_fee_per_gas(&self) -> u128 {
+        self.transaction.transaction.max_fee_per_gas()
     }
 }