bring --disable-run-on-all flag back with deprecation notice

sigp · Nov 20, 2023 · 85bd06f · 85bd06f
1 parent 388270f
commit 85bd06f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/lighthouse/tests/validator_client.rs b/lighthouse/tests/validator_client.rs
@@ -493,6 +493,25 @@ fn monitoring_endpoint() {
             assert_eq!(api_conf.update_period_secs, Some(30));
         });
 }
+
+#[test]
+fn disable_run_on_all_flag() {
+    CommandLineTest::new()
+        .flag("disable-run-on-all", None)
+        .run()
+        .with_config(|config| {
+            assert_eq!(config.broadcast_topics, vec![]);
+        });
+    // --broadcast flag takes precedence
+    CommandLineTest::new()
+        .flag("disable-run-on-all", None)
+        .flag("broadcast", Some("attestations"))
+        .run()
+        .with_config(|config| {
+            assert_eq!(config.broadcast_topics, vec![ApiTopic::Attestations]);
+        });
+}
+
 #[test]
 fn no_broadcast_flag() {
     CommandLineTest::new().run().with_config(|config| {

diff --git a/validator_client/src/cli.rs b/validator_client/src/cli.rs
@@ -26,6 +26,18 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                 )
                 .takes_value(true),
         )
+        // TODO remove this flag in a future release
+        .arg(
+            Arg::with_name("disable-run-on-all")
+                .long("disable-run-on-all")
+                .value_name("DISABLE_RUN_ON_ALL")
+                .help("DEPRECATED. Use --broadcast. \
+                       By default, Lighthouse publishes attestation, sync committee subscriptions \
+                       and proposer preparation messages to all beacon nodes provided in the \
+                       `--beacon-nodes flag`. This option changes that behaviour such that these \
+                       api calls only go out to the first available and synced beacon node")
+                .takes_value(false),
+        )
         .arg(
             Arg::with_name("broadcast")
                 .long("broadcast")

diff --git a/validator_client/src/config.rs b/validator_client/src/config.rs
@@ -222,6 +222,9 @@ impl Config {
             config.beacon_nodes_tls_certs = Some(tls_certs.split(',').map(PathBuf::from).collect());
         }
 
+        if cli_args.is_present("disable-run-on-all") {
+            config.broadcast_topics = vec![];
+        }
         if let Some(broadcast_topics) = cli_args.value_of("broadcast") {
             config.broadcast_topics = broadcast_topics
                 .split(',')