From 0b23abd4794e8bd64689152786584088b3f1f040 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 30 Dec 2020 22:17:24 -0800
Subject: [PATCH] Bind RPC and faucet to 0.0.0.0

---
 core/src/test_validator.rs                 | 19 +++++++++++++++----
 validator/src/bin/solana-test-validator.rs |  7 +++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/core/src/test_validator.rs b/core/src/test_validator.rs
index 588f3dda4..0070c862c 100644
--- a/core/src/test_validator.rs
+++ b/core/src/test_validator.rs
@@ -24,8 +24,13 @@ use {
         signature::{read_keypair_file, write_keypair_file, Keypair, Signer},
     },
     std::{
-        collections::HashMap, fs::remove_dir_all, net::SocketAddr, path::PathBuf, sync::Arc,
-        thread::sleep, time::Duration,
+        collections::HashMap,
+        fs::remove_dir_all,
+        net::{IpAddr, Ipv4Addr, SocketAddr},
+        path::PathBuf,
+        sync::Arc,
+        thread::sleep,
+        time::Duration,
     },
 };
 
@@ -328,13 +333,19 @@ impl TestValidator {
         }
 
         let vote_account_address = validator_vote_account.pubkey();
-        let rpc_url = format!("http://{}:{}", node.info.rpc.ip(), node.info.rpc.port());
+        let rpc_url = format!("http://{}", node.info.rpc);
         let rpc_pubsub_url = format!("ws://{}/", node.info.rpc_pubsub);
         let tpu = node.info.tpu;
         let gossip = node.info.gossip;
 
         let validator_config = ValidatorConfig {
-            rpc_addrs: Some((node.info.rpc, node.info.rpc_pubsub)),
+            rpc_addrs: Some((
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), node.info.rpc.port()),
+                SocketAddr::new(
+                    IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
+                    node.info.rpc_pubsub.port(),
+                ),
+            )),
             rpc_config: config.rpc_config.clone(),
             accounts_hash_interval_slots: 100,
             account_paths: vec![ledger_path.join("accounts")],
diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs
index 25efb34cf..595e961a0 100644
--- a/validator/src/bin/solana-test-validator.rs
+++ b/validator/src/bin/solana-test-validator.rs
@@ -159,7 +159,7 @@ fn main() {
     };
     let rpc_port = value_t_or_exit!(matches, "rpc_port", u16);
     let faucet_addr = Some(SocketAddr::new(
-        IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
+        IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
         FAUCET_PORT,
     ));
 
@@ -318,7 +318,10 @@ fn main() {
         println_name_value("Gossip Address:", &test_validator.gossip().to_string());
         println_name_value("TPU Address:", &test_validator.tpu().to_string());
         if let Some(faucet_addr) = &faucet_addr {
-            println_name_value("Faucet Address:", &faucet_addr.to_string());
+            println_name_value(
+                "Faucet Address:",
+                &format!("{}:{}", &test_validator.gossip().ip(), faucet_addr.port()),
+            );
         }
 
         let progress_bar = new_spinner_progress_bar();