From 671fd989ef75854b3e1bf1ce381fba63d0662a37 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 16:59:05 +0900
Subject: [PATCH] v2.0: Make unified scheduler opt-in for block verification
 (backport of #1668) (#1874)

Make unified scheduler opt-in for block verification (#1668)

* Enable unified scheduler for block verification

* Revert making unified scheduler enabled by default

(cherry picked from commit 40508cd03f295fa170ff0f116d1b945972d5c593)

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
---
 ledger-tool/src/main.rs           | 2 --
 unified-scheduler-pool/src/lib.rs | 5 -----
 validator/src/cli.rs              | 2 --
 3 files changed, 9 deletions(-)

diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
index 02b29602c8ab7b..8339c0a14d07ff 100644
--- a/ledger-tool/src/main.rs
+++ b/ledger-tool/src/main.rs
@@ -720,7 +720,6 @@ fn main() {
                 .takes_value(true)
                 .possible_values(BlockVerificationMethod::cli_names())
                 .global(true)
-                .hidden(hidden_unless_forced())
                 .help(BlockVerificationMethod::cli_message()),
         )
         .arg(
@@ -730,7 +729,6 @@ fn main() {
                 .takes_value(true)
                 .validator(|s| is_within_range(s, 1..))
                 .global(true)
-                .hidden(hidden_unless_forced())
                 .help(DefaultSchedulerPool::cli_message()),
         )
         .arg(
diff --git a/unified-scheduler-pool/src/lib.rs b/unified-scheduler-pool/src/lib.rs
index ed7f1407a3c37f..1a2706fb284601 100644
--- a/unified-scheduler-pool/src/lib.rs
+++ b/unified-scheduler-pool/src/lib.rs
@@ -1,8 +1,3 @@
-//! NOTE: While the unified scheduler is fully functional and moderately performant even with
-//! mainnet-beta, it has known resource-exhaustion related security issues for replaying
-//! specially-crafted blocks produced by malicious leaders. Thus, this experimental and
-//! nondefault functionality is exempt from the bug bounty program for now.
-//!
 //! Transaction scheduling code.
 //!
 //! This crate implements 3 solana-runtime traits (`InstalledScheduler`, `UninstalledScheduler` and
diff --git a/validator/src/cli.rs b/validator/src/cli.rs
index 978d650a2ef1de..dc1b783eba8298 100644
--- a/validator/src/cli.rs
+++ b/validator/src/cli.rs
@@ -1522,7 +1522,6 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
         .arg(
             Arg::with_name("block_verification_method")
                 .long("block-verification-method")
-                .hidden(hidden_unless_forced())
                 .value_name("METHOD")
                 .takes_value(true)
                 .possible_values(BlockVerificationMethod::cli_names())
@@ -1539,7 +1538,6 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
         .arg(
             Arg::with_name("unified_scheduler_handler_threads")
                 .long("unified-scheduler-handler-threads")
-                .hidden(hidden_unless_forced())
                 .value_name("COUNT")
                 .takes_value(true)
                 .validator(|s| is_within_range(s, 1..))