@aztec/p2p 0.0.1-commit.934299a21 → 0.0.1-commit.949a33fd8

package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js

@@ -6,7 +6,7 @@ import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
 import { TxArchive } from './archive/index.js';
 import { DeletedPool } from './deleted_pool.js';
-import { EvictionManager, FeePayerBalanceEvictionRule, FeePayerBalancePreAddRule, InvalidTxsAfterMiningRule, InvalidTxsAfterReorgRule, LowPriorityEvictionRule, LowPriorityPreAddRule, NullifierConflictRule, TxPoolRejectionCode } from './eviction/index.js';
+import { EvictionManager, FeePayerBalanceEvictionRule, FeePayerBalancePreAddRule, InsufficientFeePerGasEvictionRule, InvalidTxsAfterMiningRule, InvalidTxsAfterReorgRule, LowPriorityEvictionRule, LowPriorityPreAddRule, NullifierConflictRule, TxPoolRejectionCode } from './eviction/index.js';
 import { TxPoolV2Instrumentation } from './instrumentation.js';
 import { DEFAULT_TX_POOL_V2_CONFIG } from './interfaces.js';
 import { buildTxMetaData, checkNullifierConflict } from './tx_metadata.js';
@@ -23,6 +23,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
     #l2BlockSource;
     #worldStateSynchronizer;
     #createTxValidator;
+    #checkAllowedSetupCalls;
     // === In-Memory Indices ===
     #indices = new TxPoolIndices();
     // === Config & Services ===
@@ -41,6 +42,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         this.#l2BlockSource = deps.l2BlockSource;
         this.#worldStateSynchronizer = deps.worldStateSynchronizer;
         this.#createTxValidator = deps.createTxValidator;
+        this.#checkAllowedSetupCalls = deps.checkAllowedSetupCalls;
         this.#config = {
             ...DEFAULT_TX_POOL_V2_CONFIG,
             ...config
@@ -61,6 +63,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         }));
         // Post-event eviction rules (run after events to check ALL pending txs)
         this.#evictionManager.registerRule(new InvalidTxsAfterMiningRule());
+        this.#evictionManager.registerRule(new InsufficientFeePerGasEvictionRule(deps.blockMinFeesProvider));
         this.#evictionManager.registerRule(new InvalidTxsAfterReorgRule(deps.worldStateSynchronizer));
         this.#evictionManager.registerRule(new FeePayerBalanceEvictionRule(deps.worldStateSynchronizer));
         // LowPriorityEvictionRule handles cases where txs become pending via prepareForSlot (unprotect)
@@ -128,9 +131,32 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         const rejected = [];
         const errors = new Map();
         const acceptedPending = new Set();
+        // Phase 1: Pre-compute all throwable I/O outside the transaction.
+        // If any pre-computation throws, the entire call fails before mutations happen.
+        const precomputed = new Map();
+        const validator = await this.#createTxValidator();
+        for (const tx of txs){
+            const txHash = tx.getTxHash();
+            const txHashStr = txHash.toString();
+            const meta = await buildTxMetaData(tx);
+            const minedBlockId = await this.#getMinedBlockId(txHash);
+            // Validate non-mined txs (mined and pre-protected txs bypass validation inside the transaction)
+            let isValid = true;
+            if (!minedBlockId) {
+                isValid = await this.#validateMeta(meta, validator);
+            }
+            precomputed.set(txHashStr, {
+                meta,
+                minedBlockId,
+                isValid
+            });
+        }
+        // Phase 2: Apply mutations inside the transaction using only pre-computed results,
+        // in-memory reads, and buffered DB writes. Nothing here can throw an unhandled exception.
         const poolAccess = this.#createPreAddPoolAccess();
         const preAddContext = opts.feeComparisonOnly !== undefined ? {
-            feeComparisonOnly: opts.feeComparisonOnly
+            feeComparisonOnly: opts.feeComparisonOnly,
+            priceBumpPercentage: this.#config.priceBumpPercentage
         } : undefined;
         await this.#store.transactionAsync(async ()=>{
             for (const tx of txs){
@@ -141,28 +167,28 @@ import { TxPoolIndices } from './tx_pool_indices.js';
                     ignored.push(txHash);
                     continue;
                 }
-                // Check mined status first (applies to all paths)
-                const minedBlockId = await this.#getMinedBlockId(txHash);
+                const { meta, minedBlockId, isValid } = precomputed.get(txHashStr);
                 const preProtectedSlot = this.#indices.getProtectionSlot(txHashStr);
                 if (minedBlockId) {
                     // Already mined - add directly (protection already set if pre-protected)
                     await this.#addTx(tx, {
                         mined: minedBlockId
-                    }, opts);
+                    }, opts, meta);
                     accepted.push(txHash);
                 } else if (preProtectedSlot !== undefined) {
                     // Pre-protected and not mined - add as protected (bypass validation)
                     await this.#addTx(tx, {
                         protected: preProtectedSlot
-                    }, opts);
+                    }, opts, meta);
                     accepted.push(txHash);
+                } else if (!isValid) {
+                    // Failed pre-computed validation
+                    rejected.push(txHash);
                 } else {
-                    // Regular pending tx - validate and run pre-add rules
-                    const result = await this.#tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored, errors, preAddContext);
+                    // Regular pending tx - run pre-add rules using pre-computed metadata
+                    const result = await this.#tryAddRegularPendingTx(tx, meta, opts, poolAccess, acceptedPending, ignored, errors, preAddContext);
                     if (result.status === 'accepted') {
                         acceptedPending.add(txHashStr);
-                    } else if (result.status === 'rejected') {
-                        rejected.push(txHash);
                     } else {
                         ignored.push(txHash);
                     }
@@ -197,18 +223,10 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             } : {}
         };
     }
-    /** Validates and adds a regular pending tx. Returns status. */ async #tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored, errors, preAddContext) {
-        const txHash = tx.getTxHash();
-        const txHashStr = txHash.toString();
-        // Build metadata and validate using metadata
-        const meta = await buildTxMetaData(tx);
-        if (!await this.#validateMeta(meta)) {
-            return {
-                status: 'rejected'
-            };
-        }
+    /** Adds a validated pending tx, running pre-add rules and evicting conflicts. */ async #tryAddRegularPendingTx(tx, precomputedMeta, opts, poolAccess, acceptedPending, ignored, errors, preAddContext) {
+        const txHashStr = tx.getTxHash().toString();
         // Run pre-add rules
-        const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess, preAddContext);
+        const preAddResult = await this.#evictionManager.runPreAddRules(precomputedMeta, poolAccess, preAddContext);
         if (preAddResult.shouldIgnore) {
             this.#log.debug(`Ignoring tx ${txHashStr}: ${preAddResult.reason?.message ?? 'unknown reason'}`);
             if (preAddResult.reason && preAddResult.reason.code !== TxPoolRejectionCode.INTERNAL_ERROR) {
@@ -254,7 +272,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             };
         }
         // Add the transaction
-        await this.#addTx(tx, 'pending', opts);
+        await this.#addTx(tx, 'pending', opts, precomputedMeta);
         return {
             status: 'accepted'
         };
@@ -263,33 +281,44 @@ import { TxPoolIndices } from './tx_pool_indices.js';
         const txHashStr = tx.getTxHash().toString();
         // Check if already in pool
         if (this.#indices.has(txHashStr)) {
+            this.#log.verbose(`canAddPendingTx: tx ${txHashStr} already in pool`);
             return 'ignored';
         }
         // Build metadata and check pre-add rules
         const meta = await buildTxMetaData(tx);
         const poolAccess = this.#createPreAddPoolAccess();
         const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess);
-        return preAddResult.shouldIgnore ? 'ignored' : 'accepted';
+        if (preAddResult.shouldIgnore) {
+            this.#log.verbose(`canAddPendingTx: tx ${txHashStr} ignored by pre-add rule`, {
+                reason: preAddResult.reason?.message ?? 'no reason provided'
+            });
+            return 'ignored';
+        }
+        return 'accepted';
     }
     async addProtectedTxs(txs, block, opts) {
         const slotNumber = block.globalVariables.slotNumber;
+        // Precompute setup-call allow-list flags outside the store transaction
+        const allowedFlags = await Promise.all(txs.map((tx)=>this.#checkAllowedSetupCalls(tx)));
         await this.#store.transactionAsync(async ()=>{
-            for (const tx of txs){
+            for(let i = 0; i < txs.length; i++){
+                const tx = txs[i];
                 const txHash = tx.getTxHash();
                 const txHashStr = txHash.toString();
                 const isNew = !this.#indices.has(txHashStr);
                 const minedBlockId = await this.#getMinedBlockId(txHash);
                 if (isNew) {
+                    const meta = await buildTxMetaData(tx, allowedFlags[i]);
                     // New tx - add as mined or protected (callback emitted by #addTx)
                     if (minedBlockId) {
                         await this.#addTx(tx, {
                             mined: minedBlockId
-                        }, opts);
+                        }, opts, meta);
                         this.#indices.setProtection(txHashStr, slotNumber);
                     } else {
                         await this.#addTx(tx, {
                             protected: slotNumber
-                        }, opts);
+                        }, opts, meta);
                     }
                 } else {
                     // Existing tx - update protection and mined status
@@ -396,6 +425,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             // Step 5: Run post-event eviction rules (inside transaction for atomicity)
             await this.#evictionManager.evictAfterNewBlock(block.header, nullifiers, feePayers);
         });
+        if (found.length > 0) {
+            this.#callbacks.onTxsMined(found.map((m)=>m.txHash));
+        }
         this.#log.info(`Marked ${found.length} txs as mined in block ${blockId.number}`);
     }
     async prepareForSlot(slotNumber) {
@@ -623,9 +655,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
     /**
    * Adds a new transaction to the pool with the specified state.
    * Emits onTxsAdded callback immediately after DB write.
-   */ async #addTx(tx, state, opts = {}) {
+   */ async #addTx(tx, state, opts = {}, precomputedMeta) {
         const txHashStr = tx.getTxHash().toString();
-        const meta = await buildTxMetaData(tx);
+        const meta = precomputedMeta ?? await buildTxMetaData(tx);
         meta.receivedAt = this.#dateProvider.now();
         await this.#txsDB.set(txHashStr, tx.toBuffer());
         await this.#deletedPool.clearSoftDeleted(txHashStr);
@@ -780,7 +812,8 @@ import { TxPoolIndices } from './tx_pool_indices.js';
             }
             try {
                 const tx = Tx.fromBuffer(buffer);
-                const meta = await buildTxMetaData(tx);
+                const allowedSetupCalls = await this.#checkAllowedSetupCalls(tx);
+                const meta = await buildTxMetaData(tx, allowedSetupCalls);
                 loaded.push({
                     tx,
                     meta

package/dest/msg_validators/attestation_validator/attestation_validator.d.ts

@@ -1,10 +1,16 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { type Logger } from '@aztec/foundation/log';
-import { type CheckpointAttestation, type P2PValidator, type ValidationResult } from '@aztec/stdlib/p2p';
+import { type CheckpointAttestation, type CoordinationSignatureContext, type P2PValidator, type ValidationResult } from '@aztec/stdlib/p2p';
 export declare class CheckpointAttestationValidator implements P2PValidator<CheckpointAttestation> {
     protected epochCache: EpochCacheInterface;
     protected logger: Logger;
-    constructor(epochCache: EpochCacheInterface);
+    private readonly pipeliningWindow;
+    protected readonly signatureContext: CoordinationSignatureContext;
+    constructor(epochCache: EpochCacheInterface, opts: {
+        l1PublishingTime?: number;
+        p2pPropagationTime?: number;
+        signatureContext: CoordinationSignatureContext;
+    });
     validate(message: CheckpointAttestation): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSyxZQUFZLEVBRWpCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFJM0IscUJBQWEsOEJBQStCLFlBQVcsWUFBWSxDQUFDLHFCQUFxQixDQUFDO0lBQ3hGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFekIsWUFBWSxVQUFVLEVBQUUsbUJBQW1CLEVBRzFDO0lBRUssUUFBUSxDQUFDLE9BQU8sRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0E2RHhFO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSyw0QkFBNEIsRUFDakMsS0FBSyxZQUFZLEVBRWpCLEtBQUssZ0JBQWdCLEVBRXRCLE1BQU0sbUJBQW1CLENBQUM7QUFJM0IscUJBQWEsOEJBQStCLFlBQVcsWUFBWSxDQUFDLHFCQUFxQixDQUFDO0lBQ3hGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBbUI7SUFDcEQsU0FBUyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSw0QkFBNEIsQ0FBQztJQUVsRSxZQUNFLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQ0osZ0JBQWdCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDMUIsa0JBQWtCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDNUIsZ0JBQWdCLEVBQUUsNEJBQTRCLENBQUM7S0FDaEQsRUFTRjtJQUVLLFFBQVEsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBNkV4RTtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAI3B,qBAAa,8BAA+B,YAAW,YAAY,CAAC,qBAAqB,CAAC;IACxF,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,YAAY,UAAU,EAAE,mBAAmB,EAG1C;IAEK,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6DxE;CACF"}
+{"version":3,"file":"attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,4BAA4B,EACjC,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EAEtB,MAAM,mBAAmB,CAAC;AAI3B,qBAAa,8BAA+B,YAAW,YAAY,CAAC,qBAAqB,CAAC;IACxF,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,4BAA4B,CAAC;IAElE,YACE,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,EAAE,4BAA4B,CAAC;KAChD,EASF;IAEK,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6ExE;CACF"}

package/dest/msg_validators/attestation_validator/attestation_validator.js

@@ -1,31 +1,56 @@
 import { NoCommitteeError } from '@aztec/ethereum/contracts';
 import { createLogger } from '@aztec/foundation/log';
-import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
-import { isWithinClockTolerance } from '../clock_tolerance.js';
+import { PeerErrorSeverity, hasValidSignatureContext } from '@aztec/stdlib/p2p';
+import { PipeliningWindow, isWithinClockTolerance } from '../clock_tolerance.js';
 export class CheckpointAttestationValidator {
     epochCache;
     logger;
-    constructor(epochCache){
+    pipeliningWindow;
+    signatureContext;
+    constructor(epochCache, opts){
         this.epochCache = epochCache;
+        this.pipeliningWindow = new PipeliningWindow(epochCache, {
+            l1PublishingTime: opts.l1PublishingTime,
+            p2pPropagationTime: opts.p2pPropagationTime
+        });
+        this.signatureContext = opts.signatureContext;
         this.logger = createLogger('p2p:checkpoint-attestation-validator');
     }
     async validate(message) {
         const slotNumber = message.payload.header.slotNumber;
         try {
-            const { currentSlot, nextSlot } = this.epochCache.getCurrentAndNextSlot();
-            if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
-                // Check if message is for previous slot and within clock tolerance
-                if (!isWithinClockTolerance(slotNumber, currentSlot, this.epochCache)) {
-                    this.logger.warn(`Checkpoint attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
+            // Cross-chain replay check: reject attestations that carry a foreign signing domain.
+            if (!hasValidSignatureContext(message.payload, this.signatureContext)) {
+                this.logger.warn(`Rejecting checkpoint attestation with foreign signature context for slot ${slotNumber}`, {
+                    chainId: message.payload.signatureContext.chainId,
+                    rollupAddress: message.payload.signatureContext.rollupAddress.toString(),
+                    expectedChainId: this.signatureContext.chainId,
+                    expectedRollupAddress: this.signatureContext.rollupAddress.toString()
+                });
+                return {
+                    result: 'reject',
+                    severity: PeerErrorSeverity.LowToleranceError
+                };
+            }
+            // Use target slots since proposals target pipeline slots (slot + 1 when pipelining).
+            const { targetSlot, nextSlot } = this.epochCache.getTargetAndNextSlot();
+            if (slotNumber !== targetSlot && slotNumber !== nextSlot) {
+                // When pipelining, accept attestations for the current slot (built in the previous slot)
+                // until the target slot reaches its L1 publish cutoff.
+                if (this.pipeliningWindow.acceptsAttestation(slotNumber)) {
+                // Fall through to remaining validation (signature, committee, etc.)
+                } else if (!isWithinClockTolerance(slotNumber, targetSlot, this.epochCache)) {
+                    this.logger.warn(`Checkpoint attestation slot ${slotNumber} is not current (${targetSlot}) or next (${nextSlot}) slot`);
                     return {
                         result: 'reject',
                         severity: PeerErrorSeverity.HighToleranceError
                     };
+                } else {
+                    this.logger.debug(`Ignoring checkpoint attestation for previous slot ${slotNumber} within clock tolerance`);
+                    return {
+                        result: 'ignore'
+                    };
                 }
-                this.logger.debug(`Ignoring checkpoint attestation for previous slot ${slotNumber} within clock tolerance`);
-                return {
-                    result: 'ignore'
-                };
             }
             // Verify the signature is valid
             const attester = message.getSender();

package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts

@@ -1,5 +1,5 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { type CheckpointAttestation, type ValidationResult } from '@aztec/stdlib/p2p';
+import { type CheckpointAttestation, type CoordinationSignatureContext, type ValidationResult } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPoolApi } from '../../mem_pools/attestation_pool/attestation_pool.js';
 import { CheckpointAttestationValidator } from './attestation_validator.js';
@@ -14,7 +14,11 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
 export declare class FishermanAttestationValidator extends CheckpointAttestationValidator {
     private attestationPool;
     private invalidAttestationCounter;
-    constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPoolApi, telemetryClient: TelemetryClient);
+    constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPoolApi, telemetryClient: TelemetryClient, opts: {
+        l1PublishingTime?: number;
+        p2pPropagationTime?: number;
+        signatureContext: CoordinationSignatureContext;
+    });
     validate(message: CheckpointAttestation): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQXFCLEtBQUssZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RyxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFrQyxNQUFNLHlCQUF5QixDQUFDO0FBRXBILE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDL0YsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLDhCQUE4QjtJQUs3RSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxrQkFBa0IsRUFDM0MsZUFBZSxFQUFFLGVBQWUsRUFhakM7SUFFYyxRQUFRLENBQUMsT0FBTyxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXdEakY7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssNEJBQTRCLEVBRWpDLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxFQUF1QixLQUFLLGVBQWUsRUFBa0MsTUFBTSx5QkFBeUIsQ0FBQztBQUVwSCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNEQUFzRCxDQUFDO0FBQy9GLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTVFOzs7Ozs7O0dBT0c7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSw4QkFBOEI7SUFLN0UsT0FBTyxDQUFDLGVBQWU7SUFKekIsT0FBTyxDQUFDLHlCQUF5QixDQUFDO0lBRWxDLFlBQ0UsVUFBVSxFQUFFLG1CQUFtQixFQUN2QixlQUFlLEVBQUUsa0JBQWtCLEVBQzNDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLElBQUksRUFBRTtRQUNKLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQzFCLGtCQUFrQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQzVCLGdCQUFnQixFQUFFLDRCQUE0QixDQUFDO0tBQ2hELEVBYUY7SUFFYyxRQUFRLENBQUMsT0FBTyxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXdEakY7Q0FDRiJ9

package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,qBAAqB,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACzG,OAAO,EAAuB,KAAK,eAAe,EAAkC,MAAM,yBAAyB,CAAC;AAEpH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,8BAA8B;IAK7E,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,kBAAkB,EAC3C,eAAe,EAAE,eAAe,EAajC;IAEc,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwDjF;CACF"}
+{"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,4BAA4B,EAEjC,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAuB,KAAK,eAAe,EAAkC,MAAM,yBAAyB,CAAC;AAEpH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,8BAA8B;IAK7E,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,kBAAkB,EAC3C,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,EAAE,4BAA4B,CAAC;KAChD,EAaF;IAEc,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwDjF;CACF"}

package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js

@@ -11,8 +11,8 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
  */ export class FishermanAttestationValidator extends CheckpointAttestationValidator {
     attestationPool;
     invalidAttestationCounter;
-    constructor(epochCache, attestationPool, telemetryClient){
-        super(epochCache), this.attestationPool = attestationPool;
+    constructor(epochCache, attestationPool, telemetryClient, opts){
+        super(epochCache, opts), this.attestationPool = attestationPool;
         this.logger = this.logger.createChild('[FISHERMAN]');
         const meter = telemetryClient.getMeter('FishermanAttestationValidator');
         this.invalidAttestationCounter = createUpDownCounterWithDefault(meter, Metrics.VALIDATOR_INVALID_ATTESTATION_RECEIVED_COUNT, {

package/dest/msg_validators/clock_tolerance.d.ts

@@ -18,4 +18,15 @@ export declare const MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS = 500;
  * @returns true if the message is for the previous slot AND we're within the clock tolerance window
  */
 export declare function isWithinClockTolerance(messageSlot: SlotNumber, currentSlot: SlotNumber, epochCache: EpochCacheInterface): boolean;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvY2tfdG9sZXJhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvY2xvY2tfdG9sZXJhbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTdEOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0saUNBQWlDLE1BQU0sQ0FBQztBQUVyRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxXQUFXLEVBQUUsVUFBVSxFQUN2QixXQUFXLEVBQUUsVUFBVSxFQUN2QixVQUFVLEVBQUUsbUJBQW1CLEdBQzlCLE9BQU8sQ0F5QlQifQ==
+export declare class PipeliningWindow {
+    private readonly epochCache;
+    private readonly proposalWindowIntoTargetSlot;
+    private readonly attestationWindowIntoTargetSlot;
+    constructor(epochCache: EpochCacheInterface, opts?: {
+        p2pPropagationTime?: number;
+        l1PublishingTime?: number;
+    });
+    acceptsProposal(messageSlot: SlotNumber): boolean;
+    acceptsAttestation(messageSlot: SlotNumber): boolean;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvY2tfdG9sZXJhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvY2xvY2tfdG9sZXJhbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRzdEOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0saUNBQWlDLE1BQU0sQ0FBQztBQUVyRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxXQUFXLEVBQUUsVUFBVSxFQUN2QixXQUFXLEVBQUUsVUFBVSxFQUN2QixVQUFVLEVBQUUsbUJBQW1CLEdBQzlCLE9BQU8sQ0EwQlQ7QUE0Q0QscUJBQWEsZ0JBQWdCO0lBS3pCLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVTtJQUo3QixPQUFPLENBQUMsUUFBUSxDQUFDLDRCQUE0QixDQUFTO0lBQ3RELE9BQU8sQ0FBQyxRQUFRLENBQUMsK0JBQStCLENBQVM7SUFFekQsWUFDbUIsVUFBVSxFQUFFLG1CQUFtQixFQUNoRCxJQUFJLEdBQUU7UUFDSixrQkFBa0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUM1QixnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztLQUN0QixFQVlQO0lBRU0sZUFBZSxDQUFDLFdBQVcsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUV2RDtJQUVNLGtCQUFrQixDQUFDLFdBQVcsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUUxRDtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"clock_tolerance.d.ts","sourceRoot":"","sources":["../../src/msg_validators/clock_tolerance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D;;;;;;;GAOG;AACH,eAAO,MAAM,iCAAiC,MAAM,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,EACvB,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CAyBT"}
+{"version":3,"file":"clock_tolerance.d.ts","sourceRoot":"","sources":["../../src/msg_validators/clock_tolerance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D;;;;;;;GAOG;AACH,eAAO,MAAM,iCAAiC,MAAM,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,EACvB,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CA0BT;AA4CD,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJ7B,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAS;IAEzD,YACmB,UAAU,EAAE,mBAAmB,EAChD,IAAI,GAAE;QACJ,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;KACtB,EAYP;IAEM,eAAe,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAEvD;IAEM,kBAAkB,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAE1D;CACF"}

package/dest/msg_validators/clock_tolerance.js

@@ -1,4 +1,5 @@
 import { SlotNumber } from '@aztec/foundation/branded-types';
+import { DEFAULT_P2P_PROPAGATION_TIME, createPipelinedCheckpointTimingModel } from '@aztec/stdlib/timetable';
 /**
  * Maximum clock disparity tolerance for P2P message validation (in milliseconds).
  * Messages for the previous slot are accepted if we're within this many milliseconds
@@ -25,9 +26,10 @@ import { SlotNumber } from '@aztec/foundation/branded-types';
         return false;
     }
     // Check how far we are into the current slot (in milliseconds)
-    const { ts: slotStartTs, nowMs, slot } = epochCache.getEpochAndSlotNow();
-    // Sanity check: ensure the epoch cache's current slot matches the expected current slot
-    if (slot !== currentSlot) {
+    const { ts: slotStartTs, nowMs } = epochCache.getEpochAndSlotNow();
+    const targetSlot = epochCache.getTargetSlot();
+    // Sanity check: ensure the epoch cache's target slot matches the expected current slot
+    if (targetSlot !== currentSlot) {
         return false;
     }
     // ts is in seconds, convert to ms; nowMs is already in milliseconds
@@ -35,3 +37,59 @@ import { SlotNumber } from '@aztec/foundation/branded-types';
     const elapsedMs = Number(nowMs - slotStartMs);
     return elapsedMs < MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS;
 }
+/**
+ * Checks if a straggler message for the previous target slot should be accepted.
+ *
+ * Under pipelining, proposals and attestations carry the target slot N. Most of the
+ * time the receiver is either still in the build slot N-1 (accepted via the main
+ * `slotNumber === targetSlot` match) or in the target slot N (accepted via
+ * `slotNumber === nextSlot` when pipelining is disabled, or again via `targetSlot`
+ * when the receiver itself is pipelining). Stragglers that arrive after the receiver
+ * has rolled past the target slot fall to this check: accept `messageSlot === slotNow`
+ * while we're still within the first `windowSeconds + clock-disparity` of the slot.
+ *
+ * Under the early-pipelining schedule `windowSeconds` is small (0 for proposals,
+ * `2*p2pPropagationTime` for attestations) since the proposer collects everything
+ * before the slot boundary.
+ *
+ * @param messageSlot - The slot number from the received message
+ * @param epochCache - EpochCache to get timing and pipelining state
+ * @param windowSeconds - How far into the current slot we still accept previous-target messages
+ * @returns true if pipelining is enabled, the message is for the current wallclock slot, and we're within the grace period
+ */ function isWithinPipeliningWindow(messageSlot, epochCache, windowSeconds) {
+    if (!epochCache.isProposerPipeliningEnabled()) {
+        return false;
+    }
+    const currentSlot = epochCache.getSlotNow();
+    if (messageSlot !== currentSlot) {
+        return false;
+    }
+    const { ts: slotStartTs, nowMs } = epochCache.getEpochAndSlotNow();
+    const slotStartMs = slotStartTs * 1000n;
+    const elapsedMs = Number(nowMs - slotStartMs);
+    const windowMs = windowSeconds * 1000 + MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS;
+    return elapsedMs < windowMs;
+}
+export class PipeliningWindow {
+    epochCache;
+    proposalWindowIntoTargetSlot;
+    attestationWindowIntoTargetSlot;
+    constructor(epochCache, opts = {}){
+        this.epochCache = epochCache;
+        const l1Constants = epochCache.getL1Constants();
+        const checkpointTiming = createPipelinedCheckpointTimingModel({
+            aztecSlotDuration: l1Constants.slotDuration,
+            ethereumSlotDuration: l1Constants.ethereumSlotDuration,
+            l1PublishingTime: opts.l1PublishingTime ?? l1Constants.ethereumSlotDuration,
+            p2pPropagationTime: opts.p2pPropagationTime ?? DEFAULT_P2P_PROPAGATION_TIME
+        });
+        this.proposalWindowIntoTargetSlot = checkpointTiming.proposalWindowIntoTargetSlot;
+        this.attestationWindowIntoTargetSlot = checkpointTiming.attestationWindowIntoTargetSlot;
+    }
+    acceptsProposal(messageSlot) {
+        return isWithinPipeliningWindow(messageSlot, this.epochCache, this.proposalWindowIntoTargetSlot);
+    }
+    acceptsAttestation(messageSlot) {
+        return isWithinPipeliningWindow(messageSlot, this.epochCache, this.attestationWindowIntoTargetSlot);
+    }
+}

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

@@ -1,9 +1,13 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import type { BlockProposal, P2PValidator } from '@aztec/stdlib/p2p';
-import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
-export declare class BlockProposalValidator extends ProposalValidator<BlockProposal> implements P2PValidator<BlockProposal> {
+import type { BlockProposal, CoordinationSignatureContext, P2PValidator, ValidationResult } from '@aztec/stdlib/p2p';
+export declare class BlockProposalValidator implements P2PValidator<BlockProposal> {
+    private proposalValidator;
     constructor(epochCache: EpochCacheInterface, opts: {
         txsPermitted: boolean;
+        maxTxsPerBlock?: number;
+        p2pPropagationTime?: number;
+        signatureContext: CoordinationSignatureContext;
     });
+    validate(proposal: BlockProposal): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVyRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSxzQkFBdUIsU0FBUSxpQkFBaUIsQ0FBQyxhQUFhLENBQUUsWUFBVyxZQUFZLENBQUMsYUFBYSxDQUFDO0lBQ2pILFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUE7S0FBRSxFQUUzRTtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSw0QkFBNEIsRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUlySCxxQkFBYSxzQkFBdUIsWUFBVyxZQUFZLENBQUMsYUFBYSxDQUFDO0lBQ3hFLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBb0I7SUFFN0MsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQy9CLElBQUksRUFBRTtRQUNKLFlBQVksRUFBRSxPQUFPLENBQUM7UUFDdEIsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3hCLGtCQUFrQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQzVCLGdCQUFnQixFQUFFLDRCQUE0QixDQUFDO0tBQ2hELEVBR0Y7SUFFSyxRQUFRLENBQUMsUUFBUSxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FNakU7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,qBAAa,sBAAuB,SAAQ,iBAAiB,CAAC,aAAa,CAAE,YAAW,YAAY,CAAC,aAAa,CAAC;IACjH,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAE3E;CACF"}
+{"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,4BAA4B,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIrH,qBAAa,sBAAuB,YAAW,YAAY,CAAC,aAAa,CAAC;IACxE,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,YACE,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QACJ,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,EAAE,4BAA4B,CAAC;KAChD,EAGF;IAEK,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAMjE;CACF"}

package/dest/msg_validators/proposal_validator/block_proposal_validator.js

@@ -1,6 +1,14 @@
 import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
-export class BlockProposalValidator extends ProposalValidator {
+export class BlockProposalValidator {
+    proposalValidator;
     constructor(epochCache, opts){
-        super(epochCache, opts, 'p2p:block_proposal_validator');
+        this.proposalValidator = new ProposalValidator(epochCache, opts, 'p2p:block_proposal_validator');
+    }
+    async validate(proposal) {
+        const headerResult = await this.proposalValidator.validate(proposal);
+        if (headerResult.result !== 'accept') {
+            return headerResult;
+        }
+        return this.proposalValidator.validateTxs(proposal);
     }
 }

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

@@ -1,9 +1,13 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import type { CheckpointProposal, P2PValidator } from '@aztec/stdlib/p2p';
-import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
-export declare class CheckpointProposalValidator extends ProposalValidator<CheckpointProposal> implements P2PValidator<CheckpointProposal> {
+import type { CheckpointProposal, CoordinationSignatureContext, P2PValidator, ValidationResult } from '@aztec/stdlib/p2p';
+export declare class CheckpointProposalValidator implements P2PValidator<CheckpointProposal> {
+    private proposalValidator;
     constructor(epochCache: EpochCacheInterface, opts: {
         txsPermitted: boolean;
+        maxTxsPerBlock?: number;
+        p2pPropagationTime?: number;
+        signatureContext: CoordinationSignatureContext;
     });
+    validate(proposal: CheckpointProposal): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUUxRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSwyQkFDWCxTQUFRLGlCQUFpQixDQUFDLGtCQUFrQixDQUM1QyxZQUFXLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQztJQUUzQyxZQUFZLFVBQVUsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUU7UUFBRSxZQUFZLEVBQUUsT0FBTyxDQUFBO0tBQUUsRUFFM0U7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFDVixrQkFBa0IsRUFDbEIsNEJBQTRCLEVBQzVCLFlBQVksRUFDWixnQkFBZ0IsRUFDakIsTUFBTSxtQkFBbUIsQ0FBQztBQUkzQixxQkFBYSwyQkFBNEIsWUFBVyxZQUFZLENBQUMsa0JBQWtCLENBQUM7SUFDbEYsT0FBTyxDQUFDLGlCQUFpQixDQUFvQjtJQUU3QyxZQUNFLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQ0osWUFBWSxFQUFFLE9BQU8sQ0FBQztRQUN0QixjQUFjLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDeEIsa0JBQWtCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDNUIsZ0JBQWdCLEVBQUUsNEJBQTRCLENBQUM7S0FDaEQsRUFHRjtJQUVLLFFBQVEsQ0FBQyxRQUFRLEVBQUUsa0JBQWtCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBWXRFO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"checkpoint_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,qBAAa,2BACX,SAAQ,iBAAiB,CAAC,kBAAkB,CAC5C,YAAW,YAAY,CAAC,kBAAkB,CAAC;IAE3C,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAE3E;CACF"}
+{"version":3,"file":"checkpoint_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EACV,kBAAkB,EAClB,4BAA4B,EAC5B,YAAY,EACZ,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAI3B,qBAAa,2BAA4B,YAAW,YAAY,CAAC,kBAAkB,CAAC;IAClF,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,YACE,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QACJ,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,EAAE,4BAA4B,CAAC;KAChD,EAGF;IAEK,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAYtE;CACF"}

package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js

@@ -1,6 +1,20 @@
 import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
-export class CheckpointProposalValidator extends ProposalValidator {
+export class CheckpointProposalValidator {
+    proposalValidator;
     constructor(epochCache, opts){
-        super(epochCache, opts, 'p2p:checkpoint_proposal_validator');
+        this.proposalValidator = new ProposalValidator(epochCache, opts, 'p2p:checkpoint_proposal_validator');
+    }
+    async validate(proposal) {
+        const headerResult = await this.proposalValidator.validate(proposal);
+        if (headerResult.result !== 'accept') {
+            return headerResult;
+        }
+        const blockProposal = proposal.getBlockProposal();
+        if (blockProposal) {
+            return this.proposalValidator.validateTxs(blockProposal);
+        }
+        return {
+            result: 'accept'
+        };
     }
 }

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

@@ -1,13 +1,22 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { type Logger } from '@aztec/foundation/log';
-import { BlockProposal, CheckpointProposal, type ValidationResult } from '@aztec/stdlib/p2p';
-export declare abstract class ProposalValidator<TProposal extends BlockProposal | CheckpointProposal> {
-    protected epochCache: EpochCacheInterface;
-    protected logger: Logger;
-    protected txsPermitted: boolean;
+import { type BlockProposal, type CheckpointProposalCore, type CoordinationSignatureContext, type ValidationResult } from '@aztec/stdlib/p2p';
+/** Validates header-level and tx-level fields of block and checkpoint proposals. */
+export declare class ProposalValidator {
+    private epochCache;
+    private logger;
+    private txsPermitted;
+    private maxTxsPerBlock?;
+    private pipeliningWindow;
+    private signatureContext;
     constructor(epochCache: EpochCacheInterface, opts: {
         txsPermitted: boolean;
+        maxTxsPerBlock?: number;
+        p2pPropagationTime?: number;
+        signatureContext: CoordinationSignatureContext;
     }, loggerName: string);
-    validate(proposal: TProposal): Promise<ValidationResult>;
+    /** Validates header-level fields: slot, signature, and proposer. */
+    validate(proposal: BlockProposal | CheckpointProposalCore): Promise<ValidationResult>;
+    /** Validates transaction-related fields of a block proposal. */
+    validateTxs(proposal: BlockProposal): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFxQixLQUFLLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJaEgsOEJBQXNCLGlCQUFpQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQzFGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDekIsU0FBUyxDQUFDLFlBQVksRUFBRSxPQUFPLENBQUM7SUFFaEMsWUFBWSxVQUFVLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQTtLQUFFLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFJL0Y7SUFFWSxRQUFRLENBQUMsUUFBUSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0F3RXBFO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRzlELE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxzQkFBc0IsRUFDM0IsS0FBSyw0QkFBNEIsRUFFakMsS0FBSyxnQkFBZ0IsRUFFdEIsTUFBTSxtQkFBbUIsQ0FBQztBQUkzQixvRkFBb0Y7QUFDcEYscUJBQWEsaUJBQWlCO0lBQzVCLE9BQU8sQ0FBQyxVQUFVLENBQXNCO0lBQ3hDLE9BQU8sQ0FBQyxNQUFNLENBQVM7SUFDdkIsT0FBTyxDQUFDLFlBQVksQ0FBVTtJQUM5QixPQUFPLENBQUMsY0FBYyxDQUFDLENBQVM7SUFDaEMsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsZ0JBQWdCLENBQStCO0lBRXZELFlBQ0UsVUFBVSxFQUFFLG1CQUFtQixFQUMvQixJQUFJLEVBQUU7UUFDSixZQUFZLEVBQUUsT0FBTyxDQUFDO1FBQ3RCLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUN4QixrQkFBa0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUM1QixnQkFBZ0IsRUFBRSw0QkFBNEIsQ0FBQztLQUNoRCxFQUNELFVBQVUsRUFBRSxNQUFNLEVBUW5CO0lBRUQsb0VBQW9FO0lBQ3ZELFFBQVEsQ0FBQyxRQUFRLEVBQUUsYUFBYSxHQUFHLHNCQUFzQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXVEakc7SUFFRCxnRUFBZ0U7SUFDbkQsV0FBVyxDQUFDLFFBQVEsRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBd0MzRTtDQUNGIn0=

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;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIhH,8BAAsB,iBAAiB,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB;IAC1F,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC;IAEhC,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAAE,UAAU,EAAE,MAAM,EAI/F;IAEY,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwEpE;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;AAG9D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EAEjC,KAAK,gBAAgB,EAEtB,MAAM,mBAAmB,CAAC;AAI3B,oFAAoF;AACpF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,YACE,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QACJ,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,EAAE,4BAA4B,CAAC;KAChD,EACD,UAAU,EAAE,MAAM,EAQnB;IAED,oEAAoE;IACvD,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAuDjG;IAED,gEAAgE;IACnD,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwC3E;CACF"}