From 811b85cb0eb712c97b881e3cdd0a2aceb93c0880 Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Mon, 11 Nov 2024 18:46:54 +0100
Subject: [PATCH] token-cli: Add confirm-tx timeout to RPC client

#### Problem

As noticed with #7456, a transaction with a nonced blockhash fails to
confirm even though it works.

This might be because of the confirmation logic in the RPC client, which
looks for the provided blockhash:
https://github.com/anza-xyz/agave/blob/b46c87ea538a1508ed4ae36f8dbf6c75dd57c883/rpc-client/src/nonblocking/rpc_client.rs#L1090

#### Summary of changes

Specify a default transaction confirmation timeout.
---
 token/cli/src/config.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/token/cli/src/config.rs b/token/cli/src/config.rs
index 8469383498e..0ea6284bb78 100644
--- a/token/cli/src/config.rs
+++ b/token/cli/src/config.rs
@@ -26,7 +26,7 @@ use {
         },
         token::ComputeUnitLimit,
     },
-    std::{process::exit, rc::Rc, str::FromStr, sync::Arc},
+    std::{process::exit, rc::Rc, str::FromStr, sync::Arc, time::Duration},
 };
 
 type SignersOf = Vec<(Arc<dyn Signer>, Pubkey)>;
@@ -55,6 +55,9 @@ pub(crate) struct MintInfo {
     pub decimals: u8,
 }
 
+const DEFAULT_RPC_TIMEOUT: Duration = Duration::from_secs(30);
+const DEFAULT_CONFIRM_TX_TIMEOUT: Duration = Duration::from_secs(5);
+
 pub struct Config<'a> {
     pub default_signer: Option<Arc<dyn Signer>>,
     pub rpc_client: Arc<RpcClient>,
@@ -97,9 +100,11 @@ impl<'a> Config<'a> {
                 .unwrap_or(&cli_config.json_rpc_url),
         );
         let websocket_url = solana_cli_config::Config::compute_websocket_url(&json_rpc_url);
-        let rpc_client = Arc::new(RpcClient::new_with_commitment(
+        let rpc_client = Arc::new(RpcClient::new_with_timeouts_and_commitment(
             json_rpc_url,
+            DEFAULT_RPC_TIMEOUT,
             CommitmentConfig::confirmed(),
+            DEFAULT_CONFIRM_TX_TIMEOUT,
         ));
         let sign_only = matches.is_present(SIGN_ONLY_ARG.name);
         let program_client: Arc<dyn ProgramClient<ProgramRpcClientSendTransaction>> = if sign_only {