@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.1142ef1

package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js

@@ -1,195 +1,309 @@
-import { Secp256k1Signer } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
-import { TxHash } from '@aztec/stdlib/tx';
-import { jest } from '@jest/globals';
-import { mock } from 'jest-mock-extended';
-import { mockAttestation } from './mocks.js';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { makeBlockProposal, makeCheckpointProposal, makeL2BlockHeader } from '@aztec/stdlib/testing';
+import { MAX_PROPOSALS_PER_SLOT } from './kv_attestation_pool.js';
+import { mockCheckpointAttestation } from './mocks.js';
 const NUMBER_OF_SIGNERS_PER_TEST = 4;
 export function describeAttestationPool(getAttestationPool) {
     let ap;
     let signers;
-    // Check that metrics are recorded correctly
-    let metricsMock;
     beforeEach(()=>{
         ap = getAttestationPool();
         signers = Array.from({
             length: NUMBER_OF_SIGNERS_PER_TEST
         }, ()=>Secp256k1Signer.random());
-        metricsMock = mock();
-        // Can i overwrite this like this??
-        ap.metrics = metricsMock;
     });
-    const createAttestationsForSlot = (slotNumber)=>{
-        const archive = Fr.random();
-        return Promise.all(signers.map((signer)=>mockAttestation(signer, slotNumber, archive)));
+    const createCheckpointAttestationsForSlot = (slotNumber, archive)=>{
+        const archiveToUse = archive ?? Fr.random();
+        return signers.map((signer)=>mockCheckpointAttestation(signer, slotNumber, archiveToUse));
     };
-    // We compare buffers as the objects can have cached values attached to them which are not serialised
-    // using array containing as the kv store does not respect insertion order
-    const compareAttestations = (a1, a2)=>{
+    const mockBlockProposalForPool = (signer, slotNumber, archive = Fr.random())=>{
+        const header = makeL2BlockHeader(1, 2, slotNumber);
+        return makeBlockProposal({
+            signer,
+            blockHeader: header,
+            archiveRoot: archive
+        });
+    };
+    // Compare checkpoint attestations buffers
+    // Using array containing as the kv store does not respect insertion order
+    const compareCheckpointAttestations = (a1, a2)=>{
         const a1Buffer = a1.map((attestation)=>attestation.toBuffer());
         const a2Buffer = a2.map((attestation)=>attestation.toBuffer());
         expect(a1Buffer.length).toBe(a2Buffer.length);
         expect(a1Buffer).toEqual(expect.arrayContaining(a2Buffer));
     };
-    it('should add attestations to pool', async ()=>{
-        const slotNumber = 420;
-        const archive = Fr.random();
-        const attestations = await Promise.all(signers.map((signer)=>mockAttestation(signer, slotNumber, archive)));
-        await ap.addAttestations(attestations);
-        // Check metrics have been updated.
-        expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
-        const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString());
-        expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
-        compareAttestations(retreivedAttestations, attestations);
-        // Delete by slot
-        await ap.deleteAttestationsForSlot(BigInt(slotNumber));
-        expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
-        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString());
-        expect(retreivedAttestationsAfterDelete.length).toBe(0);
-    });
-    it('Should handle duplicate proposals in a slot', async ()=>{
-        const slotNumber = 420;
-        const archive = Fr.random();
-        const txs = [
-            0,
-            1,
-            2,
-            3,
-            4,
-            5
-        ].map(()=>TxHash.random());
-        // Use the same signer for all attestations
-        const attestations = [];
-        const signer = signers[0];
-        for(let i = 0; i < NUMBER_OF_SIGNERS_PER_TEST; i++){
-            attestations.push(await mockAttestation(signer, slotNumber, archive, txs));
-        }
-        await ap.addAttestations(attestations);
-        const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString());
-        expect(retreivedAttestations.length).toBe(1);
-        expect(retreivedAttestations[0].toBuffer()).toEqual(attestations[0].toBuffer());
-        expect(retreivedAttestations[0].payload.txHashes).toEqual(txs);
-        expect((await retreivedAttestations[0].getSender()).toString()).toEqual(signer.address.toString());
-    });
-    it('Should store attestations by differing slot', async ()=>{
-        const slotNumbers = [
-            1,
-            2,
-            3,
-            4
-        ];
-        const attestations = await Promise.all(signers.map((signer, i)=>mockAttestation(signer, slotNumbers[i])));
-        await ap.addAttestations(attestations);
-        for (const attestation of attestations){
-            const slot = attestation.payload.header.globalVariables.slotNumber;
-            const archive = attestation.archive.toString();
-            const retreivedAttestations = await ap.getAttestationsForSlot(slot.toBigInt(), archive);
+    describe('CheckpointAttestation', ()=>{
+        it('should add attestations to pool', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const attestations = signers.slice(0, -1).map((signer)=>mockCheckpointAttestation(signer, slotNumber, archive));
+            await ap.addCheckpointAttestations(attestations);
+            const retrievedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString());
+            expect(retrievedAttestations.length).toBe(attestations.length);
+            compareCheckpointAttestations(retrievedAttestations, attestations);
+            // Check hasCheckpointAttestation for added attestations
+            for (const attestation of attestations){
+                expect(await ap.hasCheckpointAttestation(attestation)).toBe(true);
+            }
+            const retrievedAttestationsForSlot = await ap.getCheckpointAttestationsForSlot(SlotNumber(slotNumber));
+            expect(retrievedAttestationsForSlot.length).toBe(attestations.length);
+            compareCheckpointAttestations(retrievedAttestationsForSlot, attestations);
+            // Add another one
+            const newAttestation = mockCheckpointAttestation(signers[NUMBER_OF_SIGNERS_PER_TEST - 1], slotNumber, archive);
+            await ap.addCheckpointAttestations([
+                newAttestation
+            ]);
+            const retrievedAttestationsAfterAdd = await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString());
+            expect(retrievedAttestationsAfterAdd.length).toBe(attestations.length + 1);
+            compareCheckpointAttestations(retrievedAttestationsAfterAdd, [
+                ...attestations,
+                newAttestation
+            ]);
+            expect(await ap.hasCheckpointAttestation(newAttestation)).toBe(true);
+            const retrievedAttestationsForSlotAfterAdd = await ap.getCheckpointAttestationsForSlot(SlotNumber(slotNumber));
+            expect(retrievedAttestationsForSlotAfterAdd.length).toBe(attestations.length + 1);
+            compareCheckpointAttestations(retrievedAttestationsForSlotAfterAdd, [
+                ...attestations,
+                newAttestation
+            ]);
+            // Delete by slot
+            await ap.deleteCheckpointAttestationsOlderThan(SlotNumber(slotNumber + 1));
+            const retreivedAttestationsAfterDelete = await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString());
+            expect(retreivedAttestationsAfterDelete.length).toBe(0);
+            // Check hasCheckpointAttestation after deletion
+            for (const attestation of attestations){
+                expect(await ap.hasCheckpointAttestation(attestation)).toBe(false);
+            }
+            expect(await ap.hasCheckpointAttestation(newAttestation)).toBe(false);
+        });
+        it('should handle duplicate proposals in a slot', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            // Use the same signer for all attestations
+            const attestations = [];
+            const signer = signers[0];
+            for(let i = 0; i < NUMBER_OF_SIGNERS_PER_TEST; i++){
+                attestations.push(mockCheckpointAttestation(signer, slotNumber, archive));
+            }
+            // Add them to store and check we end up with only one
+            await ap.addCheckpointAttestations(attestations);
+            const retreivedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString());
             expect(retreivedAttestations.length).toBe(1);
-            expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
-            expect(retreivedAttestations[0].payload.header.globalVariables.slotNumber).toEqual(slot);
-        }
-    });
-    it('Should store attestations by differing slot and archive', async ()=>{
-        const slotNumbers = [
-            1,
-            1,
-            2,
-            3
-        ];
-        const archives = [
-            Fr.random(),
-            Fr.random(),
-            Fr.random(),
-            Fr.random()
-        ];
-        const attestations = await Promise.all(signers.map((signer, i)=>mockAttestation(signer, slotNumbers[i], archives[i])));
-        await ap.addAttestations(attestations);
-        for (const attestation of attestations){
-            const slot = attestation.payload.header.globalVariables.slotNumber;
-            const proposalId = attestation.archive.toString();
-            const retreivedAttestations = await ap.getAttestationsForSlot(slot.toBigInt(), proposalId);
-            expect(retreivedAttestations.length).toBe(1);
-            expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
-            expect(retreivedAttestations[0].payload.header.globalVariables.slotNumber).toEqual(slot);
-        }
-    });
-    it('Should delete attestations', async ()=>{
-        const slotNumber = 420;
-        const archive = Fr.random();
-        const attestations = await Promise.all(signers.map((signer)=>mockAttestation(signer, slotNumber, archive)));
-        const proposalId = attestations[0].archive.toString();
-        await ap.addAttestations(attestations);
-        expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
-        const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
-        expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
-        compareAttestations(retreivedAttestations, attestations);
-        await ap.deleteAttestations(attestations);
-        expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
-        const gottenAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
-        expect(gottenAfterDelete.length).toBe(0);
-    });
-    it('Should blanket delete attestations per slot', async ()=>{
-        const slotNumber = 420;
-        const archive = Fr.random();
-        const attestations = await Promise.all(signers.map((signer)=>mockAttestation(signer, slotNumber, archive)));
-        const proposalId = attestations[0].archive.toString();
-        await ap.addAttestations(attestations);
-        const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
-        expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
-        compareAttestations(retreivedAttestations, attestations);
-        await ap.deleteAttestationsForSlot(BigInt(slotNumber));
-        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
-        expect(retreivedAttestationsAfterDelete.length).toBe(0);
+            expect(retreivedAttestations[0].toBuffer()).toEqual(attestations[0].toBuffer());
+            expect(retreivedAttestations[0].getSender()?.toString()).toEqual(signer.address.toString());
+            // Try adding them on another operation and check they are still not duplicated
+            await ap.addCheckpointAttestations([
+                attestations[0]
+            ]);
+            expect(await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString())).toHaveLength(1);
+        });
+        it('should store attestations by differing slot', async ()=>{
+            const slotNumbers = [
+                1,
+                2,
+                3,
+                4
+            ];
+            const attestations = signers.map((signer, i)=>mockCheckpointAttestation(signer, slotNumbers[i]));
+            await ap.addCheckpointAttestations(attestations);
+            for (const attestation of attestations){
+                const slot = attestation.payload.header.slotNumber;
+                const archive = attestation.archive.toString();
+                const retreivedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(slot, archive);
+                expect(retreivedAttestations.length).toBe(1);
+                expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
+                expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
+            }
+        });
+        it('should store attestations by differing slot and archive', async ()=>{
+            const slotNumbers = [
+                1,
+                1,
+                2,
+                3
+            ];
+            const archives = [
+                Fr.random(),
+                Fr.random(),
+                Fr.random(),
+                Fr.random()
+            ];
+            const attestations = signers.map((signer, i)=>mockCheckpointAttestation(signer, slotNumbers[i], archives[i]));
+            await ap.addCheckpointAttestations(attestations);
+            for (const attestation of attestations){
+                const slot = attestation.payload.header.slotNumber;
+                const proposalId = attestation.archive.toString();
+                const retreivedAttestations = await ap.getCheckpointAttestationsForSlotAndProposal(slot, proposalId);
+                expect(retreivedAttestations.length).toBe(1);
+                expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
+                expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
+            }
+        });
+        it('should delete attestations older than a given slot', async ()=>{
+            const slotNumbers = [
+                1,
+                2,
+                3,
+                69,
+                72,
+                74,
+                88,
+                420
+            ];
+            const attestations = (await Promise.all(slotNumbers.map((slotNumber)=>createCheckpointAttestationsForSlot(slotNumber)))).flat();
+            const proposalId = attestations[0].archive.toString();
+            await ap.addCheckpointAttestations(attestations);
+            const attestationsForSlot1 = await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(1), proposalId);
+            expect(attestationsForSlot1.length).toBe(signers.length);
+            await ap.deleteCheckpointAttestationsOlderThan(SlotNumber(73));
+            const attestationsForSlot1AfterDelete = await ap.getCheckpointAttestationsForSlotAndProposal(SlotNumber(1), proposalId);
+            expect(attestationsForSlot1AfterDelete.length).toBe(0);
+        });
     });
-    it('Should blanket delete attestations per slot and proposal', async ()=>{
-        const slotNumber = 420;
-        const archive = Fr.random();
-        const attestations = await Promise.all(signers.map((signer)=>mockAttestation(signer, slotNumber, archive)));
-        const proposalId = attestations[0].archive.toString();
-        // Add another set of attestations with a different proposalId, yet the same slot
-        const archive2 = Fr.random();
-        const attestations2 = await Promise.all(signers.map((signer)=>mockAttestation(signer, slotNumber, archive2)));
-        const proposalId2 = attestations2[0].archive.toString();
-        await ap.addAttestations(attestations);
-        await ap.addAttestations(attestations2);
-        expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations.length);
-        expect(metricsMock.recordAddedObjects).toHaveBeenCalledWith(attestations2.length);
-        const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
-        expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
-        compareAttestations(retreivedAttestations, attestations);
-        await ap.deleteAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
-        expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
-        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
-        expect(retreivedAttestationsAfterDelete.length).toBe(0);
-        const retreivedAttestationsAfterDeleteForOtherProposal = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId2);
-        expect(retreivedAttestationsAfterDeleteForOtherProposal.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
-        compareAttestations(retreivedAttestationsAfterDeleteForOtherProposal, attestations2);
+    describe('BlockProposal in attestation pool', ()=>{
+        it('should add and retrieve block proposal', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = await mockBlockProposalForPool(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            await ap.addBlockProposal(proposal);
+            const retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            expect(retrievedProposal).toEqual(proposal);
+            // Check hasBlockProposal with both id and object
+            expect(await ap.hasBlockProposal(proposalId)).toBe(true);
+            expect(await ap.hasBlockProposal(proposal)).toBe(true);
+        });
+        it('should return undefined for non-existent block proposal', async ()=>{
+            const nonExistentId = Fr.random().toString();
+            const retrievedProposal = await ap.getBlockProposal(nonExistentId);
+            expect(retrievedProposal).toBeUndefined();
+            // Check hasBlockProposal returns false for non-existent proposal
+            expect(await ap.hasBlockProposal(nonExistentId)).toBe(false);
+        });
+        it('should update block proposal if added twice with same id', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal1 = await mockBlockProposalForPool(signers[0], slotNumber, archive);
+            const proposalId = proposal1.archive.toString();
+            await ap.addBlockProposal(proposal1);
+            // Create a new proposal with same archive but different signer
+            const proposal2 = await mockBlockProposalForPool(signers[1], slotNumber, archive);
+            await ap.addBlockProposal(proposal2);
+            const retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            // Should have the second proposal
+            expect(retrievedProposal.toBuffer()).toEqual(proposal2.toBuffer());
+            expect(retrievedProposal.getSender()?.toString()).toBe(signers[1].address.toString());
+        });
+        it('should handle block proposals with different slots and same archive', async ()=>{
+            const archive = Fr.random();
+            const proposal1 = await mockBlockProposalForPool(signers[0], 100, archive);
+            const proposal2 = await mockBlockProposalForPool(signers[1], 200, archive);
+            const proposalId = archive.toString();
+            await ap.addBlockProposal(proposal1);
+            await ap.addBlockProposal(proposal2);
+            // Should get the latest one added
+            const retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            expect(retrievedProposal.toBuffer()).toEqual(proposal2.toBuffer());
+            expect(retrievedProposal.slotNumber).toBe(SlotNumber(200));
+        });
     });
-    it('Should delete attestations older than a given slot', async ()=>{
-        const slotNumbers = [
-            1,
-            2,
-            3,
-            69,
-            72,
-            74,
-            88,
-            420
-        ];
-        const attestations = (await Promise.all(slotNumbers.map((slotNumber)=>createAttestationsForSlot(slotNumber)))).flat();
-        const proposalId = attestations[0].archive.toString();
-        await ap.addAttestations(attestations);
-        const attestationsForSlot1 = await ap.getAttestationsForSlot(BigInt(1), proposalId);
-        expect(attestationsForSlot1.length).toBe(signers.length);
-        const deleteAttestationsSpy = jest.spyOn(ap, 'deleteAttestationsForSlot');
-        await ap.deleteAttestationsOlderThan(BigInt(73));
-        const attestationsForSlot1AfterDelete = await ap.getAttestationsForSlot(BigInt(1), proposalId);
-        expect(attestationsForSlot1AfterDelete.length).toBe(0);
-        expect(deleteAttestationsSpy).toHaveBeenCalledTimes(5);
-        expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(1));
-        expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(2));
-        expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(3));
-        expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(69));
-        expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(72));
+    describe('CheckpointProposal in attestation pool', ()=>{
+        const mockCheckpointProposalForPool = (signer, slotNumber, archive = Fr.random())=>{
+            const header = makeL2BlockHeader(1, 2, slotNumber);
+            return makeCheckpointProposal({
+                signer,
+                checkpointHeader: header.toCheckpointHeader(),
+                archiveRoot: archive,
+                lastBlock: {
+                    blockHeader: header
+                }
+            });
+        };
+        it('should add and retrieve checkpoint proposal as core (without lastBlock)', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = await mockCheckpointProposalForPool(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            await ap.addCheckpointProposal(proposal);
+            const retrievedProposal = await ap.getCheckpointProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            // Should return core version (without lastBlock)
+            expect(retrievedProposal.toBuffer()).toEqual(proposal.toCore().toBuffer());
+            // Check hasCheckpointProposal with both id and object
+            expect(await ap.hasCheckpointProposal(proposalId)).toBe(true);
+            expect(await ap.hasCheckpointProposal(proposal)).toBe(true);
+        });
+        it('should extract and store block proposal when adding checkpoint proposal with lastBlock', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = await mockCheckpointProposalForPool(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            // Verify the proposal has a lastBlock
+            const expectedBlockProposal = proposal.getBlockProposal();
+            expect(expectedBlockProposal).toBeDefined();
+            await ap.addCheckpointProposal(proposal);
+            // The block proposal should be stored separately and retrievable
+            const retrievedBlockProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedBlockProposal).toBeDefined();
+            expect(retrievedBlockProposal.archive.toString()).toBe(archive.toString());
+            expect(retrievedBlockProposal.blockHeader.toBuffer()).toEqual(expectedBlockProposal.blockHeader.toBuffer());
+        });
+        it('should not store block proposal when checkpoint proposal has no lastBlock', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const header = makeL2BlockHeader(1, 2, slotNumber);
+            // Create a checkpoint proposal WITHOUT lastBlock
+            const proposal = await makeCheckpointProposal({
+                signer: signers[0],
+                checkpointHeader: header.toCheckpointHeader(),
+                archiveRoot: archive
+            });
+            const proposalId = proposal.archive.toString();
+            await ap.addCheckpointProposal(proposal);
+            // The checkpoint proposal should be stored
+            const retrievedCheckpointProposal = await ap.getCheckpointProposal(proposalId);
+            expect(retrievedCheckpointProposal).toBeDefined();
+            // But no block proposal should be stored (archive key won't have a block proposal)
+            const retrievedBlockProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedBlockProposal).toBeUndefined();
+        });
+        it('should return undefined for non-existent checkpoint proposal', async ()=>{
+            const nonExistentId = Fr.random().toString();
+            const retrievedProposal = await ap.getCheckpointProposal(nonExistentId);
+            expect(retrievedProposal).toBeUndefined();
+            // Check hasCheckpointProposal returns false for non-existent proposal
+            expect(await ap.hasCheckpointProposal(nonExistentId)).toBe(false);
+        });
+        it('should update checkpoint proposal if added twice with same id', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal1 = await mockCheckpointProposalForPool(signers[0], slotNumber, archive);
+            const proposalId = proposal1.archive.toString();
+            await ap.addCheckpointProposal(proposal1);
+            // Create a new proposal with same archive but different signer
+            const proposal2 = await mockCheckpointProposalForPool(signers[1], slotNumber, archive);
+            await ap.addCheckpointProposal(proposal2);
+            const retrievedProposal = await ap.getCheckpointProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            // Should have the second proposal (as core)
+            expect(retrievedProposal.toBuffer()).toEqual(proposal2.toCore().toBuffer());
+            expect(retrievedProposal.getSender()?.toString()).toBe(signers[1].address.toString());
+        });
+        it('should throw ProposalSlotCapExceededError when exceeding capacity', async ()=>{
+            const slotNumber = 420;
+            // Add MAX_PROPOSALS_PER_SLOT proposals
+            for(let i = 0; i < MAX_PROPOSALS_PER_SLOT; i++){
+                const proposal = await mockCheckpointProposalForPool(signers[i % NUMBER_OF_SIGNERS_PER_TEST], slotNumber);
+                await ap.addCheckpointProposal(proposal);
+            }
+            // The next proposal should throw
+            const extraProposal = await mockCheckpointProposalForPool(signers[0], slotNumber);
+            await expect(ap.addCheckpointProposal(extraProposal)).rejects.toThrow('Maximum checkpoint proposals per slot');
+        });
     });
 }

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

@@ -1,3 +1,3 @@
 export * from './attestation_pool.js';
 export * from './memory_attestation_pool.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsOEJBQThCLENBQUMifQ==

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

@@ -1,22 +1,40 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
+import { BlockProposal, CheckpointAttestation, CheckpointProposal, type CheckpointProposalCore } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
+export declare const MAX_PROPOSALS_PER_SLOT = 5;
+export declare const ATTESTATION_CAP_BUFFER = 10;
 export declare class KvAttestationPool implements AttestationPool {
     private store;
     private log;
     private metrics;
-    private attestations;
-    private proposalsForSlot;
-    private attestationsForProposal;
+    private proposals;
+    private checkpointAttestations;
+    private checkpointProposals;
+    private checkpointProposalsForSlot;
+    private checkpointAttestationsForProposal;
     constructor(store: AztecAsyncKVStore, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    private poolStats;
+    isEmpty(): Promise<boolean>;
     private getProposalKey;
     private getAttestationKey;
-    addAttestations(attestations: BlockAttestation[]): Promise<void>;
-    getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
-    deleteAttestationsOlderThan(oldestSlot: bigint): Promise<void>;
-    deleteAttestationsForSlot(slot: bigint): Promise<void>;
-    deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
-    deleteAttestations(attestations: BlockAttestation[]): Promise<void>;
+    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
+    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
+    hasBlockProposal(idOrProposal: string | 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>;
+    private deleteCheckpointAttestationsForSlot;
+    hasCheckpointAttestation(attestation: CheckpointAttestation): Promise<boolean>;
+    canAddProposal(_block: BlockProposal): Promise<boolean>;
+    canAddCheckpointProposal(proposal: CheckpointProposal): Promise<boolean>;
+    canAddCheckpointAttestation(attestation: CheckpointAttestation, committeeSize: number): Promise<boolean>;
+    hasReachedCheckpointProposalCap(slot: SlotNumber): Promise<boolean>;
+    hasReachedCheckpointAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean>;
 }
-//# sourceMappingURL=kv_attestation_pool.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia3ZfYXR0ZXN0YXRpb25fcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy9hdHRlc3RhdGlvbl9wb29sL2t2X2F0dGVzdGF0aW9uX3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSTdELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sRUFDTCxhQUFhLEVBQ2IscUJBQXFCLEVBQ3JCLGtCQUFrQixFQUNsQixLQUFLLHNCQUFzQixFQUM1QixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUluRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUU3RCxlQUFPLE1BQU0sc0JBQXNCLElBQUksQ0FBQztBQUN4QyxlQUFPLE1BQU0sc0JBQXNCLEtBQUssQ0FBQztBQUV6QyxxQkFBYSxpQkFBa0IsWUFBVyxlQUFlO0lBZXJELE9BQU8sQ0FBQyxLQUFLO0lBRWIsT0FBTyxDQUFDLEdBQUc7SUFoQmIsT0FBTyxDQUFDLE9BQU8sQ0FBNkM7SUFFNUQsT0FBTyxDQUFDLFNBQVMsQ0FHZjtJQUdGLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBZ0M7SUFDOUQsT0FBTyxDQUFDLG1CQUFtQixDQUFnQztJQUMzRCxPQUFPLENBQUMsMEJBQTBCLENBQXFDO0lBQ3ZFLE9BQU8sQ0FBQyxpQ0FBaUMsQ0FBcUM7SUFFOUUsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ2hDLFNBQVMsR0FBRSxlQUFzQyxFQUN6QyxHQUFHLHlDQUF5QyxFQVdyRDtJQUVELE9BQU8sQ0FBQyxTQUFTLENBSWY7SUFFVyxPQUFPLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVF2QztJQUVELE9BQU8sQ0FBQyxjQUFjO0lBWXRCLE9BQU8sQ0FBQyxpQkFBaUI7SUFJWixnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNekU7SUFFWSxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBVzVFO0lBRVksZ0JBQWdCLENBQUMsWUFBWSxFQUFFLE1BQU0sR0FBRyxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUdwRjtJQUVZLHFCQUFxQixDQUFDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBNEI5RTtJQUVZLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixHQUFHLFNBQVMsQ0FBQyxDQVcxRjtJQUVZLHFCQUFxQixDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsa0JBQWtCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUc5RjtJQUVZLHlCQUF5QixDQUFDLFlBQVksRUFBRSxxQkFBcUIsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQzNGO0lBRVksZ0NBQWdDLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQVNoRztJQUVZLDJDQUEyQyxDQUN0RCxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxHQUNqQixPQUFPLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQWtCbEM7SUFFWSxxQ0FBcUMsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLeEY7WUFFYSxtQ0FBbUM7SUF3QnBDLHdCQUF3QixDQUFDLFdBQVcsRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBYzFGO0lBRU0sY0FBYyxDQUFDLE1BQU0sRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUc3RDtJQUVZLHdCQUF3QixDQUFDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBTXBGO0lBRVksMkJBQTJCLENBQ3RDLFdBQVcsRUFBRSxxQkFBcUIsRUFDbEMsYUFBYSxFQUFFLE1BQU0sR0FDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVNsQjtJQUVZLCtCQUErQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUcvRTtJQUVZLGtDQUFrQyxDQUM3QyxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxFQUNsQixhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBS2xCO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"kv_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/kv_attestation_pool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,iBAAkB,YAAW,eAAe;IAQrD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IATb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,gBAAgB,CAAqC;IAC7D,OAAO,CAAC,uBAAuB,CAAqC;gBAG1D,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC;IAStD,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBhE,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBrF,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBrF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBjF"}
+{"version":3,"file":"kv_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/kv_attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI7D,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,sBAAsB,EAC5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,qBAAa,iBAAkB,YAAW,eAAe;IAerD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IAhBb,OAAO,CAAC,OAAO,CAA6C;IAE5D,OAAO,CAAC,SAAS,CAGf;IAGF,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,0BAA0B,CAAqC;IACvE,OAAO,CAAC,iCAAiC,CAAqC;IAE9E,YACU,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC,EAWrD;IAED,OAAO,CAAC,SAAS,CAIf;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAQvC;IAED,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;IAEY,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAW5E;IAEY,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAGpF;IAEY,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B9E;IAEY,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAW1F;IAEY,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAG9F;IAEY,yBAAyB,CAAC,YAAY,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC3F;IAEY,gCAAgC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAShG;IAEY,2CAA2C,CACtD,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAkBlC;IAEY,qCAAqC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAKxF;YAEa,mCAAmC;IAwBpC,wBAAwB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAc1F;IAEM,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG7D;IAEY,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMpF;IAEY,2BAA2B,CACtC,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CASlB;IAEY,+BAA+B,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAG/E;IAEY,kCAAkC,CAC7C,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CAKlB;CACF"}