feat(bundles): update send bundle loop to only wait for new blocks on…

… auto bundling mode
alchemyplatform · Oct 5, 2023 · c2824b0 · c2824b0
1 parent c2224ac
commit c2824b0
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/crates/builder/src/bundle_sender.rs b/crates/builder/src/bundle_sender.rs
@@ -141,6 +141,7 @@ where
 
         loop {
             let mut send_bundle_response: Option<oneshot::Sender<SendBundleResult>> = None;
+            let mut last_block = None;
 
             if self.manual_bundling_mode.load(Ordering::Relaxed) {
                 tokio::select! {
@@ -151,34 +152,33 @@ where
                         continue;
                     }
                 }
-            }
+            } else {
+                last_block = rx.recv().await;
 
-            // Wait for new block. Block number doesn't matter as the pool will only notify of new blocks
-            // after the pool has updated its state. The bundle will be formed using the latest pool state
-            // and can land in the next block
-            let mut last_block = match rx.recv().await {
-                Some(b) => b,
-                None => {
+                if last_block.is_none() {
                     error!("Block stream closed");
                     bail!("Block stream closed");
                 }
-            };
-            // Consume any other blocks that may have been buffered up
-            loop {
-                match rx.try_recv() {
-                    Ok(b) => {
-                        last_block = b;
-                    }
-                    Err(mpsc::error::TryRecvError::Empty) => {
-                        break;
-                    }
-                    Err(mpsc::error::TryRecvError::Disconnected) => {
-                        error!("Block stream closed");
-                        bail!("Block stream closed");
+                // Consume any other blocks that may have been buffered up
+                loop {
+                    match rx.try_recv() {
+                        Ok(b) => {
+                            last_block = Some(b);
+                        }
+                        Err(mpsc::error::TryRecvError::Empty) => {
+                            break;
+                        }
+                        Err(mpsc::error::TryRecvError::Disconnected) => {
+                            error!("Block stream closed");
+                            bail!("Block stream closed");
+                        }
                     }
                 }
             }
 
+            // Wait for new block. Block number doesn't matter as the pool will only notify of new blocks
+            // after the pool has updated its state. The bundle will be formed using the latest pool state
+            // and can land in the next block
             self.check_for_and_log_transaction_update().await;
             let result = self.send_bundle_with_increasing_gas_fees().await;
             match &result {
@@ -192,7 +192,7 @@ where
                     } else {
                         info!("Bundle with hash {tx_hash:?} landed in block {block_number} after increasing gas fees {attempt_number} time(s)");
                     }
-                SendBundleResult::NoOperationsInitially => trace!("No ops to send at block {}", last_block.block_number),
+                SendBundleResult::NoOperationsInitially => trace!("No ops to send at block {}", last_block.unwrap().block_number),
                 SendBundleResult::NoOperationsAfterFeeIncreases {
                     initial_op_count,
                     attempt_number,