@aztec/p2p 0.0.0-test.0 → 0.0.1-commit.023c3e5

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,23 +1,48 @@
-import { Fr } from '@aztec/foundation/fields';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
+import { BlockProposal, CheckpointAttestation, CheckpointProposal } from '@aztec/stdlib/p2p';
 import { getTelemetryClient } from '@aztec/telemetry-client';
+import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
+export const MAX_PROPOSALS_PER_SLOT = 5;
+export const ATTESTATION_CAP_BUFFER = 10;
 export class KvAttestationPool {
     store;
     log;
     metrics;
-    attestations;
-    proposalsForSlot;
-    attestationsForProposal;
+    proposals;
+    // Checkpoint attestation storage
+    checkpointAttestations;
+    checkpointProposals;
+    checkpointProposalsForSlot;
+    checkpointAttestationsForProposal;
     constructor(store, telemetry = getTelemetryClient(), log = createLogger('aztec:attestation_pool')){
         this.store = store;
         this.log = log;
-        this.attestations = store.openMap('attestations');
-        this.proposalsForSlot = store.openMultiMap('proposals_for_slot');
-        this.attestationsForProposal = store.openMultiMap('attestations_for_proposal');
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
+        this.poolStats = async ()=>{
+            return {
+                itemCount: await this.checkpointAttestations.sizeAsync()
+            };
+        };
+        this.proposals = store.openMap('proposals');
+        // Initialize checkpoint attestation storage
+        this.checkpointAttestations = store.openMap('checkpoint_attestations');
+        this.checkpointProposals = store.openMap('checkpoint_proposals');
+        this.checkpointProposalsForSlot = store.openMultiMap('checkpoint_proposals_for_slot');
+        this.checkpointAttestationsForProposal = store.openMultiMap('checkpoint_attestations_for_proposal');
+        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
+    }
+    poolStats;
+    async isEmpty() {
+        for await (const _ of this.checkpointAttestations.entriesAsync()){
+            return false;
+        }
+        for await (const _ of this.proposals.entriesAsync()){
+            return false;
+        }
+        return true;
     }
     getProposalKey(slot, proposalId) {
         const slotStr = typeof slot === 'string' ? slot : new Fr(slot).toString();
@@ -27,86 +52,167 @@ export class KvAttestationPool {
     getAttestationKey(slot, proposalId, address) {
         return `${this.getProposalKey(slot, proposalId)}-${address}`;
     }
-    async addAttestations(attestations) {
+    async addBlockProposal(blockProposal) {
+        await this.store.transactionAsync(async ()=>{
+            const proposalId = blockProposal.archive.toString();
+            // Strip signedTxs before storing to avoid persisting full tx data
+            await this.proposals.set(proposalId, blockProposal.withoutSignedTxs().toBuffer());
+        });
+    }
+    async getBlockProposal(id) {
+        const buffer = await this.proposals.getAsync(id);
+        try {
+            if (buffer && buffer.length > 0) {
+                return BlockProposal.fromBuffer(buffer);
+            }
+        } catch  {
+            return Promise.resolve(undefined);
+        }
+        return Promise.resolve(undefined);
+    }
+    async hasBlockProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
+        return await this.proposals.hasAsync(id);
+    }
+    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()}`);
+        }
+        // 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()}`);
+        }
+        await this.store.transactionAsync(async ()=>{
+            const slotKey = proposal.slotNumber;
+            const proposalId = proposal.archive.toString();
+            await this.checkpointProposalsForSlot.set(slotKey, proposalId);
+            // Store the checkpoint proposal as core (without lastBlock) to avoid duplication
+            await this.checkpointProposals.set(proposalId, proposal.toCore().toBuffer());
+            // Store the extracted block proposal separately
+            if (blockProposal) {
+                await this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs().toBuffer());
+            }
+        });
+    }
+    async getCheckpointProposal(id) {
+        const buffer = await this.checkpointProposals.getAsync(id);
+        try {
+            if (buffer && buffer.length > 0) {
+                return CheckpointProposal.fromBuffer(buffer);
+            }
+        } catch  {
+            return Promise.resolve(undefined);
+        }
+        return Promise.resolve(undefined);
+    }
+    async hasCheckpointProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
+        return await this.checkpointProposals.hasAsync(id);
+    }
+    async addCheckpointAttestations(attestations) {
         await this.store.transactionAsync(async ()=>{
             for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+                const slotNumber = attestation.payload.header.slotNumber;
                 const proposalId = attestation.archive;
-                const address = (await attestation.getSender()).toString();
-                await this.attestations.set(this.getAttestationKey(slotNumber, proposalId, address), attestation.toBuffer());
-                await this.proposalsForSlot.set(slotNumber.toString(), proposalId.toString());
-                await this.attestationsForProposal.set(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`);
+                const sender = attestation.getSender();
+                // Skip attestations with invalid signatures
+                if (!sender) {
+                    this.log.warn(`Skipping checkpoint attestation with invalid signature for slot ${slotNumber}`, {
+                        signature: attestation.signature.toString(),
+                        slotNumber,
+                        proposalId
+                    });
+                    continue;
+                }
+                const address = sender.toString();
+                await this.checkpointAttestations.set(this.getAttestationKey(slotNumber, proposalId, address), attestation.toBuffer());
+                await this.checkpointProposalsForSlot.set(slotNumber, proposalId.toString());
+                await this.checkpointAttestationsForProposal.set(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
+                this.log.verbose(`Added checkpoint attestation for slot ${slotNumber} from ${address}`, {
+                    signature: attestation.signature.toString(),
+                    slotNumber,
+                    address,
+                    proposalId
+                });
             }
         });
-        this.metrics.recordAddedObjects(attestations.length);
     }
-    async getAttestationsForSlot(slot, proposalId) {
-        const attestationIds = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
+    async getCheckpointAttestationsForSlot(slot) {
+        const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
+        const attestations = [];
+        for (const proposalId of proposalIds){
+            attestations.push(...await this.getCheckpointAttestationsForSlotAndProposal(slot, proposalId));
+        }
+        return attestations;
+    }
+    async getCheckpointAttestationsForSlotAndProposal(slot, proposalId) {
+        const attestationIds = await toArray(this.checkpointAttestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
         const attestations = [];
-        // alternatively iterate this.attestaions starting from slot-proposal-EthAddress.zero
         for (const id of attestationIds){
-            const buf = await this.attestations.getAsync(id);
+            const buf = await this.checkpointAttestations.getAsync(id);
             if (!buf) {
-                // this should not happen unless we lost writes
-                throw new Error('Attestation not found ' + id);
+                throw new Error('Checkpoint attestation not found ' + id);
             }
-            const attestation = BlockAttestation.fromBuffer(buf);
+            const attestation = CheckpointAttestation.fromBuffer(buf);
             attestations.push(attestation);
         }
         return attestations;
     }
-    async deleteAttestationsOlderThan(oldestSlot) {
-        const olderThan = await toArray(this.proposalsForSlot.keysAsync({
-            end: new Fr(oldestSlot).toString()
+    async deleteCheckpointAttestationsOlderThan(oldestSlot) {
+        const olderThan = await toArray(this.checkpointProposalsForSlot.keysAsync({
+            end: oldestSlot
         }));
         for (const oldSlot of olderThan){
-            await this.deleteAttestationsForSlot(BigInt(oldSlot));
+            await this.deleteCheckpointAttestationsForSlot(SlotNumber(oldSlot));
         }
     }
-    async deleteAttestationsForSlot(slot) {
-        const slotFr = new Fr(slot);
+    async deleteCheckpointAttestationsForSlot(slot) {
         let numberOfAttestations = 0;
         await this.store.transactionAsync(async ()=>{
-            const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
+            const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
             for (const proposalId of proposalIds){
-                const attestations = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slotFr, proposalId)));
+                const attestations = await toArray(this.checkpointAttestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
                 numberOfAttestations += attestations.length;
                 for (const attestation of attestations){
-                    await this.attestations.delete(attestation);
+                    await this.checkpointAttestations.delete(attestation);
                 }
-                await this.attestationsForProposal.delete(this.getProposalKey(slotFr, proposalId));
+                await this.checkpointProposals.delete(proposalId);
+                await this.checkpointAttestationsForProposal.delete(this.getProposalKey(slot, proposalId));
             }
+            await this.checkpointProposalsForSlot.delete(slot);
+            this.log.verbose(`Removed ${numberOfAttestations} checkpoint attestations for slot ${slot}`);
         });
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
     }
-    async deleteAttestationsForSlotAndProposal(slot, proposalId) {
-        let numberOfAttestations = 0;
-        await this.store.transactionAsync(async ()=>{
-            const slotString = new Fr(slot).toString();
-            const attestations = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
-            numberOfAttestations += attestations.length;
-            for (const attestation of attestations){
-                await this.attestations.delete(attestation);
-            }
-            await this.proposalsForSlot.deleteValue(slotString, proposalId);
-            await this.attestationsForProposal.delete(this.getProposalKey(slotString, proposalId));
-        });
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
+    async hasCheckpointAttestation(attestation) {
+        const slotNumber = attestation.payload.header.slotNumber;
+        const proposalId = attestation.archive;
+        const sender = attestation.getSender();
+        // Attestations with invalid signatures are never in the pool
+        if (!sender) {
+            return false;
+        }
+        const address = sender.toString();
+        const key = this.getAttestationKey(slotNumber, proposalId, address);
+        return await this.checkpointAttestations.hasAsync(key);
     }
-    async deleteAttestations(attestations) {
-        await this.store.transactionAsync(async ()=>{
-            for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
-                const proposalId = attestation.archive;
-                const address = (await attestation.getSender()).toString();
-                await this.attestations.delete(this.getAttestationKey(slotNumber, proposalId, address));
-                await this.attestationsForProposal.deleteValue(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
-            }
-        });
-        this.metrics.recordRemovedObjects(attestations.length);
+    canAddProposal(_block) {
+        // TODO(palla/mbps): implement proposal cap logic
+        return Promise.resolve(true);
+    }
+    async canAddCheckpointProposal(proposal) {
+        // TODO(palla/mbps): Adjust checkpoint proposal limit to 1. Also connect to slashing condition in the caller.
+        return await this.checkpointProposals.hasAsync(proposal.archive.toString()) || !await this.hasReachedCheckpointProposalCap(proposal.slotNumber);
+    }
+    async canAddCheckpointAttestation(attestation, committeeSize) {
+        return await this.hasCheckpointAttestation(attestation) || !await this.hasReachedCheckpointAttestationCap(attestation.payload.header.slotNumber, attestation.archive.toString(), committeeSize);
+    }
+    async hasReachedCheckpointProposalCap(slot) {
+        const uniqueProposalCount = await this.checkpointProposalsForSlot.getValueCountAsync(slot);
+        return uniqueProposalCount >= MAX_PROPOSALS_PER_SLOT;
+    }
+    async hasReachedCheckpointAttestationCap(slot, proposalId, committeeSize) {
+        const limit = committeeSize + ATTESTATION_CAP_BUFFER;
+        return await this.checkpointAttestationsForProposal.getValueCountAsync(this.getProposalKey(slot, proposalId)) >= limit;
     }
 }

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

@@ -1,17 +1,31 @@
-import type { BlockAttestation } from '@aztec/stdlib/p2p';
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { BlockProposal, CheckpointAttestation, CheckpointProposal, CheckpointProposalCore } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
 export declare class InMemoryAttestationPool implements AttestationPool {
-    #private;
     private log;
     private metrics;
-    private attestations;
+    private proposals;
+    private checkpointAttestations;
+    private checkpointProposals;
     constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
-    addAttestations(attestations: BlockAttestation[]): Promise<void>;
-    deleteAttestationsOlderThan(oldestSlot: bigint): Promise<void>;
-    deleteAttestationsForSlot(slot: bigint): Promise<void>;
-    deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
-    deleteAttestations(attestations: BlockAttestation[]): Promise<void>;
+    private poolStats;
+    isEmpty(): Promise<boolean>;
+    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
+    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
+    hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
+    canAddProposal(_block: BlockProposal): Promise<boolean>;
+    addCheckpointProposal(proposal: CheckpointProposal): Promise<void>;
+    getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined>;
+    hasCheckpointProposal(idOrProposal: string | CheckpointProposal): Promise<boolean>;
+    addCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
+    getCheckpointAttestationsForSlot(slot: SlotNumber): Promise<CheckpointAttestation[]>;
+    getCheckpointAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<CheckpointAttestation[]>;
+    deleteCheckpointAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void>;
+    hasReachedCheckpointProposalCap(slot: SlotNumber): Promise<boolean>;
+    hasReachedCheckpointAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean>;
+    canAddCheckpointProposal(proposal: CheckpointProposal): Promise<boolean>;
+    canAddCheckpointAttestation(attestation: CheckpointAttestation, committeeSize: number): Promise<boolean>;
+    hasCheckpointAttestation(attestation: CheckpointAttestation): Promise<boolean>;
 }
-//# sourceMappingURL=memory_attestation_pool.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5X2F0dGVzdGF0aW9uX3Bvb2wuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9tZW1vcnlfYXR0ZXN0YXRpb25fcG9vbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFDVixhQUFhLEVBQ2IscUJBQXFCLEVBQ3JCLGtCQUFrQixFQUNsQixzQkFBc0IsRUFDdkIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0seUJBQXlCLENBQUM7QUFJbkYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHN0QscUJBQWEsdUJBQXdCLFlBQVcsZUFBZTtJQWUzRCxPQUFPLENBQUMsR0FBRztJQWRiLE9BQU8sQ0FBQyxPQUFPLENBQTZDO0lBRTVELE9BQU8sQ0FBQyxTQUFTLENBQTZCO0lBSTlDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FHNUI7SUFDRixPQUFPLENBQUMsbUJBQW1CLENBQXNDO0lBRWpFLFlBQ0UsU0FBUyxHQUFFLGVBQXNDLEVBQ3pDLEdBQUcseUNBQXVDLEVBTW5EO0lBRUQsT0FBTyxDQUFDLFNBQVMsQ0FJZjtJQUVLLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWpDO0lBRU0sZ0JBQWdCLENBQUMsYUFBYSxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSW5FO0lBRU0sZ0JBQWdCLENBQUMsRUFBRSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsYUFBYSxHQUFHLFNBQVMsQ0FBQyxDQUV0RTtJQUVNLGdCQUFnQixDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsYUFBYSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHOUU7SUFFTSxjQUFjLENBQUMsTUFBTSxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRzdEO0lBSVkscUJBQXFCLENBQUMsUUFBUSxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0EyQjlFO0lBRU0scUJBQXFCLENBQUMsRUFBRSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLENBRXBGO0lBRU0scUJBQXFCLENBQUMsWUFBWSxFQUFFLE1BQU0sR0FBRyxrQkFBa0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBR3hGO0lBRU0seUJBQXlCLENBQUMsWUFBWSxFQUFFLHFCQUFxQixFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTZCckY7SUFFTSxnQ0FBZ0MsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLENBTTFGO0lBRU0sMkNBQTJDLENBQ2hELElBQUksRUFBRSxVQUFVLEVBQ2hCLFVBQVUsRUFBRSxNQUFNLEdBQ2pCLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLENBU2xDO0lBRU0scUNBQXFDLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0JsRjtJQUVNLCtCQUErQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUl6RTtJQUVNLGtDQUFrQyxDQUN2QyxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxFQUNsQixhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBSWxCO0lBRVksd0JBQXdCLENBQUMsUUFBUSxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FLcEY7SUFFWSwyQkFBMkIsQ0FDdEMsV0FBVyxFQUFFLHFCQUFxQixFQUNsQyxhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBU2xCO0lBRU0sd0JBQXdCLENBQUMsV0FBVyxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FxQnBGO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAKE,OAAO,CAAC,GAAG;IAJ1E,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;gBAExG,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAAuC;IAK1G,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAW/E,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgChE,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe/E,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBjF"}
+{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EACV,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,qBAAa,uBAAwB,YAAW,eAAe;IAe3D,OAAO,CAAC,GAAG;IAdb,OAAO,CAAC,OAAO,CAA6C;IAE5D,OAAO,CAAC,SAAS,CAA6B;IAI9C,OAAO,CAAC,sBAAsB,CAG5B;IACF,OAAO,CAAC,mBAAmB,CAAsC;IAEjE,YACE,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC,EAMnD;IAED,OAAO,CAAC,SAAS,CAIf;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAEjC;IAEM,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAInE;IAEM,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAEtE;IAEM,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG9E;IAEM,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG7D;IAIY,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B9E;IAEM,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAEpF;IAEM,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAGxF;IAEM,yBAAyB,CAAC,YAAY,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BrF;IAEM,gCAAgC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAM1F;IAEM,2CAA2C,CAChD,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CASlC;IAEM,qCAAqC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlF;IAEM,+BAA+B,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAIzE;IAEM,kCAAkC,CACvC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CAIlB;IAEY,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAKpF;IAEY,2BAA2B,CACtC,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CASlB;IAEM,wBAAwB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBpF;CACF"}

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -1,56 +1,117 @@
 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;
-    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.attestations = new Map();
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
+        this.poolStats = ()=>{
+            return Promise.resolve({
+                itemCount: this.checkpointAttestations.size
+            });
+        };
+        this.proposals = new Map();
+        this.checkpointAttestations = new Map();
+        this.checkpointProposals = new Map();
+        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
     }
-    getAttestationsForSlot(slot, proposalId) {
-        const slotAttestationMap = this.attestations.get(slot);
-        if (slotAttestationMap) {
-            const proposalAttestationMap = slotAttestationMap.get(proposalId);
-            if (proposalAttestationMap) {
-                return Promise.resolve(Array.from(proposalAttestationMap.values()));
-            }
+    poolStats;
+    isEmpty() {
+        return Promise.resolve(this.checkpointAttestations.size === 0 && this.proposals.size === 0);
+    }
+    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();
+    }
+    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));
     }
-    async 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.globalVariables.slotNumber;
+            const slotNumber = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
-            const address = await attestation.getSender();
-            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
-            const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-            proposalAttestationMap.set(address.toString(), attestation);
-            this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`);
+            const sender = attestation.getSender();
+            // Skip attestations with invalid signatures
+            if (!sender) {
+                this.log.warn(`Skipping checkpoint attestation with invalid signature for slot ${slotNumber}`, {
+                    signature: attestation.signature.toString(),
+                    slotNumber,
+                    proposalId
+                });
+                continue;
+            }
+            const slotAttestationMap = getCheckpointSlotOrDefault(this.checkpointAttestations, slotNumber);
+            const proposalAttestationMap = getCheckpointProposalOrDefault(slotAttestationMap, proposalId);
+            proposalAttestationMap.set(sender.toString(), attestation);
+            this.log.verbose(`Added checkpoint attestation for slot ${slotNumber} from ${sender}`, {
+                signature: attestation.signature.toString(),
+                slotNumber,
+                address: sender,
+                proposalId
+            });
         }
-        // TODO: set these to pending or something ????
-        this.metrics.recordAddedObjects(attestations.length);
         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);
@@ -59,69 +120,59 @@ 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);
-        this.attestations.delete(slot);
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
-        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.metrics.recordRemovedObjects(numberOfAttestations);
-            }
-        }
-        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);
     }
-    async deleteAttestations(attestations) {
-        for (const attestation of attestations){
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
-            const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
-            if (slotAttestationMap) {
-                const proposalId = attestation.archive.toString();
-                const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-                if (proposalAttestationMap) {
-                    const address = await attestation.getSender();
-                    proposalAttestationMap.delete(address.toString());
-                    this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
-                }
-            }
+    async canAddCheckpointProposal(proposal) {
+        return this.checkpointProposals.has(proposal.archive.toString()) || !await this.hasReachedCheckpointProposalCap(proposal.slotNumber);
+    }
+    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();
+        // Attestations with invalid signatures are never in the pool
+        if (!sender) {
+            return Promise.resolve(false);
         }
-        this.metrics.recordRemovedObjects(attestations.length);
-        return Promise.resolve();
+        const slotAttestationMap = this.checkpointAttestations.get(slotNumber);
+        if (!slotAttestationMap) {
+            return Promise.resolve(false);
+        }
+        const proposalAttestationMap = slotAttestationMap.get(proposalId);
+        if (!proposalAttestationMap) {
+            return Promise.resolve(false);
+        }
+        return Promise.resolve(proposalAttestationMap.has(sender.toString()));
     }
 }
-/**
- * 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(map, slot) {
+// 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());
     }