@aztec/p2p 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

package/dest/msg_validators/attestation_validator/attestation_validator.js

@@ -1,30 +1,53 @@
 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';
 export class CheckpointAttestationValidator {
     epochCache;
     logger;
-    constructor(epochCache){
+    timetable;
+    signatureContext;
+    clockDisparityMs;
+    constructor(epochCache, timetable, opts){
         this.epochCache = epochCache;
+        this.timetable = timetable;
+        this.signatureContext = opts.signatureContext;
+        this.clockDisparityMs = opts.clockDisparityMs;
         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`);
-                    return {
-                        result: 'reject',
-                        severity: PeerErrorSeverity.HighToleranceError
-                    };
-                }
-                this.logger.debug(`Ignoring checkpoint attestation for previous slot ${slotNumber} within clock tolerance`);
+            // 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: 'ignore'
+                    result: 'reject',
+                    severity: PeerErrorSeverity.LowToleranceError
+                };
+            }
+            // Accept attestations whose explicit per-slot receive window contains the current wall-clock time.
+            // The window spans the build-frame start (attestation_receive_start) to the attestation deadline
+            // (target_slot_start + S - 2E), widened by the configured clock-disparity tolerance on both ends, so
+            // it covers the build slot, the target slot, and clock-disparity grace. This is the sole arrival
+            // gate; attestations are otherwise attributed by content, not by current/next slot.
+            const startSeconds = this.timetable.getAttestationReceiveStart(slotNumber);
+            const deadlineSeconds = this.timetable.getAttestationDeadline(slotNumber);
+            const nowMs = Number(this.epochCache.getEpochAndSlotNow().nowMs);
+            if (nowMs < startSeconds * 1000 - this.clockDisparityMs || nowMs > deadlineSeconds * 1000 + this.clockDisparityMs) {
+                this.logger.warn(`Checkpoint attestation slot ${slotNumber} is outside its receive window`, {
+                    slotNumber,
+                    nowMs,
+                    windowStartSeconds: startSeconds,
+                    windowDeadlineSeconds: deadlineSeconds
+                });
+                return {
+                    result: 'reject',
+                    severity: PeerErrorSeverity.HighToleranceError
                 };
             }
             // Verify the signature is valid

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

@@ -1,5 +1,6 @@
 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 { ConsensusTimetable } from '@aztec/stdlib/timetable';
 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 +15,10 @@ 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, timetable: ConsensusTimetable, attestationPool: AttestationPoolApi, telemetryClient: TelemetryClient, opts: {
+        signatureContext: CoordinationSignatureContext;
+        clockDisparityMs: number;
+    });
     validate(message: CheckpointAttestation): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQXFCLEtBQUssZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RyxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFrQyxNQUFNLHlCQUF5QixDQUFDO0FBRXBILE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDL0YsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLDhCQUE4QjtJQUs3RSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxrQkFBa0IsRUFDM0MsZUFBZSxFQUFFLGVBQWUsRUFhakM7SUFFYyxRQUFRLENBQUMsT0FBTyxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXdEakY7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssNEJBQTRCLEVBRWpDLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFrQyxNQUFNLHlCQUF5QixDQUFDO0FBRXBILE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDL0YsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLDhCQUE4QjtJQU03RSxPQUFPLENBQUMsZUFBZTtJQUx6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQy9CLFNBQVMsRUFBRSxrQkFBa0IsRUFDckIsZUFBZSxFQUFFLGtCQUFrQixFQUMzQyxlQUFlLEVBQUUsZUFBZSxFQUNoQyxJQUFJLEVBQUU7UUFDSixnQkFBZ0IsRUFBRSw0QkFBNEIsQ0FBQztRQUMvQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7S0FDMUIsRUFhRjtJQUVjLFFBQVEsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBcURqRjtDQUNGIn0=

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,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,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;IAM7E,OAAO,CAAC,eAAe;IALzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EAC/B,SAAS,EAAE,kBAAkB,EACrB,eAAe,EAAE,kBAAkB,EAC3C,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE;QACJ,gBAAgB,EAAE,4BAA4B,CAAC;QAC/C,gBAAgB,EAAE,MAAM,CAAC;KAC1B,EAaF;IAEc,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAqDjF;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, timetable, attestationPool, telemetryClient, opts){
+        super(epochCache, timetable, 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, {
@@ -41,8 +41,7 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
                 result: 'accept'
             };
         }
-        const proposalId = message.archive.toString();
-        const proposal = await this.attestationPool.getCheckpointProposal(proposalId);
+        const proposal = await this.attestationPool.getCheckpointProposal(message.payload.header.slotNumber);
         if (proposal) {
             // Compare the attestation payload with the proposal payload
             if (!message.payload.equals(proposal)) {
@@ -67,7 +66,7 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
             }
         } else {
             // We might receive attestations before proposals in some cases
-            this.logger.debug(`Received attestation for slot ${slotNumberBigInt} but proposal not found yet. ` + `Proposal ID: ${proposalId}`);
+            this.logger.debug(`Received attestation for slot ${slotNumberBigInt} but proposal not found yet.`);
         }
         return {
             result: 'accept'

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

@@ -1,10 +1,16 @@
 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> {
-    constructor(epochCache: EpochCacheInterface, opts: {
+import type { BlockProposal, CoordinationSignatureContext, P2PValidator, ValidationResult } from '@aztec/stdlib/p2p';
+import type { ConsensusTimetable } from '@aztec/stdlib/timetable';
+export declare class BlockProposalValidator implements P2PValidator<BlockProposal> {
+    private proposalValidator;
+    constructor(epochCache: EpochCacheInterface, timetable: ConsensusTimetable, opts: {
         txsPermitted: boolean;
         maxTxsPerBlock?: number;
+        maxBlocksPerCheckpoint?: number;
+        skipSlotValidation?: boolean;
+        signatureContext: CoordinationSignatureContext;
+        clockDisparityMs: number;
     });
+    validate(proposal: BlockProposal): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVyRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSxzQkFBdUIsU0FBUSxpQkFBaUIsQ0FBQyxhQUFhLENBQUUsWUFBVyxZQUFZLENBQUMsYUFBYSxDQUFDO0lBQ2pILFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUM7UUFBQyxjQUFjLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUVwRztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSw0QkFBNEIsRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNySCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSWxFLHFCQUFhLHNCQUF1QixZQUFXLFlBQVksQ0FBQyxhQUFhLENBQUM7SUFDeEUsT0FBTyxDQUFDLGlCQUFpQixDQUFvQjtJQUU3QyxZQUNFLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsU0FBUyxFQUFFLGtCQUFrQixFQUM3QixJQUFJLEVBQUU7UUFDSixZQUFZLEVBQUUsT0FBTyxDQUFDO1FBQ3RCLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUN4QixzQkFBc0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNoQyxrQkFBa0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztRQUM3QixnQkFBZ0IsRUFBRSw0QkFBNEIsQ0FBQztRQUMvQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7S0FDMUIsRUFHRjtJQUVLLFFBQVEsQ0FBQyxRQUFRLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQU1qRTtDQUNGIn0=

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,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAEpG;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;AACrH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAIlE,qBAAa,sBAAuB,YAAW,YAAY,CAAC,aAAa,CAAC;IACxE,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,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,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 {
-    constructor(epochCache, opts){
-        super(epochCache, opts, 'p2p:block_proposal_validator');
+export class BlockProposalValidator {
+    proposalValidator;
+    constructor(epochCache, timetable, opts){
+        this.proposalValidator = new ProposalValidator(epochCache, timetable, 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,10 +1,16 @@
 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> {
-    constructor(epochCache: EpochCacheInterface, opts: {
+import type { CheckpointProposal, CoordinationSignatureContext, P2PValidator, ValidationResult } from '@aztec/stdlib/p2p';
+import type { ConsensusTimetable } from '@aztec/stdlib/timetable';
+export declare class CheckpointProposalValidator implements P2PValidator<CheckpointProposal> {
+    private proposalValidator;
+    constructor(epochCache: EpochCacheInterface, timetable: ConsensusTimetable, opts: {
         txsPermitted: boolean;
         maxTxsPerBlock?: number;
+        maxBlocksPerCheckpoint?: number;
+        skipSlotValidation?: boolean;
+        signatureContext: CoordinationSignatureContext;
+        clockDisparityMs: number;
     });
+    validate(proposal: CheckpointProposal): Promise<ValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUUxRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSwyQkFDWCxTQUFRLGlCQUFpQixDQUFDLGtCQUFrQixDQUM1QyxZQUFXLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQztJQUUzQyxZQUFZLFVBQVUsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUU7UUFBRSxZQUFZLEVBQUUsT0FBTyxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFFcEc7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFDVixrQkFBa0IsRUFDbEIsNEJBQTRCLEVBQzVCLFlBQVksRUFDWixnQkFBZ0IsRUFDakIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSWxFLHFCQUFhLDJCQUE0QixZQUFXLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQztJQUNsRixPQUFPLENBQUMsaUJBQWlCLENBQW9CO0lBRTdDLFlBQ0UsVUFBVSxFQUFFLG1CQUFtQixFQUMvQixTQUFTLEVBQUUsa0JBQWtCLEVBQzdCLElBQUksRUFBRTtRQUNKLFlBQVksRUFBRSxPQUFPLENBQUM7UUFDdEIsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3hCLHNCQUFzQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ2hDLGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO1FBQzdCLGdCQUFnQixFQUFFLDRCQUE0QixDQUFDO1FBQy9DLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztLQUMxQixFQUdGO0lBRUssUUFBUSxDQUFDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FrQnRFO0NBQ0YifQ==

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,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAEpG;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;AAC3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAIlE,qBAAa,2BAA4B,YAAW,YAAY,CAAC,kBAAkB,CAAC;IAClF,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,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,EAGF;IAEK,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkBtE;CACF"}

package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js

@@ -1,6 +1,26 @@
 import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
-export class CheckpointProposalValidator extends ProposalValidator {
-    constructor(epochCache, opts){
-        super(epochCache, opts, 'p2p:checkpoint_proposal_validator');
+export class CheckpointProposalValidator {
+    proposalValidator;
+    constructor(epochCache, timetable, opts){
+        this.proposalValidator = new ProposalValidator(epochCache, timetable, 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) {
+            // The terminal block is carried inside the checkpoint proposal rather than gossiped as a
+            // standalone block proposal, so apply the per-checkpoint block ceiling to it here too.
+            const indexResult = this.proposalValidator.validateBlockIndexWithinCheckpoint(blockProposal);
+            if (indexResult.result !== 'accept') {
+                return indexResult;
+            }
+            return this.proposalValidator.validateTxs(blockProposal);
+        }
+        return {
+            result: 'accept'
+        };
     }
 }

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

@@ -1,15 +1,40 @@
 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;
-    protected maxTxsPerBlock?: number;
-    constructor(epochCache: EpochCacheInterface, opts: {
+import { type BlockProposal, type CheckpointProposalCore, type CoordinationSignatureContext, type ValidationResult } from '@aztec/stdlib/p2p';
+import type { ConsensusTimetable } from '@aztec/stdlib/timetable';
+/** Validates header-level and tx-level fields of block and checkpoint proposals. */
+export declare class ProposalValidator {
+    private epochCache;
+    private timetable;
+    private logger;
+    private txsPermitted;
+    private maxTxsPerBlock?;
+    private skipSlotValidation;
+    private signatureContext;
+    private clockDisparityMs;
+    constructor(epochCache: EpochCacheInterface, timetable: ConsensusTimetable, opts: {
         txsPermitted: boolean;
         maxTxsPerBlock?: number;
+        maxBlocksPerCheckpoint?: number;
+        skipSlotValidation?: boolean;
+        signatureContext: CoordinationSignatureContext;
+        clockDisparityMs: number;
     }, loggerName: string);
-    validate(proposal: TProposal): Promise<ValidationResult>;
+    /** 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 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFxQixLQUFLLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJaEgsOEJBQXNCLGlCQUFpQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQzFGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDekIsU0FBUyxDQUFDLFlBQVksRUFBRSxPQUFPLENBQUM7SUFDaEMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVsQyxZQUNFLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQztRQUFDLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEVBQ3hELFVBQVUsRUFBRSxNQUFNLEVBTW5CO0lBRVksUUFBUSxDQUFDLFFBQVEsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBZ0ZwRTtDQUNGIn0=
+//# 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;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;IAChC,SAAS,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACxD,UAAU,EAAE,MAAM,EAMnB;IAEY,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAgFpE;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

@@ -1,39 +1,67 @@
 import { NoCommitteeError } from '@aztec/ethereum/contracts';
 import { createLogger } from '@aztec/foundation/log';
-import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
-import { isWithinClockTolerance } from '../clock_tolerance.js';
-export class ProposalValidator {
+import { MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT } from '@aztec/stdlib/deserialization';
+import { PeerErrorSeverity, hasValidSignatureContext } from '@aztec/stdlib/p2p';
+/** Validates header-level and tx-level fields of block and checkpoint proposals. */ export class ProposalValidator {
     epochCache;
+    timetable;
     logger;
     txsPermitted;
     maxTxsPerBlock;
-    constructor(epochCache, opts, loggerName){
+    skipSlotValidation;
+    signatureContext;
+    clockDisparityMs;
+    constructor(epochCache, timetable, opts, loggerName){
         this.epochCache = epochCache;
+        this.timetable = timetable;
         this.txsPermitted = opts.txsPermitted;
         this.maxTxsPerBlock = opts.maxTxsPerBlock;
+        this.skipSlotValidation = opts.skipSlotValidation ?? false;
+        this.signatureContext = opts.signatureContext;
+        this.clockDisparityMs = opts.clockDisparityMs;
         this.logger = createLogger(loggerName);
     }
-    async validate(proposal) {
+    /** Validates header-level fields: slot, signature, and proposer. */ async validate(proposal) {
         try {
-            // Slot check
-            const { currentSlot, nextSlot } = this.epochCache.getCurrentAndNextSlot();
+            // Cross-chain replay check: reject proposals that carry a foreign signing domain.
+            if (!hasValidSignatureContext(proposal, this.signatureContext)) {
+                this.logger.warn(`Penalizing peer for proposal with foreign signature context`, {
+                    chainId: proposal.signatureContext.chainId,
+                    rollupAddress: proposal.signatureContext.rollupAddress.toString(),
+                    expectedChainId: this.signatureContext.chainId,
+                    expectedRollupAddress: this.signatureContext.rollupAddress.toString()
+                });
+                return {
+                    result: 'reject',
+                    severity: PeerErrorSeverity.LowToleranceError
+                };
+            }
+            // Slot check: the tight checkpoint proposal receive window (`[receiveStart - δ, target_slot_start -
+            // E - D + δ]`) is the sole acceptance gate, applied to both block and checkpoint proposals. The
+            // window itself bounds which slots are valid, so far/wrong slots fall outside it. Every block
+            // proposal for slot N is sent before the checkpoint proposal for slot N, so nothing legitimate can
+            // arrive after the checkpoint receive deadline; gating block proposals on the same window rejects
+            // late block proposals at p2p ingress. The attestation deadline remains their re-execution/
+            // validation deadline downstream, not their arrival gate.
             const slotNumber = proposal.slotNumber;
-            if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
-                // Check if message is for previous slot and within clock tolerance
-                if (!isWithinClockTolerance(slotNumber, currentSlot, this.epochCache)) {
+            if (!this.skipSlotValidation) {
+                // Proposal receive window: [checkpoint_proposal_receive_start, checkpoint_proposal_receive_deadline],
+                // widened by the configured clock-disparity tolerance on both ends.
+                const startSeconds = this.timetable.getCheckpointProposalReceiveStart(slotNumber);
+                const deadlineSeconds = this.timetable.getCheckpointProposalReceiveDeadline(slotNumber);
+                const nowMs = Number(this.epochCache.getEpochAndSlotNow().nowMs);
+                if (nowMs < startSeconds * 1000 - this.clockDisparityMs || nowMs > deadlineSeconds * 1000 + this.clockDisparityMs) {
                     this.logger.warn(`Penalizing peer for invalid slot number ${slotNumber}`, {
-                        currentSlot,
-                        nextSlot
+                        slotNumber,
+                        nowMs,
+                        windowStartSeconds: startSeconds,
+                        windowDeadlineSeconds: deadlineSeconds
                     });
                     return {
                         result: 'reject',
                         severity: PeerErrorSeverity.HighToleranceError
                     };
                 }
-                this.logger.verbose(`Ignoring proposal for previous slot ${slotNumber} within clock tolerance`);
-                return {
-                    result: 'ignore'
-                };
             }
             // Signature validity
             const proposer = proposal.getSender();
@@ -44,40 +72,16 @@ export class ProposalValidator {
                     severity: PeerErrorSeverity.MidToleranceError
                 };
             }
-            // Transactions permitted check
-            const embeddedTxCount = proposal.txs?.length ?? 0;
-            if (!this.txsPermitted && (proposal.txHashes.length > 0 || embeddedTxCount > 0)) {
-                this.logger.warn(`Penalizing peer for proposal with ${proposal.txHashes.length} transaction(s) when transactions are not permitted`);
-                return {
-                    result: 'reject',
-                    severity: PeerErrorSeverity.MidToleranceError
-                };
-            }
-            // Max txs per block check
-            if (this.maxTxsPerBlock !== undefined && proposal.txHashes.length > this.maxTxsPerBlock) {
-                this.logger.warn(`Penalizing peer for proposal with ${proposal.txHashes.length} transaction(s) when max is ${this.maxTxsPerBlock}`);
-                return {
-                    result: 'reject',
-                    severity: PeerErrorSeverity.MidToleranceError
-                };
-            }
-            // Embedded txs must be listed in txHashes
-            const hashSet = new Set(proposal.txHashes.map((h)=>h.toString()));
-            const missingTxHashes = embeddedTxCount > 0 ? proposal.txs.filter((tx)=>!hashSet.has(tx.getTxHash().toString())).map((tx)=>tx.getTxHash().toString()) : [];
-            if (embeddedTxCount > 0 && missingTxHashes.length > 0) {
-                this.logger.warn('Penalizing peer for embedded transaction(s) not included in txHashes', {
-                    embeddedTxCount,
-                    txHashesLength: proposal.txHashes.length,
-                    missingTxHashes
-                });
+            // Proposer check
+            const expectedProposer = await this.epochCache.getProposerAttesterAddressInSlot(slotNumber);
+            if (expectedProposer === undefined) {
+                this.logger.warn(`Penalizing peer for proposal with no expected proposer for current slot ${slotNumber}`);
                 return {
                     result: 'reject',
-                    severity: PeerErrorSeverity.MidToleranceError
+                    severity: PeerErrorSeverity.HighToleranceError
                 };
             }
-            // Proposer check
-            const expectedProposer = await this.epochCache.getProposerAttesterAddressInSlot(slotNumber);
-            if (expectedProposer !== undefined && !proposer.equals(expectedProposer)) {
+            if (!proposer.equals(expectedProposer)) {
                 this.logger.warn(`Penalizing peer for invalid proposer for current slot ${slotNumber}`, {
                     expectedProposer,
                     proposer: proposer.toString()
@@ -87,16 +91,17 @@ export class ProposalValidator {
                     severity: PeerErrorSeverity.MidToleranceError
                 };
             }
-            // Validate tx hashes for all txs embedded in the proposal
-            if (!(await Promise.all(proposal.txs?.map((tx)=>tx.validateTxHash()) ?? [])).every((v)=>v)) {
-                this.logger.warn(`Penalizing peer for invalid tx hashes in proposal`, {
-                    proposer,
-                    slotNumber
-                });
-                return {
-                    result: 'reject',
-                    severity: PeerErrorSeverity.LowToleranceError
-                };
+            // 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') {
+                    return indexResult;
+                }
             }
             return {
                 result: 'accept'
@@ -111,4 +116,71 @@ export class ProposalValidator {
             throw e;
         }
     }
+    /**
+   * 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) {
+        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
+            };
+        }
+        return {
+            result: 'accept'
+        };
+    }
+    /** Validates transaction-related fields of a block proposal. */ async validateTxs(proposal) {
+        // Transactions permitted check
+        const embeddedTxCount = proposal.txs?.length ?? 0;
+        if (!this.txsPermitted && (proposal.txHashes.length > 0 || embeddedTxCount > 0)) {
+            this.logger.warn(`Penalizing peer for proposal with ${proposal.txHashes.length} transaction(s) when transactions are not permitted`);
+            return {
+                result: 'reject',
+                severity: PeerErrorSeverity.MidToleranceError
+            };
+        }
+        // Max txs per block check
+        if (this.maxTxsPerBlock !== undefined && proposal.txHashes.length > this.maxTxsPerBlock) {
+            this.logger.warn(`Penalizing peer for proposal with ${proposal.txHashes.length} transaction(s) when max is ${this.maxTxsPerBlock}`);
+            return {
+                result: 'reject',
+                severity: PeerErrorSeverity.MidToleranceError
+            };
+        }
+        // Embedded txs must be listed in txHashes
+        const hashSet = new Set(proposal.txHashes.map((h)=>h.toString()));
+        const missingTxHashes = embeddedTxCount > 0 ? proposal.txs.filter((tx)=>!hashSet.has(tx.getTxHash().toString())).map((tx)=>tx.getTxHash().toString()) : [];
+        if (embeddedTxCount > 0 && missingTxHashes.length > 0) {
+            this.logger.warn('Penalizing peer for embedded transaction(s) not included in txHashes', {
+                embeddedTxCount,
+                txHashesLength: proposal.txHashes.length,
+                missingTxHashes
+            });
+            return {
+                result: 'reject',
+                severity: PeerErrorSeverity.MidToleranceError
+            };
+        }
+        // Validate tx hashes for all txs embedded in the proposal
+        if (!(await Promise.all(proposal.txs?.map((tx)=>tx.validateTxHash()) ?? [])).every((v)=>v)) {
+            this.logger.warn(`Penalizing peer for invalid tx hashes in proposal`);
+            return {
+                result: 'reject',
+                severity: PeerErrorSeverity.LowToleranceError
+            };
+        }
+        return {
+            result: 'accept'
+        };
+    }
 }

package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts

@@ -4,4 +4,4 @@ export declare class AggregateTxValidator<T> implements TxValidator<T> {
     constructor(...validators: TxValidator<T>[]);
     validateTx(tx: T): Promise<TxValidationResult>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdncmVnYXRlX3R4X3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9hZ2dyZWdhdGVfdHhfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXhFLHFCQUFhLG9CQUFvQixDQUFDLENBQUMsQ0FBRSxZQUFXLFdBQVcsQ0FBQyxDQUFDLENBQUM7SUFDNUQsUUFBUSxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUN0QyxZQUFZLEdBQUcsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQU0xQztJQUVLLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQWtCbkQ7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdncmVnYXRlX3R4X3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL3R4X3ZhbGlkYXRvci9hZ2dyZWdhdGVfdHhfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXhFLHFCQUFhLG9CQUFvQixDQUFDLENBQUMsQ0FBRSxZQUFXLFdBQVcsQ0FBQyxDQUFDLENBQUM7SUFDNUQsUUFBUSxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUN0QyxZQUFZLEdBQUcsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQU0xQztJQUVLLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQVNuRDtDQUNGIn0=

package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate_tx_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/aggregate_tx_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAExE,qBAAa,oBAAoB,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAC5D,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,YAAY,GAAG,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EAM1C;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBnD;CACF"}
+{"version":3,"file":"aggregate_tx_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/aggregate_tx_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAExE,qBAAa,oBAAoB,CAAC,CAAC,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAC5D,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,YAAY,GAAG,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,EAM1C;IAEK,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CASnD;CACF"}

package/dest/msg_validators/tx_validator/aggregate_tx_validator.js

@@ -7,25 +7,18 @@ export class AggregateTxValidator {
         this.validators = validators;
     }
     async validateTx(tx) {
-        const aggregate = {
-            result: 'valid',
-            reason: []
-        };
+        const reasons = [];
         for (const validator of this.validators){
             const result = await validator.validateTx(tx);
             if (result.result === 'invalid') {
-                aggregate.result = 'invalid';
-                aggregate.reason.push(...result.reason);
-            } else if (result.result === 'skipped') {
-                if (aggregate.result === 'valid') {
-                    aggregate.result = 'skipped';
-                }
-                aggregate.reason.push(...result.reason);
+                reasons.push(...result.reason);
             }
         }
-        if (aggregate.result === 'valid') {
-            delete aggregate.reason;
-        }
-        return aggregate;
+        return reasons.length > 0 ? {
+            result: 'invalid',
+            reason: reasons
+        } : {
+            result: 'valid'
+        };
     }
 }

package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts

@@ -1,4 +1,4 @@
 import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
 /** Returns the default list of functions allowed to run in the setup phase of a transaction. */
 export declare function getDefaultAllowedSetupFunctions(): Promise<AllowedElement[]>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsb3dlZF9wdWJsaWNfc2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy90eF92YWxpZGF0b3IvYWxsb3dlZF9wdWJsaWNfc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFJdEUsZ0dBQWdHO0FBQ2hHLHdCQUFzQiwrQkFBK0IsSUFBSSxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsQ0F1Q2pGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsb3dlZF9wdWJsaWNfc2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy90eF92YWxpZGF0b3IvYWxsb3dlZF9wdWJsaWNfc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNdEUsZ0dBQWdHO0FBQ2hHLHdCQUFzQiwrQkFBK0IsSUFBSSxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FtQmpGIn0=

package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allowed_public_setup.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/allowed_public_setup.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,gGAAgG;AAChG,wBAAsB,+BAA+B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAuCjF"}
+{"version":3,"file":"allowed_public_setup.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/tx_validator/allowed_public_setup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,gGAAgG;AAChG,wBAAsB,+BAA+B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAmBjF"}