Add skip preflight to CLI

CHANGELOG.md

@@ -14,6 +14,9 @@ Release channels have their own copy of this changelog:
 
 <a name="edge-channel"></a>
 ## [2.2.0] - Unreleased
+* Changes
+  * CLI:
+    * Add global `--skip-preflight` option for skipping preflight checks on all transactions sent through RPC. This flag, along with `--use-rpc`, can improve success rate with program deployments using the public RPC nodes.
 
 ## [2.1.0]
 * Breaking:

cargo-registry/src/client.rs

@@ -12,6 +12,7 @@ use {
     solana_cli_config::{Config, ConfigInput},
     solana_cli_output::OutputFormat,
     solana_rpc_client::rpc_client::RpcClient,
+    solana_rpc_client_api::config::RpcSendTransactionConfig,
     solana_sdk::{
         commitment_config,
         signature::{read_keypair_file, Keypair},
@@ -30,6 +31,7 @@ impl<'a> RPCCommandConfig<'a> {
             authority: &client.cli_signers[client.authority_signer_index],
             output_format: &OutputFormat::Display,
             use_quic: true,
+            rpc_send_transaction_config: client.rpc_transaction_config,
         })
     }
 }
@@ -42,6 +44,7 @@ pub(crate) struct Client {
     commitment: commitment_config::CommitmentConfig,
     cli_signers: Vec<Keypair>,
     authority_signer_index: SignerIndex,
+    rpc_transaction_config: RpcSendTransactionConfig,
 }
 
 impl Client {
@@ -64,6 +67,13 @@ impl Client {
         App::new(name)
             .about(about)
             .version(version)
+            .arg(
+                Arg::with_name("skip_preflight")
+                    .long("skip-preflight")
+                    .global(true)
+                    .takes_value(false)
+                    .help("Skip the preflight check when sending transactions"),
+            )
             .arg(
                 Arg::with_name("config_file")
                     .short("C")
@@ -208,6 +218,8 @@ impl Client {
         let server_url =
             value_t!(matches, "server_url", String).unwrap_or(format!("http://0.0.0.0:{}", port));
 
+        let skip_preflight = matches.is_present("skip_preflight");
+
         Ok(Client {
             rpc_client: Arc::new(RpcClient::new_with_timeouts_and_commitment(
                 json_rpc_url.to_string(),
@@ -221,6 +233,11 @@ impl Client {
             commitment,
             cli_signers: vec![payer_keypair, authority_keypair],
             authority_signer_index: 1,
+            rpc_transaction_config: RpcSendTransactionConfig {
+                skip_preflight,
+                preflight_commitment: Some(commitment.commitment),
+                ..RpcSendTransactionConfig::default()
+            },
         })
     }
 }

cli/src/clap_app.rs

@@ -14,6 +14,13 @@ pub fn get_clap_app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> A
         .about(about)
         .version(version)
         .setting(AppSettings::SubcommandRequiredElseHelp)
+        .arg(
+            Arg::with_name("skip_preflight")
+                .long("skip-preflight")
+                .global(true)
+                .takes_value(false)
+                .help("Skip the preflight check when sending transactions"),
+        )
         .arg({
             let arg = Arg::with_name("config_file")
                 .short("C")

cli/src/feature.rs

@@ -990,6 +990,10 @@ fn process_activate(
         FEATURE_NAMES.get(&feature_id).unwrap(),
         feature_id
     );
-    let result = rpc_client.send_and_confirm_transaction_with_spinner(&transaction);
+    let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+        &transaction,
+        config.commitment,
+        config.send_transaction_config,
+    );
     log_instruction_custom_error::<SystemError>(result, config)
 }

cli/src/main.rs

@@ -212,6 +212,8 @@ pub fn parse_args<'a>(
         !DEFAULT_TPU_ENABLE_UDP
     };
 
+    let skip_preflight = matches.is_present("skip_preflight");
+
     let use_tpu_client = matches.is_present("use_tpu_client");
 
     Ok((
@@ -227,6 +229,7 @@ pub fn parse_args<'a>(
             output_format,
             commitment,
             send_transaction_config: RpcSendTransactionConfig {
+                skip_preflight,
                 preflight_commitment: Some(commitment.commitment),
                 ..RpcSendTransactionConfig::default()
             },

cli/src/nonce.rs

@@ -437,7 +437,11 @@ pub fn process_authorize_nonce_account(
         &tx.message,
         config.commitment,
     )?;
-    let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
+    let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+        &tx,
+        config.commitment,
+        config.send_transaction_config,
+    );
 
     log_instruction_custom_error::<SystemError>(result, config)
 }
@@ -537,7 +541,11 @@ pub fn process_create_nonce_account(
 
     let mut tx = Transaction::new_unsigned(message);
     tx.try_sign(&config.signers, latest_blockhash)?;
-    let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
+    let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+        &tx,
+        config.commitment,
+        config.send_transaction_config,
+    );
 
     log_instruction_custom_error::<SystemError>(result, config)
 }
@@ -597,7 +605,11 @@ pub fn process_new_nonce(
         &tx.message,
         config.commitment,
     )?;
-    let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
+    let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+        &tx,
+        config.commitment,
+        config.send_transaction_config,
+    );
 
     log_instruction_custom_error::<SystemError>(result, config)
 }
@@ -667,7 +679,11 @@ pub fn process_withdraw_from_nonce_account(
         &tx.message,
         config.commitment,
     )?;
-    let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
+    let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+        &tx,
+        config.commitment,
+        config.send_transaction_config,
+    );
 
     log_instruction_custom_error::<SystemError>(result, config)
 }
@@ -697,7 +713,11 @@ pub(crate) fn process_upgrade_nonce_account(
         &tx.message,
         config.commitment,
     )?;
-    let result = rpc_client.send_and_confirm_transaction_with_spinner(&tx);
+    let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+        &tx,
+        config.commitment,
+        config.send_transaction_config,
+    );
     log_instruction_custom_error::<SystemError>(result, config)
 }
 

cli/src/program.rs

@@ -35,7 +35,7 @@ use {
     solana_client::{
         connection_cache::ConnectionCache,
         send_and_confirm_transactions_in_parallel::{
-            send_and_confirm_transactions_in_parallel_blocking, SendAndConfirmConfig,
+            send_and_confirm_transactions_in_parallel_blocking_v2, SendAndConfirmConfigV2,
         },
         tpu_client::{TpuClient, TpuClientConfig},
     },
@@ -47,7 +47,7 @@ use {
     solana_rpc_client::rpc_client::RpcClient,
     solana_rpc_client_api::{
         client_error::ErrorKind as ClientErrorKind,
-        config::{RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSendTransactionConfig},
+        config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
         filter::{Memcmp, RpcFilterType},
         request::MAX_MULTIPLE_ACCOUNTS,
     },
@@ -1575,7 +1575,11 @@ fn process_program_upgrade(
         let signers = &[fee_payer_signer, upgrade_authority_signer];
         tx.try_sign(signers, blockhash)?;
         let final_tx_sig = rpc_client
-            .send_and_confirm_transaction_with_spinner(&tx)
+            .send_and_confirm_transaction_with_spinner_and_config(
+                &tx,
+                config.commitment,
+                config.send_transaction_config,
+            )
             .map_err(|e| format!("Upgrading program failed: {e}"))?;
         let program_id = CliProgramId {
             program_id: program_id.to_string(),
@@ -1728,10 +1732,7 @@ fn process_set_authority(
             .send_and_confirm_transaction_with_spinner_and_config(
                 &tx,
                 config.commitment,
-                RpcSendTransactionConfig {
-                    preflight_commitment: Some(config.commitment.commitment),
-                    ..RpcSendTransactionConfig::default()
-                },
+                config.send_transaction_config,
             )
             .map_err(|e| format!("Setting authority failed: {e}"))?;
 
@@ -1790,10 +1791,7 @@ fn process_set_authority_checked(
             .send_and_confirm_transaction_with_spinner_and_config(
                 &tx,
                 config.commitment,
-                RpcSendTransactionConfig {
-                    preflight_commitment: Some(config.commitment.commitment),
-                    ..RpcSendTransactionConfig::default()
-                },
+                config.send_transaction_config,
             )
             .map_err(|e| format!("Setting authority failed: {e}"))?;
 
@@ -2132,10 +2130,7 @@ fn close(
     let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
         &tx,
         config.commitment,
-        RpcSendTransactionConfig {
-            preflight_commitment: Some(config.commitment.commitment),
-            ..RpcSendTransactionConfig::default()
-        },
+        config.send_transaction_config,
     );
     if let Err(err) = result {
         if let ClientErrorKind::TransactionError(TransactionError::InstructionError(
@@ -2358,10 +2353,7 @@ fn process_extend_program(
     let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
         &tx,
         config.commitment,
-        RpcSendTransactionConfig {
-            preflight_commitment: Some(config.commitment.commitment),
-            ..RpcSendTransactionConfig::default()
-        },
+        config.send_transaction_config,
     );
     if let Err(err) = result {
         if let ClientErrorKind::TransactionError(TransactionError::InstructionError(
@@ -2936,7 +2928,11 @@ fn send_deploy_messages(
             } else {
                 initial_transaction.try_sign(&[fee_payer_signer], blockhash)?;
             }
-            let result = rpc_client.send_and_confirm_transaction_with_spinner(&initial_transaction);
+            let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+                &initial_transaction,
+                config.commitment,
+                config.send_transaction_config,
+            );
             log_instruction_custom_error::<SystemError>(result, config)
                 .map_err(|err| format!("Account allocation failed: {err}"))?;
         } else {
@@ -3003,14 +2999,15 @@ fn send_deploy_messages(
                         .expect("Should return a valid tpu client")
                     );
 
-                    send_and_confirm_transactions_in_parallel_blocking(
+                    send_and_confirm_transactions_in_parallel_blocking_v2(
                         rpc_client.clone(),
                         tpu_client,
                         &write_messages,
                         &[fee_payer_signer, write_signer],
-                        SendAndConfirmConfig {
+                        SendAndConfirmConfigV2 {
                             resign_txs_count: Some(max_sign_attempts),
                             with_spinner: true,
+                            rpc_send_transaction_config: config.send_transaction_config,
                         },
                     )
                 },
@@ -3046,10 +3043,7 @@ fn send_deploy_messages(
                     .send_and_confirm_transaction_with_spinner_and_config(
                         &final_tx,
                         config.commitment,
-                        RpcSendTransactionConfig {
-                            preflight_commitment: Some(config.commitment.commitment),
-                            ..RpcSendTransactionConfig::default()
-                        },
+                        config.send_transaction_config,
                     )
                     .map_err(|e| format!("Deploying program failed: {e}"))?,
             ));

cli/src/program_v4.rs

@@ -20,7 +20,7 @@ use {
     solana_client::{
         connection_cache::ConnectionCache,
         send_and_confirm_transactions_in_parallel::{
-            send_and_confirm_transactions_in_parallel_blocking, SendAndConfirmConfig,
+            send_and_confirm_transactions_in_parallel_blocking_v2, SendAndConfirmConfigV2,
         },
         tpu_client::{TpuClient, TpuClientConfig},
     },
@@ -567,6 +567,7 @@ pub struct ProgramV4CommandConfig<'a> {
     pub authority: &'a dyn Signer,
     pub output_format: &'a OutputFormat,
     pub use_quic: bool,
+    pub rpc_send_transaction_config: RpcSendTransactionConfig,
 }
 
 impl<'a> ProgramV4CommandConfig<'a> {
@@ -578,6 +579,7 @@ impl<'a> ProgramV4CommandConfig<'a> {
             authority: config.signers[*auth_signer_index],
             output_format: &config.output_format,
             use_quic: config.use_quic,
+            rpc_send_transaction_config: config.send_transaction_config,
         }
     }
 }
@@ -1014,8 +1016,11 @@ fn send_messages(
                 let mut initial_transaction = Transaction::new_unsigned(message.clone());
                 initial_transaction
                     .try_sign(&[config.payer, initial_signer, config.authority], blockhash)?;
-                let result =
-                    rpc_client.send_and_confirm_transaction_with_spinner(&initial_transaction);
+                let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+                    &initial_transaction,
+                    config.commitment,
+                    config.rpc_send_transaction_config,
+                );
                 log_instruction_custom_error_ex::<SystemError, _>(
                     result,
                     config.output_format,
@@ -1031,7 +1036,11 @@ fn send_messages(
 
             let mut initial_transaction = Transaction::new_unsigned(message.clone());
             initial_transaction.try_sign(&[config.payer, config.authority], blockhash)?;
-            let result = rpc_client.send_and_confirm_transaction_with_spinner(&initial_transaction);
+            let result = rpc_client.send_and_confirm_transaction_with_spinner_and_config(
+                &initial_transaction,
+                config.commitment,
+                config.rpc_send_transaction_config,
+            );
             log_instruction_custom_error_ex::<SystemError, _>(
                 result,
                 config.output_format,
@@ -1074,14 +1083,15 @@ fn send_messages(
                     .block_on(tpu_client_fut)
                     .expect("Should return a valid tpu client");
 
-                send_and_confirm_transactions_in_parallel_blocking(
+                send_and_confirm_transactions_in_parallel_blocking_v2(
                     rpc_client.clone(),
                     Some(tpu_client),
                     write_messages,
                     &[config.payer, config.authority],
-                    SendAndConfirmConfig {
+                    SendAndConfirmConfigV2 {
                         resign_txs_count: Some(5),
                         with_spinner: true,
+                        rpc_send_transaction_config: config.rpc_send_transaction_config,
                     },
                 )
             }
@@ -1107,11 +1117,7 @@ fn send_messages(
             .send_and_confirm_transaction_with_spinner_and_config(
                 &final_tx,
                 config.commitment,
-                RpcSendTransactionConfig {
-                    skip_preflight: true,
-                    preflight_commitment: Some(config.commitment.commitment),
-                    ..RpcSendTransactionConfig::default()
-                },
+                config.rpc_send_transaction_config,
             )
             .map_err(|e| format!("Deploying program failed: {e}"))?;
     }