feat(network): add support for bootnodes_v4(enode) and bootnodes_v5(enode and enr) in config file similiar in geth

weixie.cui · cuiweixie · commit cf6da46b2730 · 2025-11-26T20:38:11.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/config/src/config.rs b/crates/config/src/config.rs
@@ -595,6 +595,7 @@ mod tests {
     use crate::PruneConfig;
     use alloy_primitives::Address;
     use reth_network_peers::TrustedPeer;
+    use reth_network_types::peers::Discv5BootNode;
     use reth_prune_types::{PruneMode, PruneModes, ReceiptsLogPruneConfig};
     use std::{collections::BTreeMap, path::Path, str::FromStr, time::Duration};
 
@@ -1164,4 +1165,133 @@ connect_trusted_nodes_only = true
             assert!(conf.peers.trusted_nodes.contains(&node));
         }
     }
+
+    #[test]
+    fn test_bootnodes_v4_config() {
+        let reth_toml = r#"
+[peers]
+bootnodes_v4 = [
+    "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+    "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303"
+]
+"#;
+
+        let conf: Config = toml::from_str(reth_toml).unwrap();
+        assert_eq!(conf.peers.bootnodes_v4.len(), 2);
+
+        let expected_enodes = vec![
+            "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+            "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303",
+        ];
+
+        for enode in expected_enodes {
+            let node = TrustedPeer::from_str(enode).unwrap();
+            assert!(conf.peers.bootnodes_v4.contains(&node));
+        }
+    }
+
+    #[test]
+    fn test_bootnodes_v5_config_enode() {
+        let reth_toml = r#"
+[peers]
+bootnodes_v5 = [
+    "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+    "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303"
+]
+"#;
+
+        let conf: Config = toml::from_str(reth_toml).unwrap();
+        assert_eq!(conf.peers.bootnodes_v5.len(), 2);
+
+        let expected_enodes = vec![
+            "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+            "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303",
+        ];
+
+        for enode in expected_enodes {
+            let node = TrustedPeer::from_str(enode).unwrap();
+            let bootnode = Discv5BootNode::Enode(node);
+            assert!(conf.peers.bootnodes_v5.contains(&bootnode));
+        }
+    }
+
+    #[test]
+    fn test_bootnodes_v5_config_enr() {
+        let reth_toml = r#"
+[peers]
+bootnodes_v5 = [
+    "enr:-J64QBwRIWAco7lv6jImSOjPU_W266lHXzpAS5YOh7WmgTyBZkgLgOwo_mxKJq3wz2XRbsoBItbv1dCyjIoNq67mFguGAYrTxM42gmlkgnY0gmlwhBLSsHKHb3BzdGFja4S0lAUAiXNlY3AyNTZrMaEDmoWSi8hcsRpQf2eJsNUx-sqv6fH4btmo2HsAzZFAKnKDdGNwgiQGg3VkcIIkBg"
+]
+"#;
+
+        let conf: Config = toml::from_str(reth_toml).unwrap();
+        assert_eq!(conf.peers.bootnodes_v5.len(), 1);
+
+        let expected_enr = "enr:-J64QBwRIWAco7lv6jImSOjPU_W266lHXzpAS5YOh7WmgTyBZkgLgOwo_mxKJq3wz2XRbsoBItbv1dCyjIoNq67mFguGAYrTxM42gmlkgnY0gmlwhBLSsHKHb3BzdGFja4S0lAUAiXNlY3AyNTZrMaEDmoWSi8hcsRpQf2eJsNUx-sqv6fH4btmo2HsAzZFAKnKDdGNwgiQGg3VkcIIkBg";
+        let bootnode = Discv5BootNode::Enr(expected_enr.to_string());
+        assert!(conf.peers.bootnodes_v5.contains(&bootnode));
+    }
+
+    #[test]
+    fn test_bootnodes_v5_config_mixed() {
+        let reth_toml = r#"
+[peers]
+bootnodes_v5 = [
+    "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+    "enr:-J64QBwRIWAco7lv6jImSOjPU_W266lHXzpAS5YOh7WmgTyBZkgLgOwo_mxKJq3wz2XRbsoBItbv1dCyjIoNq67mFguGAYrTxM42gmlkgnY0gmlwhBLSsHKHb3BzdGFja4S0lAUAiXNlY3AyNTZrMaEDmoWSi8hcsRpQf2eJsNUx-sqv6fH4btmo2HsAzZFAKnKDdGNwgiQGg3VkcIIkBg"
+]
+"#;
+
+        let conf: Config = toml::from_str(reth_toml).unwrap();
+        assert_eq!(conf.peers.bootnodes_v5.len(), 2);
+
+        let enode_node = TrustedPeer::from_str(
+            "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+        )
+        .unwrap();
+        let enode_bootnode = Discv5BootNode::Enode(enode_node);
+        assert!(conf.peers.bootnodes_v5.contains(&enode_bootnode));
+
+        let enr_string = "enr:-J64QBwRIWAco7lv6jImSOjPU_W266lHXzpAS5YOh7WmgTyBZkgLgOwo_mxKJq3wz2XRbsoBItbv1dCyjIoNq67mFguGAYrTxM42gmlkgnY0gmlwhBLSsHKHb3BzdGFja4S0lAUAiXNlY3AyNTZrMaEDmoWSi8hcsRpQf2eJsNUx-sqv6fH4btmo2HsAzZFAKnKDdGNwgiQGg3VkcIIkBg";
+        let enr_bootnode = Discv5BootNode::Enr(enr_string.to_string());
+        assert!(conf.peers.bootnodes_v5.contains(&enr_bootnode));
+    }
+
+    #[test]
+    fn test_bootnodes_v4_and_v5_separate_config() {
+        let reth_toml = r#"
+[peers]
+bootnodes_v4 = [
+    "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303"
+]
+bootnodes_v5 = [
+    "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303"
+]
+"#;
+
+        let conf: Config = toml::from_str(reth_toml).unwrap();
+        assert_eq!(conf.peers.bootnodes_v4.len(), 1);
+        assert_eq!(conf.peers.bootnodes_v5.len(), 1);
+
+        let v4_node = TrustedPeer::from_str(
+            "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+        )
+        .unwrap();
+        let v5_node = TrustedPeer::from_str(
+            "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303",
+        )
+        .unwrap();
+        let v5_bootnode = Discv5BootNode::Enode(v5_node.clone());
+
+        assert!(conf.peers.bootnodes_v4.contains(&v4_node));
+        assert!(conf.peers.bootnodes_v5.contains(&v5_bootnode));
+        assert!(!conf.peers.bootnodes_v4.contains(&v5_node));
+    }
+
+    #[test]
+    fn test_bootnodes_default_empty() {
+        let conf: Config = Config::default();
+        assert!(conf.peers.bootnodes_v4.is_empty());
+        assert!(conf.peers.bootnodes_v5.is_empty());
+    }
 }
diff --git a/crates/net/network-types/src/peers/config.rs b/crates/net/network-types/src/peers/config.rs
@@ -4,6 +4,7 @@ use std::{
     collections::HashSet,
     io::{self, ErrorKind},
     path::Path,
+    str::FromStr,
     time::Duration,
 };
 
@@ -13,6 +14,37 @@ use tracing::info;
 
 use crate::{BackoffKind, ReputationChangeWeights};
 
+/// A bootnode for Discv5 discovery that can be either an enode (TrustedPeer) or an ENR string.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(untagged))]
+pub enum Discv5BootNode {
+    /// An enode URL (enode://...)
+    Enode(TrustedPeer),
+    /// An ENR string (enr:...)
+    Enr(String),
+}
+
+impl FromStr for Discv5BootNode {
+    type Err = <TrustedPeer as FromStr>::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        // Check if it's an ENR (starts with "enr:")
+        if s.starts_with("enr:") {
+            Ok(Discv5BootNode::Enr(s.to_string()))
+        } else {
+            // Try to parse as enode
+            TrustedPeer::from_str(s).map(Discv5BootNode::Enode)
+        }
+    }
+}
+
+impl From<TrustedPeer> for Discv5BootNode {
+    fn from(peer: TrustedPeer) -> Self {
+        Discv5BootNode::Enode(peer)
+    }
+}
+
 /// Maximum number of available slots for outbound sessions.
 pub const DEFAULT_MAX_COUNT_PEERS_OUTBOUND: u32 = 100;
 
@@ -172,6 +204,18 @@ pub struct PeersConfig {
     /// IPs within the specified CIDR ranges will be allowed.
     #[cfg_attr(feature = "serde", serde(skip))]
     pub ip_filter: IpFilter,
+    /// Bootnodes for Discv4 discovery (enode:// format).
+    ///
+    /// Similar to geth's BootstrapNodes. These nodes are used to bootstrap the Discv4
+    /// discovery protocol.
+    #[cfg_attr(feature = "serde", serde(default))]
+    pub bootnodes_v4: Vec<TrustedPeer>,
+    /// Bootnodes for Discv5 discovery (enode:// or enr: format).
+    ///
+    /// Similar to geth's BootstrapNodesV5. These nodes are used to bootstrap the Discv5
+    /// discovery protocol. Can be either enode URLs (enode://...) or ENR strings (enr:...).
+    #[cfg_attr(feature = "serde", serde(default))]
+    pub bootnodes_v5: Vec<Discv5BootNode>,
 }
 
 impl Default for PeersConfig {
@@ -191,6 +235,8 @@ impl Default for PeersConfig {
             max_backoff_count: 5,
             incoming_ip_throttle_duration: INBOUND_IP_THROTTLE_DURATION,
             ip_filter: IpFilter::default(),
+            bootnodes_v4: Default::default(),
+            bootnodes_v5: Default::default(),
         }
     }
 }
@@ -314,6 +360,18 @@ impl PeersConfig {
         self
     }
 
+    /// Sets the bootnodes for Discv4 discovery.
+    pub fn with_bootnodes_v4(mut self, bootnodes: Vec<TrustedPeer>) -> Self {
+        self.bootnodes_v4 = bootnodes;
+        self
+    }
+
+    /// Sets the bootnodes for Discv5 discovery.
+    pub fn with_bootnodes_v5(mut self, bootnodes: Vec<Discv5BootNode>) -> Self {
+        self.bootnodes_v5 = bootnodes;
+        self
+    }
+
     /// Returns settings for testing
     #[cfg(any(test, feature = "test-utils"))]
     pub fn test() -> Self {
diff --git a/crates/net/network-types/src/peers/mod.rs b/crates/net/network-types/src/peers/mod.rs
@@ -4,7 +4,7 @@ pub mod kind;
 pub mod reputation;
 pub mod state;
 
-pub use config::{ConnectionsConfig, PeersConfig};
+pub use config::{ConnectionsConfig, Discv5BootNode, PeersConfig};
 pub use reputation::{Reputation, ReputationChange, ReputationChangeKind, ReputationChangeWeights};
 
 use alloy_eip2124::ForkId;
diff --git a/crates/net/network/src/peers.rs b/crates/net/network/src/peers.rs
@@ -111,6 +111,8 @@ impl PeersManager {
             max_backoff_count,
             incoming_ip_throttle_duration,
             ip_filter,
+            bootnodes_v4: _,
+            bootnodes_v5: _,
         } = config;
         let (manager_tx, handle_rx) = mpsc::unbounded_channel();
         let now = Instant::now();
diff --git a/crates/node/core/Cargo.toml b/crates/node/core/Cargo.toml
@@ -33,6 +33,7 @@ reth-discv5.workspace = true
 reth-net-nat.workspace = true
 reth-net-banlist.workspace = true
 reth-network-peers.workspace = true
+reth-network-types.workspace = true
 reth-prune-types.workspace = true
 reth-stages-types.workspace = true
 reth-ethereum-forks.workspace = true
diff --git a/crates/node/core/src/args/network.rs b/crates/node/core/src/args/network.rs
