From 454a9f31753802f6bed21bf4ee2f86ed42d3e9fc Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 04:46:45 +0000
Subject: [PATCH] Switch `solana deploy` commitment default from "max" to
 "singleGossip" (#14146)

(cherry picked from commit db4ac17259673c4942a038118cb75bbed5d8fd37)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 cli/src/cli.rs  | 2 +-
 cli/src/main.rs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cli/src/cli.rs b/cli/src/cli.rs
index 8e6842e446..0cbd0418a4 100644
--- a/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -2792,7 +2792,7 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
                         .takes_value(false)
                         .help("Use the designated program id, even if the account already holds a large balance of SOL")
                 )
-                .arg(commitment_arg_with_default("max")),
+                .arg(commitment_arg_with_default("singleGossip")),
         )
         .subcommand(
             SubCommand::with_name("program-upgrade")
diff --git a/cli/src/main.rs b/cli/src/main.rs
index 5425b238ab..431ffd5492 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -206,7 +206,10 @@ pub fn parse_args<'a>(
             verbose,
             output_format,
             commitment,
-            send_transaction_config: RpcSendTransactionConfig::default(),
+            send_transaction_config: RpcSendTransactionConfig {
+                preflight_commitment: Some(commitment.commitment),
+                ..RpcSendTransactionConfig::default()
+            },
             address_labels,
         },
         signers,