Cargo.lock

@@ -5777,7 +5777,6 @@ dependencies = [
 [[package]]
 name = "solana-lite-rpc-core"
 version = "0.2.0"
-source = "git+https://github.com/blockworks-foundation/lite-rpc.git?branch=mango_simulation_test#ddd9f95a4d23972a4a49ea4db0086030bb7d6a72"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5809,7 +5808,6 @@ dependencies = [
 [[package]]
 name = "solana-lite-rpc-services"
 version = "0.2.0"
-source = "git+https://github.com/blockworks-foundation/lite-rpc.git?branch=mango_simulation_test#ddd9f95a4d23972a4a49ea4db0086030bb7d6a72"
 dependencies = [
  "anyhow",
  "async-channel",

Cargo.toml

@@ -49,8 +49,8 @@ solana-logger = "1.15.2"
 solana-transaction-status = "1.15.2"
 solana-account-decoder = "1.15.2"
 
-solana-lite-rpc-core = { git = "https://github.com/blockworks-foundation/lite-rpc.git", branch = "mango_simulation_test" }
-solana-lite-rpc-services = { git = "https://github.com/blockworks-foundation/lite-rpc.git", branch = "mango_simulation_test" }
+solana-lite-rpc-core = { path = "/home/galactus/mangolana/lite-rpc/core" }
+solana-lite-rpc-services = { path = "/home/galactus/mangolana/lite-rpc/services" }
 
 
 # pin program to mango-v3 version of solana sdk

src/confirmation_strategies.rs

@@ -166,17 +166,16 @@ pub fn confirmation_by_lite_rpc_notification_stream(
     let confirming_task = {
         let transaction_map = transaction_map.clone();
         let tx_confirm_records = tx_confirm_records.clone();
-        let exit_signal = exit_signal.clone();
         tokio::spawn(async move {
+            let mut started_getting_mm_transactions = false;
             let mut tx_record_rx = tx_record_rx;
             let mut notification_stream = notification_stream;
-            
-            #[allow(unused_assignments)]
-            let mut remove_tx = None;
-            while !transaction_map.is_empty() || !exit_signal.load(Ordering::Relaxed) {
+
+            while !transaction_map.is_empty() || !started_getting_mm_transactions {
                 tokio::select! {
                     transaction_record = tx_record_rx.recv() => {
                         if let Some(transaction_record) = transaction_record{
+                            started_getting_mm_transactions = true;
                             transaction_map
                             .insert(transaction_record.signature.to_string(), (transaction_record, Instant::now()));
                         }
@@ -184,8 +183,6 @@ pub fn confirmation_by_lite_rpc_notification_stream(
                     },
                     notification = notification_stream.recv() => {
                         if let Some(notification) = notification {
-                            remove_tx = None;
-                            
                             match notification {
                                 NotificationMsg::BlockNotificationMsg(block_notification) => {
                                     let _ = tx_block_data.send(BlockData {
@@ -209,7 +206,8 @@ pub fn confirmation_by_lite_rpc_notification_stream(
                                                 },
                                                 _ => None
                                             };
-                                            remove_tx = Some(tx_notification.signature.clone());
+
+                                            transaction_map.remove(&tx_notification.signature);
                                             let _ = tx_confirm_records.send(TransactionConfirmRecord {
                                                 signature: tx_notification.signature,
                                                 confirmed_slot: Some(tx_notification.slot),
@@ -234,10 +232,6 @@ pub fn confirmation_by_lite_rpc_notification_stream(
                                     // others do nothing
                                 }
                             }
-
-                            if let Some(signature) = &remove_tx {
-                                transaction_map.remove(signature);
-                            }
                         }
                     },
                     _ = tokio::time::sleep(Duration::from_secs(1)) => {
@@ -246,7 +240,6 @@ pub fn confirmation_by_lite_rpc_notification_stream(
                     }
                 }
             }
-            log::info!("stopped processing the transactions");
         })
     };
 
@@ -294,7 +287,7 @@ pub fn confirmation_by_lite_rpc_notification_stream(
                     }
 
                     // if exit and all the transactions are processed
-                    if exit_signal.load(Ordering::Relaxed) && transaction_map.is_empty() {
+                    if exit_signal.load(Ordering::Relaxed) && transaction_map.len() == 0 {
                         break;
                     }
                 }