@aztec/p2p 5.0.0-private.20260319 → 5.0.0-rc.2

package/dest/client/p2p_client.js

@@ -371,13 +371,12 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
     return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
 var _dec, _dec1, _initProto;
-import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
 import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/promise';
 import { DateProvider } from '@aztec/foundation/timer';
 import { L2TipsKVStore } from '@aztec/kv-store/stores';
 import { L2BlockStream } from '@aztec/stdlib/block';
+import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { Attributes, WithTracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { getP2PDefaultConfig } from '../config.js';
@@ -435,8 +434,7 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
     txProvider;
     validatorAddresses;
     /** Tracks the last slot for which we called prepareForSlot */ lastSlotProcessed;
-    /** Polls for slot changes and calls prepareForSlot on the tx pool */ slotMonitor;
-    constructor(store, l2BlockSource, mempools, p2pService, txCollection, txFileStore, epochCache, config = {}, _dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('p2p')){
+    constructor(store, l2BlockSource, mempools, p2pService, txCollection, txFileStore, epochCache, config = {}, _dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('p2p'), initialBlockHash){
         super(telemetry, 'P2PClient'), this.store = store, this.l2BlockSource = l2BlockSource, this.p2pService = p2pService, this.txCollection = txCollection, this.txFileStore = txFileStore, this.epochCache = epochCache, this._dateProvider = _dateProvider, this.telemetry = telemetry, this.log = log, this.currentState = (_initProto(this), P2PClientState.IDLE), this.syncPromise = Promise.resolve(), this.syncResolve = undefined, this.latestBlockNumberAtStart = -1, this.provenBlockNumberAtStart = -1, this.finalizedBlockNumberAtStart = -1, this.validatorAddresses = [], this.lastSlotProcessed = SlotNumber.ZERO;
         this.config = {
             ...getP2PDefaultConfig(),
@@ -445,7 +443,7 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         this.txPool = mempools.txPool;
         this.attestationPool = mempools.attestationPool;
         this.txProvider = new TxProvider(this.txCollection, this.txPool, this, this.log.createChild('tx-provider'), this.telemetry);
-        this.l2Tips = new L2TipsKVStore(store, 'p2p_client');
+        this.l2Tips = new L2TipsKVStore(store, 'p2p_client', initialBlockHash);
         this.synchedLatestSlot = store.openSingleton('p2p_pool_last_l2_slot');
     }
     registerThisValidatorAddresses(addresses) {
@@ -491,7 +489,10 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
                     const from = BlockNumber(oldFinalizedBlockNum + 1);
                     const limit = event.block.number - from + 1;
                     if (limit > 0) {
-                        const oldBlocks = await this.l2BlockSource.getBlocks(from, limit);
+                        const oldBlocks = await this.l2BlockSource.getBlocksData({
+                            from,
+                            limit
+                        });
                         await this.handleFinalizedL2Blocks(oldBlocks);
                     }
                     break;
@@ -501,10 +502,12 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
                 break;
             case 'chain-pruned':
                 this.txCollection.stopCollectingForBlocksAfter(event.block.number);
-                await this.handlePruneL2Blocks(event.block, event.checkpoint);
+                await this.handlePruneL2Blocks(event.block, event.checkpointed.checkpoint);
                 break;
             case 'chain-checkpointed':
                 break;
+            case 'chain-proposed':
+                break;
             default:
                 {
                     const _ = event;
@@ -572,16 +575,16 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
                 syncedFinalizedBlock
             });
         }
+        // Should never happen: all branches above call initBlockStream()
+        if (!this.blockStream) {
+            throw new Error('Block stream not initialized');
+        }
         this.blockStream.start();
-        await this.txCollection.start();
         this.txFileStore?.start();
-        // Start slot monitor to call prepareForSlot when the slot changes
-        this.slotMonitor = new RunningPromise(()=>this.maybeCallPrepareForSlot(), this.log, this.config.slotCheckIntervalMS);
-        this.slotMonitor.start();
         return this.syncPromise;
     }
-    addReqRespSubProtocol(subProtocol, handler, validator) {
-        return this.p2pService.addReqRespSubProtocol(subProtocol, handler, validator);
+    addReqRespSubProtocol(subProtocol, handler) {
+        return this.p2pService.addReqRespSubProtocol(subProtocol, handler);
     }
     initBlockStream(startingBlock) {
         if (!this.blockStream) {
@@ -598,8 +601,6 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
    * 'ready' will now return 'false' and the running promise that keeps the client synced is interrupted.
    */ async stop() {
         this.log.debug('Stopping p2p client...');
-        await this.slotMonitor?.stop();
-        this.log.debug('Stopped slot monitor');
         await tryStop(this.txCollection);
         this.log.debug('Stopped tx collection service');
         await this.txFileStore?.stop();
@@ -616,6 +617,10 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
     }
     /** Triggers a sync to the archiver. Used for testing. */ async sync() {
         this.initBlockStream();
+        // Should never happen: initBlockStream() creates blockStream if absent
+        if (!this.blockStream) {
+            throw new Error('Block stream not initialized');
+        }
         await this.blockStream.sync();
     }
     async broadcastProposal(proposal) {
@@ -642,36 +647,64 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
             // Store our own last-block proposal so we can respond to req/resp requests for it.
             await this.attestationPool.tryAddBlockProposal(blockProposal);
         }
+        const checkpointCore = proposal.toCore();
+        const { count } = await this.attestationPool.tryAddCheckpointProposal(checkpointCore);
+        if (count > 1) {
+            if (this.config.broadcastEquivocatedProposals) {
+                this.log.warn(`Broadcasting equivocated checkpoint proposal for slot ${proposal.slotNumber}`, {
+                    slot: proposal.slotNumber,
+                    archive: proposal.archive.toString(),
+                    count
+                });
+            } else {
+                throw new Error(`Attempted to broadcast a duplicate checkpoint proposal for slot ${proposal.slotNumber}`);
+            }
+        }
         return this.p2pService.propagate(proposal);
     }
     async broadcastCheckpointAttestations(attestations) {
         this.log.verbose(`Broadcasting ${attestations.length} checkpoint attestations to peers`);
         await Promise.all(attestations.map((att)=>this.p2pService.propagate(att)));
     }
-    async getCheckpointAttestationsForSlot(slot, proposalId) {
-        return await (proposalId ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalId) : this.attestationPool.getCheckpointAttestationsForSlot(slot));
+    async getCheckpointAttestationsForSlot(slot, proposalPayloadHash) {
+        return await (proposalPayloadHash ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalPayloadHash) : this.attestationPool.getCheckpointAttestationsForSlot(slot));
     }
     addOwnCheckpointAttestations(attestations) {
         return this.attestationPool.addOwnCheckpointAttestations(attestations);
     }
+    getProposalsForSlot(slot) {
+        return this.attestationPool.getProposalsForSlot(slot);
+    }
     hasBlockProposalsForSlot(slot) {
         return this.attestationPool.hasBlockProposalsForSlot(slot);
     }
+    hasCheckpointProposalForSlot(slot) {
+        return this.attestationPool.hasCheckpointProposalForSlot(slot);
+    }
     // REVIEW: https://github.com/AztecProtocol/aztec-packages/issues/7963
     // ^ This pattern is not my favorite (md)
     registerBlockProposalHandler(handler) {
         this.p2pService.registerBlockReceivedCallback(handler);
     }
-    registerCheckpointProposalHandler(handler) {
-        this.p2pService.registerCheckpointReceivedCallback(handler);
+    registerValidatorCheckpointProposalHandler(handler) {
+        this.p2pService.registerValidatorCheckpointReceivedCallback(handler);
+    }
+    registerAllNodesCheckpointProposalHandler(handler) {
+        this.p2pService.registerAllNodesCheckpointReceivedCallback(handler);
     }
     registerDuplicateProposalCallback(callback) {
         this.p2pService.registerDuplicateProposalCallback(callback);
     }
+    registerOversizedProposalCallback(callback) {
+        this.p2pService.registerOversizedProposalCallback(callback);
+    }
     registerDuplicateAttestationCallback(callback) {
         this.p2pService.registerDuplicateAttestationCallback(callback);
     }
-    async getPendingTxs(limit, after) {
+    registerCheckpointAttestationCallback(callback) {
+        this.p2pService.registerCheckpointAttestationCallback(callback);
+    }
+    async getPendingTxs(limit, after, options) {
         if (limit !== undefined && limit <= 0) {
             throw new TypeError('limit must be greater than 0');
         }
@@ -686,23 +719,27 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         }
         const endIndex = limit !== undefined ? startIndex + limit : undefined;
         txHashes = txHashes.slice(startIndex, endIndex);
-        const maybeTxs = await Promise.all(txHashes.map((txHash)=>this.txPool.getTxByHash(txHash)));
+        // This is a public-facing API (exposed via both the node and the p2p RPC), so proofs are opt-in.
+        const includeProof = !!options?.includeProof;
+        const maybeTxs = await Promise.all(txHashes.map((txHash)=>this.txPool.getTxByHash(txHash, {
+                includeProof
+            })));
         return maybeTxs.filter((tx)=>!!tx);
     }
     getPendingTxCount() {
         return this.txPool.getPendingTxCount();
     }
-    async *iteratePendingTxs() {
+    async *iteratePendingTxs(opts) {
         for (const txHash of (await this.txPool.getPendingTxHashes())){
-            const tx = await this.txPool.getTxByHash(txHash);
+            const tx = await this.txPool.getTxByHash(txHash, opts);
             if (tx) {
                 yield tx;
             }
         }
     }
-    async *iterateEligiblePendingTxs() {
+    async *iterateEligiblePendingTxs(opts) {
         for (const txHash of (await this.txPool.getEligiblePendingTxHashes())){
-            const tx = await this.txPool.getTxByHash(txHash);
+            const tx = await this.txPool.getTxByHash(txHash, opts);
             if (tx) {
                 yield tx;
             }
@@ -711,16 +748,18 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
     /**
    * Returns a transaction in the transaction pool by its hash.
    * @param txHash - Hash of the transaction to look for in the pool.
+   * @param opts - Set `includeProof: false` to skip loading the tx proof from the DB.
    * @returns A single tx or undefined.
-   */ getTxByHashFromPool(txHash) {
-        return this.txPool.getTxByHash(txHash);
+   */ getTxByHashFromPool(txHash, opts) {
+        return this.txPool.getTxByHash(txHash, opts);
     }
     /**
    * Returns transactions in the transaction pool by hash.
    * @param txHashes - Hashes of the transactions to look for.
+   * @param opts - Set `includeProof: false` to skip loading tx proofs from the DB.
    * @returns The txs found, in the same order as the requested hashes. If a tx is not found, it will be undefined.
-   */ getTxsByHashFromPool(txHashes) {
-        return this.txPool.getTxsByHash(txHashes);
+   */ getTxsByHashFromPool(txHashes, opts) {
+        return this.txPool.getTxsByHash(txHashes, opts);
     }
     hasTxsInPool(txHashes) {
         return this.txPool.hasTxs(txHashes);
@@ -808,7 +847,9 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
    * @returns Information about p2p client status: state & syncedToBlockNum.
    */ async getStatus() {
         const blockNumber = await this.getSyncedLatestBlockNum();
-        const blockHash = blockNumber === 0 ? GENESIS_BLOCK_HEADER_HASH.toString() : await this.l2BlockSource.getBlockHeader(blockNumber).then((header)=>header?.hash()).then((hash)=>hash?.toString());
+        const blockHash = await this.l2BlockSource.getBlockData({
+            number: blockNumber
+        }).then((data)=>data?.header.hash()).then((hash)=>hash?.toString());
         return {
             state: this.currentState,
             syncedToL2Block: {
@@ -834,13 +875,17 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         if (!blocks.length) {
             return;
         }
-        await this.handleMinedBlocks(blocks);
-        await this.maybeCallPrepareForSlot();
-        await this.startCollectingMissingTxs(blocks);
         const lastBlock = blocks.at(-1);
-        await this.synchedLatestSlot.set(BigInt(lastBlock.header.getSlot()));
+        const lastSlot = lastBlock.header.getSlot();
+        // Mark txs mined before releasing protections: a block landing at this slot supersedes any
+        // protection for txs it includes, so mined-marking must run first to keep just-landed txs from
+        // being unprotected into pending where they could be evicted before they are recorded as mined.
+        await this.handleMinedBlocks(blocks);
+        await this.maybeCallPrepareForSlot(lastSlot);
+        await this.collectingMissingTxs(blocks);
+        await this.synchedLatestSlot.set(BigInt(lastSlot));
     }
-    /** Request txs for unproven blocks so the prover node has more chances to get them. */ async startCollectingMissingTxs(blocks) {
+    /** Request txs for unproven blocks so the prover node can prove. */ async collectingMissingTxs(blocks) {
         try {
             // TODO(#15435): If the archiver has lagged behind L1, the reported proven block number may
             // be much lower than the actual one, and it does not update until the pending chain is
@@ -848,7 +893,9 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
             // are already proven, but the archiver has not yet updated its state. Until this is properly
             // fixed, it is mitigated by the expiration date of collection requests, which depends on
             // the slot number of the block.
-            const provenBlockNumber = await this.l2BlockSource.getProvenBlockNumber();
+            const provenBlockNumber = await this.l2BlockSource.getBlockNumber({
+                tag: 'proven'
+            }) ?? BlockNumber.ZERO;
             const unprovenBlocks = blocks.filter((block)=>block.number > provenBlockNumber);
             for (const block of unprovenBlocks){
                 const txHashes = block.body.txEffects.map((txEffect)=>txEffect.txHash);
@@ -859,7 +906,19 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
                         blockNumber: block.number,
                         blockHash: await block.hash().then((h)=>h.toString())
                     });
-                    this.txCollection.startCollecting(block, missingTxHashes);
+                    // Both `slashDataWithholdingToleranceSlots` and `p2pMissingTxCollectionDeadlineSlots`
+                    // count *full slots after the block slot* — value N means collection runs until
+                    // `slotStart(block.slot + N + 1)`. Take the larger of the two so collection never
+                    // gives up before the data-withholding slash verdict is rendered.
+                    const blockSlot = block.header.getSlot();
+                    const toleranceSlots = this.config.slashDataWithholdingToleranceSlots;
+                    const configuredSlots = this.config.p2pMissingTxCollectionDeadlineSlots ?? 0;
+                    const deadlineSlot = SlotNumber(blockSlot + Math.max(toleranceSlots, configuredSlots) + 1);
+                    const deadlineSeconds = getTimestampForSlot(deadlineSlot, this.epochCache.getL1Constants());
+                    const deadline = new Date(Number(deadlineSeconds) * 1000);
+                    await this.txCollection.collectFastForBlock(block, missingTxHashes, {
+                        deadline
+                    });
                 }
             }
         } catch (err) {
@@ -914,15 +973,12 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
         }
         return isEpochPrune;
     }
-    /** Checks if the slot has changed and calls prepareForSlot if so. */ async maybeCallPrepareForSlot() {
-        // If we have a pending checkpoint available, we want to prepare the target slot - otherwise we prepare the current slot
-        // Knowledege of pending checkpoints is in the PR above
-        const { targetSlot } = this.epochCache.getTargetAndNextSlot();
-        if (targetSlot <= this.lastSlotProcessed) {
+    /** Calls prepareForSlot for the given slot if it advances past the last slot we prepared for. */ async maybeCallPrepareForSlot(slot) {
+        if (slot <= this.lastSlotProcessed) {
             return;
         }
-        this.lastSlotProcessed = targetSlot;
-        await this.txPool.prepareForSlot(targetSlot);
+        this.lastSlotProcessed = slot;
+        await this.txPool.prepareForSlot(slot);
     }
     async startServiceIfSynched() {
         if (this.currentState !== P2PClientState.SYNCHING) {

package/dest/config.d.ts

@@ -8,21 +8,15 @@ import { type TxFileStoreConfig } from './services/tx_file_store/config.js';
 /**
  * P2P client configuration values.
  */
-export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, ChainConfig, TxCollectionConfig, TxFileStoreConfig, Pick<SequencerConfig, 'blockDurationMs' | 'expectedBlockProposalsPerSlot' | 'maxTxsPerBlock'> {
+export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, ChainConfig, TxCollectionConfig, TxFileStoreConfig, Pick<SequencerConfig, 'expectedBlockProposalsPerSlot' | 'maxTxsPerBlock' | 'checkpointProposalSyncGraceSeconds' | 'maxBlocksPerCheckpoint'>, Required<Pick<SequencerConfig, 'blockDurationMs'>> {
     /** Maximum transactions per block for validation. Overrides maxTxsPerBlock for gossip validation when set. */
     validateMaxTxsPerBlock?: number;
     /** Maximum transactions per checkpoint for validation. Used as fallback for maxTxsPerBlock when that is not set. */
     validateMaxTxsPerCheckpoint?: number;
-    /** Maximum L2 gas per block for validation. When set, txs exceeding this limit are rejected. */
-    validateMaxL2BlockGas?: number;
-    /** Maximum DA gas per block for validation. When set, txs exceeding this limit are rejected. */
-    validateMaxDABlockGas?: number;
     /** A flag dictating whether the P2P subsystem should be enabled. */
     p2pEnabled: boolean;
     /** The frequency in which to check for new L2 blocks. */
     blockCheckIntervalMS: number;
-    /** The frequency in which to check for new L2 slots. */
-    slotCheckIntervalMS: number;
     /** The number of blocks to fetch in a single batch. */
     blockRequestBatchSize: number;
     /** DEBUG: Disable colocation penalty - for testing purposes only */
@@ -55,6 +49,10 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
     maxPeerCount: number;
     /** If announceUdpAddress or announceTcpAddress are not provided, query for the IP address of the machine. Default is false. */
     queryForIp: boolean;
+    /**
+     * HTTPS URLs that return plain-text public IPv4, tried in order when resolving the announce IP (e.g. when `queryForIp` is true and `p2pIp` is unset).
+     */
+    publicIpServices: string[];
     /** The interval of the gossipsub heartbeat to perform maintenance tasks. */
     gossipsubInterval: number;
     /** The D parameter for the gossipsub protocol. */
@@ -73,6 +71,12 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
     gossipsubMcacheGossip: number;
     /** How long to keep message IDs in the seen cache (ms). */
     gossipsubSeenTTL: number;
+    /**
+     * Maximum clock-disparity tolerance (ms) applied to proposal/attestation gossip receive windows. Both
+     * ends of each acceptance window are widened by this much so peers are not penalized for messages valid
+     * when sent but arriving slightly early or late due to clock skew (Ethereum's MAXIMUM_GOSSIP_CLOCK_DISPARITY).
+     */
+    maxGossipClockDisparityMs: number;
     /** The 'age' (in # of L2 blocks) of a processed tx after which we heavily penalize a peer for re-sending it. */
     doubleSpendSeverePeerPenaltyWindow: number;
     /** The weight of the tx topic for the gossipsub protocol.  This determines how much the score for this specific topic contributes to the overall peer score. */
@@ -83,6 +87,8 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
     gossipsubTxInvalidMessageDeliveriesDecay: number;
     /** The values for the peer scoring system. Passed as a comma separated list of values in order: low, mid, high tolerance errors. */
     peerPenaltyValues: number[];
+    /** How long (in seconds) a peer is banned for once its score drops below the ban threshold. */
+    peerBanDurationSeconds: number;
     /** Limit of transactions to archive in the tx pool. Once the archived tx limit is reached, the oldest archived txs will be purged. */
     archivedTxLimit: number;
     /** A list of trusted peers. */
@@ -99,6 +105,8 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
     maxPendingTxCount: number;
     /** The node's seen message ID cache size */
     seenMessageCacheSize: number;
+    /** Maximum number of (validator, tx) pairs to keep in the tx validation LRU cache. */
+    txValidationCacheSize: number;
     /** True to disable the status handshake on peer connected. */
     p2pDisableStatusHandshake?: boolean;
     /** True to only permit validators to connect */
@@ -121,10 +129,34 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
     broadcastEquivocatedProposals?: boolean;
     /** Minimum age (ms) a transaction must have been in the pool before it's eligible for block building. */
     minTxPoolAgeMs: number;
+    /**
+     * Number of full L2 slots to wait after a checkpoint's slot before declaring its txs missing
+     * for data-withholding slashing.
+     */
+    slashDataWithholdingToleranceSlots: number;
+    /**
+     * Number of L2 slots after a mined block's slot to keep collecting its missing txs. Clamped
+     * up so that collection always runs at least until the data-withholding slash verdict is
+     * rendered (`block.slot + slashDataWithholdingToleranceSlots + 1`). Defaults to undefined,
+     * in which case the tolerance window is used directly.
+     */
+    p2pMissingTxCollectionDeadlineSlots?: number;
     /** Minimum percentage fee increase required to replace an existing tx via RPC (0 = no bump). */
     priceBumpPercentage: bigint;
+    /** Drop incoming block and checkpoint proposals at the libp2p dispatch layer (for testing only) */
+    skipIncomingProposals?: boolean;
+    /** Accept proposal gossip regardless of slot timing (for testing only). */
+    skipProposalSlotValidation?: boolean;
+    /**
+     * Whether this node skips checkpoint proposal validation and always attests. When set, the checkpoint
+     * attestation is created and broadcast before the embedded last block is processed, so it is not delayed
+     * past the slot's attestation window by that block's re-execution. Mirrors the validator config flag.
+     */
+    skipCheckpointProposalValidation?: boolean;
 }
 export declare const DEFAULT_P2P_PORT = 40400;
+/** Default endpoints used to discover this machine's public IPv4 when `queryForIp` is enabled. */
+export declare const DEFAULT_PUBLIC_IP_SERVICES: string[];
 export declare const p2pConfigMappings: ConfigMappingsType<P2PConfig>;
 /**
  * Gets the config values for p2p client from environment variables.
@@ -135,106 +167,104 @@ export declare function getP2PDefaultConfig(): P2PConfig;
 /**
  * Required P2P config values for a bootstrap node.
  */
-export type BootnodeConfig = Pick<P2PConfig, 'p2pIp' | 'p2pPort' | 'p2pBroadcastPort' | 'peerIdPrivateKey' | 'peerIdPrivateKeyPath' | 'bootstrapNodes' | 'listenAddress' | 'queryForIp'> & Required<Pick<P2PConfig, 'p2pIp' | 'p2pPort'>> & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb'> & Pick<ChainConfig, 'l1ChainId'>;
+export type BootnodeConfig = Pick<P2PConfig, 'p2pIp' | 'p2pPort' | 'p2pBroadcastPort' | 'peerIdPrivateKey' | 'peerIdPrivateKeyPath' | 'bootstrapNodes' | 'listenAddress' | 'queryForIp' | 'publicIpServices'> & Required<Pick<P2PConfig, 'p2pIp' | 'p2pPort'>> & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb'> & Pick<ChainConfig, 'l1ChainId'>;
 export declare const bootnodeConfigMappings: ConfigMappingsType<Pick<{
-    archivedTxLimit: unknown;
-    batchTxRequesterBadPeerThreshold: unknown;
-    batchTxRequesterDumbParallelWorkerCount: unknown;
-    batchTxRequesterSmartParallelWorkerCount: unknown;
-    batchTxRequesterTxBatchSize: unknown;
-    blockCheckIntervalMS: unknown;
-    blockDurationMs: unknown;
-    blockRequestBatchSize: unknown;
-    bootstrapNodeEnrVersionCheck: unknown;
-    bootstrapNodes: unknown;
-    bootstrapNodesAsFullPeers: unknown;
-    broadcastEquivocatedProposals: unknown;
-    dataDirectory: unknown;
-    dataStoreMapSizeKb: unknown;
-    debugDisableColocationPenalty: unknown;
-    debugP2PInstrumentMessages: unknown;
-    dialTimeoutMs: unknown;
-    disableTransactions: unknown;
-    doubleSpendSeverePeerPenaltyWindow: unknown;
-    dropTransactionsProbability: unknown;
-    expectedBlockProposalsPerSlot: unknown;
-    fishermanMode: unknown;
-    gossipsubD: unknown;
-    gossipsubDLazy: unknown;
-    gossipsubDhi: unknown;
-    gossipsubDlo: unknown;
-    gossipsubFloodPublish: unknown;
-    gossipsubInterval: unknown;
-    gossipsubMcacheGossip: unknown;
-    gossipsubMcacheLength: unknown;
-    gossipsubSeenTTL: unknown;
-    gossipsubTxInvalidMessageDeliveriesDecay: unknown;
-    gossipsubTxInvalidMessageDeliveriesWeight: unknown;
-    gossipsubTxTopicWeight: unknown;
-    individualRequestTimeoutMs: unknown;
-    l1ChainId: unknown;
-    l1Contracts: unknown;
-    l2QueueSize: unknown;
-    listenAddress: unknown;
-    maxPeerCount: unknown;
-    maxPendingTxCount: unknown;
-    maxTxsPerBlock: unknown;
-    minTxPoolAgeMs: unknown;
-    overallRequestTimeoutMs: unknown;
-    p2pAllowOnlyValidators: unknown;
-    p2pBroadcastPort: unknown;
-    p2pDisableStatusHandshake: unknown;
-    p2pDiscoveryDisabled: unknown;
-    p2pEnabled: unknown;
-    p2pIp: unknown;
-    p2pMaxFailedAuthAttemptsAllowed: unknown;
-    p2pOptimisticNegotiation: unknown;
-    p2pPort: unknown;
-    p2pStoreMapSizeKb: unknown;
-    peerCheckIntervalMS: unknown;
-    peerFailedBanTimeMs: unknown;
-    peerIdPrivateKey: unknown;
-    peerIdPrivateKeyPath: unknown;
-    peerPenaltyValues: unknown;
-    preferredPeers: unknown;
-    priceBumpPercentage: unknown;
-    privatePeers: unknown;
-    queryForIp: unknown;
-    rollupVersion: unknown;
-    seenMessageCacheSize: unknown;
-    slotCheckIntervalMS: unknown;
-    trustedPeers: unknown;
-    txCollectionDisableSlowDuringFastRequests: unknown;
-    txCollectionFastMaxParallelRequestsPerNode: unknown;
-    txCollectionFastNodeIntervalMs: unknown;
-    txCollectionFastNodesTimeoutBeforeReqRespMs: unknown;
-    txCollectionFileStoreFastBackoffBaseMs: unknown;
-    txCollectionFileStoreFastBackoffMaxMs: unknown;
-    txCollectionFileStoreFastDelayMs: unknown;
-    txCollectionFileStoreFastWorkerCount: unknown;
-    txCollectionFileStoreSlowBackoffBaseMs: unknown;
-    txCollectionFileStoreSlowBackoffMaxMs: unknown;
-    txCollectionFileStoreSlowDelayMs: unknown;
-    txCollectionFileStoreSlowWorkerCount: unknown;
-    txCollectionFileStoreUrls: unknown;
-    txCollectionMissingTxsCollectorType: unknown;
-    txCollectionNodeRpcMaxBatchSize: unknown;
-    txCollectionNodeRpcUrls: unknown;
-    txCollectionReconcileIntervalMs: unknown;
-    txCollectionSlowNodesIntervalMs: unknown;
-    txCollectionSlowReqRespIntervalMs: unknown;
-    txCollectionSlowReqRespTimeoutMs: unknown;
-    txFileStoreEnabled: unknown;
-    txFileStoreMaxQueueSize: unknown;
-    txFileStoreUploadConcurrency: unknown;
-    txFileStoreUrl: unknown;
-    txPoolDeleteTxsAfterReorg: unknown;
-    txPublicSetupAllowListExtend: unknown;
-    validateMaxDABlockGas: unknown;
-    validateMaxL2BlockGas: unknown;
-    validateMaxTxsPerBlock: unknown;
-    validateMaxTxsPerCheckpoint: unknown;
-}, "bootstrapNodes" | "dataDirectory" | "dataStoreMapSizeKb" | "l1ChainId" | "listenAddress" | "p2pBroadcastPort" | "p2pIp" | "p2pPort" | "peerIdPrivateKey" | "peerIdPrivateKeyPath" | "queryForIp">>;
+    maxTxsPerBlock: number;
+    maxBlocksPerCheckpoint: number;
+    blockDurationMs: number;
+    checkpointProposalSyncGraceSeconds: number;
+    expectedBlockProposalsPerSlot: number;
+    l1ChainId: number;
+    rollupVersion: number;
+    dataDirectory: string;
+    dataStoreMapSizeKb: number;
+    batchTxRequesterSmartParallelWorkerCount: number;
+    batchTxRequesterDumbParallelWorkerCount: number;
+    batchTxRequesterTxBatchSize: number;
+    batchTxRequesterBadPeerThreshold: number;
+    overallRequestTimeoutMs: number;
+    individualRequestTimeoutMs: number;
+    p2pOptimisticNegotiation: boolean;
+    dialTimeoutMs: number;
+    txCollectionFastNodesTimeoutBeforeReqRespMs: number;
+    txCollectionFastNodeIntervalMs: number;
+    txCollectionNodeRpcUrls: string[];
+    txCollectionFastMaxParallelRequestsPerNode: number;
+    txCollectionNodeRpcMaxBatchSize: number;
+    txCollectionFileStoreUrls: string[];
+    txCollectionFileStoreFastDelayMs: number;
+    txCollectionFileStoreFastWorkerCount: number;
+    txCollectionFileStoreFastBackoffBaseMs: number;
+    txCollectionFileStoreFastBackoffMaxMs: number;
+    txFileStoreUrl: string;
+    txFileStoreUploadConcurrency: number;
+    txFileStoreMaxQueueSize: number;
+    txFileStoreEnabled: boolean;
+    validateMaxTxsPerBlock: number;
+    validateMaxTxsPerCheckpoint: number;
+    p2pEnabled: boolean;
+    blockCheckIntervalMS: number;
+    blockRequestBatchSize: number;
+    debugDisableColocationPenalty: boolean;
+    peerCheckIntervalMS: number;
+    peerFailedBanTimeMs: number;
+    l2QueueSize: number;
+    p2pPort: number;
+    p2pBroadcastPort: number;
+    p2pIp: string;
+    listenAddress: string;
+    peerIdPrivateKey: SecretValue<string>;
+    peerIdPrivateKeyPath: string;
+    bootstrapNodes: string[];
+    bootstrapNodeEnrVersionCheck: boolean;
+    bootstrapNodesAsFullPeers: boolean;
+    maxPeerCount: number;
+    queryForIp: boolean;
+    publicIpServices: string[];
+    gossipsubInterval: number;
+    gossipsubD: number;
+    gossipsubDlo: number;
+    gossipsubDhi: number;
+    gossipsubDLazy: number;
+    gossipsubFloodPublish: boolean;
+    gossipsubMcacheLength: number;
+    gossipsubMcacheGossip: number;
+    gossipsubSeenTTL: number;
+    maxGossipClockDisparityMs: number;
+    doubleSpendSeverePeerPenaltyWindow: number;
+    gossipsubTxTopicWeight: number;
+    gossipsubTxInvalidMessageDeliveriesWeight: number;
+    gossipsubTxInvalidMessageDeliveriesDecay: number;
+    peerPenaltyValues: number[];
+    peerBanDurationSeconds: number;
+    archivedTxLimit: number;
+    trustedPeers: string[];
+    privatePeers: string[];
+    preferredPeers: string[];
+    p2pStoreMapSizeKb: number;
+    txPublicSetupAllowListExtend: AllowedElement[];
+    maxPendingTxCount: number;
+    seenMessageCacheSize: number;
+    txValidationCacheSize: number;
+    p2pDisableStatusHandshake: boolean;
+    p2pAllowOnlyValidators: boolean;
+    p2pDiscoveryDisabled: boolean;
+    p2pMaxFailedAuthAttemptsAllowed: number;
+    disableTransactions: boolean;
+    dropTransactionsProbability: number;
+    txPoolDeleteTxsAfterReorg: boolean;
+    debugP2PInstrumentMessages: boolean;
+    fishermanMode: boolean;
+    broadcastEquivocatedProposals: boolean;
+    minTxPoolAgeMs: number;
+    slashDataWithholdingToleranceSlots: number;
+    p2pMissingTxCollectionDeadlineSlots: number;
+    priceBumpPercentage: bigint;
+    skipIncomingProposals: boolean;
+    skipProposalSlotValidation: boolean;
+    skipCheckpointProposalValidation: boolean;
+    rollupAddress: import("@aztec/foundation/eth-address").EthAddress;
+}, "bootstrapNodes" | "dataDirectory" | "dataStoreMapSizeKb" | "l1ChainId" | "listenAddress" | "p2pBroadcastPort" | "p2pIp" | "p2pPort" | "peerIdPrivateKey" | "peerIdPrivateKeyPath" | "publicIpServices" | "queryForIp">>;
 /**
  * Parses a string to a list of allowed elements.
  * Each entry is expected to be of one of the following formats:
@@ -249,4 +279,4 @@ export declare const bootnodeConfigMappings: ConfigMappingsType<Pick<{
  * @returns A list of allowed elements
  */
 export declare function parseAllowList(value: string): AllowedElement[];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUN2QixXQUFXLEVBU1osTUFBTSwwQkFBMEIsQ0FBQztBQUlsQyxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBQ25CLEtBQUssV0FBVyxFQUNoQixLQUFLLGVBQWUsRUFHckIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFFbEYsT0FBTyxFQUNMLEtBQUssc0JBQXNCLEVBRTVCLE1BQU0saURBQWlELENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQTRCLE1BQU0sOEJBQThCLENBQUM7QUFDL0YsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQThCLE1BQU0sb0NBQW9DLENBQUM7QUFDekcsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQTZCLE1BQU0sb0NBQW9DLENBQUM7QUFFdkc7O0dBRUc7QUFDSCxNQUFNLFdBQVcsU0FDZixTQUFRLGdCQUFnQixFQUN0QixzQkFBc0IsRUFDdEIsV0FBVyxFQUNYLGtCQUFrQixFQUNsQixpQkFBaUIsRUFDakIsSUFBSSxDQUFDLGVBQWUsRUFBRSxpQkFBaUIsR0FBRywrQkFBK0IsR0FBRyxnQkFBZ0IsQ0FBQztJQUMvRiw4R0FBOEc7SUFDOUcsc0JBQXNCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFaEMsb0hBQW9IO0lBQ3BILDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRXJDLGdHQUFnRztJQUNoRyxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUUvQixnR0FBZ0c7SUFDaEcscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFL0Isb0VBQW9FO0lBQ3BFLFVBQVUsRUFBRSxPQUFPLENBQUM7SUFFcEIseURBQXlEO0lBQ3pELG9CQUFv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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUN2QixXQUFXLEVBVVosTUFBTSwwQkFBMEIsQ0FBQztBQUlsQyxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBQ25CLEtBQUssV0FBVyxFQUNoQixLQUFLLGVBQWUsRUFHckIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFFbEYsT0FBTyxFQUNMLEtBQUssc0JBQXNCLEVBRTVCLE1BQU0saURBQWlELENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQTRCLE1BQU0sOEJBQThCLENBQUM7QUFDL0YsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQThCLE1BQU0sb0NBQW9DLENBQUM7QUFDekcsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQTZCLE1BQU0sb0NBQW9DLENBQUM7QUFFdkc7O0dBRUc7QUFDSCxNQUFNLFdBQVcsU0FDZixTQUFRLGdCQUFnQixFQUN0QixzQkFBc0IsRUFDdEIsV0FBVyxFQUNYLGtCQUFrQixFQUNsQixpQkFBaUIsRUFDakIsSUFBSSxDQUNGLGVBQWUsRUFDYiwrQkFBK0IsR0FDL0IsZ0JBQWdCLEdBQ2hCLG9DQUFvQyxHQUNwQyx3QkFBd0IsQ0FDM0IsRUFHRCxRQUFRLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3BELDhHQUE4RztJQUM5RyxzQkFBc0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVoQyxvSEFBb0g7SUFDcEgsMkJBQTJCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFckMsb0VBQW9FO0lBQ3BFLFVBQVUsRUFBRSxPQUFPLENBQUM7SUFFcEIseURBQXlEO0lBQ3pELG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUU3Qix1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