fix(pool): fix crash when block height goes backwards

alchemyplatform · Jun 28, 2024 · 9a84f6e · 9a84f6e
1 parent 3f36456
commit 9a84f6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/crates/builder/src/transaction_tracker.rs b/crates/builder/src/transaction_tracker.rs
@@ -267,8 +267,10 @@ where
         self.validate_transaction(&tx)?;
         let gas_fees = GasFees::from(&tx);
         info!(
-            "Sending transaction with nonce: {:?} gas fees: {:?}",
-            self.nonce, gas_fees
+            "Sending transaction with nonce: {:?} gas fees: {:?} gas limit: {:?}",
+            self.nonce,
+            gas_fees,
+            tx.gas()
         );
         let sent_tx = self.sender.send_transaction(tx, expected_storage).await;
 

diff --git a/crates/pool/src/mempool/pool.rs b/crates/pool/src/mempool/pool.rs
@@ -173,8 +173,8 @@ impl PoolInner {
             .duration_since(UNIX_EPOCH)
             .expect("time should be after epoch");
 
-        let block_delta_time = sys_block_time - self.prev_sys_block_time;
-        let block_delta_height = block_number - self.prev_block_number;
+        let block_delta_time = sys_block_time.saturating_sub(self.prev_sys_block_time);
+        let block_delta_height = block_number.saturating_sub(self.prev_block_number);
         let candidate_gas_price = base_fee + candidate_gas_fees.max_priority_fee_per_gas;
         let mut expired = Vec::new();
         let mut num_candidates = 0;