fix: erroneous AutoMineMaxFeeTooLow

NomicFoundation · Dec 6, 2023 · c50a9d7 · c50a9d7
1 parent fd8ce51
commit c50a9d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/crates/edr_eth/src/transaction/signed.rs b/crates/edr_eth/src/transaction/signed.rs
@@ -99,8 +99,8 @@ impl SignedTransaction {
             SignedTransaction::PreEip155Legacy(_)
             | SignedTransaction::PostEip155Legacy(_)
             | SignedTransaction::Eip2930(_) => None,
-            SignedTransaction::Eip1559(tx) => Some(tx.max_priority_fee_per_gas),
-            SignedTransaction::Eip4844(tx) => Some(tx.max_priority_fee_per_gas),
+            SignedTransaction::Eip1559(tx) => Some(tx.max_fee_per_gas),
+            SignedTransaction::Eip4844(tx) => Some(tx.max_fee_per_gas),
         }
     }
 

diff --git a/crates/edr_provider/src/data.rs b/crates/edr_provider/src/data.rs
@@ -467,6 +467,7 @@ impl ProviderData {
         filter_id
     }
 
+    /// Calculates the next block's base fee per gas.
     pub fn next_block_base_fee_per_gas(&self) -> Result<Option<U256>, BlockchainError> {
         if self.spec_id() < SpecId::LONDON {
             return Ok(None);
@@ -626,16 +627,6 @@ impl ProviderData {
         &mut self,
         transaction_request: TransactionRequestAndSender,
     ) -> Result<B256, ProviderError> {
-        if let Some(chain_id) = transaction_request.request.chain_id() {
-            let expected = self.chain_id();
-            if chain_id != expected {
-                return Err(ProviderError::InvalidChainId {
-                    expected,
-                    actual: chain_id,
-                });
-            }
-        }
-
         let signed_transaction = if self.is_auto_mining {
             let sender = transaction_request.sender;
             self.validate_auto_mine_transaction(