remove --libp2p-nodes config and allow tcp multiaddress in --boot-nodes

Author: jxs

beacon_node/lighthouse_network/src/config.rs

@@ -73,9 +73,6 @@ pub struct Config {
     /// List of nodes to initially connect to, on Multiaddr format.
     pub boot_nodes_multiaddr: Vec<Multiaddr>,
 
-    /// List of libp2p nodes to initially connect to.
-    pub libp2p_nodes: Vec<Multiaddr>,
-
     /// List of trusted libp2p nodes which are not scored and marked as explicit.
     pub trusted_peers: Vec<PeerIdSerialized>,
 
@@ -343,7 +340,6 @@ impl Default for Config {
             discv5_config,
             boot_nodes_enr: vec![],
             boot_nodes_multiaddr: vec![],
-            libp2p_nodes: vec![],
             trusted_peers: vec![],
             disable_peer_scoring: false,
             client_version: lighthouse_version::version_with_platform(),

beacon_node/lighthouse_network/src/service/mod.rs

@@ -573,11 +573,6 @@ impl<E: EthSpec> Network<E> {
             };
         };
 
-        // attempt to connect to user-input libp2p nodes
-        for multiaddr in &config.libp2p_nodes {
-            dial(multiaddr.clone());
-        }
-
         // attempt to connect to any specified boot-nodes
         let mut boot_nodes = config.boot_nodes_enr.clone();
         boot_nodes.dedup();

beacon_node/src/cli.rs

@@ -359,15 +359,6 @@ pub fn cli_app() -> Command {
                 This disables this feature, fixing the ENR's IP/PORT to those specified on boot.")
                 .display_order(0)
         )
-        .arg(
-            Arg::new("libp2p-addresses")
-                .long("libp2p-addresses")
-                .value_name("MULTIADDR")
-                .help("One or more comma-delimited multiaddrs to manually connect to a libp2p peer \
-                       without an ENR.")
-                .action(ArgAction::Set)
-                .display_order(0)
-        )
         // NOTE: This is hide because it is primarily a developer feature for testnets and
         // debugging. We remove it from the list to avoid clutter.
         .arg(

beacon_node/src/config.rs

@@ -1196,12 +1196,6 @@ pub fn set_network_config(
                     let multi: Multiaddr = addr
                         .parse()
                         .map_err(|_| format!("Not valid as ENR nor Multiaddr: {}", addr))?;
-                    if !multi.iter().any(|proto| matches!(proto, Protocol::Udp(_))) {
-                        error!(multiaddr = multi.to_string(), "Missing UDP in Multiaddr");
-                    }
-                    if !multi.iter().any(|proto| matches!(proto, Protocol::P2p(_))) {
-                        error!(multiaddr = multi.to_string(), "Missing P2P in Multiaddr");
-                    }
                     multiaddrs.push(multi);
                 }
             }
@@ -1210,17 +1204,6 @@ pub fn set_network_config(
         config.boot_nodes_multiaddr = multiaddrs;
     }
 
-    if let Some(libp2p_addresses_str) = cli_args.get_one::<String>("libp2p-addresses") {
-        config.libp2p_nodes = libp2p_addresses_str
-            .split(',')
-            .map(|multiaddr| {
-                multiaddr
-                    .parse()
-                    .map_err(|_| format!("Invalid Multiaddr: {}", multiaddr))
-            })
-            .collect::<Result<Vec<Multiaddr>, _>>()?;
-    }
-
     if parse_flag(cli_args, "disable-peer-scoring") {
         config.disable_peer_scoring = true;
     }

book/src/help_bn.md

@@ -223,9 +223,6 @@ Options:
           store the block SSZ as a file at this path. This feature is only
           recommended for developers. This directory is not pruned, users should
           be careful to avoid filling up their disks.
-      --libp2p-addresses <MULTIADDR>
-          One or more comma-delimited multiaddrs to manually connect to a libp2p
-          peer without an ENR.
       --listen-address [<ADDRESS>...]
           The address lighthouse will listen for UDP and TCP connections. To
           listen over IPv4 and IPv6 set this flag twice with the different