@aztec/p2p 4.0.0-nightly.20260112 → 4.0.0-nightly.20260114

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -1,60 +1,93 @@
 import { createLogger } from '@aztec/foundation/log';
 import { getTelemetryClient } from '@aztec/telemetry-client';
+import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
 import { ATTESTATION_CAP_BUFFER, MAX_PROPOSALS_PER_SLOT } from './kv_attestation_pool.js';
 export class InMemoryAttestationPool {
     log;
     metrics;
-    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
-    attestations;
     proposals;
+    // Checkpoint attestations
+    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+    checkpointAttestations;
+    checkpointProposals;
     constructor(telemetry = getTelemetryClient(), log = createLogger('p2p:attestation_pool')){
         this.log = log;
         this.poolStats = ()=>{
             return Promise.resolve({
-                itemCount: this.attestations.size
+                itemCount: this.checkpointAttestations.size
             });
         };
-        this.attestations = new Map();
         this.proposals = new Map();
+        this.checkpointAttestations = new Map();
+        this.checkpointProposals = new Map();
         this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
     }
     poolStats;
     isEmpty() {
-        return Promise.resolve(this.attestations.size === 0);
+        return Promise.resolve(this.checkpointAttestations.size === 0 && this.proposals.size === 0);
     }
-    getAttestationsForSlot(slot) {
-        return Promise.resolve(Array.from(this.attestations.get(slot)?.values() ?? []).flatMap((proposalAttestationMap)=>Array.from(proposalAttestationMap.values())));
+    addBlockProposal(blockProposal) {
+        // Strip signedTxs before storing to avoid holding full tx data in memory
+        this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs());
+        return Promise.resolve();
     }
-    getAttestationsForSlotAndProposal(slot, proposalId) {
-        const slotAttestationMap = this.attestations.get(slot);
-        if (slotAttestationMap) {
-            const proposalAttestationMap = slotAttestationMap.get(proposalId);
-            if (proposalAttestationMap) {
-                return Promise.resolve(Array.from(proposalAttestationMap.values()));
-            }
+    getBlockProposal(id) {
+        return Promise.resolve(this.proposals.get(id));
+    }
+    hasBlockProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
+        return Promise.resolve(this.proposals.has(id));
+    }
+    canAddProposal(_block) {
+        // TODO(palla/mbps): See when to allow
+        return Promise.resolve(true);
+    }
+    // Checkpoint attestation methods
+    async addCheckpointProposal(proposal) {
+        if (!await this.canAddCheckpointProposal(proposal)) {
+            throw new ProposalSlotCapExceededError(`Maximum checkpoint proposals per slot reached: slot=${proposal.slotNumber} cap=${MAX_PROPOSALS_PER_SLOT} proposal=${proposal.archive.toString()}`);
         }
-        return Promise.resolve([]);
+        // Extract and validate the block proposal if present
+        const blockProposal = proposal.getBlockProposal();
+        if (blockProposal && !await this.canAddProposal(blockProposal)) {
+            throw new ProposalSlotCapExceededError(`Maximum block proposals per slot reached when extracting from checkpoint: slot=${proposal.slotNumber} proposal=${blockProposal.archive.toString()}`);
+        }
+        const slotProposalMapping = getCheckpointSlotOrDefault(this.checkpointAttestations, proposal.slotNumber);
+        slotProposalMapping.set(proposal.archive.toString(), new Map());
+        // Store the checkpoint proposal as core (without lastBlock) to avoid duplication
+        this.checkpointProposals.set(proposal.archive.toString(), proposal.toCore());
+        // Store the extracted block proposal separately
+        if (blockProposal) {
+            this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs());
+        }
+        return Promise.resolve();
+    }
+    getCheckpointProposal(id) {
+        return Promise.resolve(this.checkpointProposals.get(id));
     }
-    addAttestations(attestations) {
+    hasCheckpointProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
+        return Promise.resolve(this.checkpointProposals.has(id));
+    }
+    addCheckpointAttestations(attestations) {
         for (const attestation of attestations){
-            // Perf: order and group by slot before insertion
             const slotNumber = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
             const sender = attestation.getSender();
             // Skip attestations with invalid signatures
             if (!sender) {
-                this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber}`, {
+                this.log.warn(`Skipping checkpoint attestation with invalid signature for slot ${slotNumber}`, {
                     signature: attestation.signature.toString(),
                     slotNumber,
                     proposalId
                 });
                 continue;
             }
-            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber);
-            const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
+            const slotAttestationMap = getCheckpointSlotOrDefault(this.checkpointAttestations, slotNumber);
+            const proposalAttestationMap = getCheckpointProposalOrDefault(slotAttestationMap, proposalId);
             proposalAttestationMap.set(sender.toString(), attestation);
-            this.log.verbose(`Added attestation for slot ${slotNumber} from ${sender}`, {
+            this.log.verbose(`Added checkpoint attestation for slot ${slotNumber} from ${sender}`, {
                 signature: attestation.signature.toString(),
                 slotNumber,
                 address: sender,
@@ -63,22 +96,22 @@ export class InMemoryAttestationPool {
         }
         return Promise.resolve();
     }
-    #getNumberOfAttestationsInSlot(slot) {
-        let total = 0;
-        const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
+    getCheckpointAttestationsForSlot(slot) {
+        return Promise.resolve(Array.from(this.checkpointAttestations.get(slot)?.values() ?? []).flatMap((proposalAttestationMap)=>Array.from(proposalAttestationMap.values())));
+    }
+    getCheckpointAttestationsForSlotAndProposal(slot, proposalId) {
+        const slotAttestationMap = this.checkpointAttestations.get(slot);
         if (slotAttestationMap) {
-            for (const proposalAttestationMap of slotAttestationMap.values() ?? []){
-                total += proposalAttestationMap.size;
+            const proposalAttestationMap = slotAttestationMap.get(proposalId);
+            if (proposalAttestationMap) {
+                return Promise.resolve(Array.from(proposalAttestationMap.values()));
             }
         }
-        return total;
+        return Promise.resolve([]);
     }
-    async deleteAttestationsOlderThan(oldestSlot) {
+    deleteCheckpointAttestationsOlderThan(oldestSlot) {
         const olderThan = [];
-        // Entries are iterated in insertion order, so we can break as soon as we find a slot that is older than the oldestSlot.
-        // Note: this will only prune correctly if attestations are added in order of rising slot, it is important that we do not allow
-        // insertion of attestations that are old. #(https://github.com/AztecProtocol/aztec-packages/issues/10322)
-        const slots = this.attestations.keys();
+        const slots = this.checkpointAttestations.keys();
         for (const slot of slots){
             if (slot < oldestSlot) {
                 olderThan.push(slot);
@@ -87,57 +120,32 @@ export class InMemoryAttestationPool {
             }
         }
         for (const oldSlot of olderThan){
-            await this.deleteAttestationsForSlot(oldSlot);
+            const proposalIds = this.checkpointAttestations.get(oldSlot)?.keys();
+            proposalIds?.forEach((proposalId)=>this.checkpointProposals.delete(proposalId));
+            this.checkpointAttestations.delete(oldSlot);
         }
         return Promise.resolve();
     }
-    deleteAttestationsForSlot(slot) {
-        // We count the number of attestations we are removing
-        const numberOfAttestations = this.#getNumberOfAttestationsInSlot(slot);
-        const proposalIdsToDelete = this.attestations.get(slot)?.keys();
-        let proposalIdsToDeleteCount = 0;
-        proposalIdsToDelete?.forEach((proposalId)=>{
-            this.proposals.delete(proposalId);
-            proposalIdsToDeleteCount++;
-        });
-        this.attestations.delete(slot);
-        this.log.verbose(`Removed ${numberOfAttestations} attestations and ${proposalIdsToDeleteCount} proposals for slot ${slot}`);
-        return Promise.resolve();
+    hasReachedCheckpointProposalCap(slot) {
+        const slotAttestationMap = this.checkpointAttestations.get(slot);
+        const proposalCount = slotAttestationMap?.size ?? 0;
+        return Promise.resolve(proposalCount >= MAX_PROPOSALS_PER_SLOT);
     }
-    deleteAttestationsForSlotAndProposal(slot, proposalId) {
-        const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
-        if (slotAttestationMap) {
-            if (slotAttestationMap.has(proposalId)) {
-                const numberOfAttestations = slotAttestationMap.get(proposalId)?.size ?? 0;
-                slotAttestationMap.delete(proposalId);
-                this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-            }
-        }
-        this.proposals.delete(proposalId);
-        return Promise.resolve();
+    hasReachedCheckpointAttestationCap(slot, proposalId, committeeSize) {
+        const limit = committeeSize + ATTESTATION_CAP_BUFFER;
+        const count = this.checkpointAttestations.get(slot)?.get(proposalId)?.size ?? 0;
+        return Promise.resolve(limit <= 0 || count >= limit);
     }
-    deleteAttestations(attestations) {
-        for (const attestation of attestations){
-            const slotNumber = attestation.payload.header.slotNumber;
-            const slotAttestationMap = this.attestations.get(slotNumber);
-            if (slotAttestationMap) {
-                const proposalId = attestation.archive.toString();
-                const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-                if (proposalAttestationMap) {
-                    const sender = attestation.getSender();
-                    // Skip attestations with invalid signatures
-                    if (!sender) {
-                        this.log.warn(`Skipping deletion of attestation with invalid signature for slot ${slotNumber}`);
-                        continue;
-                    }
-                    proposalAttestationMap.delete(sender.toString());
-                    this.log.debug(`Deleted attestation for slot ${slotNumber} from ${sender}`);
-                }
-            }
-        }
-        return Promise.resolve();
+    async canAddCheckpointProposal(proposal) {
+        return this.checkpointProposals.has(proposal.archive.toString()) || !await this.hasReachedCheckpointProposalCap(proposal.slotNumber);
     }
-    hasAttestation(attestation) {
+    async canAddCheckpointAttestation(attestation, committeeSize) {
+        const sender = attestation.getSender();
+        const slot = attestation.payload.header.slotNumber;
+        const pid = attestation.archive.toString();
+        return !!sender && ((this.checkpointAttestations.get(slot)?.get(pid)?.has(sender.toString()) ?? false) || !await this.hasReachedCheckpointAttestationCap(slot, pid, committeeSize));
+    }
+    hasCheckpointAttestation(attestation) {
         const slotNumber = attestation.payload.header.slotNumber;
         const proposalId = attestation.archive.toString();
         const sender = attestation.getSender();
@@ -145,7 +153,7 @@ export class InMemoryAttestationPool {
         if (!sender) {
             return Promise.resolve(false);
         }
-        const slotAttestationMap = this.attestations.get(slotNumber);
+        const slotAttestationMap = this.checkpointAttestations.get(slotNumber);
         if (!slotAttestationMap) {
             return Promise.resolve(false);
         }
@@ -155,63 +163,16 @@ export class InMemoryAttestationPool {
         }
         return Promise.resolve(proposalAttestationMap.has(sender.toString()));
     }
-    addBlockProposal(blockProposal) {
-        // We initialize slot-proposal mapping if it does not exist
-        // This is important to ensure we can delete this proposal if there were not attestations for it
-        const slotProposalMapping = getSlotOrDefault(this.attestations, blockProposal.slotNumber);
-        slotProposalMapping.set(blockProposal.payload.archive.toString(), new Map());
-        this.proposals.set(blockProposal.payload.archive.toString(), blockProposal);
-        return Promise.resolve();
-    }
-    getBlockProposal(id) {
-        return Promise.resolve(this.proposals.get(id));
-    }
-    hasBlockProposal(idOrProposal) {
-        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.payload.archive.toString();
-        return Promise.resolve(this.proposals.has(id));
-    }
-    hasReachedProposalCap(slot) {
-        const slotAttestationMap = this.attestations.get(slot);
-        const proposalCount = slotAttestationMap?.size ?? 0;
-        return Promise.resolve(proposalCount >= MAX_PROPOSALS_PER_SLOT);
-    }
-    hasReachedAttestationCap(slot, proposalId, committeeSize) {
-        const limit = committeeSize + ATTESTATION_CAP_BUFFER;
-        const count = this.attestations.get(slot)?.get(proposalId)?.size ?? 0;
-        return Promise.resolve(limit <= 0 || count >= limit);
-    }
-    async canAddProposal(block) {
-        return this.proposals.has(block.archive.toString()) || !await this.hasReachedProposalCap(block.slotNumber);
-    }
-    async canAddAttestation(attestation, committeeSize) {
-        const sender = attestation.getSender();
-        const slot = attestation.payload.header.slotNumber;
-        const pid = attestation.archive.toString();
-        return !!sender && ((this.attestations.get(slot)?.get(pid)?.has(sender.toString()) ?? false) || !await this.hasReachedAttestationCap(slot, pid, committeeSize));
-    }
 }
-/**
- * Get Slot or Default
- *
- * Fetch the slot mapping, if it does not exist, then create a mapping and return it
- * @param map - The map to fetch from
- * @param slot - The slot to fetch
- * @returns The slot mapping
- */ function getSlotOrDefault(// eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+// Checkpoint attestation helper functions
+function getCheckpointSlotOrDefault(// eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
 map, slot) {
     if (!map.has(slot)) {
         map.set(slot, new Map());
     }
     return map.get(slot);
 }
-/**
- * Get Proposal or Default
- *
- * Fetch the proposal mapping, if it does not exist, then create a mapping and return it
- * @param map - The map to fetch from
- * @param proposalId - The proposal id to fetch
- * @returns The proposal mapping
- */ function getProposalOrDefault(map, proposalId) {
+function getCheckpointProposalOrDefault(map, proposalId) {
     if (!map.has(proposalId)) {
         map.set(proposalId, new Map());
     }

package/dest/mem_pools/attestation_pool/mocks.d.ts

@@ -1,6 +1,6 @@
 import type { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
+import { CheckpointAttestation } from '@aztec/stdlib/p2p';
 /** Generate Account
  *
  * Create a random signer
@@ -229,11 +229,12 @@ export declare const generateAccount: () => {
     source: string;
     type: "local";
 };
-/** Mock Attestation
+/** Mock Checkpoint Attestation
  *
- * @param signer A viem signer to create a signature
+ * @param signer A Secp256k1Signer to create a signature
  * @param slot The slot number the attestation is for
- * @returns A Block Attestation
+ * @param archive The archive root (defaults to random)
+ * @returns A Checkpoint Attestation
  */
-export declare const mockAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr) => BlockAttestation;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9tb2Nrcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNqRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUNMLGdCQUFnQixFQUlqQixNQUFNLG1CQUFtQixDQUFDO0FBSzNCOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBRzNCLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILGVBQU8sTUFBTSxlQUFlLDRFQWdCM0IsQ0FBQyJ9
+export declare const mockCheckpointAttestation: (signer: Secp256k1Signer, slot?: number, archive?: Fr) => CheckpointAttestation;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9tb2Nrcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNqRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUNMLHFCQUFxQixFQUl0QixNQUFNLG1CQUFtQixDQUFDO0FBSzNCOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBRzNCLENBQUM7QUFFRjs7Ozs7O0dBTUc7QUFDSCxlQUFPLE1BQU0seUJBQXlCLGlGQW1CckMsQ0FBQyJ9

package/dest/mem_pools/attestation_pool/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAK3B;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAG3B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,4EAgB3B,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,qBAAqB,EAItB,MAAM,mBAAmB,CAAC;AAK3B;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAG3B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,iFAmBrC,CAAC"}

package/dest/mem_pools/attestation_pool/mocks.js

@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { BlockAttestation, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
+import { CheckpointAttestation, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
 import { makeL2BlockHeader } from '@aztec/stdlib/testing';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 /** Generate Account
@@ -10,18 +10,19 @@ import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
     const privateKey = generatePrivateKey();
     return privateKeyToAccount(privateKey);
 };
-/** Mock Attestation
+/** Mock Checkpoint Attestation
  *
- * @param signer A viem signer to create a signature
+ * @param signer A Secp256k1Signer to create a signature
  * @param slot The slot number the attestation is for
- * @returns A Block Attestation
- */ export const mockAttestation = (signer, slot = 0, archive = Fr.random())=>{
+ * @param archive The archive root (defaults to random)
+ * @returns A Checkpoint Attestation
+ */ export const mockCheckpointAttestation = (signer, slot = 0, archive = Fr.random())=>{
     // Use arbitrary numbers for all other than slot
     const header = makeL2BlockHeader(1, 2, slot);
     const payload = new ConsensusPayload(header.toCheckpointHeader(), archive);
-    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+    const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointAttestation);
     const attestationSignature = signer.sign(attestationHash);
-    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+    const proposalHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointProposal);
     const proposerSignature = signer.sign(proposalHash);
-    return new BlockAttestation(payload, attestationSignature, proposerSignature);
+    return new CheckpointAttestation(payload, attestationSignature, proposerSignature);
 };

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

@@ -1,10 +1,10 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { type Logger } from '@aztec/foundation/log';
-import { type BlockAttestation, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p';
-export declare class AttestationValidator implements P2PValidator<BlockAttestation> {
+import { type CheckpointAttestation, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p';
+export declare class CheckpointAttestationValidator implements P2PValidator<CheckpointAttestation> {
     protected epochCache: EpochCacheInterface;
     protected logger: Logger;
     constructor(epochCache: EpochCacheInterface);
-    validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined>;
+    validate(message: CheckpointAttestation): Promise<PeerErrorSeverity | undefined>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxLQUFLLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhHLHFCQUFhLG9CQUFxQixZQUFXLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQztJQUN6RSxTQUFTLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0lBQzFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRXpCLFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUcxQztJQUVLLFFBQVEsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxDQXFEaEY7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxxQkFBcUIsRUFBRSxLQUFLLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXJHLHFCQUFhLDhCQUErQixZQUFXLFlBQVksQ0FBQyxxQkFBcUIsQ0FBQztJQUN4RixTQUFTLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0lBQzFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRXpCLFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUcxQztJQUVLLFFBQVEsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxDQXdEckY7Q0FDRiJ9

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,EAAE,KAAK,gBAAgB,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEhG,qBAAa,oBAAqB,YAAW,YAAY,CAAC,gBAAgB,CAAC;IACzE,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,YAAY,UAAU,EAAE,mBAAmB,EAG1C;IAEK,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAqDhF;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,EAAE,KAAK,qBAAqB,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAErG,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,iBAAiB,GAAG,SAAS,CAAC,CAwDrF;CACF"}

package/dest/msg_validators/attestation_validator/attestation_validator.js

@@ -1,25 +1,25 @@
 import { NoCommitteeError } from '@aztec/ethereum/contracts';
 import { createLogger } from '@aztec/foundation/log';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
-export class AttestationValidator {
+export class CheckpointAttestationValidator {
     epochCache;
     logger;
     constructor(epochCache){
         this.epochCache = epochCache;
-        this.logger = createLogger('p2p:attestation-validator');
+        this.logger = createLogger('p2p:checkpoint-attestation-validator');
     }
     async validate(message) {
         const slotNumber = message.payload.header.slotNumber;
         try {
-            const { currentProposer, nextProposer, currentSlot, nextSlot } = await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
+            const { currentSlot, nextSlot } = await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
             if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
-                this.logger.warn(`Attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
+                this.logger.warn(`Checkpoint attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
                 return PeerErrorSeverity.HighToleranceError;
             }
             // Verify the signature is valid
             const attester = message.getSender();
             if (attester === undefined) {
-                this.logger.warn(`Invalid signature in attestation for slot ${slotNumber}`);
+                this.logger.warn(`Invalid signature in checkpoint attestation for slot ${slotNumber}`);
                 return PeerErrorSeverity.LowToleranceError;
             }
             // Verify the attester is in the committee for this slot
@@ -27,26 +27,28 @@ export class AttestationValidator {
                 this.logger.warn(`Attester ${attester.toString()} is not in committee for slot ${slotNumber}`);
                 return PeerErrorSeverity.HighToleranceError;
             }
-            // Verify the proposer signature matches the expected proposer for this slot
+            // Verify the proposer signature matches the expected proposer for the attestation's slot
+            // We look up the proposer for the specific slot rather than using currentSlot/nextSlot
+            // since timing differences could cause mismatches
             const proposer = message.getProposer();
-            const expectedProposer = slotNumber === currentSlot ? currentProposer : nextProposer;
+            const expectedProposer = await this.epochCache.getProposerAttesterAddressInSlot(slotNumber);
             if (!expectedProposer) {
                 this.logger.warn(`No proposer defined for slot ${slotNumber}`);
                 return PeerErrorSeverity.HighToleranceError;
             }
             if (!proposer) {
-                this.logger.warn(`Invalid proposer signature in attestation for slot ${slotNumber}`);
+                this.logger.warn(`Invalid proposer signature in checkpoint attestation for slot ${slotNumber}`);
                 return PeerErrorSeverity.LowToleranceError;
             }
             if (!proposer.equals(expectedProposer)) {
-                this.logger.warn(`Proposer signature mismatch in attestation. ` + `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumber}`);
+                this.logger.warn(`Proposer signature mismatch in checkpoint attestation. ` + `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumber}`);
                 return PeerErrorSeverity.HighToleranceError;
             }
             return undefined;
         } catch (e) {
             // People shouldn't be sending us attestations if the committee doesn't exist
             if (e instanceof NoCommitteeError) {
-                this.logger.warn(`No committee exists for attestation for slot ${slotNumber}`);
+                this.logger.warn(`No committee exists for checkpoint attestation for slot ${slotNumber}`);
                 return PeerErrorSeverity.LowToleranceError;
             }
             throw e;

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

@@ -1,8 +1,8 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { type BlockAttestation, PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import { type CheckpointAttestation, PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from '../../mem_pools/attestation_pool/attestation_pool.js';
-import { AttestationValidator } from './attestation_validator.js';
+import { CheckpointAttestationValidator } from './attestation_validator.js';
 /**
  * FishermanAttestationValidator extends the base AttestationValidator to add
  * additional validation for fisherman nodes: verifying that attestations sign
@@ -11,10 +11,10 @@ import { AttestationValidator } from './attestation_validator.js';
  * handled by LibP2PService based on the fishermanMode config to ensure a better
  * view of the network.
  */
-export declare class FishermanAttestationValidator extends AttestationValidator {
+export declare class FishermanAttestationValidator extends CheckpointAttestationValidator {
     private attestationPool;
     private invalidAttestationCounter;
     constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPool, telemetryClient: TelemetryClient);
-    validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined>;
+    validate(message: CheckpointAttestation): Promise<PeerErrorSeverity | undefined>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3RSxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFcEYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDNUYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFbEU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLG9CQUFvQjtJQUtuRSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLGVBQWUsRUFBRSxlQUFlLEVBT2pDO0lBRWMsUUFBUSxDQUFDLE9BQU8sRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLENBd0R6RjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNsRixPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFcEYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDNUYsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLDhCQUE4QjtJQUs3RSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLGVBQWUsRUFBRSxlQUFlLEVBT2pDO0lBRWMsUUFBUSxDQUFDLE9BQU8sRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLENBd0Q5RjtDQUNGIn0=

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,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,oBAAoB;IAKnE,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,eAAe,EACxC,eAAe,EAAE,eAAe,EAOjC;IAEc,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAwDzF;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,EAAE,KAAK,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAC;AAC5F,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,eAAe,EACxC,eAAe,EAAE,eAAe,EAOjC;IAEc,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAwD9F;CACF"}

package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js

@@ -1,6 +1,6 @@
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import { Attributes, Metrics } from '@aztec/telemetry-client';
-import { AttestationValidator } from './attestation_validator.js';
+import { CheckpointAttestationValidator } from './attestation_validator.js';
 /**
  * FishermanAttestationValidator extends the base AttestationValidator to add
  * additional validation for fisherman nodes: verifying that attestations sign
@@ -8,7 +8,7 @@ import { AttestationValidator } from './attestation_validator.js';
  * Invalid attestations are rejected (not propagated), but peer penalization is
  * handled by LibP2PService based on the fishermanMode config to ensure a better
  * view of the network.
- */ export class FishermanAttestationValidator extends AttestationValidator {
+ */ export class FishermanAttestationValidator extends CheckpointAttestationValidator {
     attestationPool;
     invalidAttestationCounter;
     constructor(epochCache, attestationPool, telemetryClient){
@@ -35,17 +35,17 @@ import { AttestationValidator } from './attestation_validator.js';
             return undefined;
         }
         const proposalId = message.archive.toString();
-        const proposal = await this.attestationPool.getBlockProposal(proposalId);
+        const proposal = await this.attestationPool.getCheckpointProposal(proposalId);
         if (proposal) {
             // Compare the attestation payload with the proposal payload
-            if (!message.payload.equals(proposal.payload)) {
+            if (!message.payload.equals(proposal)) {
                 this.logger.error(`Attestation payload mismatch for slot ${slotNumberBigInt}! ` + `Attester ${attester.toString()} signed different data than the proposal.`, {
                     slot: slotNumberBigInt.toString(),
                     attester: attester.toString(),
                     proposer: proposer.toString(),
                     proposalArchive: proposal.archive.toString(),
                     attestationArchive: message.archive.toString(),
-                    proposalHeader: proposal.payload.header.hash().toString(),
+                    proposalHeader: proposal.checkpointHeader.hash().toString(),
                     attestationHeader: message.payload.header.hash().toString()
                 });
                 // Track invalid attestation metric

package/dest/msg_validators/index.d.ts

@@ -1,4 +1,4 @@
 export * from './tx_validator/index.js';
-export * from './block_proposal_validator/index.js';
+export * from './proposal_validator/index.js';
 export * from './attestation_validator/index.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMscUNBQXFDLENBQUM7QUFDcEQsY0FBYyxrQ0FBa0MsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxrQ0FBa0MsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/msg_validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,qCAAqC,CAAC;AACpD,cAAc,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/msg_validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC"}

package/dest/msg_validators/index.js

@@ -1,3 +1,3 @@
 export * from './tx_validator/index.js';
-export * from './block_proposal_validator/index.js';
+export * from './proposal_validator/index.js';
 export * from './attestation_validator/index.js';

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

@@ -0,0 +1,9 @@
+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: {
+        txsPermitted: boolean;
+    });
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVyRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSxzQkFBdUIsU0FBUSxpQkFBaUIsQ0FBQyxhQUFhLENBQUUsWUFBVyxZQUFZLENBQUMsYUFBYSxDQUFDO0lBQ2pILFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUE7S0FBRSxFQUUzRTtDQUNGIn0=

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

@@ -0,0 +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"}

package/dest/msg_validators/proposal_validator/block_proposal_validator.js

@@ -0,0 +1,6 @@
+import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
+export class BlockProposalValidator extends ProposalValidator {
+    constructor(epochCache, opts){
+        super(epochCache, opts, 'p2p:block_proposal_validator');
+    }
+}

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

@@ -0,0 +1,9 @@
+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: {
+        txsPermitted: boolean;
+    });
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUUxRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSwyQkFDWCxTQUFRLGlCQUFpQixDQUFDLGtCQUFrQixDQUM1QyxZQUFXLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQztJQUUzQyxZQUFZLFVBQVUsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUU7UUFBRSxZQUFZLEVBQUUsT0FBTyxDQUFBO0tBQUUsRUFFM0U7Q0FDRiJ9

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

@@ -0,0 +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"}

package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js

@@ -0,0 +1,6 @@
+import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
+export class CheckpointProposalValidator extends ProposalValidator {
+    constructor(epochCache, opts){
+        super(epochCache, opts, 'p2p:checkpoint_proposal_validator');
+    }
+}

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

@@ -0,0 +1,4 @@
+export * from './block_proposal_validator.js';
+export * from './checkpoint_proposal_validator.js';
+export * from './proposal_validator.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLG9DQUFvQyxDQUFDO0FBQ25ELGNBQWMseUJBQXlCLENBQUMifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC"}

package/dest/msg_validators/proposal_validator/index.js

@@ -0,0 +1,3 @@
+export * from './block_proposal_validator.js';
+export * from './checkpoint_proposal_validator.js';
+export * from './proposal_validator.js';