@aztec/p2p 0.0.1-commit.4d3c002 → 0.0.1-commit.4d9804df

package/dest/services/data_store.js

@@ -11,7 +11,6 @@ export class AztecDatastore {
     #db;
     #memoryDatastore;
     #dbDatastore;
-    #batchOps = [];
     maxMemoryItems;
     constructor(db, { maxMemoryItems } = {
         maxMemoryItems: 50
@@ -65,23 +64,24 @@ export class AztecDatastore {
         await this.#dbDatastore.delete(key.toString());
     }
     batch() {
+        const ops = [];
         return {
             put: (key, value)=>{
-                this.#batchOps.push({
+                ops.push({
                     type: 'put',
                     key,
                     value
                 });
             },
             delete: (key)=>{
-                this.#batchOps.push({
+                ops.push({
                     type: 'del',
                     key
                 });
             },
             commit: async ()=>{
                 await this.#db.transactionAsync(async ()=>{
-                    for (const op of this.#batchOps){
+                    for (const op of ops){
                         if (op.type === 'put' && op.value) {
                             await this.put(op.key, op.value);
                         } else if (op.type === 'del') {
@@ -89,7 +89,7 @@ export class AztecDatastore {
                         }
                     }
                 });
-                this.#batchOps = []; // Clear operations after commit
+                ops.length = 0;
             }
         };
     }

package/dest/services/discv5/discV5_service.d.ts

@@ -1,3 +1,5 @@
+import { DateProvider } from '@aztec/foundation/timer';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { PeerId } from '@libp2p/interface';
 import { type IDiscv5CreateOptions } from '@nethermindeth/discv5';
@@ -13,6 +15,7 @@ export declare class DiscV5Service extends EventEmitter implements PeerDiscovery
     private config;
     private readonly packageVersion;
     private logger;
+    private readonly dateProvider;
     /** The Discv5 instance */
     private discv5;
     /** This instance's ENR */
@@ -23,9 +26,14 @@ export declare class DiscV5Service extends EventEmitter implements PeerDiscovery
     private bootstrapNodePeerIds;
     bootstrapNodeEnrs: ENR[];
     private trustedPeerEnrs;
+    /** Node IDs of all config-provided peers (bootstrap, trusted, private); these are never persisted. */
+    private readonly configProvidedNodeIds;
     private startTime;
+    private currentIp;
+    /** Persistent store of discovered peer ENRs, used to re-seed discovery after a restart. */
+    private readonly persistedEnrs?;
     private handlers;
-    constructor(peerId: PeerId, config: P2PConfig, packageVersion: string, telemetry?: TelemetryClient, logger?: import("@aztec/foundation/log").Logger, configOverrides?: Partial<IDiscv5CreateOptions>);
+    constructor(peerId: PeerId, config: P2PConfig, packageVersion: string, telemetry?: TelemetryClient, logger?: import("@aztec/foundation/log").Logger, store?: AztecAsyncKVStore, configOverrides?: Partial<IDiscv5CreateOptions>, dateProvider?: DateProvider);
     private onMultiaddrUpdated;
     start(): Promise<void>;
     runRandomNodesQuery(): Promise<void>;
@@ -36,8 +44,11 @@ export declare class DiscV5Service extends EventEmitter implements PeerDiscovery
     isBootstrapPeer(peerId: PeerId): boolean;
     stop(): Promise<void>;
     private onEnrAdded;
+    private onPeerDiscovered;
+    /** Whether an ENR belongs in the persisted store: a validated, non-config peer that isn't ourselves. */
+    private shouldPersist;
     private isOurBootnode;
     private onDiscovered;
     private validateEnr;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzY1Y1X3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9kaXNjdjUvZGlzY1Y1X3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFzQixLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxPQUFPLEVBQW1DLEtBQUssb0JBQW9CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRyxPQUFPLEVBQUUsR0FBRyxFQUFlLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxZQUFZLE1BQU0sUUFBUSxDQUFDO0FBRWxDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSWpELE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBSTlFOztHQUVHO0FBQ0gscUJBQWEsYUFBYyxTQUFRLFlBQWEsWUFBVyxvQkFBb0I7SUF5QjNFLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWM7SUFFL0IsT0FBTyxDQUFDLE1BQU07SUE1QmhCLDBCQUEwQjtJQUMxQixPQUFPLENBQUMsTUFBTSxDQUFxQjtJQUVuQywwQkFBMEI7SUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBYztJQUV6QiwyQkFBMkI7SUFDM0IsT0FBTyxDQUFDLFFBQVEsQ0FBcUI7SUFFckMsT0FBTyxDQUFDLFlBQVksQ0FBOEI7SUFFbEQsT0FBTyxDQUFDLG9CQUFvQixDQUFnQjtJQUNyQyxpQkFBaUIsRUFBRSxHQUFHLEVBQUUsQ0FBTTtJQUNyQyxPQUFPLENBQUMsZUFBZSxDQUFhO0lBRXBDLE9BQU8sQ0FBQyxTQUFTLENBQUs7SUFFdEIsT0FBTyxDQUFDLFFBQVEsQ0FJZDtJQUVGLFlBQ1UsTUFBTSxFQUFFLE1BQU0sRUFDZCxNQUFNLEVBQUUsU0FBUyxFQUNSLGNBQWMsRUFBRSxNQUFNLEVBQ3ZDLFNBQVMsR0FBRSxlQUFzQyxFQUN6QyxNQUFNLHlDQUFxQyxFQUNuRCxlQUFlLEdBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFNLEVBMkVwRDtJQUVELE9BQU8sQ0FBQyxrQkFBa0I7SUFVYixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQXFEbEM7SUFFWSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUJoRDtJQUVNLFlBQVksSUFBSSxHQUFHLEVBQUUsQ0FFM0I7SUFFTSxNQUFNLElBQUksR0FBRyxDQUVuQjtJQUVNLFNBQVMsSUFBSSxNQUFNLENBRXpCO0lBRU0sU0FBUyxJQUFJLGtCQUFrQixDQUVyQztJQUVNLGVBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FFOUM7SUFFWSxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQVdqQztZQUVhLFVBQVU7SUFPeEIsT0FBTyxDQUFDLGFBQWE7SUFJckIsT0FBTyxDQUFDLFlBQVk7SUFxQnBCLE9BQU8sQ0FBQyxXQUFXO0NBMEJwQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzY1Y1X3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9kaXNjdjUvZGlzY1Y1X3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFekQsT0FBTyxFQUFzQixLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxPQUFPLEVBQW1DLEtBQUssb0JBQW9CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRyxPQUFPLEVBQUUsR0FBRyxFQUFlLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxZQUFZLE1BQU0sUUFBUSxDQUFDO0FBRWxDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSWpELE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBUTlFOztHQUVHO0FBQ0gscUJBQWEsYUFBYyxTQUFRLFlBQWEsWUFBVyxvQkFBb0I7SUFnQzNFLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWM7SUFFL0IsT0FBTyxDQUFDLE1BQU07SUFHZCxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUF0Qy9CLDBCQUEwQjtJQUMxQixPQUFPLENBQUMsTUFBTSxDQUFxQjtJQUVuQywwQkFBMEI7SUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBYztJQUV6QiwyQkFBMkI7SUFDM0IsT0FBTyxDQUFDLFFBQVEsQ0FBcUI7SUFFckMsT0FBTyxDQUFDLFlBQVksQ0FBOEI7SUFFbEQsT0FBTyxDQUFDLG9CQUFvQixDQUFnQjtJQUNyQyxpQkFBaUIsRUFBRSxHQUFHLEVBQUUsQ0FBTTtJQUNyQyxPQUFPLENBQUMsZUFBZSxDQUFhO0lBQ3BDLHNHQUFzRztJQUN0RyxPQUFPLENBQUMsUUFBUSxDQUFDLHFCQUFxQixDQUFjO0lBRXBELE9BQU8sQ0FBQyxTQUFTLENBQUs7SUFFdEIsT0FBTyxDQUFDLFNBQVMsQ0FBcUI7SUFFdEMsMkZBQTJGO0lBQzNGLE9BQU8sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLENBQW9CO0lBRW5ELE9BQU8sQ0FBQyxRQUFRLENBSWQ7SUFFRixZQUNVLE1BQU0sRUFBRSxNQUFNLEVBQ2QsTUFBTSxFQUFFLFNBQVMsRUFDUixjQUFjLEVBQUUsTUFBTSxFQUN2QyxTQUFTLEdBQUUsZUFBc0MsRUFDekMsTUFBTSx5Q0FBcUMsRUFDbkQsS0FBSyxDQUFDLEVBQUUsaUJBQWlCLEVBQ3pCLGVBQWUsR0FBRSxPQUFPLENBQUMsb0JBQW9CLENBQU0sRUFDbEMsWUFBWSxHQUFFLFlBQWlDLEVBc0ZqRTtJQUVELE9BQU8sQ0FBQyxrQkFBa0I7SUErQmIsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0E4RWxDO0lBRVksbUJBQW1CLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQWlCaEQ7SUFFTSxZQUFZLElBQUksR0FBRyxFQUFFLENBRTNCO0lBRU0sTUFBTSxJQUFJLEdBQUcsQ0FFbkI7SUFFTSxTQUFTLElBQUksTUFBTSxDQUV6QjtJQUVNLFNBQVMsSUFBSSxrQkFBa0IsQ0FFckM7SUFFTSxlQUFlLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBRTlDO0lBRVksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FXakM7WUFFYSxVQUFVO1lBa0JWLGdCQUFnQjtJQVU5Qix3R0FBd0c7SUFDeEcsT0FBTyxDQUFDLGFBQWE7SUFJckIsT0FBTyxDQUFDLGFBQWE7SUFJckIsT0FBTyxDQUFDLFlBQVk7SUFxQnBCLE9BQU8sQ0FBQyxXQUFXO0NBcUNwQiJ9

package/dest/services/discv5/discV5_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discV5_service.d.ts","sourceRoot":"","sources":["../../../src/services/discv5/discV5_service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEvG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAmC,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,GAAG,EAAe,MAAM,oBAAoB,CAAC;AACtD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD,OAAO,EAAE,KAAK,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAI9E;;GAEG;AACH,qBAAa,aAAc,SAAQ,YAAa,YAAW,oBAAoB;IAyB3E,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,MAAM;IA5BhB,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAqB;IAEnC,0BAA0B;IAC1B,OAAO,CAAC,GAAG,CAAc;IAEzB,2BAA2B;IAC3B,OAAO,CAAC,QAAQ,CAAqB;IAErC,OAAO,CAAC,YAAY,CAA8B;IAElD,OAAO,CAAC,oBAAoB,CAAgB;IACrC,iBAAiB,EAAE,GAAG,EAAE,CAAM;IACrC,OAAO,CAAC,eAAe,CAAa;IAEpC,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,QAAQ,CAId;IAEF,YACU,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACR,cAAc,EAAE,MAAM,EACvC,SAAS,GAAE,eAAsC,EACzC,MAAM,yCAAqC,EACnD,eAAe,GAAE,OAAO,CAAC,oBAAoB,CAAM,EA2EpD;IAED,OAAO,CAAC,kBAAkB;IAUb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAqDlC;IAEY,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAiBhD;IAEM,YAAY,IAAI,GAAG,EAAE,CAE3B;IAEM,MAAM,IAAI,GAAG,CAEnB;IAEM,SAAS,IAAI,MAAM,CAEzB;IAEM,SAAS,IAAI,kBAAkB,CAErC;IAEM,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE9C;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAWjC;YAEa,UAAU;IAOxB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAqBpB,OAAO,CAAC,WAAW;CA0BpB"}
+{"version":3,"file":"discV5_service.d.ts","sourceRoot":"","sources":["../../../src/services/discv5/discV5_service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAsB,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEvG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAmC,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,GAAG,EAAe,MAAM,oBAAoB,CAAC;AACtD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD,OAAO,EAAE,KAAK,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAQ9E;;GAEG;AACH,qBAAa,aAAc,SAAQ,YAAa,YAAW,oBAAoB;IAgC3E,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,MAAM;IAGd,OAAO,CAAC,QAAQ,CAAC,YAAY;IAtC/B,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAqB;IAEnC,0BAA0B;IAC1B,OAAO,CAAC,GAAG,CAAc;IAEzB,2BAA2B;IAC3B,OAAO,CAAC,QAAQ,CAAqB;IAErC,OAAO,CAAC,YAAY,CAA8B;IAElD,OAAO,CAAC,oBAAoB,CAAgB;IACrC,iBAAiB,EAAE,GAAG,EAAE,CAAM;IACrC,OAAO,CAAC,eAAe,CAAa;IACpC,sGAAsG;IACtG,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAc;IAEpD,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,SAAS,CAAqB;IAEtC,2FAA2F;IAC3F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAoB;IAEnD,OAAO,CAAC,QAAQ,CAId;IAEF,YACU,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACR,cAAc,EAAE,MAAM,EACvC,SAAS,GAAE,eAAsC,EACzC,MAAM,yCAAqC,EACnD,KAAK,CAAC,EAAE,iBAAiB,EACzB,eAAe,GAAE,OAAO,CAAC,oBAAoB,CAAM,EAClC,YAAY,GAAE,YAAiC,EAsFjE;IAED,OAAO,CAAC,kBAAkB;IA+Bb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CA8ElC;IAEY,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAiBhD;IAEM,YAAY,IAAI,GAAG,EAAE,CAE3B;IAEM,MAAM,IAAI,GAAG,CAEnB;IAEM,SAAS,IAAI,MAAM,CAEzB;IAEM,SAAS,IAAI,kBAAkB,CAErC;IAEM,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE9C;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAWjC;YAEa,UAAU;YAkBV,gBAAgB;IAU9B,wGAAwG;IACxG,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAqBpB,OAAO,CAAC,WAAW;CAqCpB"}

package/dest/services/discv5/discV5_service.js

@@ -1,5 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
+import { DateProvider } from '@aztec/foundation/timer';
 import { checkCompressedComponentVersion } from '@aztec/stdlib/versioning';
 import { OtelMetricsAdapter, getTelemetryClient } from '@aztec/telemetry-client';
 import { multiaddr } from '@multiformats/multiaddr';
@@ -10,7 +11,9 @@ import { createNodeENR } from '../../enr/generate-enr.js';
 import { AZTEC_ENR_KEY, Discv5Event, PeerEvent } from '../../types/index.js';
 import { convertToMultiaddr } from '../../util.js';
 import { PeerDiscoveryState } from '../service.js';
+import { PersistedEnrStore } from './persisted_enr_store.js';
 const delayBeforeStart = 2000; // 2sec
+/** Upper bound on persisted peer ENRs, to keep the store bounded as peers churn. */ const MAX_PERSISTED_PEER_ENRS = 100;
 /**
  * Peer discovery service using Discv5.
  */ export class DiscV5Service extends EventEmitter {
@@ -18,6 +21,7 @@ const delayBeforeStart = 2000; // 2sec
     config;
     packageVersion;
     logger;
+    dateProvider;
     /** The Discv5 instance */ discv5;
     /** This instance's ENR */ enr;
     /** Version identifiers. */ versions;
@@ -25,18 +29,30 @@ const delayBeforeStart = 2000; // 2sec
     bootstrapNodePeerIds;
     bootstrapNodeEnrs;
     trustedPeerEnrs;
+    /** Node IDs of all config-provided peers (bootstrap, trusted, private); these are never persisted. */ configProvidedNodeIds;
     startTime;
+    currentIp;
+    /** Persistent store of discovered peer ENRs, used to re-seed discovery after a restart. */ persistedEnrs;
     handlers;
-    constructor(peerId, config, packageVersion, telemetry = getTelemetryClient(), logger = createLogger('p2p:discv5_service'), configOverrides = {}){
-        super(), this.peerId = peerId, this.config = config, this.packageVersion = packageVersion, this.logger = logger, this.currentState = PeerDiscoveryState.STOPPED, this.bootstrapNodePeerIds = [], this.bootstrapNodeEnrs = [], this.trustedPeerEnrs = [], this.startTime = 0, this.handlers = {
+    constructor(peerId, config, packageVersion, telemetry = getTelemetryClient(), logger = createLogger('p2p:discv5_service'), store, configOverrides = {}, dateProvider = new DateProvider()){
+        super(), this.peerId = peerId, this.config = config, this.packageVersion = packageVersion, this.logger = logger, this.dateProvider = dateProvider, this.currentState = PeerDiscoveryState.STOPPED, this.bootstrapNodePeerIds = [], this.bootstrapNodeEnrs = [], this.trustedPeerEnrs = [], this.startTime = 0, this.handlers = {
             onMultiaddrUpdated: this.onMultiaddrUpdated.bind(this),
-            onDiscovered: this.onDiscovered.bind(this),
+            onPeerDiscovered: this.onPeerDiscovered.bind(this),
             onEnrAdded: this.onEnrAdded.bind(this)
         };
+        this.persistedEnrs = store ? new PersistedEnrStore(store, MAX_PERSISTED_PEER_ENRS, createLogger(`${this.logger.module}:enr-store`)) : undefined;
         const { p2pIp, p2pPort, p2pBroadcastPort, bootstrapNodes, trustedPeers, privatePeers } = config;
+        this.currentIp = p2pIp;
         this.bootstrapNodeEnrs = bootstrapNodes.map((x)=>ENR.decodeTxt(x));
         const privatePeerEnrs = new Set(privatePeers);
         this.trustedPeerEnrs = trustedPeers.filter((x)=>!privatePeerEnrs.has(x)).map((x)=>ENR.decodeTxt(x));
+        // Peers supplied via config are re-injected from config on every start, so they must never end up
+        // in the persisted (discovered-peer) store — private peers especially must not be written there.
+        this.configProvidedNodeIds = new Set([
+            ...bootstrapNodes,
+            ...trustedPeers,
+            ...privatePeers
+        ].map((x)=>ENR.decodeTxt(x).nodeId));
         // If no overridden broadcast port is provided, use the p2p port as the broadcast port
         if (!p2pBroadcastPort) {
             this.logger.warn('No p2pBroadcastPort provided, using p2pPort as broadcast port');
@@ -84,20 +100,37 @@ const delayBeforeStart = 2000; // 2sec
                 return origOnEstablished(...args);
             }
         };
-        this.discv5.on(Discv5Event.DISCOVERED, this.handlers.onDiscovered);
+        this.discv5.on(Discv5Event.DISCOVERED, this.handlers.onPeerDiscovered);
         this.discv5.on(Discv5Event.ENR_ADDED, this.handlers.onEnrAdded);
         this.discv5.on(Discv5Event.MULTIADDR_UPDATED, this.handlers.onMultiaddrUpdated);
     }
     onMultiaddrUpdated(m) {
-        const address = m.nodeAddress().address;
-        // We want to update our tcp port to match the udp port
-        // p2pBroadcastPort is optional on config, however it is set to default within the p2p client factory
-        const multiAddrTcp = multiaddr(convertToMultiaddr(address, this.config.p2pBroadcastPort, 'tcp'));
+        const newIp = m.nodeAddress().address;
+        const previousIp = this.currentIp;
+        if (newIp === previousIp) {
+            this.logger.debug('Discv5 confirmed current IP (no change)', {
+                ip: newIp
+            });
+            return;
+        }
+        const multiAddrTcp = multiaddr(convertToMultiaddr(newIp, this.config.p2pBroadcastPort, 'tcp'));
         this.enr.setLocationMultiaddr(multiAddrTcp);
-        this.logger.info('Multiaddr updated', {
-            multiaddr: multiAddrTcp.toString()
-        });
-        this.emit('ip:changed', address);
+        this.currentIp = newIp;
+        if (previousIp) {
+            this.logger.info('IP address changed, ENR updated', {
+                previousIp,
+                newIp,
+                multiaddr: multiAddrTcp.toString(),
+                enr: this.enr.encodeTxt()
+            });
+        } else {
+            this.logger.info('Initial IP discovered via discv5, ENR updated', {
+                ip: newIp,
+                multiaddr: multiAddrTcp.toString(),
+                enr: this.enr.encodeTxt()
+            });
+        }
+        this.emit('ip:changed', newIp);
     }
     async start() {
         if (this.currentState === PeerDiscoveryState.RUNNING) {
@@ -105,13 +138,18 @@ const delayBeforeStart = 2000; // 2sec
         }
         this.logger.debug('Starting DiscV5');
         await this.discv5.start();
-        this.startTime = Date.now();
+        this.startTime = this.dateProvider.now();
+        const enrUpdateEnabled = this.config.queryForIp || !this.config.p2pIp;
         this.logger.info(`DiscV5 service started`, {
             nodeId: this.enr.nodeId,
             peerId: this.peerId,
             enrUdp: await this.enr.getFullMultiaddr('udp'),
             enrTcp: await this.enr.getFullMultiaddr('tcp'),
-            versions: this.versions
+            versions: this.versions,
+            enrUpdateEnabled,
+            queryForIp: this.config.queryForIp,
+            configuredIp: this.config.p2pIp ?? 'none',
+            pingIntervalMs: this.config.queryForIp ? 10_000 : 300_000
         });
         this.currentState = PeerDiscoveryState.RUNNING;
         // Add bootnode ENR if provided
@@ -141,6 +179,23 @@ const delayBeforeStart = 2000; // 2sec
                 this.discv5.addEnr(enr);
             }
         }
+        // Re-seed discovery from peers persisted on previous runs. This lets a node rejoin the network
+        // after a restart even when no bootstrap node is reachable: discv5 has no on-disk routing table,
+        // so without this its DHT would start empty and rediscovery would depend on inbound dials alone.
+        if (this.persistedEnrs) {
+            // Drop peers that are now config-provided (re-injected above) or fail version checks.
+            const enrs = await this.persistedEnrs.load((enr)=>this.validateEnr(enr) && !this.configProvidedNodeIds.has(enr.nodeId));
+            for (const enr of enrs){
+                try {
+                    this.discv5.addEnr(enr);
+                } catch (err) {
+                    this.logger.debug(`Error re-seeding persisted ENR ${enr.nodeId}`, err);
+                }
+            }
+            if (enrs.length > 0) {
+                this.logger.info(`Re-seeded discovery with ${enrs.length} persisted peer ENRs`);
+            }
+        }
     }
     async runRandomNodesQuery() {
         if (this.currentState !== PeerDiscoveryState.RUNNING) {
@@ -148,8 +203,8 @@ const delayBeforeStart = 2000; // 2sec
         }
         // First, wait some time before starting the peer discovery
         // reference: https://github.com/ChainSafe/lodestar/issues/3423
-        const msSinceStart = Date.now() - this.startTime;
-        if (Date.now() - this.startTime <= delayBeforeStart) {
+        const msSinceStart = this.dateProvider.now() - this.startTime;
+        if (this.dateProvider.now() - this.startTime <= delayBeforeStart) {
             await sleep(delayBeforeStart - msSinceStart);
         }
         try {
@@ -177,22 +232,48 @@ const delayBeforeStart = 2000; // 2sec
         if (this.currentState !== PeerDiscoveryState.RUNNING) {
             return;
         }
-        await this.discv5.off(Discv5Event.DISCOVERED, this.handlers.onDiscovered);
+        await this.discv5.off(Discv5Event.DISCOVERED, this.handlers.onPeerDiscovered);
         await this.discv5.off(Discv5Event.ENR_ADDED, this.handlers.onEnrAdded);
         await this.discv5.off(Discv5Event.MULTIADDR_UPDATED, this.handlers.onMultiaddrUpdated);
         await this.discv5.stop();
         this.currentState = PeerDiscoveryState.STOPPED;
     }
     async onEnrAdded(enr) {
-        const multiAddrTcp = await enr.getFullMultiaddr('tcp');
-        const multiAddrUdp = await enr.getFullMultiaddr('udp');
-        this.logger.debug(`Added ENR ${enr.encodeTxt()}`, {
-            multiAddrTcp,
-            multiAddrUdp,
-            nodeId: enr.nodeId
-        });
+        try {
+            const multiAddrTcp = await enr.getFullMultiaddr('tcp');
+            const multiAddrUdp = await enr.getFullMultiaddr('udp');
+            this.logger.debug(`Added ENR ${enr.encodeTxt()}`, {
+                multiAddrTcp,
+                multiAddrUdp,
+                nodeId: enr.nodeId
+            });
+            // A peer just entered the routing table — persist it so we can re-seed discovery after a restart.
+            if (this.persistedEnrs && this.shouldPersist(enr)) {
+                await this.persistedEnrs.persist(enr);
+            }
+            this.onDiscovered(enr);
+        } catch (err) {
+            // A malformed ENR address field (e.g. a 3-byte TCP port) makes @nethermindeth/enr throw while
+            // parsing the multiaddr. This is an async event listener, so an unhandled rejection would crash
+            // the process — catch, log, and drop the ENR instead.
+            this.logger.warn(`Dropping ENR with unparseable address`, {
+                nodeId: enr.nodeId,
+                err
+            });
+        }
+    }
+    async onPeerDiscovered(enr) {
+        // discv5 updates an existing routing-table entry on an ENR sequence bump without emitting enrAdded,
+        // so DISCOVERED is our only signal that a peer we already track may have changed address. Refresh
+        // the persisted copy (a no-op for peers we don't already store) so we don't keep dialing a stale ENR.
+        if (this.persistedEnrs && this.shouldPersist(enr)) {
+            await this.persistedEnrs.refresh(enr);
+        }
         this.onDiscovered(enr);
     }
+    /** Whether an ENR belongs in the persisted store: a validated, non-config peer that isn't ourselves. */ shouldPersist(enr) {
+        return !this.configProvidedNodeIds.has(enr.nodeId) && enr.nodeId !== this.enr.nodeId && this.validateEnr(enr);
+    }
     isOurBootnode(enr) {
         return this.bootstrapNodeEnrs.some((x)=>x.nodeId === enr.nodeId);
     }
@@ -223,6 +304,18 @@ const delayBeforeStart = 2000; // 2sec
             this.logger.debug(`Peer node ${enr.nodeId} does not have aztec key in ENR`);
             return false;
         }
+        // A malformed TCP field (e.g. a non-2-byte port) makes @nethermindeth/enr throw while building the
+        // multiaddr. Reject such an ENR here so it's never emitted as a full peer or re-parsed by an
+        // unguarded listener (which would crash the process). A missing TCP addr is allowed — those peers
+        // are simply skipped at dial time.
+        try {
+            enr.getLocationMultiaddr('tcp');
+        } catch (err) {
+            this.logger.debug(`Peer node ${enr.nodeId} has an unparseable TCP address`, {
+                err
+            });
+            return false;
+        }
         // And check it has the correct version
         let compressedVersion;
         try {

package/dest/services/discv5/persisted_enr_store.d.ts

@@ -0,0 +1,38 @@
+import { type Logger } from '@aztec/foundation/log';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import { ENR } from '@nethermindeth/enr';
+/**
+ * A bounded, transactional store of discovered peer ENRs used to re-seed discovery after a restart.
+ *
+ * Entries are keyed by nodeId (so re-seeing a peer dedups in place) and carry a monotonic sequence so
+ * the store behaves as a FIFO: when it exceeds its cap, the oldest-seen peers are evicted first. All
+ * writes run in a transaction so concurrent discovery events can't race the size check.
+ */
+export declare class PersistedEnrStore {
+    private readonly store;
+    private readonly maxEntries;
+    private readonly logger;
+    private readonly enrs;
+    /** Monotonic sequence stamped on each entry; seeded from the store's max in {@link load}. */
+    private seq;
+    constructor(store: AztecAsyncKVStore, maxEntries: number, logger?: Logger);
+    /** Adds or replaces a peer's ENR, stamping it as most-recently-seen and evicting the oldest if over cap. */
+    persist(enr: ENR): Promise<void>;
+    /**
+     * Refreshes an already-persisted peer's stored ENR when a newer one (higher ENR sequence) is seen.
+     * A no-op for peers we don't already track — we never add new peers via this path, only update.
+     *
+     * This exists because discv5 updates an existing routing-table entry on an ENR sequence bump without
+     * emitting an `enrAdded` event, so a peer that changes address would otherwise keep its stale ENR
+     * persisted until evicted.
+     */
+    refresh(enr: ENR): Promise<void>;
+    /**
+     * Loads all persisted ENRs, decoding each and keeping those the `accept` predicate allows. Entries
+     * that fail to decode or are rejected are removed from the store. The FIFO sequence resumes from the
+     * highest persisted value so eviction order survives restarts.
+     */
+    load(accept: (enr: ENR) => boolean): Promise<ENR[]>;
+    private decodeStoredEnr;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVyc2lzdGVkX2Vucl9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL2Rpc2N2NS9wZXJzaXN0ZWRfZW5yX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUV4RSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUEwQnpDOzs7Ozs7R0FNRztBQUNILHFCQUFhLGlCQUFpQjtJQU0xQixPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUs7SUFDdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxVQUFVO0lBQzNCLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQVB6QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBZ0M7SUFDckQsNkZBQTZGO0lBQzdGLE9BQU8sQ0FBQyxHQUFHLENBQUs7SUFFaEIsWUFDbUIsS0FBSyxFQUFFLGlCQUFpQixFQUN4QixVQUFVLEVBQUUsTUFBTSxFQUNsQixNQUFNLEdBQUUsTUFBNkMsRUFHdkU7SUFFRCw0R0FBNEc7SUFDL0YsT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXdCNUM7SUFFRDs7Ozs7OztPQU9HO0lBQ1UsT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXVCNUM7SUFFRDs7OztPQUlHO0lBQ1UsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLEtBQUssT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQThCL0Q7SUFFRCxPQUFPLENBQUMsZUFBZTtDQVd4QiJ9

package/dest/services/discv5/persisted_enr_store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"persisted_enr_store.d.ts","sourceRoot":"","sources":["../../../src/services/discv5/persisted_enr_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AA0BzC;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAPzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgC;IACrD,6FAA6F;IAC7F,OAAO,CAAC,GAAG,CAAK;IAEhB,YACmB,KAAK,EAAE,iBAAiB,EACxB,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,MAA6C,EAGvE;IAED,4GAA4G;IAC/F,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAwB5C;IAED;;;;;;;OAOG;IACU,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB5C;IAED;;;;OAIG;IACU,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CA8B/D;IAED,OAAO,CAAC,eAAe;CAWxB"}

package/dest/services/discv5/persisted_enr_store.js

@@ -0,0 +1,145 @@
+import { createLogger } from '@aztec/foundation/log';
+import { ENR } from '@nethermindeth/enr';
+/** Map name under which discovered peer ENRs are persisted so discovery can be re-seeded after a restart. */ const PERSISTED_ENRS_MAP_NAME = 'discovered_peer_enrs';
+function parsePersistedEnr(value) {
+    try {
+        const parsed = JSON.parse(value);
+        if (typeof parsed?.enr === 'string' && typeof parsed?.seq === 'number') {
+            return parsed;
+        }
+    } catch  {
+    // Unparseable entry; caller treats it as stale.
+    }
+    return undefined;
+}
+/**
+ * A bounded, transactional store of discovered peer ENRs used to re-seed discovery after a restart.
+ *
+ * Entries are keyed by nodeId (so re-seeing a peer dedups in place) and carry a monotonic sequence so
+ * the store behaves as a FIFO: when it exceeds its cap, the oldest-seen peers are evicted first. All
+ * writes run in a transaction so concurrent discovery events can't race the size check.
+ */ export class PersistedEnrStore {
+    store;
+    maxEntries;
+    logger;
+    enrs;
+    /** Monotonic sequence stamped on each entry; seeded from the store's max in {@link load}. */ seq;
+    constructor(store, maxEntries, logger = createLogger('p2p:discv5:enr-store')){
+        this.store = store;
+        this.maxEntries = maxEntries;
+        this.logger = logger;
+        this.seq = 0;
+        this.enrs = store.openMap(PERSISTED_ENRS_MAP_NAME);
+    }
+    /** Adds or replaces a peer's ENR, stamping it as most-recently-seen and evicting the oldest if over cap. */ async persist(enr) {
+        const nodeId = enr.nodeId;
+        const enrTxt = enr.encodeTxt();
+        try {
+            await this.store.transactionAsync(async ()=>{
+                const seq = ++this.seq;
+                const others = [];
+                for await (const [id, value] of this.enrs.entriesAsync()){
+                    if (id !== nodeId) {
+                        others.push({
+                            nodeId: id,
+                            seq: parsePersistedEnr(value)?.seq ?? 0
+                        });
+                    }
+                }
+                const overflow = others.length + 1 - this.maxEntries;
+                if (overflow > 0) {
+                    others.sort((a, b)=>a.seq - b.seq); // oldest-seen (lowest sequence) first
+                    for(let i = 0; i < overflow; i++){
+                        await this.enrs.delete(others[i].nodeId);
+                    }
+                }
+                await this.enrs.set(nodeId, JSON.stringify({
+                    enr: enrTxt,
+                    seq
+                }));
+            });
+        } catch (err) {
+            this.logger.warn(`Failed to persist discovered ENR ${nodeId}`, err);
+        }
+    }
+    /**
+   * Refreshes an already-persisted peer's stored ENR when a newer one (higher ENR sequence) is seen.
+   * A no-op for peers we don't already track — we never add new peers via this path, only update.
+   *
+   * This exists because discv5 updates an existing routing-table entry on an ENR sequence bump without
+   * emitting an `enrAdded` event, so a peer that changes address would otherwise keep its stale ENR
+   * persisted until evicted.
+   */ async refresh(enr) {
+        const nodeId = enr.nodeId;
+        try {
+            await this.store.transactionAsync(async ()=>{
+                const existing = await this.enrs.getAsync(nodeId);
+                if (!existing) {
+                    return;
+                }
+                // Two unrelated sequence numbers are in play:
+                //  - the ENR sequence (`enr.seq` / `storedEnrSeq`) is set by the *peer* and bumped whenever it
+                //    revises its record (e.g. changes address); we compare these to decide whether the incoming
+                //    ENR is genuinely newer and worth keeping.
+                //  - our storage sequence (`this.seq`) is an internal counter used only for FIFO eviction; we
+                //    stamp a fresh one so this entry counts as most-recently-seen.
+                const storedEnrSeq = this.decodeStoredEnr(existing)?.seq;
+                if (storedEnrSeq !== undefined && enr.seq <= storedEnrSeq) {
+                    return;
+                }
+                await this.enrs.set(nodeId, JSON.stringify({
+                    enr: enr.encodeTxt(),
+                    seq: ++this.seq
+                }));
+            });
+        } catch (err) {
+            this.logger.warn(`Failed to refresh persisted ENR ${nodeId}`, err);
+        }
+    }
+    /**
+   * Loads all persisted ENRs, decoding each and keeping those the `accept` predicate allows. Entries
+   * that fail to decode or are rejected are removed from the store. The FIFO sequence resumes from the
+   * highest persisted value so eviction order survives restarts.
+   */ async load(accept) {
+        const valid = [];
+        const stale = [];
+        let maxSeq = 0;
+        for await (const [nodeId, value] of this.enrs.entriesAsync()){
+            const parsed = parsePersistedEnr(value);
+            let enr;
+            if (parsed) {
+                try {
+                    enr = ENR.decodeTxt(parsed.enr);
+                } catch (err) {
+                    this.logger.debug(`Dropping undecodable persisted ENR ${nodeId}`, err);
+                }
+            }
+            if (!parsed || !enr || !accept(enr)) {
+                stale.push(nodeId);
+                continue;
+            }
+            maxSeq = Math.max(maxSeq, parsed.seq);
+            valid.push(enr);
+        }
+        this.seq = maxSeq;
+        if (stale.length > 0) {
+            await this.store.transactionAsync(async ()=>{
+                for (const nodeId of stale){
+                    await this.enrs.delete(nodeId);
+                }
+            });
+        }
+        return valid;
+    }
+    decodeStoredEnr(value) {
+        const parsed = parsePersistedEnr(value);
+        if (!parsed) {
+            return undefined;
+        }
+        try {
+            return ENR.decodeTxt(parsed.enr);
+        } catch  {
+            return undefined;
+        }
+    }
+}