@aztec/p2p 5.0.0-rc.1 → 5.0.0

package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js

@@ -1,4 +1,4 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { FifoSet } from '@aztec/foundation/fifo-set';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
@@ -469,7 +469,13 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             await this.#evictionManager.evictAfterNewBlock(block.header, nullifiers, feePayers);
         });
         if (found.length > 0) {
-            this.#callbacks.onTxsMined(found.map((m)=>m.txHash));
+            // receivedAt is 0 for txs hydrated from the DB on restart (true receive time lost) — leave
+            // their delay undefined so the metric isn't polluted by epoch-sized values.
+            const now = this.#dateProvider.now();
+            this.#callbacks.onTxsMined(found.map((m)=>({
+                    txHash: m.txHash,
+                    minedDelayMs: m.receivedAt > 0 ? now - m.receivedAt : undefined
+                })));
         }
         this.#log.info(`Marked ${found.length} txs as mined in block ${blockId.number}`);
     }
@@ -588,8 +594,11 @@ import { TxPoolIndices } from './tx_pool_indices.js';
     }
     async handleFinalizedBlock(block) {
         const blockNumber = block.globalVariables.blockNumber;
-        // Step 1: Find mined txs at or before finalized block
-        const minedTxsToFinalize = this.#indices.findTxsMinedAtOrBefore(blockNumber);
+        // Hold finalized txs for a configurable margin behind the finalized tip so a prover still
+        // proving an epoch with already-finalized blocks isn't starved of its txs. 0 deletes at the finalized tip.
+        const cutoffBlock = await this.#finalizationCutoffBlock(block);
+        // Step 1: Find mined txs at or before the cutoff block
+        const minedTxsToFinalize = this.#indices.findTxsMinedAtOrBefore(cutoffBlock);
         // Step 2: Archive in chunks if archiving is enabled. Hydrating an entire epoch's worth of
         // mined txs at once would OOM under load. When archiving is disabled there is no need to hydrate the txs at all.
         if (this.#archive.isEnabled()) {
@@ -611,14 +620,46 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         // transaction. Only tx hashes are touched here, so memory is bounded and atomicity is preserved.
         await this.#store.transactionAsync(async ()=>{
             await this.#deleteTxsBatch(minedTxsToFinalize);
-            await this.#deletedPool.finalizeBlock(blockNumber);
+            await this.#deletedPool.finalizeBlock(cutoffBlock);
         });
         if (minedTxsToFinalize.length > 0) {
-            this.#log.info(`Finalized ${minedTxsToFinalize.length} mined txs from blocks up to ${blockNumber}`, {
-                txHashes: minedTxsToFinalize
+            this.#log.info(`Finalized ${minedTxsToFinalize.length} mined txs from blocks up to ${cutoffBlock}`, {
+                txHashes: minedTxsToFinalize,
+                finalizedBlockNumber: blockNumber,
+                cutoffBlock
             });
         }
     }
+    /**
+   * Resolves the block up to which finalized txs may be deleted, given `keepFinalizedTxsForSlots`.
+   * With a margin of 0 this is just the finalized block. Otherwise we keep txs whose block is within
+   * the margin (in slots) of the finalized tip: take the target slot `finalizedSlot - margin`, find the
+   * latest checkpoint at or before it with a single reverse range query (`limit: 1`), and use that
+   * checkpoint's last block as the cutoff. This rounds to a checkpoint boundary, so it can retain slightly
+   * more than the configured margin but never less, and never deletes past the finalized block.
+   */ async #finalizationCutoffBlock(block) {
+        const keepSlots = this.#config.keepFinalizedTxsForSlots;
+        if (keepSlots <= 0) {
+            return block.globalVariables.blockNumber;
+        }
+        // The goal here really is to ensure we keep transactions long enough for them to be proven.
+        // So we could be smart and calculate the number of slots until the end of the proof submission window.
+        // Our approach here is a lot simpler however and we just keep transactions for the configured number
+        // of slots past L1 finalisation. This means we may keep transactions in the mined pool for longer
+        // than strictly necessary.
+        const targetSlot = block.getSlot() - keepSlots;
+        if (targetSlot < 0) {
+            // The margin reaches past genesis: keep everything.
+            return BlockNumber(0);
+        }
+        const [checkpoint] = await this.#l2BlockSource.getCheckpointsData({
+            fromSlot: SlotNumber(targetSlot),
+            limit: 1,
+            reverse: true
+        });
+        // No checkpoint at or before the target slot (e.g. early chain): keep everything.
+        return checkpoint ? BlockNumber(checkpoint.startBlock + checkpoint.blockCount - 1) : BlockNumber(0);
+    }
     // === Query Methods ===
     async getTxByHash(txHash, opts = {}) {
         const txHashStr = txHash.toString();
@@ -680,6 +721,10 @@ import { TxPoolIndices } from './tx_pool_indices.js';
     getPendingTxCount() {
         return this.#indices.getPendingTxCount();
     }
+    hasEligiblePendingTxs(minCount) {
+        const maxReceivedAt = this.#dateProvider.now() - this.#config.minTxPoolAgeMs;
+        return this.#indices.hasEligiblePendingTxs(maxReceivedAt, minCount);
+    }
     getMinedTxHashes() {
         return this.#indices.getMinedTxs().map(([hash, blockId])=>[
                 TxHash.fromString(hash),
@@ -719,6 +764,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         if (config.minTxPoolAgeMs !== undefined) {
             this.#config.minTxPoolAgeMs = config.minTxPoolAgeMs;
         }
+        if (config.keepFinalizedTxsForSlots !== undefined) {
+            this.#config.keepFinalizedTxsForSlots = config.keepFinalizedTxsForSlots;
+        }
         // Update eviction rules with new config
         this.#evictionManager.updateConfig(config);
     }
@@ -954,7 +1002,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             getFeePayerBalance: async (feePayer)=>{
                 const db = this.#worldStateSynchronizer.getCommitted();
                 const publicStateSource = new DatabasePublicStateSource(db);
-                const balance = await publicStateSource.storageRead(ProtocolContractAddress.FeeJuice, await computeFeePayerBalanceStorageSlot(AztecAddress.fromString(feePayer)));
+                const balance = await publicStateSource.storageRead(ProtocolContractAddress.FeeJuice, await computeFeePayerBalanceStorageSlot(AztecAddress.fromStringUnsafe(feePayer)));
                 return balance.toBigInt();
             },
             getFeePayerPendingTxs: (feePayer)=>this.#indices.getFeePayerPendingTxs(feePayer),

package/dest/msg_validators/proposal_validator/proposal_validator.d.ts

@@ -8,7 +8,6 @@ export declare class ProposalValidator {
     private logger;
     private txsPermitted;
     private maxTxsPerBlock?;
-    private maxBlocksPerCheckpoint?;
     private skipSlotValidation;
     private signatureContext;
     private clockDisparityMs;
@@ -23,14 +22,19 @@ export declare class ProposalValidator {
     /** Validates header-level fields: slot, signature, and proposer. */
     validate(proposal: BlockProposal | CheckpointProposalCore): Promise<ValidationResult>;
     /**
-     * Rejects a block proposal whose index within its checkpoint lands at or beyond the per-checkpoint
-     * block limit. `MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT` is a hard ceiling applied even when
-     * `maxBlocksPerCheckpoint` is unset; a lower configured value tightens it further.
-     * `indexWithinCheckpoint` is 0-based, so a ceiling of 72 rejects the 73rd block. Applies to standalone
+     * Rejects a block proposal whose index within its checkpoint lands at or beyond the hard attestable
+     * ceiling `MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT` (a structurally impossible index that can never be
+     * part of any checkpoint we could attest to). `indexWithinCheckpoint` is 0-based, so a ceiling of 72
+     * rejects the 73rd block.
+     *
+     * Indices in `[maxBlocksPerCheckpoint, MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT)` are over the configured
+     * consensus limit but still structurally valid: they are proposer misbehavior, not relaying-peer
+     * fault, so they are *not* rejected here. The p2p service retains and re-broadcasts the first such
+     * proposal per (slot, proposer) as slashing evidence and skips processing it. Applies to standalone
      * block proposals and to the terminal block embedded in a checkpoint proposal.
      */
     validateBlockIndexWithinCheckpoint(proposal: BlockProposal): ValidationResult;
     /** Validates transaction-related fields of a block proposal. */
     validateTxs(proposal: BlockProposal): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSTlELE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxzQkFBc0IsRUFDM0IsS0FBSyw0QkFBNEIsRUFFakMsS0FBSyxnQkFBZ0IsRUFFdEIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWxFLG9GQUFvRjtBQUNwRixxQkFBYSxpQkFBaUI7SUFDNUIsT0FBTyxDQUFDLFVBQVUsQ0FBc0I7SUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBcUI7SUFDdEMsT0FBTyxDQUFDLE1BQU0sQ0FBUztJQUN2QixPQUFPLENBQUMsWUFBWSxDQUFVO0lBQzlCLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBUztJQUNoQyxPQUFPLENBQUMsc0JBQXNCLENBQUMsQ0FBUztJQUN4QyxPQUFPLENBQUMsa0JBQWtCLENBQVU7SUFDcEMsT0FBTyxDQUFDLGdCQUFnQixDQUErQjtJQUN2RCxPQUFPLENBQUMsZ0JBQWdCLENBQVM7SUFFakMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQy9CLFNBQVMsRUFBRSxrQkFBa0IsRUFDN0IsSUFBSSxFQUFFO1FBQ0osWUFBWSxFQUFFLE9BQU8sQ0FBQztRQUN0QixjQUFjLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDeEIsc0JBQXNCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDaEMsa0JBQWtCLENBQUMsRUFBRSxPQUFPLENBQUM7UUFDN0IsZ0JBQWdCLEVBQUUsNEJBQTRCLENBQUM7UUFDL0MsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0tBQzFCLEVBQ0QsVUFBVSxFQUFFLE1BQU0sRUFXbkI7SUFFRCxvRUFBb0U7SUFDdkQsUUFBUSxDQUFDLFFBQVEsRUFBRSxhQUFhLEdBQUcsc0JBQXNCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBMEVqRztJQUVEOzs7Ozs7T0FNRztJQUNJLGtDQUFrQyxDQUFDLFFBQVEsRUFBRSxhQUFhLEdBQUcsZ0JBQWdCLENBWW5GO0lBRUQsZ0VBQWdFO0lBQ25ELFdBQVcsQ0FBQyxRQUFRLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXdDM0U7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSTlELE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxzQkFBc0IsRUFDM0IsS0FBSyw0QkFBNEIsRUFFakMsS0FBSyxnQkFBZ0IsRUFFdEIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWxFLG9GQUFvRjtBQUNwRixxQkFBYSxpQkFBaUI7SUFDNUIsT0FBTyxDQUFDLFVBQVUsQ0FBc0I7SUFDeEMsT0FBTyxDQUFDLFNBQVMsQ0FBcUI7SUFDdEMsT0FBTyxDQUFDLE1BQU0sQ0FBUztJQUN2QixPQUFPLENBQUMsWUFBWSxDQUFVO0lBQzlCLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBUztJQUNoQyxPQUFPLENBQUMsa0JBQWtCLENBQVU7SUFDcEMsT0FBTyxDQUFDLGdCQUFnQixDQUErQjtJQUN2RCxPQUFPLENBQUMsZ0JBQWdCLENBQVM7SUFFakMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQy9CLFNBQVMsRUFBRSxrQkFBa0IsRUFDN0IsSUFBSSxFQUFFO1FBQ0osWUFBWSxFQUFFLE9BQU8sQ0FBQztRQUN0QixjQUFjLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDeEIsc0JBQXNCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDaEMsa0JBQWtCLENBQUMsRUFBRSxPQUFPLENBQUM7UUFDN0IsZ0JBQWdCLEVBQUUsNEJBQTRCLENBQUM7UUFDL0MsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0tBQzFCLEVBQ0QsVUFBVSxFQUFFLE1BQU0sRUFVbkI7SUFFRCxvRUFBb0U7SUFDdkQsUUFBUSxDQUFDLFFBQVEsRUFBRSxhQUFhLEdBQUcsc0JBQXNCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBa0ZqRztJQUVEOzs7Ozs7Ozs7OztPQVdHO0lBQ0ksa0NBQWtDLENBQUMsUUFBUSxFQUFFLGFBQWEsR0FBRyxnQkFBZ0IsQ0FRbkY7SUFFRCxnRUFBZ0U7SUFDbkQsV0FBVyxDQUFDLFFBQVEsRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBd0MzRTtDQUNGIn0=

package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EAEjC,KAAK,gBAAgB,EAEtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,oFAAoF;AACpF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,sBAAsB,CAAC,CAAS;IACxC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,gBAAgB,CAA+B;IACvD,OAAO,CAAC,gBAAgB,CAAS;IAEjC,YACE,UAAU,EAAE,mBAAmB,EAC/B,SAAS,EAAE,kBAAkB,EAC7B,IAAI,EAAE;QACJ,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,gBAAgB,EAAE,4BAA4B,CAAC;QAC/C,gBAAgB,EAAE,MAAM,CAAC;KAC1B,EACD,UAAU,EAAE,MAAM,EAWnB;IAED,oEAAoE;IACvD,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0EjG;IAED;;;;;;OAMG;IACI,kCAAkC,CAAC,QAAQ,EAAE,aAAa,GAAG,gBAAgB,CAYnF;IAED,gEAAgE;IACnD,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwC3E;CACF"}
+{"version":3,"file":"proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EAEjC,KAAK,gBAAgB,EAEtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,oFAAoF;AACpF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,gBAAgB,CAA+B;IACvD,OAAO,CAAC,gBAAgB,CAAS;IAEjC,YACE,UAAU,EAAE,mBAAmB,EAC/B,SAAS,EAAE,kBAAkB,EAC7B,IAAI,EAAE;QACJ,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,gBAAgB,EAAE,4BAA4B,CAAC;QAC/C,gBAAgB,EAAE,MAAM,CAAC;KAC1B,EACD,UAAU,EAAE,MAAM,EAUnB;IAED,oEAAoE;IACvD,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkFjG;IAED;;;;;;;;;;;OAWG;IACI,kCAAkC,CAAC,QAAQ,EAAE,aAAa,GAAG,gBAAgB,CAQnF;IAED,gEAAgE;IACnD,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwC3E;CACF"}

package/dest/msg_validators/proposal_validator/proposal_validator.js

@@ -8,7 +8,6 @@ import { PeerErrorSeverity, hasValidSignatureContext } from '@aztec/stdlib/p2p';
     logger;
     txsPermitted;
     maxTxsPerBlock;
-    maxBlocksPerCheckpoint;
     skipSlotValidation;
     signatureContext;
     clockDisparityMs;
@@ -17,7 +16,6 @@ import { PeerErrorSeverity, hasValidSignatureContext } from '@aztec/stdlib/p2p';
         this.timetable = timetable;
         this.txsPermitted = opts.txsPermitted;
         this.maxTxsPerBlock = opts.maxTxsPerBlock;
-        this.maxBlocksPerCheckpoint = opts.maxBlocksPerCheckpoint;
         this.skipSlotValidation = opts.skipSlotValidation ?? false;
         this.signatureContext = opts.signatureContext;
         this.clockDisparityMs = opts.clockDisparityMs;
@@ -76,7 +74,14 @@ import { PeerErrorSeverity, hasValidSignatureContext } from '@aztec/stdlib/p2p';
             }
             // Proposer check
             const expectedProposer = await this.epochCache.getProposerAttesterAddressInSlot(slotNumber);
-            if (expectedProposer !== undefined && !proposer.equals(expectedProposer)) {
+            if (expectedProposer === undefined) {
+                this.logger.warn(`Penalizing peer for proposal with no expected proposer for current slot ${slotNumber}`);
+                return {
+                    result: 'reject',
+                    severity: PeerErrorSeverity.HighToleranceError
+                };
+            }
+            if (!proposer.equals(expectedProposer)) {
                 this.logger.warn(`Penalizing peer for invalid proposer for current slot ${slotNumber}`, {
                     expectedProposer,
                     proposer: proposer.toString()
@@ -86,8 +91,12 @@ import { PeerErrorSeverity, hasValidSignatureContext } from '@aztec/stdlib/p2p';
                     severity: PeerErrorSeverity.MidToleranceError
                 };
             }
-            // A block proposal whose index lands beyond the checkpoint block limit can never be part of a
-            // checkpoint we would attest to, so reject it immediately at ingress.
+            // A block proposal whose index lands at or beyond the hard attestable ceiling is structurally
+            // impossible garbage, so reject it immediately at ingress. Indices in
+            // `[maxBlocksPerCheckpoint, MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT)` are over the consensus limit
+            // but structurally valid proposer misbehavior; they pass gossip validation here so the offending
+            // proposal can be retained and re-broadcast as slashing evidence (handled downstream in the p2p
+            // service), rather than penalizing the relaying peer.
             if ('indexWithinCheckpoint' in proposal) {
                 const indexResult = this.validateBlockIndexWithinCheckpoint(proposal);
                 if (indexResult.result !== 'accept') {
@@ -108,15 +117,19 @@ import { PeerErrorSeverity, hasValidSignatureContext } from '@aztec/stdlib/p2p';
         }
     }
     /**
-   * Rejects a block proposal whose index within its checkpoint lands at or beyond the per-checkpoint
-   * block limit. `MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT` is a hard ceiling applied even when
-   * `maxBlocksPerCheckpoint` is unset; a lower configured value tightens it further.
-   * `indexWithinCheckpoint` is 0-based, so a ceiling of 72 rejects the 73rd block. Applies to standalone
+   * Rejects a block proposal whose index within its checkpoint lands at or beyond the hard attestable
+   * ceiling `MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT` (a structurally impossible index that can never be
+   * part of any checkpoint we could attest to). `indexWithinCheckpoint` is 0-based, so a ceiling of 72
+   * rejects the 73rd block.
+   *
+   * Indices in `[maxBlocksPerCheckpoint, MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT)` are over the configured
+   * consensus limit but still structurally valid: they are proposer misbehavior, not relaying-peer
+   * fault, so they are *not* rejected here. The p2p service retains and re-broadcasts the first such
+   * proposal per (slot, proposer) as slashing evidence and skips processing it. Applies to standalone
    * block proposals and to the terminal block embedded in a checkpoint proposal.
    */ validateBlockIndexWithinCheckpoint(proposal) {
-        const maxBlocksPerCheckpoint = Math.min(this.maxBlocksPerCheckpoint ?? MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT, MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT);
-        if (proposal.indexWithinCheckpoint >= maxBlocksPerCheckpoint) {
-            this.logger.warn(`Penalizing peer for proposal with indexWithinCheckpoint ${proposal.indexWithinCheckpoint} >= max ${maxBlocksPerCheckpoint}`);
+        if (proposal.indexWithinCheckpoint >= MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT) {
+            this.logger.warn(`Penalizing peer for proposal with indexWithinCheckpoint ${proposal.indexWithinCheckpoint} >= attestable ceiling ${MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT}`);
             return {
                 result: 'reject',
                 severity: PeerErrorSeverity.MidToleranceError

package/dest/msg_validators/tx_validator/phases_validator.js

@@ -74,7 +74,7 @@ export class PhasesTxValidator {
                     if (entry.onlySelf && !publicCall.request.msgSender.equals(contractAddress)) {
                         return TX_ERROR_SETUP_ONLY_SELF_WRONG_SENDER;
                     }
-                    if (entry.rejectNullMsgSender && publicCall.request.msgSender.equals(AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS))) {
+                    if (entry.rejectNullMsgSender && publicCall.request.msgSender.equals(AztecAddress.fromBigIntUnsafe(NULL_MSG_SENDER_CONTRACT_ADDRESS))) {
                         return TX_ERROR_SETUP_NULL_MSG_SENDER;
                     }
                     return undefined;
@@ -103,7 +103,7 @@ export class PhasesTxValidator {
                 if (entry.onlySelf && !publicCall.request.msgSender.equals(contractAddress)) {
                     return TX_ERROR_SETUP_ONLY_SELF_WRONG_SENDER;
                 }
-                if (entry.rejectNullMsgSender && publicCall.request.msgSender.equals(AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS))) {
+                if (entry.rejectNullMsgSender && publicCall.request.msgSender.equals(AztecAddress.fromBigIntUnsafe(NULL_MSG_SENDER_CONTRACT_ADDRESS))) {
                     return TX_ERROR_SETUP_NULL_MSG_SENDER;
                 }
                 return undefined;

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,10 +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>;
@@ -37,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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzY1Y1X3NlcnZpY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9kaXNjdjUvZGlzY1Y1X3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFzQixLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxPQUFPLEVBQW1DLEtBQUssb0JBQW9CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRyxPQUFPLEVBQUUsR0FBRyxFQUFlLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxZQUFZLE1BQU0sUUFBUSxDQUFDO0FBRWxDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSWpELE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBSTlFOztHQUVHO0FBQ0gscUJBQWEsYUFBYyxTQUFRLFlBQWEsWUFBVyxvQkFBb0I7SUEyQjNFLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWM7SUFFL0IsT0FBTyxDQUFDLE1BQU07SUE5QmhCLDBCQUEwQjtJQUMxQixPQUFPLENBQUMsTUFBTSxDQUFxQjtJQUVuQywwQkFBMEI7SUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBYztJQUV6QiwyQkFBMkI7SUFDM0IsT0FBTyxDQUFDLFFBQVEsQ0FBcUI7SUFFckMsT0FBTyxDQUFDLFlBQVksQ0FBOEI7SUFFbEQsT0FBTyxDQUFDLG9CQUFvQixDQUFnQjtJQUNyQyxpQkFBaUIsRUFBRSxHQUFHLEVBQUUsQ0FBTTtJQUNyQyxPQUFPLENBQUMsZUFBZSxDQUFhO0lBRXBDLE9BQU8sQ0FBQyxTQUFTLENBQUs7SUFFdEIsT0FBTyxDQUFDLFNBQVMsQ0FBcUI7SUFFdEMsT0FBTyxDQUFDLFFBQVEsQ0FJZDtJQUVGLFlBQ1UsTUFBTSxFQUFFLE1BQU0sRUFDZCxNQUFNLEVBQUUsU0FBUyxFQUNSLGNBQWMsRUFBRSxNQUFNLEVBQ3ZDLFNBQVMsR0FBRSxlQUFzQyxFQUN6QyxNQUFNLHlDQUFxQyxFQUNuRCxlQUFlLEdBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFNLEVBNkVwRDtJQUVELE9BQU8sQ0FBQyxrQkFBa0I7SUErQmIsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0EwRGxDO0lBRVksbUJBQW1CLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQWlCaEQ7SUFFTSxZQUFZLElBQUksR0FBRyxFQUFFLENBRTNCO0lBRU0sTUFBTSxJQUFJLEdBQUcsQ0FFbkI7SUFFTSxTQUFTLElBQUksTUFBTSxDQUV6QjtJQUVNLFNBQVMsSUFBSSxrQkFBa0IsQ0FFckM7SUFFTSxlQUFlLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBRTlDO0lBRVksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FXakM7WUFFYSxVQUFVO0lBT3hCLE9BQU8sQ0FBQyxhQUFhO0lBSXJCLE9BQU8sQ0FBQyxZQUFZO0lBcUJwQixPQUFPLENBQUMsV0FBVztDQTBCcEIifQ==
+//# 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;IA2B3E,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,MAAM;IA9BhB,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,SAAS,CAAqB;IAEtC,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,EA6EpD;IAED,OAAO,CAAC,kBAAkB;IA+Bb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CA0DlC;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,20 +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');
@@ -86,7 +100,7 @@ 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);
     }
@@ -124,7 +138,7 @@ 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,
@@ -165,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) {
@@ -172,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 {
@@ -201,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);
     }
@@ -247,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"}