Replace ifconfig.me with solana_net_utils::get_public_ip_addr for…

… Public IP (solana-labs#106)

Co-authored-by: Eric Semeniuc <3838856+esemeniuc@users.noreply.github.com>

Cargo.toml

@@ -52,7 +52,6 @@ protobuf-src = "1.1.0"
 quinn = "0.9"
 rand = "0.8.5"
 rayon = "1.7.0"
-reqwest = "0.11.16"
 rustls = { version = "0.20", features = ["dangerous_configuration"] }
 serde = { version = "1.0.160", features = ["derive"] }
 serde_json = "1.0.96"

transaction-relayer/Cargo.toml

@@ -26,7 +26,6 @@ jwt = { workspace = true }
 log = { workspace = true }
 openssl = { workspace = true }
 prost-types = { workspace = true }
-reqwest = { workspace = true }
 solana-address-lookup-table-program = { workspace = true }
 solana-client = { workspace = true }
 solana-core = { workspace = true }

transaction-relayer/src/main.rs

@@ -102,6 +102,9 @@ struct Args {
     )]
     websocket_servers: Vec<String>,
 
+    #[arg(long, env, default_value = "entrypoint.mainnet-beta.solana.com:8001")]
+    entrypoint_address: String,
+
     /// This is the IP address that will be shared with the validator. The validator will
     /// tell the rest of the network to send packets here.
     #[arg(long, env)]
@@ -253,13 +256,15 @@ fn main() {
     let public_ip = if args.public_ip.is_some() {
         args.public_ip.unwrap()
     } else {
-        info!("reading public ip from ifconfig.me...");
-        let response = reqwest::blocking::get("https://ifconfig.me")
-            .expect("response from ifconfig.me")
-            .text()
-            .expect("public ip response");
-        response.parse().unwrap()
+        let entrypoint = solana_net_utils::parse_host_port(args.entrypoint_address.as_str())
+            .expect("parse entrypoint");
+        info!(
+            "Contacting {} to determine the validator's public IP address",
+            entrypoint
+        );
+        solana_net_utils::get_public_ip_addr(&entrypoint).expect("get public ip address")
     };
+
     info!("public ip: {:?}", public_ip);
     assert!(
         public_ip.is_ipv4(),