feat: resolve domains in enode strings (#8188)

Co-authored-by: Serge Radinovich <[email protected]>

Cargo.toml

@@ -378,6 +378,7 @@ dyn-clone = "1.0.17"
 sha2 = { version = "0.10", default-features = false }
 paste = "1.0"
 url = "2.3"
+backon = "0.4"
 
 # metrics
 metrics = "0.22.0"

bin/reth/Cargo.toml

@@ -37,6 +37,7 @@ reth-rpc-types-compat.workspace = true
 reth-rpc-api = { workspace = true, features = ["client"] }
 reth-network = { workspace = true, features = ["serde"] }
 reth-network-p2p.workspace = true
+reth-net-common.workspace = true
 reth-network-api.workspace = true
 reth-downloaders.workspace = true
 reth-tracing.workspace = true
@@ -104,7 +105,7 @@ aquamarine.workspace = true
 eyre.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
 tempfile.workspace = true
-backon = "0.4"
+backon.workspace = true
 similar-asserts.workspace = true
 itertools.workspace = true
 rayon.workspace = true

bin/reth/src/commands/p2p/mod.rs

@@ -88,8 +88,8 @@ impl Command {
 
         let mut config: Config = confy::load_path(&config_path).unwrap_or_default();
 
-        for &peer in &self.network.trusted_peers {
-            config.peers.trusted_nodes.insert(peer);
+        for peer in &self.network.trusted_peers {
+            config.peers.trusted_nodes.insert(peer.resolve().await?);
         }
 
         if config.peers.trusted_nodes.is_empty() && self.network.trusted_only {

bin/reth/src/commands/stage/run.rs

@@ -118,9 +118,10 @@ impl Command {
                     let mut config = config;
                     config.peers.trusted_nodes_only = self.network.trusted_only;
                     if !self.network.trusted_peers.is_empty() {
-                        self.network.trusted_peers.iter().for_each(|peer| {
-                            config.peers.trusted_nodes.insert(*peer);
-                        });
+                        for peer in &self.network.trusted_peers {
+                            let peer = peer.resolve().await?;
+                            config.peers.trusted_nodes.insert(peer);
+                        }
                     }
 
                     let network_secret_path = self

book/cli/reth/node.md

@@ -126,6 +126,11 @@ Networking:
 
           Will fall back to a network-specific default if not specified.
 
+      --dns-retries <DNS_RETRIES>
+          Amount of DNS resolution requests retries to perform when peering
+
+          [default: 0]
+
       --peers-file <FILE>
           The path to the known peers file. Connected peers are dumped to this file on nodes
           shutdown, and read on startup. Cannot be used with `--no-persist-peers`.

book/cli/reth/p2p.md

@@ -110,6 +110,11 @@ Networking:
 
           Will fall back to a network-specific default if not specified.
 
+      --dns-retries <DNS_RETRIES>
+          Amount of DNS resolution requests retries to perform when peering
+
+          [default: 0]
+
       --peers-file <FILE>
           The path to the known peers file. Connected peers are dumped to this file on nodes
           shutdown, and read on startup. Cannot be used with `--no-persist-peers`.

book/cli/reth/stage/run.md

@@ -177,6 +177,11 @@ Networking:
 
           Will fall back to a network-specific default if not specified.
 
+      --dns-retries <DNS_RETRIES>
+          Amount of DNS resolution requests retries to perform when peering
+
+          [default: 0]
+
       --peers-file <FILE>
           The path to the known peers file. Connected peers are dumped to this file on nodes
           shutdown, and read on startup. Cannot be used with `--no-persist-peers`.

book/cli/reth/stage/unwind.md

@@ -139,6 +139,11 @@ Networking:
 
           Will fall back to a network-specific default if not specified.
 
+      --dns-retries <DNS_RETRIES>
+          Amount of DNS resolution requests retries to perform when peering
+
+          [default: 0]
+
       --peers-file <FILE>
           The path to the known peers file. Connected peers are dumped to this file on nodes
           shutdown, and read on startup. Cannot be used with `--no-persist-peers`.

crates/net/common/src/lib.rs

@@ -10,6 +10,7 @@
 
 pub mod ban_list;
 pub mod bandwidth_meter;
+
 /// Traits related to tokio streams
 pub mod stream;