Add connectToDiscv5Bootnodes option

packages/cli/src/options/beaconNodeOptions/network.ts

@@ -10,6 +10,7 @@ export interface INetworkArgs {
   "network.bootMultiaddrs": string[];
   "network.localMultiaddrs": string[];
   "network.subscribeAllSubnets": boolean;
+  "network.connectToDiscv5Bootnodes": boolean;
 }
 
 export function parseArgs(args: INetworkArgs): IBeaconNodeOptions["network"] {
@@ -26,6 +27,7 @@ export function parseArgs(args: INetworkArgs): IBeaconNodeOptions["network"] {
     bootMultiaddrs: args["network.bootMultiaddrs"],
     localMultiaddrs: args["network.localMultiaddrs"],
     subscribeAllSubnets: args["network.subscribeAllSubnets"],
+    connectToDiscv5Bootnodes: args["network.connectToDiscv5Bootnodes"],
   };
 }
 
@@ -86,4 +88,11 @@ export const options: ICliCommandOptions<INetworkArgs> = {
     defaultDescription: String(defaultOptions.network.subscribeAllSubnets === true),
     group: "network",
   },
+
+  "network.connectToDiscv5Bootnodes": {
+    type: "boolean",
+    description: "Attempt direct connection to discv5 bootnodes from network.discv5.bootEnrs option",
+    defaultDescription: String(defaultOptions.network.connectToDiscv5Bootnodes === true),
+    group: "network",
+  },
 };

packages/cli/test/unit/options/beaconNodeOptions.test.ts

@@ -44,6 +44,7 @@ describe("options / beaconNodeOptions", () => {
       "network.bootMultiaddrs": [],
       "network.localMultiaddrs": [],
       "network.subscribeAllSubnets": true,
+      "network.connectToDiscv5Bootnodes": true,
 
       "sync.isSingleNode": true,
       "sync.disableProcessAsChainSegment": true,
@@ -98,6 +99,7 @@ describe("options / beaconNodeOptions", () => {
         bootMultiaddrs: [],
         localMultiaddrs: [],
         subscribeAllSubnets: true,
+        connectToDiscv5Bootnodes: true,
       },
       sync: {
         isSingleNode: true,

packages/lodestar/src/network/nodejs/util.ts

@@ -18,18 +18,18 @@ export type NodeJsLibp2pOpts = {
 /**
  *
  * @param peerIdOrPromise Create an instance of NodejsNode asynchronously
- * @param network
+ * @param networkOpts
  * @param peerStoreDir
  */
 export async function createNodeJsLibp2p(
   peerIdOrPromise: PeerId | Promise<PeerId>,
-  network: Partial<INetworkOptions> = {},
+  networkOpts: Partial<INetworkOptions> = {},
   nodeJsLibp2pOpts: NodeJsLibp2pOpts = {}
 ): Promise<LibP2p> {
   const peerId = await Promise.resolve(peerIdOrPromise);
-  const localMultiaddrs = network.localMultiaddrs || defaultNetworkOptions.localMultiaddrs;
-  const bootMultiaddrs = network.bootMultiaddrs || defaultNetworkOptions.bootMultiaddrs;
-  const enr = network.discv5?.enr;
+  const localMultiaddrs = networkOpts.localMultiaddrs || defaultNetworkOptions.localMultiaddrs;
+  const bootMultiaddrs = networkOpts.bootMultiaddrs || defaultNetworkOptions.bootMultiaddrs;
+  const enr = networkOpts.discv5?.enr;
   const {peerStoreDir, disablePeerDiscovery} = nodeJsLibp2pOpts;
 
   if (enr && typeof enr !== "string") {
@@ -48,14 +48,28 @@ export async function createNodeJsLibp2p(
     await datastore.open();
   }
 
+  // Append discv5.bootEnrs to bootMultiaddrs if requested
+  if (networkOpts.connectToDiscv5Bootnodes) {
+    if (!networkOpts.bootMultiaddrs) networkOpts.bootMultiaddrs = [];
+    if (!networkOpts.discv5) networkOpts.discv5 = defaultDiscv5Options;
+
+    for (const enrOrStr of networkOpts.discv5.bootEnrs) {
+      const enr = typeof enrOrStr === "string" ? ENR.decodeTxt(enrOrStr) : enrOrStr;
+      const multiaddrTCP = enr.getLocationMultiaddr("tcp");
+      const peerId = await enr.peerId();
+      const multiaddrWithPeerId = `${multiaddrTCP}/p2p/${peerId.toB58String()}`;
+      networkOpts.bootMultiaddrs.push(multiaddrWithPeerId);
+    }
+  }
+
   return new NodejsNode({
     peerId,
     addresses: {listen: localMultiaddrs},
     datastore,
     bootMultiaddrs: bootMultiaddrs,
-    discv5: network.discv5 || defaultDiscv5Options,
-    maxConnections: network.maxPeers,
-    minConnections: network.targetPeers,
+    discv5: networkOpts.discv5 || defaultDiscv5Options,
+    maxConnections: networkOpts.maxPeers,
+    minConnections: networkOpts.targetPeers,
     // If peer discovery is enabled let the default in NodejsNode
     peerDiscovery: disablePeerDiscovery ? [] : undefined,
   });

packages/lodestar/src/network/options.ts

@@ -3,9 +3,10 @@ import {PeerManagerOpts} from "./peers";
 
 export interface INetworkOptions extends PeerManagerOpts {
   localMultiaddrs: string[];
-  bootMultiaddrs: string[];
+  bootMultiaddrs?: string[];
   discv5?: IDiscv5DiscoveryInputOptions;
   subscribeAllSubnets?: boolean;
+  connectToDiscv5Bootnodes?: boolean;
 }
 
 export const defaultDiscv5Options: IDiscv5DiscoveryInputOptions = {