Enable Light Client server by default

eserilev · eserilev · commit 74d93f6b773b · 2025-02-07T13:36:37.000+02:00
diff --git a/beacon_node/beacon_chain/src/chain_config.rs b/beacon_node/beacon_chain/src/chain_config.rs
@@ -124,7 +124,7 @@ impl Default for ChainConfig {
             genesis_backfill: false,
             always_prepare_payload: false,
             epochs_per_migration: crate::migrate::DEFAULT_EPOCHS_PER_MIGRATION,
-            enable_light_client_server: false,
+            enable_light_client_server: true,
             malicious_withhold_count: 0,
             enable_sampling: false,
             blob_publication_batches: 4,
diff --git a/beacon_node/http_api/src/lib.rs b/beacon_node/http_api/src/lib.rs
@@ -170,7 +170,7 @@ impl Default for Config {
             sse_capacity_multiplier: 1,
             enable_beacon_processor: true,
             duplicate_block_status_code: StatusCode::ACCEPTED,
-            enable_light_client_server: false,
+            enable_light_client_server: true,
             target_peers: 100,
         }
     }
diff --git a/beacon_node/lighthouse_network/src/config.rs b/beacon_node/lighthouse_network/src/config.rs
@@ -354,7 +354,7 @@ impl Default for Config {
             topics: Vec::new(),
             proposer_only: false,
             metrics_enabled: false,
-            enable_light_client_server: false,
+            enable_light_client_server: true,
             outbound_rate_limiter_config: None,
             invalid_block_storage: None,
             inbound_rate_limiter_config: None,
diff --git a/beacon_node/src/cli.rs b/beacon_node/src/cli.rs
@@ -1494,9 +1494,18 @@ pub fn cli_app() -> Command {
         .arg(
             Arg::new("light-client-server")
                 .long("light-client-server")
-                .help("Act as a full node supporting light clients on the p2p network \
-                       [experimental]")
+                .help("DEPRECATED")
+                .action(ArgAction::SetTrue)
+
+                .help_heading(FLAG_HEADER)
+                .display_order(0)
+        )
+        .arg(
+            Arg::new("disable-light-client-server")
+                .long("light-client-server")
+                .help("DEPRECATED")
                 .action(ArgAction::SetTrue)
+
                 .help_heading(FLAG_HEADER)
                 .display_order(0)
         )
diff --git a/beacon_node/src/config.rs b/beacon_node/src/config.rs
@@ -179,8 +179,8 @@ pub fn get_config<E: EthSpec>(
             cli_args.get_flag("light-client-server");
     }
 
-    if cli_args.get_flag("light-client-server") {
-        client_config.chain.enable_light_client_server = true;
+    if cli_args.get_flag("disable-light-client-server") {
+        client_config.chain.enable_light_client_server = false;
     }
 
     if let Some(cache_size) = clap_utils::parse_optional(cli_args, "shuffling-cache-size")? {
@@ -1419,7 +1419,7 @@ pub fn set_network_config(
     }
 
     // Light client server config.
-    config.enable_light_client_server = parse_flag(cli_args, "light-client-server");
+    config.enable_light_client_server = !parse_flag(cli_args, "disable-light-client-server");
 
     // The self limiter is enabled by default. If the `self-limiter-protocols` flag is not provided,
     // the default params will be used.
diff --git a/lighthouse/tests/beacon_node.rs b/lighthouse/tests/beacon_node.rs
@@ -2522,13 +2522,24 @@ fn light_client_server_enabled() {
 }
 
 #[test]
-fn light_client_http_server_enabled() {
+fn light_client_server_disabled() {
+    CommandLineTest::new()
+        .flag("disable-light-client-server", None)
+        .run_with_zero_port()
+        .with_config(|config| {
+            assert!(!config.network.enable_light_client_server);
+            assert!(!config.chain.enable_light_client_server);
+        });
+}
+
+#[test]
+fn light_client_http_server_disabled() {
     CommandLineTest::new()
         .flag("http", None)
-        .flag("light-client-server", None)
+        .flag("disable-light-client-server", None)
         .run_with_zero_port()
         .with_config(|config| {
-            assert!(config.http_api.enable_light_client_server);
+            assert!(!config.http_api.enable_light_client_server);
         });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ impl Default for Config {`
`170`	`170`	`sse_capacity_multiplier: 1,`
`171`	`171`	`enable_beacon_processor: true,`
`172`	`172`	`duplicate_block_status_code: StatusCode::ACCEPTED,`
`173`		`- enable_light_client_server: false,`
	`173`	`+ enable_light_client_server: true,`
`174`	`174`	`target_peers: 100,`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,8 @@ pub fn get_config<E: EthSpec>(`
`179`	`179`	`cli_args.get_flag("light-client-server");`
`180`	`180`	`}`
`181`	`181`
`182`		`- if cli_args.get_flag("light-client-server") {`
`183`		`- client_config.chain.enable_light_client_server = true;`
	`182`	`+ if cli_args.get_flag("disable-light-client-server") {`
	`183`	`+ client_config.chain.enable_light_client_server = false;`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`if let Some(cache_size) = clap_utils::parse_optional(cli_args, "shuffling-cache-size")? {`
`@@ -1419,7 +1419,7 @@ pub fn set_network_config(`
`1419`	`1419`	`}`
`1420`	`1420`
`1421`	`1421`	`// Light client server config.`
`1422`		`- config.enable_light_client_server = parse_flag(cli_args, "light-client-server");`
	`1422`	`+ config.enable_light_client_server = !parse_flag(cli_args, "disable-light-client-server");`
`1423`	`1423`
`1424`	`1424`	// The self limiter is enabled by default. If the `self-limiter-protocols` flag is not provided,
`1425`	`1425`	`// the default params will be used.`