Merge c7d713a into c49ee3c

packages/beacon-node/package.json

@@ -95,22 +95,23 @@
     "@chainsafe/as-chacha20poly1305": "^0.1.0",
     "@chainsafe/as-sha256": "^0.3.1",
     "@chainsafe/bls": "7.1.1",
-    "@chainsafe/discv5": "^2.0.0",
-    "@chainsafe/libp2p-gossipsub": "^5.3.0",
-    "@chainsafe/libp2p-noise": "^10.2.0",
+    "@chainsafe/discv5": "^2.1.0",
+    "@chainsafe/libp2p-gossipsub": "^6.1.0",
+    "@chainsafe/libp2p-noise": "^11.0.0",
     "@chainsafe/persistent-merkle-tree": "^0.4.2",
     "@chainsafe/snappy-stream": "^5.1.2",
     "@chainsafe/ssz": "^0.9.2",
     "@chainsafe/threads": "^1.10.0",
     "@ethersproject/abi": "^5.0.0",
-    "@libp2p/bootstrap": "^5.0.0",
+    "@libp2p/bootstrap": "^6.0.0",
     "@libp2p/interface-connection": "^3.0.2",
     "@libp2p/interface-connection-manager": "^1.3.0",
-    "@libp2p/interface-peer-id": "^1.0.5",
+    "@libp2p/interface-peer-id": "^2.0.1",
     "@libp2p/interface-pubsub": "^3.0.0",
-    "@libp2p/mdns": "^5.1.0",
+    "@libp2p/interface-registrar": "^2.0.8",
+    "@libp2p/mdns": "^6.0.0",
     "@libp2p/mplex": "^7.1.0",
-    "@libp2p/peer-id-factory": "^1.0.19",
+    "@libp2p/peer-id-factory": "^2.0.1",
     "@libp2p/prometheus-metrics": "^1.1.2",
     "@libp2p/tcp": "^6.0.4",
     "@lodestar/api": "^1.3.0",
@@ -139,7 +140,7 @@
     "it-all": "^2.0.0",
     "it-pipe": "^2.0.5",
     "jwt-simple": "0.5.6",
-    "libp2p": "0.41.0",
+    "libp2p": "0.42.2",
     "prom-client": "^14.1.0",
     "prometheus-gc-stats": "^0.6.3",
     "snappyjs": "^0.7.0",

packages/beacon-node/src/network/gossip/gossipsub.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import {Libp2p} from "libp2p";
 import {GossipSub, GossipsubEvents} from "@chainsafe/libp2p-gossipsub";
 import {SignaturePolicy, TopicStr} from "@chainsafe/libp2p-gossipsub/types";
 import {PeerScore, PeerScoreParams} from "@chainsafe/libp2p-gossipsub/score";
@@ -15,6 +14,7 @@ import {Eth2Context} from "../../chain/index.js";
 import {PeersData} from "../peers/peersData.js";
 import {ClientKind} from "../peers/client.js";
 import {GOSSIP_MAX_SIZE, GOSSIP_MAX_SIZE_BELLATRIX} from "../../constants/network.js";
+import {Libp2p} from "../interface.js";
 import {
   GossipJobQueues,
   GossipTopic,

packages/beacon-node/src/network/interface.ts

@@ -1,6 +1,9 @@
+import {Libp2p as ILibp2p} from "libp2p";
 import {Connection} from "@libp2p/interface-connection";
+import {Registrar} from "@libp2p/interface-registrar";
 import {Multiaddr} from "@multiformats/multiaddr";
 import {PeerId} from "@libp2p/interface-peer-id";
+import {ConnectionManager} from "@libp2p/interface-connection-manager";
 import {ENR} from "@chainsafe/discv5";
 import {phase0} from "@lodestar/types";
 import {BlockInput} from "../chain/blocks/types.js";
@@ -63,3 +66,5 @@ export interface INetwork {
 
 export type PeerDirection = Connection["stat"]["direction"];
 export type PeerStatus = Connection["stat"]["status"];
+
+export type Libp2p = ILibp2p & {connectionManager: ConnectionManager; registrar: Registrar};

packages/beacon-node/src/network/network.ts

@@ -1,5 +1,3 @@
-import {Libp2p} from "libp2p";
-import {DefaultConnectionManager} from "libp2p/connection-manager";
 import {Connection} from "@libp2p/interface-connection";
 import {PeerId} from "@libp2p/interface-peer-id";
 import {Multiaddr} from "@multiformats/multiaddr";
@@ -14,7 +12,7 @@ import {IMetrics} from "../metrics/index.js";
 import {ChainEvent, IBeaconChain, IBeaconClock} from "../chain/index.js";
 import {BlockInput, BlockInputType, getBlockInput} from "../chain/blocks/types.js";
 import {INetworkOptions} from "./options.js";
-import {INetwork} from "./interface.js";
+import {INetwork, Libp2p} from "./interface.js";
 import {ReqRespBeaconNode, ReqRespHandlers, doBeaconBlocksMaybeBlobsByRange} from "./reqresp/index.js";
 import {
   Eth2Gossipsub,
@@ -147,9 +145,6 @@ export class Network implements INetwork {
 
   async start(): Promise<void> {
     await this.libp2p.start();
-    // Stop latency monitor since we handle disconnects here and don't want additional load on the event loop
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-    ((this.libp2p.connectionManager as unknown) as DefaultConnectionManager)["latencyMonitor"].stop();
 
     // Network spec decides version changes based on clock fork, not head fork
     const forkCurrentSlot = this.config.getForkName(this.clock.currentSlot);

packages/beacon-node/src/network/nodejs/bundle.ts

@@ -1,4 +1,4 @@
-import {createLibp2p, Libp2p} from "libp2p";
+import {createLibp2p} from "libp2p";
 import {tcp} from "@libp2p/tcp";
 import {mplex} from "@libp2p/mplex";
 import {bootstrap} from "@libp2p/bootstrap";
@@ -9,6 +9,7 @@ import type {PeerDiscovery} from "@libp2p/interface-peer-discovery";
 import type {Components} from "libp2p/components";
 import {prometheusMetrics} from "@libp2p/prometheus-metrics";
 import {Registry} from "prom-client";
+import {Libp2p} from "../interface.js";
 import {createNoise} from "./noise.js";
 
 export interface ILibp2pOptions {
@@ -40,7 +41,7 @@ export async function createNodejsLibp2p(options: ILibp2pOptions): Promise<Libp2
       peerDiscovery.push(mdns());
     }
   }
-  return await createLibp2p({
+  return (await createLibp2p({
     peerId: options.peerId,
     addresses: {
       listen: options.addresses.listen,
@@ -104,5 +105,5 @@ export async function createNodejsLibp2p(options: ILibp2pOptions): Promise<Libp2
         agentVersion: options.lodestarVersion ? `lodestar/${options.lodestarVersion}` : "lodestar",
       },
     },
-  });
+  })) as Libp2p;
 }

packages/beacon-node/src/network/nodejs/util.ts

@@ -1,7 +1,7 @@
 import {PeerId} from "@libp2p/interface-peer-id";
-import {Libp2p} from "libp2p";
 import {Registry} from "prom-client";
 import {ENR} from "@chainsafe/discv5";
+import {Libp2p} from "../interface.js";
 import {Eth2PeerDataStore} from "../peers/datastore.js";
 import {defaultDiscv5Options, defaultNetworkOptions, INetworkOptions} from "../options.js";
 import {isLocalMultiAddr, clearMultiaddrUDP} from "../util.js";

packages/beacon-node/src/network/peers/discover.ts

@@ -1,4 +1,3 @@
-import {Libp2p} from "libp2p";
 import {PeerId} from "@libp2p/interface-peer-id";
 import {Multiaddr} from "@multiformats/multiaddr";
 import {PeerInfo} from "@libp2p/interface-peer-info";
@@ -7,6 +6,7 @@ import {ILogger, pruneSetToMax, sleep} from "@lodestar/utils";
 import {ENR, IDiscv5DiscoveryInputOptions} from "@chainsafe/discv5";
 import {ATTESTATION_SUBNET_COUNT, SYNC_COMMITTEE_SUBNET_COUNT} from "@lodestar/params";
 import {IMetrics} from "../../metrics/index.js";
+import {Libp2p} from "../interface.js";
 import {ENRKey, SubnetType} from "../metadata.js";
 import {getConnectionsMap, getDefaultDialer, prettyPrintPeerId} from "../util.js";
 import {Discv5Worker} from "../discv5/index.js";

packages/beacon-node/src/network/peers/peerManager.ts

@@ -1,4 +1,3 @@
-import {Libp2p} from "libp2p";
 import {Connection} from "@libp2p/interface-connection";
 import {PeerId} from "@libp2p/interface-peer-id";
 import {IDiscv5DiscoveryInputOptions} from "@chainsafe/discv5";
@@ -11,6 +10,7 @@ import {IBeaconChain} from "../../chain/index.js";
 import {GoodByeReasonCode, GOODBYE_KNOWN_CODES, Libp2pEvent} from "../../constants/index.js";
 import {IMetrics} from "../../metrics/index.js";
 import {NetworkEvent, INetworkEventBus} from "../events.js";
+import {Libp2p} from "../interface.js";
 import {IReqRespBeaconNode, ReqRespMethod, RequestTypedContainer} from "../reqresp/ReqRespBeaconNode.js";
 import {getConnection, getConnectionsMap, prettyPrintPeerId} from "../util.js";
 import {ISubnetsService} from "../subnets/index.js";

packages/beacon-node/src/network/peers/utils/getConnectedPeerIds.ts

@@ -1,7 +1,7 @@
-import {Libp2p} from "libp2p";
 import {Connection} from "@libp2p/interface-connection";
 import {PeerId} from "@libp2p/interface-peer-id";
 import type {ConnectionManager} from "@libp2p/interface-connection-manager";
+import {Libp2p} from "../../interface.js";
 import {getConnectionsMap} from "../../util.js";
 
 /**

packages/beacon-node/src/network/util.ts

@@ -6,8 +6,8 @@ import type {ConnectionManager} from "@libp2p/interface-connection-manager";
 import type {Components} from "libp2p/components.js";
 import type {DefaultConnectionManager} from "libp2p/connection-manager/index.js";
 import type {DefaultDialer} from "libp2p/connection-manager/dialer/index.js";
-import type {Libp2p} from "libp2p";
 import type {ENR} from "@chainsafe/discv5";
+import type {Libp2p} from "./interface.js";
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 

packages/beacon-node/src/node/nodejs.ts

@@ -1,5 +1,4 @@
 import {setMaxListeners} from "node:events";
-import {Libp2p} from "libp2p";
 import {Registry} from "prom-client";
 
 import {IBeaconConfig} from "@lodestar/config";
@@ -10,7 +9,7 @@ import {BeaconStateAllForks} from "@lodestar/state-transition";
 import {ProcessShutdownCallback} from "@lodestar/validator";
 
 import {IBeaconDb} from "../db/index.js";
-import {INetwork, Network, getReqRespHandlers} from "../network/index.js";
+import {Libp2p, INetwork, Network, getReqRespHandlers} from "../network/index.js";
 import {BeaconSync, IBeaconSync} from "../sync/index.js";
 import {BackfillSync} from "../sync/backfill/index.js";
 import {BeaconChain, IBeaconChain, initBeaconMetrics} from "../chain/index.js";

packages/beacon-node/test/utils/network.ts

@@ -1,11 +1,11 @@
 import {PeerId} from "@libp2p/interface-peer-id";
 import {Multiaddr} from "@multiformats/multiaddr";
-import {Libp2p} from "libp2p";
 import {createSecp256k1PeerId} from "@libp2p/peer-id-factory";
 import {ATTESTATION_SUBNET_COUNT, SYNC_COMMITTEE_SUBNET_COUNT} from "@lodestar/params";
 import {BitArray} from "@chainsafe/ssz";
 import {INetwork, Network} from "../../src/network/index.js";
 import {createNodejsLibp2p, ILibp2pOptions} from "../../src/network/nodejs/index.js";
+import {Libp2p} from "../../src/network/interface.js";
 import {Libp2pEvent} from "../../src/constants/index.js";
 
 export async function createNode(

packages/cli/package.json

@@ -58,9 +58,9 @@
     "@chainsafe/bls-keygen": "^0.3.0",
     "@chainsafe/bls-keystore": "^2.0.0",
     "@chainsafe/blst": "^0.2.8",
-    "@chainsafe/discv5": "^2.0.0",
+    "@chainsafe/discv5": "^2.1.0",
     "@chainsafe/ssz": "^0.9.2",
-    "@libp2p/peer-id-factory": "^1.0.19",
+    "@libp2p/peer-id-factory": "^2.0.1",
     "@lodestar/api": "^1.3.0",
     "@lodestar/beacon-node": "^1.3.0",
     "@lodestar/config": "^1.3.0",

packages/reqresp/package.json

@@ -58,7 +58,7 @@
   "dependencies": {
     "@chainsafe/snappy-stream": "^5.1.2",
     "@libp2p/interface-connection": "^3.0.2",
-    "@libp2p/interface-peer-id": "^1.0.4",
+    "@libp2p/interface-peer-id": "^2.0.1",
     "@lodestar/config": "^1.3.0",
     "@lodestar/params": "^1.3.0",
     "@lodestar/types": "^1.3.0",