diff --git a/src/confirmation_strategies.rs b/src/confirmation_strategies.rs index 6f0e7b0..ed340bc 100644 --- a/src/confirmation_strategies.rs +++ b/src/confirmation_strategies.rs @@ -186,6 +186,9 @@ pub fn confirmation_by_lite_rpc_notification_stream( match notification { NotificationMsg::BlockNotificationMsg(block_notification) => { + if block_notification.commitment != CommitmentLevel::Finalized { + continue; + } let _ = tx_block_data.send(BlockData { block_hash: block_notification.blockhash.to_string(), block_leader: block_notification.block_leader, @@ -194,12 +197,15 @@ pub fn confirmation_by_lite_rpc_notification_stream( number_of_mm_transactions: block_notification.transaction_found, total_transactions: block_notification.total_transactions, cu_consumed: block_notification.total_cu_consumed, - cu_consumed_by_simulations: block_notification.cu_consumed_by_txs, }); } NotificationMsg::UpdateTransactionMsg(tx_update_notifications) => { for tx_notification in tx_update_notifications { + if tx_notification.commitment != CommitmentLevel::Finalized { + continue; + } + if let Some(value) = transaction_map.get(&tx_notification.signature) { let (tx_sent_record, _) = value.clone(); let error = match &tx_notification.transaction_status { diff --git a/src/main.rs b/src/main.rs index 3338dc5..51531c7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -153,13 +153,14 @@ pub async fn main() -> anyhow::Result<()> { let nb_rpc_client = Arc::new(NbRpcClient::new_with_commitment( json_rpc_url.to_string(), - CommitmentConfig::confirmed(), + CommitmentConfig::finalized(), )); let tx_store = empty_tx_store(); let block_store = BlockStore::new(&nb_rpc_client) .await .expect("Blockstore should be created"); + let (notif_sx, notif_rx) = unbounded_channel(); let (transaction_service, tx_service_jh) = configure_transaction_service( nb_rpc_client.clone(), diff --git a/src/states.rs b/src/states.rs index 9fbad6a..44e2abd 100644 --- a/src/states.rs +++ b/src/states.rs @@ -102,5 +102,4 @@ pub struct BlockData { pub number_of_mm_transactions: u64, pub block_time: u64, pub cu_consumed: u64, - pub cu_consumed_by_simulations: u64, } diff --git a/src/tpu_manager.rs b/src/tpu_manager.rs index fdbb872..63927ff 100644 --- a/src/tpu_manager.rs +++ b/src/tpu_manager.rs @@ -47,10 +47,15 @@ impl TpuManager { } let transaction = bincode::serialize(transaction).unwrap(); - self.transaction_service + let res = self.transaction_service .send_transaction(transaction, None) - .await - .is_ok() + .await; + + if let Err(e) = &res{ + print!("error sending txs on custom tpu {e:?}"); + } + res.is_ok() + } pub async fn send_transaction_batch(