From a603c8b0bc761fec86cd9010a416c87e922afe3f Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Tue, 19 Jul 2022 23:50:04 -0600
Subject: [PATCH] Enable QUIC servers by default

---
 core/src/validator.rs | 18 +++---------------
 validator/src/main.rs | 12 +++++++++++-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/core/src/validator.rs b/core/src/validator.rs
index cb7ec8416..4bd725fb4 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -90,7 +90,7 @@ use {
         clock::Slot,
         epoch_schedule::MAX_LEADER_SCHEDULE_EPOCH_OFFSET,
         exit::Exit,
-        genesis_config::{ClusterType, GenesisConfig},
+        genesis_config::GenesisConfig,
         hash::Hash,
         pubkey::Pubkey,
         shred_version::compute_shred_version,
@@ -238,7 +238,7 @@ impl Default for ValidatorConfig {
             wait_to_vote_slot: None,
             ledger_column_options: LedgerColumnOptions::default(),
             runtime_config: RuntimeConfig::default(),
-            enable_quic_servers: false,
+            enable_quic_servers: true,
         }
     }
 }
@@ -992,18 +992,6 @@ impl Validator {
             &connection_cache,
         );
 
-        let enable_quic_servers = if genesis_config.cluster_type == ClusterType::MainnetBeta {
-            config.enable_quic_servers
-        } else {
-            if config.enable_quic_servers {
-                warn!(
-                    "ignoring --enable-quic-servers. QUIC is always enabled for cluster type: {:?}",
-                    genesis_config.cluster_type
-                );
-            }
-            true
-        };
-
         let tpu = Tpu::new(
             &cluster_info,
             &poh_recorder,
@@ -1036,7 +1024,7 @@ impl Validator {
             &connection_cache,
             &identity_keypair,
             config.runtime_config.log_messages_bytes_limit,
-            enable_quic_servers,
+            config.enable_quic_servers,
         );
 
         datapoint_info!(
diff --git a/validator/src/main.rs b/validator/src/main.rs
index f18812cd8..1e99b7923 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -1210,6 +1210,12 @@ pub fn main() {
                 .takes_value(false)
                 .help("Use QUIC to send transactions."),
         )
+        .arg(
+            Arg::with_name("disable_quic_servers")
+                .long("disable-quic-servers")
+                .takes_value(false)
+                .help("Disable QUIC TPU servers"),
+        )
         .arg(
             Arg::with_name("enable_quic_servers")
                 .hidden(true)
@@ -2304,7 +2310,7 @@ pub fn main() {
     let accounts_shrink_optimize_total_space =
         value_t_or_exit!(matches, "accounts_shrink_optimize_total_space", bool);
     let tpu_use_quic = matches.is_present("tpu_use_quic");
-    let enable_quic_servers = matches.is_present("enable_quic_servers");
+    let enable_quic_servers = !matches.is_present("disable_quic_servers");
     let tpu_connection_pool_size = value_t_or_exit!(matches, "tpu_connection_pool_size", usize);
 
     let shrink_ratio = value_t_or_exit!(matches, "accounts_shrink_ratio", f64);
@@ -2471,6 +2477,10 @@ pub fn main() {
         );
     }
 
+    if matches.is_present("enable_quic_servers") {
+        warn!("--enable-quic-servers is now the default behavior. This flag is deprecated and can be removed from the launch args");
+    }
+
     let rpc_bigtable_config = if matches.is_present("enable_rpc_bigtable_ledger_storage")
         || matches.is_present("enable_bigtable_ledger_upload")
     {