From 6c9bbc6712376a91185b2e6ca6fff159c2220856 Mon Sep 17 00:00:00 2001
From: bengtlofgren <bengtlofgren8@gmail.com>
Date: Fri, 7 Jul 2023 11:02:10 +0200
Subject: [PATCH] working init_network

---
 apps/src/lib/client/utils.rs | 40 +++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/apps/src/lib/client/utils.rs b/apps/src/lib/client/utils.rs
index ee63ecb1d2..4b58abe167 100644
--- a/apps/src/lib/client/utils.rs
+++ b/apps/src/lib/client/utils.rs
@@ -751,33 +751,41 @@ pub fn init_network(
             config.ledger.cometbft.p2p.addr_book_strict = !localhost;
             // Clear the net address from the config and use it to set ports
             let net_address = validator_config.net_address.take().unwrap();
-            let ip = SocketAddr::from_str(&net_address).unwrap().ip();
+            let _ip = SocketAddr::from_str(&net_address).unwrap().ip();
             let first_port = SocketAddr::from_str(&net_address).unwrap().port();
-            if !localhost {
+            if localhost {
+                config.ledger.cometbft.p2p.laddr = TendermintAddress::from_str(
+                    &format!("127.0.0.1:{}", first_port),
+                )
+                .unwrap();
+            } else {
                 config.ledger.cometbft.p2p.laddr = TendermintAddress::from_str(
                     &format!("0.0.0.0:{}", first_port),
                 )
                 .unwrap();
             }
-            config.ledger.cometbft.p2p.laddr =
-                TendermintAddress::from_str(&format!("{}:{}", ip, first_port))
-                    .unwrap();
-            if !localhost {
+            if localhost {
+                config.ledger.cometbft.rpc.laddr = TendermintAddress::from_str(
+                    &format!("127.0.0.1:{}", first_port + 1),
+                )
+                .unwrap();
+            } else {
                 config.ledger.cometbft.rpc.laddr = TendermintAddress::from_str(
                     &format!("0.0.0.0:{}", first_port + 1),
                 )
                 .unwrap();
             }
-            config.ledger.cometbft.rpc.laddr = TendermintAddress::from_str(
-                &format!("{}:{}", ip, first_port + 1),
-            )
-            .unwrap();
-
-            config.ledger.cometbft.proxy_app = TendermintAddress::from_str(
-                &format!("{}:{}", ip, first_port + 2),
-            )
-            .unwrap();
-
+            if localhost {
+                config.ledger.cometbft.proxy_app = TendermintAddress::from_str(
+                    &format!("127.0.0.1:{}", first_port + 2),
+                )
+                .unwrap();
+            } else {
+                config.ledger.cometbft.proxy_app = TendermintAddress::from_str(
+                    &format!("0.0.0.0:{}", first_port + 2),
+                )
+                .unwrap();
+            }
             config.write(&validator_dir, &chain_id, true).unwrap();
         },
     );