Discv5: Do not issue FINDNODES right after the start

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

@@ -11,6 +11,7 @@ export interface INetworkArgs {
   "network.localMultiaddrs": string[];
   "network.subscribeAllSubnets": boolean;
   "network.connectToDiscv5Bootnodes": boolean;
+  "network.firstHeartBeatDelayMs": number;
 }
 
 export function parseArgs(args: INetworkArgs): IBeaconNodeOptions["network"] {
@@ -28,6 +29,7 @@ export function parseArgs(args: INetworkArgs): IBeaconNodeOptions["network"] {
     localMultiaddrs: args["network.localMultiaddrs"],
     subscribeAllSubnets: args["network.subscribeAllSubnets"],
     connectToDiscv5Bootnodes: args["network.connectToDiscv5Bootnodes"],
+    firstHeartBeatDelayMs: args["network.firstHeartBeatDelayMs"],
   };
 }
 
@@ -95,4 +97,11 @@ export const options: ICliCommandOptions<INetworkArgs> = {
     defaultDescription: String(defaultOptions.network.connectToDiscv5Bootnodes === true),
     group: "network",
   },
+
+  "network.firstHeartBeatDelayMs": {
+    type: "number",
+    description: "Delay the 1st heart beat of Peer Manager after starting Discv5",
+    defaultDescription: String(defaultOptions.network.firstHeartBeatDelayMs),
+    group: "network",
+  },
 };

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

@@ -45,6 +45,7 @@ describe("options / beaconNodeOptions", () => {
       "network.localMultiaddrs": [],
       "network.subscribeAllSubnets": true,
       "network.connectToDiscv5Bootnodes": true,
+      "network.firstHeartBeatDelayMs": 1000,
 
       "sync.isSingleNode": true,
       "sync.disableProcessAsChainSegment": true,
@@ -100,6 +101,7 @@ describe("options / beaconNodeOptions", () => {
         localMultiaddrs: [],
         subscribeAllSubnets: true,
         connectToDiscv5Bootnodes: true,
+        firstHeartBeatDelayMs: 1000,
       },
       sync: {
         isSingleNode: true,

packages/lodestar/src/network/network.ts

@@ -116,6 +116,7 @@ export class Network implements INetwork {
         config,
         peerMetadata,
         peerRpcScores,
+        signal,
         networkEventBus,
       },
       opts

packages/lodestar/src/network/options.ts

@@ -19,6 +19,7 @@ export const defaultDiscv5Options: IDiscv5DiscoveryInputOptions = {
 export const defaultNetworkOptions: INetworkOptions = {
   maxPeers: 30, // Allow some room above targetPeers for new inbound peers
   targetPeers: 25,
+  firstHeartBeatDelayMs: 1000,
   localMultiaddrs: ["/ip4/0.0.0.0/tcp/9000"],
   bootMultiaddrs: [],
   discv5: defaultDiscv5Options,

packages/lodestar/src/network/peers/peerManager.ts

@@ -1,9 +1,10 @@
 import LibP2p, {Connection} from "libp2p";
+import {AbortSignal} from "@chainsafe/abort-controller";
 import PeerId from "peer-id";
 import {IDiscv5DiscoveryInputOptions} from "@chainsafe/discv5";
 import {IBeaconConfig} from "@chainsafe/lodestar-config";
 import {allForks, altair, phase0} from "@chainsafe/lodestar-types";
-import {ILogger} from "@chainsafe/lodestar-utils";
+import {ILogger, sleep} from "@chainsafe/lodestar-utils";
 import {IBeaconChain} from "../../chain";
 import {GoodByeReasonCode, GOODBYE_KNOWN_CODES, Libp2pEvent} from "../../constants";
 import {IMetrics} from "../../metrics";
@@ -45,6 +46,11 @@ export type PeerManagerOpts = {
   targetPeers: number;
   /** The maximum number of peers we allow (exceptions for subnet peers) */
   maxPeers: number;
+  /**
+   * Delay the 1st heartbeat after starting discv5
+   * See https://github.com/ChainSafe/lodestar/issues/3423
+   */
+  firstHeartBeatDelayMs: number;
   /**
    * If null, Don't run discv5 queries, nor connect to cached peers in the peerStore
    */
@@ -62,6 +68,7 @@ export type PeerManagerModules = {
   config: IBeaconConfig;
   peerMetadata: Libp2pPeerMetadataStore;
   peerRpcScores: IPeerRpcScoreStore;
+  signal?: AbortSignal;
   networkEventBus: INetworkEventBus;
 };
 
@@ -103,6 +110,7 @@ export class PeerManager {
   private peerRpcScores: IPeerRpcScoreStore;
   /** If null, discovery is disabled */
   private discovery: PeerDiscovery | null;
+  private signal: AbortSignal | undefined;
   private networkEventBus: INetworkEventBus;
 
   // A single map of connected peers with all necessary data to handle PINGs, STATUS, and metrics
@@ -124,6 +132,7 @@ export class PeerManager {
     this.config = modules.config;
     this.peerMetadata = modules.peerMetadata;
     this.peerRpcScores = modules.peerRpcScores;
+    this.signal = modules.signal;
     this.networkEventBus = modules.networkEventBus;
     this.opts = opts;
 
@@ -142,6 +151,7 @@ export class PeerManager {
     this.libp2p.connectionManager.on(Libp2pEvent.peerDisconnect, this.onLibp2pPeerDisconnect);
     this.networkEventBus.on(NetworkEvent.reqRespRequest, this.onRequest);
 
+    await sleep(this.opts.firstHeartBeatDelayMs, this.signal);
     // On start-up will connected to existing peers in libp2p.peerStore, same as autoDial behaviour
     this.heartbeat();
     this.intervals = [

packages/lodestar/test/e2e/network/gossipsub.test.ts

@@ -25,6 +25,7 @@ const opts: INetworkOptions = {
   targetPeers: 1,
   bootMultiaddrs: [],
   localMultiaddrs: [],
+  firstHeartBeatDelayMs: 1,
   discv5: null,
 };
 

packages/lodestar/test/e2e/network/network.test.ts

@@ -55,6 +55,7 @@ describe("network", function () {
       targetPeers: 1,
       bootMultiaddrs: [],
       localMultiaddrs: [],
+      firstHeartBeatDelayMs: 1,
       discv5: {
         enr,
         bindAddr: bindAddrUdp,

packages/lodestar/test/e2e/network/peers/peerManager.test.ts

@@ -85,7 +85,12 @@ describe("network / peers / PeerManager", function () {
         attnetsService: mockSubnetsService,
         syncnetsService: mockSubnetsService,
       },
-      {targetPeers: 30, maxPeers: 50, discv5: null}
+      {
+        targetPeers: 30,
+        maxPeers: 50,
+        discv5: null,
+        firstHeartBeatDelayMs: 1,
+      }
     );
     await peerManager.start();
 

packages/lodestar/test/e2e/network/reqresp.test.ts

@@ -38,6 +38,7 @@ describe("network / ReqResp", function () {
     targetPeers: 1,
     bootMultiaddrs: [],
     localMultiaddrs: [],
+    firstHeartBeatDelayMs: 1,
     discv5: null,
   };
   const state = generateState();