@aztec/p2p 0.68.0 → 0.68.2

package/dest/services/peer_manager.js

@@ -1,53 +1,86 @@
 import { __esDecorate, __runInitializers } from "tslib";
 import { createLogger } from '@aztec/foundation/log';
-import { trackSpan } from '@aztec/telemetry-client';
+import { WithTracer, trackSpan } from '@aztec/telemetry-client';
 import { inspect } from 'util';
-import { PeerScoring } from './peer-scoring/peer_scoring.js';
+import { PeerScoreState, PeerScoring } from './peer-scoring/peer_scoring.js';
+import { PeerEvent } from './types.js';
 const MAX_DIAL_ATTEMPTS = 3;
 const MAX_CACHED_PEERS = 100;
+const MAX_CACHED_PEER_AGE_MS = 5 * 60 * 1000; // 5 minutes
+const FAILED_PEER_BAN_TIME_MS = 5 * 60 * 1000; // 5 minutes timeout after failing MAX_DIAL_ATTEMPTS
 let PeerManager = (() => {
     var _a;
+    let _classSuper = WithTracer;
     let _instanceExtraInitializers = [];
     let _heartbeat_decorators;
-    return _a = class PeerManager {
-            constructor(libP2PNode, peerDiscoveryService, config, tracer, logger = createLogger('p2p:peer-manager')) {
+    return _a = class PeerManager extends _classSuper {
+            constructor(libP2PNode, peerDiscoveryService, config, telemetryClient, logger = createLogger('p2p:peer-manager')) {
+                super(telemetryClient, 'PeerManager');
                 this.libP2PNode = (__runInitializers(this, _instanceExtraInitializers), libP2PNode);
                 this.peerDiscoveryService = peerDiscoveryService;
                 this.config = config;
-                this.tracer = tracer;
                 this.logger = logger;
                 this.cachedPeers = new Map();
                 this.heartbeatCounter = 0;
+                this.displayPeerCountsPeerHeartbeat = 0;
+                this.timedOutPeers = new Map();
                 this.peerScoring = new PeerScoring(config);
                 // Handle new established connections
-                this.libP2PNode.addEventListener('peer:connect', evt => {
-                    const peerId = evt.detail;
-                    if (this.peerDiscoveryService.isBootstrapPeer(peerId)) {
-                        this.logger.verbose(`Connected to bootstrap peer ${peerId.toString()}`);
-                    }
-                    else {
-                        this.logger.verbose(`Connected to transaction peer ${peerId.toString()}`);
-                    }
-                });
+                this.libP2PNode.addEventListener(PeerEvent.CONNECTED, this.handleConnectedPeerEvent.bind(this));
                 // Handle lost connections
-                this.libP2PNode.addEventListener('peer:disconnect', evt => {
-                    const peerId = evt.detail;
-                    if (this.peerDiscoveryService.isBootstrapPeer(peerId)) {
-                        this.logger.verbose(`Disconnected from bootstrap peer ${peerId.toString()}`);
-                    }
-                    else {
-                        this.logger.verbose(`Disconnected from transaction peer ${peerId.toString()}`);
-                    }
-                });
+                this.libP2PNode.addEventListener(PeerEvent.DISCONNECTED, this.handleDisconnectedPeerEvent.bind(this));
                 // Handle Discovered peers
-                this.peerDiscoveryService.on('peer:discovered', async (enr) => {
-                    await this.handleDiscoveredPeer(enr);
-                });
+                this.peerDiscoveryService.on(PeerEvent.DISCOVERED, this.handleDiscoveredPeer.bind(this));
+                // Display peer counts every 60 seconds
+                this.displayPeerCountsPeerHeartbeat = Math.floor(60000 / this.config.peerCheckIntervalMS);
             }
             heartbeat() {
                 this.heartbeatCounter++;
-                this.discover();
                 this.peerScoring.decayAllScores();
+                this.cleanupExpiredTimeouts();
+                this.discover();
+            }
+            /**
+             * Cleans up expired timeouts.
+             *
+             * When peers fail to dial after a number of retries, they are temporarily timed out.
+             * This function removes any peers that have been in the timed out state for too long.
+             * To give them a chance to reconnect.
+             */
+            cleanupExpiredTimeouts() {
+                // Clean up expired timeouts
+                const now = Date.now();
+                for (const [peerId, timedOutPeer] of this.timedOutPeers.entries()) {
+                    if (now >= timedOutPeer.timeoutUntilMs) {
+                        this.timedOutPeers.delete(peerId);
+                    }
+                }
+            }
+            /**
+             * Simply logs the type of connected peer.
+             * @param e - The connected peer event.
+             */
+            handleConnectedPeerEvent(e) {
+                const peerId = e.detail;
+                if (this.peerDiscoveryService.isBootstrapPeer(peerId)) {
+                    this.logger.verbose(`Connected to bootstrap peer ${peerId.toString()}`);
+                }
+                else {
+                    this.logger.verbose(`Connected to transaction peer ${peerId.toString()}`);
+                }
+            }
+            /**
+             * Simply logs the type of disconnected peer.
+             * @param e - The disconnected peer event.
+             */
+            handleDisconnectedPeerEvent(e) {
+                const peerId = e.detail;
+                if (this.peerDiscoveryService.isBootstrapPeer(peerId)) {
+                    this.logger.verbose(`Disconnected from bootstrap peer ${peerId.toString()}`);
+                }
+                else {
+                    this.logger.verbose(`Disconnected from transaction peer ${peerId.toString()}`);
+                }
             }
             penalizePeer(peerId, penalty) {
                 const id = peerId.toString();
@@ -90,11 +123,11 @@ let PeerManager = (() => {
              * Discovers peers.
              */
             discover() {
-                // Get current connections
                 const connections = this.libP2PNode.getConnections();
+                const healthyConnections = this.pruneUnhealthyPeers(connections);
                 // Calculate how many connections we're looking to make
-                const peersToConnect = this.config.maxPeerCount - connections.length;
-                const logLevel = this.heartbeatCounter % 60 === 0 ? 'info' : 'debug';
+                const peersToConnect = this.config.maxPeerCount - healthyConnections.length;
+                const logLevel = this.heartbeatCounter % this.displayPeerCountsPeerHeartbeat === 0 ? 'info' : 'debug';
                 this.logger[logLevel](`Connected to ${connections.length} peers`, {
                     connections: connections.length,
                     maxPeerCount: this.config.maxPeerCount,
@@ -112,7 +145,10 @@ let PeerManager = (() => {
                     .filter(Boolean));
                 for (const [id, peerData] of this.cachedPeers.entries()) {
                     // if already dialling or connected to, remove from cache
-                    if (pendingDials.has(id) || connections.some(conn => conn.remotePeer.equals(peerData.peerId))) {
+                    if (pendingDials.has(id) ||
+                        healthyConnections.some(conn => conn.remotePeer.equals(peerData.peerId)) ||
+                        // if peer has been in cache for the max cache age, remove from cache
+                        Date.now() - peerData.addedUnixMs > MAX_CACHED_PEER_AGE_MS) {
                         this.cachedPeers.delete(id);
                     }
                     else {
@@ -123,6 +159,7 @@ let PeerManager = (() => {
                 // reverse to dial older entries first
                 cachedPeersToDial.reverse();
                 for (const peer of cachedPeersToDial) {
+                    // We remove from the cache before, as dialling will add it back if it fails
                     this.cachedPeers.delete(peer.peerId.toString());
                     void this.dialPeer(peer);
                 }
@@ -132,29 +169,64 @@ let PeerManager = (() => {
                     void this.peerDiscoveryService.runRandomNodesQuery();
                 }
             }
+            pruneUnhealthyPeers(connections) {
+                const connectedHealthyPeers = [];
+                for (const peer of connections) {
+                    const score = this.peerScoring.getScoreState(peer.remotePeer.toString());
+                    switch (score) {
+                        // TODO: add goodbye and give reasons
+                        case PeerScoreState.Banned:
+                        case PeerScoreState.Disconnect:
+                            void this.disconnectPeer(peer.remotePeer);
+                            break;
+                        case PeerScoreState.Healthy:
+                            connectedHealthyPeers.push(peer);
+                    }
+                }
+                return connectedHealthyPeers;
+            }
+            // TODO: send a goodbye with a reason to the peer
+            async disconnectPeer(peer) {
+                this.logger.debug(`Disconnecting peer ${peer.toString()}`);
+                await this.libP2PNode.hangUp(peer);
+            }
             /**
              *  Handles a discovered peer.
              * @param enr - The discovered peer's ENR.
              */
             async handleDiscoveredPeer(enr) {
-                // TODO: Will be handling peer scoring here
-                // check if peer is already connected
-                const [peerId, multiaddrTcp] = await Promise.all([enr.peerId(), enr.getFullMultiaddr('tcp')]);
-                this.logger.trace(`Handling discovered peer ${peerId.toString()} at ${multiaddrTcp?.toString() ?? 'undefined address'}`);
-                // throw if no tcp addr in multiaddr
+                // Check that the peer has not already been banned
+                const peerId = await enr.peerId();
+                const peerIdString = peerId.toString();
+                // Check if peer is temporarily timed out
+                const timedOutPeer = this.timedOutPeers.get(peerIdString);
+                if (timedOutPeer) {
+                    if (Date.now() < timedOutPeer.timeoutUntilMs) {
+                        this.logger.trace(`Skipping timed out peer ${peerId}`);
+                        return;
+                    }
+                    // Timeout period expired, remove from timed out peers
+                    this.timedOutPeers.delete(peerIdString);
+                }
+                if (this.peerScoring.getScoreState(peerIdString) != PeerScoreState.Healthy) {
+                    return;
+                }
+                const [multiaddrTcp] = await Promise.all([enr.getFullMultiaddr('tcp')]);
+                this.logger.trace(`Handling discovered peer ${peerId} at ${multiaddrTcp?.toString() ?? 'undefined address'}`);
+                // stop if no tcp addr in multiaddr
                 if (!multiaddrTcp) {
                     this.logger.debug(`No TCP address in discovered node's multiaddr ${enr.encodeTxt()}`);
                     return;
                 }
+                // check if peer is already connected
                 const connections = this.libP2PNode.getConnections();
                 if (connections.some(conn => conn.remotePeer.equals(peerId))) {
-                    this.logger.trace(`Already connected to peer ${peerId.toString()}`);
+                    this.logger.trace(`Already connected to peer ${peerId}`);
                     return;
                 }
                 // check if peer is already in cache
-                const id = peerId.toString();
-                if (this.cachedPeers.has(id)) {
-                    this.logger.trace(`Peer already in cache ${id}`);
+                if (this.cachedPeers.has(peerIdString)) {
+                    this.logger.trace(`Peer already in cache ${peerIdString}`);
                     return;
                 }
                 // create cached peer object
@@ -163,20 +235,22 @@ let PeerManager = (() => {
                     enr,
                     multiaddrTcp,
                     dialAttempts: 0,
+                    addedUnixMs: Date.now(),
                 };
                 // Determine if we should dial immediately or not
                 if (this.shouldDialPeer()) {
                     void this.dialPeer(cachedPeer);
                 }
                 else {
-                    this.logger.trace(`Caching peer ${id}`);
-                    this.cachedPeers.set(id, cachedPeer);
+                    this.logger.trace(`Caching peer ${peerIdString}`);
+                    this.cachedPeers.set(peerIdString, cachedPeer);
                     // Prune set of cached peers
                     this.pruneCachedPeers();
                 }
             }
             async dialPeer(peer) {
                 const id = peer.peerId.toString();
+                // Add to the address book before dialing
                 await this.libP2PNode.peerStore.merge(peer.peerId, { multiaddrs: [peer.multiaddrTcp] });
                 this.logger.trace(`Dialing peer ${id}`);
                 try {
@@ -192,6 +266,11 @@ let PeerManager = (() => {
                         formatLibp2pDialError(error);
                         this.logger.debug(`Failed to dial peer ${id} (dropping)`, { error: inspect(error) });
                         this.cachedPeers.delete(id);
+                        // Add to timed out peers
+                        this.timedOutPeers.set(id, {
+                            peerId: id,
+                            timeoutUntilMs: Date.now() + FAILED_PEER_BAN_TIME_MS,
+                        });
                     }
                 }
             }
@@ -218,9 +297,18 @@ let PeerManager = (() => {
                     }
                 }
             }
+            /**
+             * Stops the peer manager.
+             * Removing all event listeners.
+             */
+            stop() {
+                this.libP2PNode.removeEventListener(PeerEvent.CONNECTED, this.handleConnectedPeerEvent);
+                this.libP2PNode.removeEventListener(PeerEvent.DISCONNECTED, this.handleDisconnectedPeerEvent);
+                this.peerDiscoveryService.off(PeerEvent.DISCOVERED, this.handleDiscoveredPeer);
+            }
         },
         (() => {
-            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _heartbeat_decorators = [trackSpan('PeerManager.heartbeat')];
             __esDecorate(_a, null, _heartbeat_decorators, { kind: "method", name: "heartbeat", static: false, private: false, access: { has: obj => "heartbeat" in obj, get: obj => obj.heartbeat }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -267,4 +355,4 @@ function formatLibp2pDialError(e) {
         e.stack = undefined;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"peer_manager.js","sourceRoot":"","sources":["../../src/services/peer_manager.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"peer_manager.js","sourceRoot":"","sources":["../../src/services/peer_manager.ts"],"names":[],"mappings":"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"}

package/dest/services/reqresp/reqresp.js

@@ -1,7 +1,7 @@
 // @attribution: lodestar impl for inspiration
 import { PeerErrorSeverity } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
-import { executeTimeoutWithCustomError } from '@aztec/foundation/timer';
+import { executeTimeout } from '@aztec/foundation/timer';
 import { pipe } from 'it-pipe';
 import { CollectiveReqRespTimeoutError, IndividualReqRespTimeoutError, InvalidResponseError, } from '../../errors/reqresp.error.js';
 import { SnappyTransform } from '../encoding.js';
@@ -115,7 +115,7 @@ export class ReqResp {
             return undefined;
         };
         try {
-            return await executeTimeoutWithCustomError(requestFunction, this.overallRequestTimeoutMs, () => new CollectiveReqRespTimeoutError());
+            return await executeTimeout(requestFunction, this.overallRequestTimeoutMs, () => new CollectiveReqRespTimeoutError());
         }
         catch (e) {
             this.logger.debug(`${e.message} | subProtocol: ${subProtocol}`);
@@ -152,7 +152,7 @@ export class ReqResp {
             stream = await this.libp2p.dialProtocol(peerId, subProtocol);
             this.logger.trace(`Stream opened with ${peerId.toString()} for ${subProtocol}`);
             // Open the stream with a timeout
-            const result = await executeTimeoutWithCustomError(() => pipe([payload], stream, this.readMessage.bind(this)), this.individualRequestTimeoutMs, () => new IndividualReqRespTimeoutError());
+            const result = await executeTimeout(() => pipe([payload], stream, this.readMessage.bind(this)), this.individualRequestTimeoutMs, () => new IndividualReqRespTimeoutError());
             return result;
         }
         catch (e) {
@@ -276,4 +276,4 @@ export class ReqResp {
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"reqresp.js","sourceRoot":"","sources":["../../../src/services/reqresp/reqresp.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"reqresp.js","sourceRoot":"","sources":["../../../src/services/reqresp/reqresp.ts"],"names":[],"mappings":"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"}

package/dest/services/types.d.ts

@@ -0,0 +1,38 @@
+/***************************************************
+ *                    Events
+ ***************************************************/
+/**
+ * Events emitted from the libp2p node.
+ */
+export declare enum PeerEvent {
+    DISCOVERED = "peer:discovered",
+    CONNECTED = "peer:connect",
+    DISCONNECTED = "peer:disconnect"
+}
+/**
+ * Events emitted from the Discv5 service.
+ */
+export declare enum Discv5Event {
+    DISCOVERED = "discovered",
+    ENR_ADDED = "enrAdded"
+}
+/**
+ * Events emitted from the GossipSub protocol.
+ */
+export declare enum GossipSubEvent {
+    MESSAGE = "gossipsub:message"
+}
+/***************************************************
+ *                    Types
+ ***************************************************/
+/**
+ * Aztec network specific types
+ */
+export declare const AZTEC_ENR_KEY = "aztec_network";
+export declare enum AztecENR {
+    devnet = 1,
+    testnet = 2,
+    mainnet = 3
+}
+export declare const AZTEC_NET = AztecENR.devnet;
+//# sourceMappingURL=types.d.ts.map

package/dest/services/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/services/types.ts"],"names":[],"mappings":"AAAA;;qDAEqD;AAErD;;GAEG;AACH,oBAAY,SAAS;IACnB,UAAU,oBAAoB;IAC9B,SAAS,iBAAiB;IAC1B,YAAY,oBAAoB;CACjC;AAED;;GAEG;AACH,oBAAY,WAAW;IACrB,UAAU,eAAe;IACzB,SAAS,aAAa;CACvB;AAED;;GAEG;AACH,oBAAY,cAAc;IACxB,OAAO,sBAAsB;CAC9B;AAED;;qDAEqD;AACrD;;GAEG;AACH,eAAO,MAAM,aAAa,kBAAkB,CAAC;AAE7C,oBAAY,QAAQ;IAClB,MAAM,IAAO;IACb,OAAO,IAAO;IACd,OAAO,IAAO;CACf;AAGD,eAAO,MAAM,SAAS,kBAAkB,CAAC"}

package/dest/services/types.js

@@ -0,0 +1,43 @@
+/***************************************************
+ *                    Events
+ ***************************************************/
+/**
+ * Events emitted from the libp2p node.
+ */
+export var PeerEvent;
+(function (PeerEvent) {
+    PeerEvent["DISCOVERED"] = "peer:discovered";
+    PeerEvent["CONNECTED"] = "peer:connect";
+    PeerEvent["DISCONNECTED"] = "peer:disconnect";
+})(PeerEvent || (PeerEvent = {}));
+/**
+ * Events emitted from the Discv5 service.
+ */
+export var Discv5Event;
+(function (Discv5Event) {
+    Discv5Event["DISCOVERED"] = "discovered";
+    Discv5Event["ENR_ADDED"] = "enrAdded";
+})(Discv5Event || (Discv5Event = {}));
+/**
+ * Events emitted from the GossipSub protocol.
+ */
+export var GossipSubEvent;
+(function (GossipSubEvent) {
+    GossipSubEvent["MESSAGE"] = "gossipsub:message";
+})(GossipSubEvent || (GossipSubEvent = {}));
+/***************************************************
+ *                    Types
+ ***************************************************/
+/**
+ * Aztec network specific types
+ */
+export const AZTEC_ENR_KEY = 'aztec_network';
+export var AztecENR;
+(function (AztecENR) {
+    AztecENR[AztecENR["devnet"] = 1] = "devnet";
+    AztecENR[AztecENR["testnet"] = 2] = "testnet";
+    AztecENR[AztecENR["mainnet"] = 3] = "mainnet";
+})(AztecENR || (AztecENR = {}));
+// TODO: Make this an env var
+export const AZTEC_NET = AztecENR.devnet;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O3FEQUVxRDtBQUVyRDs7R0FFRztBQUNILE1BQU0sQ0FBTixJQUFZLFNBSVg7QUFKRCxXQUFZLFNBQVM7SUFDbkIsMkNBQThCLENBQUE7SUFDOUIsdUNBQTBCLENBQUE7SUFDMUIsNkNBQWdDLENBQUE7QUFDbEMsQ0FBQyxFQUpXLFNBQVMsS0FBVCxTQUFTLFFBSXBCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQU4sSUFBWSxXQUdYO0FBSEQsV0FBWSxXQUFXO0lBQ3JCLHdDQUF5QixDQUFBO0lBQ3pCLHFDQUFzQixDQUFBO0FBQ3hCLENBQUMsRUFIVyxXQUFXLEtBQVgsV0FBVyxRQUd0QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxDQUFOLElBQVksY0FFWDtBQUZELFdBQVksY0FBYztJQUN4QiwrQ0FBNkIsQ0FBQTtBQUMvQixDQUFDLEVBRlcsY0FBYyxLQUFkLGNBQWMsUUFFekI7QUFFRDs7cURBRXFEO0FBQ3JEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFHLGVBQWUsQ0FBQztBQUU3QyxNQUFNLENBQU4sSUFBWSxRQUlYO0FBSkQsV0FBWSxRQUFRO0lBQ2xCLDJDQUFhLENBQUE7SUFDYiw2Q0FBYyxDQUFBO0lBQ2QsNkNBQWMsQ0FBQTtBQUNoQixDQUFDLEVBSlcsUUFBUSxLQUFSLFFBQVEsUUFJbkI7QUFFRCw2QkFBNkI7QUFDN0IsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLFFBQVEsQ0FBQyxNQUFNLENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/p2p",
-  "version": "0.68.0",
+  "version": "0.68.2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -22,7 +22,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "HARDWARE_CONCURRENCY=16 RAYON_NUM_THREADS=4 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=8",
+    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "start": "node ./dest",
     "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'"
   },
@@ -68,19 +68,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.68.0",
-    "@aztec/circuits.js": "0.68.0",
-    "@aztec/epoch-cache": "0.68.0",
-    "@aztec/foundation": "0.68.0",
-    "@aztec/kv-store": "0.68.0",
-    "@aztec/telemetry-client": "0.68.0",
+    "@aztec/circuit-types": "0.68.2",
+    "@aztec/circuits.js": "0.68.2",
+    "@aztec/epoch-cache": "0.68.2",
+    "@aztec/foundation": "0.68.2",
+    "@aztec/kv-store": "0.68.2",
+    "@aztec/telemetry-client": "0.68.2",
     "@chainsafe/discv5": "9.0.0",
     "@chainsafe/enr": "3.0.0",
     "@chainsafe/libp2p-gossipsub": "13.0.0",
     "@chainsafe/libp2p-noise": "^15.0.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
     "@libp2p/bootstrap": "10.0.0",
-    "@libp2p/crypto": "^4.1.1",
+    "@libp2p/crypto": "4.0.3",
     "@libp2p/identify": "1.0.18",
     "@libp2p/interface": "1.3.1",
     "@libp2p/kad-dht": "10.0.4",

package/src/bootstrap/bootstrap.ts

@@ -4,19 +4,19 @@ import { type AztecKVStore } from '@aztec/kv-store';
 import { OtelMetricsAdapter, type TelemetryClient } from '@aztec/telemetry-client';
 
 import { Discv5, type Discv5EventEmitter } from '@chainsafe/discv5';
-import { SignableENR } from '@chainsafe/enr';
+import { type ENR, SignableENR } from '@chainsafe/enr';
 import type { PeerId } from '@libp2p/interface';
 import { type Multiaddr, multiaddr } from '@multiformats/multiaddr';
 
 import type { BootnodeConfig } from '../config.js';
-import { AZTEC_ENR_KEY, AZTEC_NET } from '../services/discv5/discV5_service.js';
+import { AZTEC_ENR_KEY, AZTEC_NET } from '../services/types.js';
 import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey, getPeerIdPrivateKey } from '../util.js';
 
 /**
  * Encapsulates a 'Bootstrap' node, used for the purpose of assisting new joiners in acquiring peers.
  */
 export class BootstrapNode implements P2PBootstrapApi {
-  private node?: Discv5 = undefined;
+  private node?: Discv5 & Discv5EventEmitter = undefined;
   private peerId?: PeerId;
 
   constructor(
@@ -49,6 +49,7 @@ export class BootstrapNode implements P2PBootstrapApi {
     enr.set(AZTEC_ENR_KEY, Uint8Array.from([AZTEC_NET]));
 
     this.logger.debug(`Starting bootstrap node ${peerId} listening on ${listenAddrUdp.toString()}`);
+
     const metricsRegistry = new OtelMetricsAdapter(this.telemetry);
     this.node = Discv5.create({
       enr,
@@ -61,10 +62,10 @@ export class BootstrapNode implements P2PBootstrapApi {
       metricsRegistry,
     });
 
-    (this.node as Discv5EventEmitter).on('multiaddrUpdated', (addr: Multiaddr) => {
+    this.node.on('multiaddrUpdated', (addr: Multiaddr) => {
       this.logger.info('Advertised socket address updated', { addr: addr.toString() });
     });
-    (this.node as Discv5EventEmitter).on('discovered', async (enr: SignableENR) => {
+    this.node.on('discovered', async (enr: SignableENR) => {
       const addr = await enr.getFullMultiaddr('udp');
       this.logger.verbose(`Discovered new peer`, { enr: enr.encodeTxt(), addr: addr?.toString() });
     });
@@ -88,35 +89,39 @@ export class BootstrapNode implements P2PBootstrapApi {
     this.logger.info('Bootstrap node stopped');
   }
 
+  private assertNodeStarted() {
+    if (!this.node) {
+      throw new Error('Node not started');
+    }
+  }
+
+  private assertPeerId() {
+    if (!this.peerId) {
+      throw new Error('No peerId found');
+    }
+  }
+
   /**
    * Returns the peerId of this node.
    * @returns The node's peer Id
    */
   public getPeerId() {
-    if (!this.peerId) {
-      throw new Error('Node not started');
-    }
-    return this.peerId;
+    this.assertPeerId();
+    return this.peerId!;
   }
 
   public getENR() {
-    if (!this.node) {
-      throw new Error('Node not started');
-    }
+    this.assertNodeStarted();
     return this.node?.enr.toENR();
   }
 
   public getEncodedEnr() {
-    if (!this.node) {
-      throw new Error('Node not started');
-    }
-    return Promise.resolve(this.node.enr.encodeTxt());
+    this.assertNodeStarted();
+    return Promise.resolve(this.node!.enr.encodeTxt());
   }
 
   public getRoutingTable() {
-    if (!this.node) {
-      throw new Error('Node not started');
-    }
-    return Promise.resolve(this.node.kadValues().map(enr => enr.encodeTxt()));
+    this.assertNodeStarted();
+    return Promise.resolve(this.node!.kadValues().map((enr: ENR) => enr.encodeTxt()));
   }
 }