feat: default listen on ws port

nervosnetwork · Nov 26, 2024 · d8388ad · d8388ad
1 parent 80cfe48
commit d8388ad
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/ckb-bin/src/subcommand/init.rs b/ckb-bin/src/subcommand/init.rs
@@ -157,11 +157,18 @@ pub fn init(args: InitArgs) -> Result<(), ExitCode> {
 
     let log_to_file = args.log_to_file.to_string();
     let log_to_stdout = args.log_to_stdout.to_string();
+    let ws_port = (args
+        .p2p_port
+        .parse::<u16>()
+        .unwrap_or_default()
+        .saturating_add(1))
+    .to_string();
     let mut context = TemplateContext::new(
         &args.chain,
         vec![
             ("rpc_port", args.rpc_port.as_str()),
             ("p2p_port", args.p2p_port.as_str()),
+            ("ws_port", ws_port.as_str()),
             ("log_to_file", log_to_file.as_str()),
             ("log_to_stdout", log_to_stdout.as_str()),
             ("block_assembler", block_assembler.as_str()),

diff --git a/resource/ckb.toml b/resource/ckb.toml
@@ -63,8 +63,8 @@ cache_size = 268435456
 options_file = "default.db-options"
 
 [network]
-listen_addresses = ["/ip4/0.0.0.0/tcp/8115"] # {{
-# _ => listen_addresses = ["/ip4/0.0.0.0/tcp/{p2p_port}"]
+listen_addresses = ["/ip4/0.0.0.0/tcp/8115", "/ip4/0.0.0.0/tcp/8118/ws"] # {{
+# _ => listen_addresses = ["/ip4/0.0.0.0/tcp/{p2p_port}", "/ip4/0.0.0.0/tcp/{ws_port}/ws"]
 # }}
 ### Specify the public and routable network addresses
 # public_addresses = []

diff --git a/util/app-config/src/tests/app_config.rs b/util/app-config/src/tests/app_config.rs
@@ -33,6 +33,7 @@ fn test_export_dev_config_files() {
         vec![
             ("rpc_port", "7000"),
             ("p2p_port", "8000"),
+            ("ws_port", "8001"),
             ("log_to_file", "true"),
             ("log_to_stdout", "true"),
             ("block_assembler", ""),
@@ -55,7 +56,10 @@ fn test_export_dev_config_files() {
         );
         assert_eq!(
             ckb_config.network.listen_addresses,
-            vec!["/ip4/0.0.0.0/tcp/8000".parse().unwrap()]
+            vec![
+                "/ip4/0.0.0.0/tcp/8000".parse().unwrap(),
+                "/ip4/0.0.0.0/tcp/8001/ws".parse().unwrap()
+            ]
         );
         assert_eq!(ckb_config.network.connect_outbound_interval_secs, 15);
         assert_eq!(ckb_config.rpc.listen_address, "127.0.0.1:7000");
@@ -86,6 +90,7 @@ fn test_log_to_stdout_only() {
         vec![
             ("rpc_port", "7000"),
             ("p2p_port", "8000"),
+            ("ws_port", "8001"),
             ("log_to_file", "false"),
             ("log_to_stdout", "true"),
             ("block_assembler", ""),
@@ -126,6 +131,7 @@ fn test_export_testnet_config_files() {
         vec![
             ("rpc_port", "7000"),
             ("p2p_port", "8000"),
+            ("ws_port", "8001"),
             ("log_to_file", "true"),
             ("log_to_stdout", "true"),
             ("block_assembler", ""),
@@ -148,7 +154,10 @@ fn test_export_testnet_config_files() {
         );
         assert_eq!(
             ckb_config.network.listen_addresses,
-            vec!["/ip4/0.0.0.0/tcp/8000".parse().unwrap()]
+            vec![
+                "/ip4/0.0.0.0/tcp/8000".parse().unwrap(),
+                "/ip4/0.0.0.0/tcp/8001/ws".parse().unwrap()
+            ]
         );
         assert_eq!(ckb_config.network.connect_outbound_interval_secs, 15);
         assert_eq!(ckb_config.rpc.listen_address, "127.0.0.1:7000");
@@ -179,6 +188,7 @@ fn test_export_integration_config_files() {
         vec![
             ("rpc_port", "7000"),
             ("p2p_port", "8000"),
+            ("ws_port", "8001"),
             ("log_to_file", "true"),
             ("log_to_stdout", "true"),
             ("block_assembler", ""),
@@ -200,7 +210,10 @@ fn test_export_integration_config_files() {
         );
         assert_eq!(
             ckb_config.network.listen_addresses,
-            vec!["/ip4/0.0.0.0/tcp/8000".parse().unwrap()]
+            vec![
+                "/ip4/0.0.0.0/tcp/8000".parse().unwrap(),
+                "/ip4/0.0.0.0/tcp/8001/ws".parse().unwrap()
+            ]
         );
         assert_eq!(ckb_config.rpc.listen_address, "127.0.0.1:7000");
     }
@@ -230,6 +243,7 @@ fn test_export_dev_config_files_assembly() {
         vec![
             ("rpc_port", "7000"),
             ("p2p_port", "8000"),
+            ("ws_port", "8001"),
             ("log_to_file", "true"),
             ("log_to_stdout", "true"),
             ("block_assembler", ""),
@@ -252,7 +266,10 @@ fn test_export_dev_config_files_assembly() {
         );
         assert_eq!(
             ckb_config.network.listen_addresses,
-            vec!["/ip4/0.0.0.0/tcp/8000".parse().unwrap()]
+            vec![
+                "/ip4/0.0.0.0/tcp/8000".parse().unwrap(),
+                "/ip4/0.0.0.0/tcp/8001/ws".parse().unwrap()
+            ]
         );
         assert_eq!(ckb_config.network.connect_outbound_interval_secs, 15);
         assert_eq!(ckb_config.rpc.listen_address, "127.0.0.1:7000");

diff --git a/util/app-config/src/tests/legacy.rs b/util/app-config/src/tests/legacy.rs
@@ -55,6 +55,7 @@ fn no_deprecated_fields_in_bundled_ckb_app_config() {
             vec![
                 ("rpc_port", "7000"),
                 ("p2p_port", "8000"),
+                ("ws_port", "8001"),
                 ("log_to_file", "true"),
                 ("log_to_stdout", "true"),
                 ("block_assembler", ""),