From 1bc9a9c23b77c0d63f5ce0de6600efb92628dd40 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 28 Jan 2020 11:25:11 -0700
Subject: [PATCH] Wait for supermajority by default, add
 --no-wait-for-supermajority flag to override

---
 validator/src/main.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/validator/src/main.rs b/validator/src/main.rs
index 85a767880..357f1e22a 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -584,10 +584,17 @@ pub fn main() {
                 .help("Redirect logging to the specified file, '-' for standard error"),
         )
         .arg(
+            Arg::with_name("no_wait_for_supermajority")
+                .long("no-wait-for-supermajority")
+                .takes_value(false)
+                .help("After processing the ledger, do not wait until a supermajority of stake is visible on gossip before starting PoH"),
+        )
+        .arg(
+            // Legacy flag that is now enabled by default.  Remove this flag a couple months after the 0.23.0
+            // release
             Arg::with_name("wait_for_supermajority")
                 .long("wait-for-supermajority")
-                .takes_value(false)
-                .help("After processing the ledger, wait until a supermajority of stake is visible on gossip before starting PoH"),
+                .hidden(true)
         )
         .arg(
             Arg::with_name("hard_forks")
@@ -655,7 +662,7 @@ pub fn main() {
             }),
         },
         voting_disabled: matches.is_present("no_voting"),
-        wait_for_supermajority: matches.is_present("wait_for_supermajority"),
+        wait_for_supermajority: !matches.is_present("no_wait_for_supermajority"),
         ..ValidatorConfig::default()
     };