Merge pull request #612 from near/xiangyi/fix_new_node_join

fix: add port to my_address so join method works
near · May 27, 2024 · 2d8d274 · 2d8d274
2 parents 653f4e1 + 256954a
commit 2d8d274
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/node/src/cli.rs b/node/src/cli.rs
@@ -221,10 +221,15 @@ pub fn run(cmd: Cli) -> anyhow::Result<()> {
                     ));
 
                     let sign_sk = sign_sk.unwrap_or_else(|| account_sk.clone());
-                    let my_address = my_address.unwrap_or_else(|| {
-                        let my_ip = local_ip().unwrap();
-                        Url::parse(&format!("http://{my_ip}:{web_port}")).unwrap()
-                    });
+                    let my_address = my_address
+                        .map(|mut addr| {
+                            addr.set_port(Some(web_port)).unwrap();
+                            addr
+                        })
+                        .unwrap_or_else(|| {
+                            let my_ip = local_ip().unwrap();
+                            Url::parse(&format!("http://{my_ip}:{web_port}")).unwrap()
+                        });
                     tracing::info!(%my_address, "address detected");
                     let rpc_client = near_fetch::Client::new(&near_rpc);
                     tracing::debug!(rpc_addr = rpc_client.rpc_addr(), "rpc client initialized");