From 18a3fa9a6fa44ddce2163b1c46f2323a648134d7 Mon Sep 17 00:00:00 2001 From: Godmode Galactus Date: Fri, 23 Jun 2023 09:42:37 +0200 Subject: [PATCH] reducing default timeout for transactions to 2 mins --- lite-rpc/src/lib.rs | 4 ++-- services/src/cleaner.rs | 8 ++++++-- services/src/transaction_service.rs | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lite-rpc/src/lib.rs b/lite-rpc/src/lib.rs index e77b9214..23e4bc75 100644 --- a/lite-rpc/src/lib.rs +++ b/lite-rpc/src/lib.rs @@ -18,7 +18,7 @@ pub const DEFAULT_LITE_RPC_ADDR: &str = "http://0.0.0.0:8890"; pub const DEFAULT_WS_ADDR: &str = "ws://0.0.0.0:8900"; #[from_env] -pub const DEFAULT_MAX_NUMBER_OF_TXS_IN_QUEUE: usize = 40_000; +pub const DEFAULT_MAX_NUMBER_OF_TXS_IN_QUEUE: usize = 200_000; /// 25 slots in 10s send to little more leaders #[from_env] @@ -30,6 +30,6 @@ pub const MAX_RETRIES: usize = 40; pub const DEFAULT_RETRY_TIMEOUT: u64 = 2; #[from_env] -pub const DEFAULT_CLEAN_INTERVAL_MS: u64 = 5 * 60 * 1000; // five minute +pub const DEFAULT_CLEAN_INTERVAL_MS: u64 = 10 * 60 * 1000; // two minute pub const DEFAULT_TRANSACTION_CONFIRMATION_STATUS: TransactionConfirmationStatus = TransactionConfirmationStatus::Finalized; diff --git a/services/src/cleaner.rs b/services/src/cleaner.rs index 986bb4b6..4c8bf7ba 100644 --- a/services/src/cleaner.rs +++ b/services/src/cleaner.rs @@ -45,7 +45,11 @@ impl Cleaner { BLOCKS_IN_BLOCKSTORE.set(self.block_store.number_of_blocks_in_store() as i64); } - pub fn start(self, ttl_duration: Duration) -> JoinHandle> { + pub fn start( + self, + ttl_transactions: Duration, + ttl_duration: Duration, + ) -> JoinHandle> { let mut ttl = tokio::time::interval(ttl_duration); tokio::spawn(async move { @@ -54,7 +58,7 @@ impl Cleaner { loop { ttl.tick().await; - self.clean_tx_sender(ttl_duration); + self.clean_tx_sender(ttl_transactions); self.clean_block_listeners(ttl_duration); self.clean_block_store(ttl_duration).await; } diff --git a/services/src/transaction_service.rs b/services/src/transaction_service.rs index 8e69f307..195a50c8 100644 --- a/services/src/transaction_service.rs +++ b/services/src/transaction_service.rs @@ -87,10 +87,10 @@ impl TransactionServiceBuilder { tpu_service.get_estimated_slot_holder(), ); - let processed_block_listener = block_listner.clone().listen_processed(); - + // transactions get invalid in around 1 mins, because the block hash expires in 150 blocks so 150 * 400ms = 60s + // Setting it to two to give some margin of error / as not all the blocks are filled. let cleaner = Cleaner::new(tx_sender.clone(), block_listner.clone(), block_store_t) - .start(clean_interval); + .start(Duration::from_secs(120), clean_interval); tokio::select! { res = tpu_service_fx => {