@aztec/p2p 0.0.0-test.0 → 0.0.1-commit.24de95ac

package/dest/enr/generate-enr.js

@@ -1,13 +1,14 @@
 import { emptyChainConfig } from '@aztec/stdlib/config';
-import { ENR, SignableENR } from '@chainsafe/enr';
 import { multiaddr } from '@multiformats/multiaddr';
-import { AZTEC_ENR_KEY } from '../types/index.js';
+import { ENR, SignableENR } from '@nethermindeth/enr';
+import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from '../types/index.js';
 import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js';
-import { setAztecEnrKey } from '../versioning.js';
-export async function createBootnodeENRandPeerId(privateKey, udpAnnounceAddress, l1ChainId) {
+import { setAztecClientVersionEnrKey, setAztecEnrKey } from '../versioning.js';
+export { ENR };
+export async function createBootnodeENRandPeerId(privateKey, p2pIp, p2pBroadcastPort, l1ChainId) {
     const peerId = await createLibP2PPeerIdFromPrivateKey(privateKey);
     const enr = SignableENR.createFromPeerId(peerId);
-    const publicAddr = multiaddr(convertToMultiaddr(udpAnnounceAddress, 'udp'));
+    const publicAddr = multiaddr(convertToMultiaddr(p2pIp, p2pBroadcastPort, 'udp'));
     enr.setLocationMultiaddr(publicAddr);
     const config = {
         ...emptyChainConfig,
@@ -19,6 +20,25 @@ export async function createBootnodeENRandPeerId(privateKey, udpAnnounceAddress,
         peerId
     };
 }
+export function createNodeENR(peerId, multiAddrUdp, multiAddrTcp, chainConfig, packageVersion) {
+    // create ENR from PeerId
+    const enr = SignableENR.createFromPeerId(peerId);
+    // Add aztec identification to ENR
+    const versions = setAztecEnrKey(enr, chainConfig);
+    // Add aztec client version to ENR
+    setAztecClientVersionEnrKey(enr, packageVersion);
+    // set location multiaddr in ENR record
+    if (multiAddrUdp) {
+        enr.setLocationMultiaddr(multiAddrUdp);
+    }
+    if (multiAddrTcp) {
+        enr.setLocationMultiaddr(multiAddrTcp);
+    }
+    return {
+        enr,
+        versions
+    };
+}
 export async function printENR(enr, log) {
     const decoded = ENR.decodeTxt(enr);
     log(`PeerID: ${await decoded.peerId()}`);
@@ -27,4 +47,6 @@ export async function printENR(enr, log) {
     log(`TCP: ${decoded.tcp}`);
     const aztec = decoded.kvs.get(AZTEC_ENR_KEY);
     log(`Aztec version: ${aztec?.toString()}`);
+    const aztecClientVersion = decoded.kvs.get(AZTEC_ENR_CLIENT_VERSION_KEY);
+    log(`Aztec client version ${aztecClientVersion ? aztecClientVersion.toString() : 'N/A'}`);
 }

package/dest/index.d.ts

@@ -1,5 +1,8 @@
+export { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
+export type { PeerId } from '@libp2p/interface';
 export * from './bootstrap/bootstrap.js';
 export * from './client/index.js';
+export * from './enr/index.js';
 export * from './config.js';
 export * from './mem_pools/attestation_pool/index.js';
 export * from './mem_pools/tx_pool/index.js';

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC"}

package/dest/index.js

@@ -1,5 +1,7 @@
+export { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
 export * from './bootstrap/bootstrap.js';
 export * from './client/index.js';
+export * from './enr/index.js';
 export * from './config.js';
 export * from './mem_pools/attestation_pool/index.js';
 export * from './mem_pools/tx_pool/index.js';

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

@@ -1,4 +1,4 @@
-import type { BlockAttestation } from '@aztec/stdlib/p2p';
+import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 /**
  * An Attestation Pool contains attestations collected by a validator
  *
@@ -7,7 +7,27 @@ import type { BlockAttestation } from '@aztec/stdlib/p2p';
  */
 export interface AttestationPool {
     /**
-     * AddAttestation
+     * Adds new block proposal to the pool
+     */
+    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
+    /**
+     * Get block proposal by it's ID
+     *
+     * @param id - The ID of the block proposal to retrieve. The ID is proposal.payload.archive
+     *
+     * @return The block proposal if it exists, otherwise undefined.
+     */
+    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
+    /**
+     * Check if a block proposal exists in the pool
+     *
+     * @param idOrProposal - The ID of the block proposal or the block proposal itself to check. The ID is proposal.payload.archive
+     *
+     * @return True if the block proposal exists, false otherwise.
+     */
+    hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
+    /**
+     * AddAttestations
      *
      * @param attestations - Attestations to add into the pool
      */
@@ -44,7 +64,16 @@ export interface AttestationPool {
      */
     deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
     /**
-     * Get Attestations for slot
+     * Get all Attestations for all proposals for a given slot
+     *
+     * Retrieve all of the attestations observed pertaining to a given slot
+     *
+     * @param slot - The slot to query
+     * @return BlockAttestations
+     */
+    getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
+    /**
+     * Get Attestations for slot and given proposal
      *
      * Retrieve all of the attestations observed pertaining to a given slot
      *
@@ -52,6 +81,15 @@ export interface AttestationPool {
      * @param proposalId - The proposal to query
      * @return BlockAttestations
      */
-    getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
+    getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
+    /**
+     * Check if a specific attestation exists in the pool
+     *
+     * @param attestation - The attestation to check
+     * @return True if the attestation exists, false otherwise
+     */
+    hasAttestation(attestation: BlockAttestation): Promise<boolean>;
+    /** Returns whether the pool is empty. */
+    isEmpty(): Promise<boolean>;
 }
 //# sourceMappingURL=attestation_pool.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE;;;;OAIG;IACH,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;;OAMG;IACH,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD;;;;;;OAMG;IACH,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvD;;;;;;;OAOG;IACH,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtF;;;;;;;;OAQG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;CACvF"}
+{"version":3,"file":"attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEzE;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;IAEjE;;;;;;OAMG;IACH,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEzE;;;;OAIG;IACH,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE;;;;OAIG;IACH,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;;;OAMG;IACH,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD;;;;;;OAMG;IACH,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvD;;;;;;;OAOG;IACH,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtF;;;;;;;OAOG;IACH,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAElE;;;;;;;;OAQG;IACH,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEjG;;;;;OAKG;IACH,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhE,yCAAyC;IACzC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7B"}

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

@@ -1 +1 @@
-{"version":3,"file":"attestation_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/attestation_pool_test_suite.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,wBAAgB,uBAAuB,CAAC,kBAAkB,EAAE,MAAM,eAAe,QAuNhF"}
+{"version":3,"file":"attestation_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/attestation_pool_test_suite.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,wBAAgB,uBAAuB,CAAC,kBAAkB,EAAE,MAAM,eAAe,QA0YhF"}

package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js

@@ -1,5 +1,7 @@
 import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
+import { BlockProposal as BlockProposalClass, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
+import { makeL2BlockHeader } from '@aztec/stdlib/testing';
 import { TxHash } from '@aztec/stdlib/tx';
 import { jest } from '@jest/globals';
 import { mock } from 'jest-mock-extended';
@@ -21,7 +23,18 @@ export function describeAttestationPool(getAttestationPool) {
     });
     const createAttestationsForSlot = (slotNumber)=>{
         const archive = Fr.random();
-        return Promise.all(signers.map((signer)=>mockAttestation(signer, slotNumber, archive)));
+        return signers.map((signer)=>mockAttestation(signer, slotNumber, archive));
+    };
+    const mockBlockProposal = (signer, slotNumber, archive = Fr.random())=>{
+        const header = makeL2BlockHeader(1, 2, slotNumber);
+        const payload = new ConsensusPayload(header.toCheckpointHeader(), archive, header.state);
+        const hash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
+        const signature = signer.sign(hash);
+        const txHashes = [
+            TxHash.random(),
+            TxHash.random()
+        ]; // Mock tx hashes
+        return new BlockProposalClass(payload, signature, txHashes);
     };
     // 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
@@ -34,62 +47,86 @@ export function describeAttestationPool(getAttestationPool) {
     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)));
+        const attestations = signers.slice(0, -1).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);
+        const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
+        expect(retrievedAttestations.length).toBe(attestations.length);
+        compareAttestations(retrievedAttestations, attestations);
+        // Check hasAttestation for added attestations
+        for (const attestation of attestations){
+            expect(await ap.hasAttestation(attestation)).toBe(true);
+        }
+        const retrievedAttestationsForSlot = await ap.getAttestationsForSlot(BigInt(slotNumber));
+        expect(retrievedAttestationsForSlot.length).toBe(attestations.length);
+        compareAttestations(retrievedAttestationsForSlot, attestations);
+        // Add another one
+        const newAttestation = mockAttestation(signers[NUMBER_OF_SIGNERS_PER_TEST - 1], slotNumber, archive);
+        await ap.addAttestations([
+            newAttestation
+        ]);
+        const retrievedAttestationsAfterAdd = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
+        expect(retrievedAttestationsAfterAdd.length).toBe(attestations.length + 1);
+        compareAttestations(retrievedAttestationsAfterAdd, [
+            ...attestations,
+            newAttestation
+        ]);
+        expect(await ap.hasAttestation(newAttestation)).toBe(true);
+        const retrievedAttestationsForSlotAfterAdd = await ap.getAttestationsForSlot(BigInt(slotNumber));
+        expect(retrievedAttestationsForSlotAfterAdd.length).toBe(attestations.length + 1);
+        compareAttestations(retrievedAttestationsForSlotAfterAdd, [
+            ...attestations,
+            newAttestation
+        ]);
         // Delete by slot
         await ap.deleteAttestationsForSlot(BigInt(slotNumber));
-        expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
-        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString());
+        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
         expect(retreivedAttestationsAfterDelete.length).toBe(0);
+        // Check hasAttestation after deletion
+        for (const attestation of attestations){
+            expect(await ap.hasAttestation(attestation)).toBe(false);
+        }
+        expect(await ap.hasAttestation(newAttestation)).toBe(false);
     });
-    it('Should handle duplicate proposals in a slot', async ()=>{
+    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));
+            attestations.push(mockAttestation(signer, slotNumber, archive));
         }
+        // Add them to store and check we end up with only one
         await ap.addAttestations(attestations);
-        const retreivedAttestations = await ap.getAttestationsForSlot(BigInt(slotNumber), archive.toString());
+        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(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());
+        expect(retreivedAttestations[0].getSender()?.toString()).toEqual(signer.address.toString());
+        // Try adding them on another operation and check they are still not duplicated
+        await ap.addAttestations([
+            attestations[0]
+        ]);
+        expect(await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString())).toHaveLength(1);
     });
-    it('Should store attestations by differing slot', async ()=>{
+    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])));
+        const attestations = 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 slot = attestation.payload.header.slotNumber;
             const archive = attestation.archive.toString();
-            const retreivedAttestations = await ap.getAttestationsForSlot(slot.toBigInt(), archive);
+            const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(slot.toBigInt(), archive);
             expect(retreivedAttestations.length).toBe(1);
             expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
-            expect(retreivedAttestations[0].payload.header.globalVariables.slotNumber).toEqual(slot);
+            expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
         }
     });
-    it('Should store attestations by differing slot and archive', async ()=>{
+    it('should store attestations by differing slot and archive', async ()=>{
         const slotNumbers = [
             1,
             1,
@@ -102,70 +139,73 @@ export function describeAttestationPool(getAttestationPool) {
             Fr.random(),
             Fr.random()
         ];
-        const attestations = await Promise.all(signers.map((signer, i)=>mockAttestation(signer, slotNumbers[i], archives[i])));
+        const attestations = 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 slot = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
-            const retreivedAttestations = await ap.getAttestationsForSlot(slot.toBigInt(), proposalId);
+            const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(slot.toBigInt(), proposalId);
             expect(retreivedAttestations.length).toBe(1);
             expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
-            expect(retreivedAttestations[0].payload.header.globalVariables.slotNumber).toEqual(slot);
+            expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
         }
     });
-    it('Should delete attestations', async ()=>{
+    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 attestations = 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);
+        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
         expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
         compareAttestations(retreivedAttestations, attestations);
+        // Check hasAttestation before deletion
+        for (const attestation of attestations){
+            expect(await ap.hasAttestation(attestation)).toBe(true);
+        }
         await ap.deleteAttestations(attestations);
-        expect(metricsMock.recordRemovedObjects).toHaveBeenCalledWith(attestations.length);
-        const gottenAfterDelete = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId);
+        const gottenAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
         expect(gottenAfterDelete.length).toBe(0);
+        // Check hasAttestation after deletion
+        for (const attestation of attestations){
+            expect(await ap.hasAttestation(attestation)).toBe(false);
+        }
     });
-    it('Should blanket delete attestations per slot', async ()=>{
+    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 attestations = 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);
+        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(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);
+        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
         expect(retreivedAttestationsAfterDelete.length).toBe(0);
     });
-    it('Should blanket delete attestations per slot and proposal', async ()=>{
+    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 attestations = 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 attestations2 = 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);
+        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(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);
+        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
         expect(retreivedAttestationsAfterDelete.length).toBe(0);
-        const retreivedAttestationsAfterDeleteForOtherProposal = await ap.getAttestationsForSlot(BigInt(slotNumber), proposalId2);
+        const retreivedAttestationsAfterDeleteForOtherProposal = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId2);
         expect(retreivedAttestationsAfterDeleteForOtherProposal.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
         compareAttestations(retreivedAttestationsAfterDeleteForOtherProposal, attestations2);
     });
-    it('Should delete attestations older than a given slot', async ()=>{
+    it('should delete attestations older than a given slot', async ()=>{
         const slotNumbers = [
             1,
             2,
@@ -179,11 +219,11 @@ export function describeAttestationPool(getAttestationPool) {
         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);
+        const attestationsForSlot1 = await ap.getAttestationsForSlotAndProposal(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);
+        const attestationsForSlot1AfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(1), proposalId);
         expect(attestationsForSlot1AfterDelete.length).toBe(0);
         expect(deleteAttestationsSpy).toHaveBeenCalledTimes(5);
         expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(1));
@@ -192,4 +232,114 @@ export function describeAttestationPool(getAttestationPool) {
         expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(69));
         expect(deleteAttestationsSpy).toHaveBeenCalledWith(BigInt(72));
     });
+    describe('BlockProposal in attestation pool', ()=>{
+        it('should add and retrieve block proposal', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = mockBlockProposal(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 = mockBlockProposal(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 = mockBlockProposal(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 = mockBlockProposal(signers[0], 100, archive);
+            const proposal2 = mockBlockProposal(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.toBigInt()).toBe(BigInt(200));
+        });
+        it('should delete block proposal when deleting attestations for slot and proposal', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = mockBlockProposal(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            // Add proposal and some attestations
+            await ap.addBlockProposal(proposal);
+            const attestations = signers.map((signer)=>mockAttestation(signer, slotNumber, archive));
+            await ap.addAttestations(attestations);
+            // Verify proposal exists
+            let retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            expect(await ap.hasBlockProposal(proposalId)).toBe(true);
+            // Delete attestations for slot and proposal
+            await ap.deleteAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+            // Proposal should be deleted
+            retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeUndefined();
+            expect(await ap.hasBlockProposal(proposalId)).toBe(false);
+        });
+        it('should delete block proposal when deleting attestations for slot', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = mockBlockProposal(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            // Add proposal
+            await ap.addBlockProposal(proposal);
+            // Verify proposal exists
+            let retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeDefined();
+            expect(await ap.hasBlockProposal(proposal)).toBe(true);
+            // Delete attestations for slot
+            await ap.deleteAttestationsForSlot(BigInt(slotNumber));
+            // Proposal should be deleted
+            retrievedProposal = await ap.getBlockProposal(proposalId);
+            expect(retrievedProposal).toBeUndefined();
+            expect(await ap.hasBlockProposal(proposal)).toBe(false);
+        });
+        it('should be able to fetch both block proposal and attestations', async ()=>{
+            const slotNumber = 420;
+            const archive = Fr.random();
+            const proposal = mockBlockProposal(signers[0], slotNumber, archive);
+            const proposalId = proposal.archive.toString();
+            // Add proposal first
+            await ap.addBlockProposal(proposal);
+            // Add attestations for the same proposal
+            const attestations = signers.slice(1).map((signer)=>mockAttestation(signer, slotNumber, archive));
+            await ap.addAttestations(attestations);
+            // Retrieve both proposal and attestations
+            const retrievedProposal = await ap.getBlockProposal(proposalId);
+            const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+            expect(retrievedProposal).toBeDefined();
+            expect(retrievedProposal).toEqual(proposal);
+            expect(await ap.hasBlockProposal(proposalId)).toBe(true);
+            compareAttestations(retrievedAttestations, attestations);
+            // Check hasAttestation for all attestations
+            for (const attestation of attestations){
+                expect(await ap.hasAttestation(attestation)).toBe(true);
+            }
+        });
+    });
 }

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

@@ -1,5 +1,5 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
+import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
 export declare class KvAttestationPool implements AttestationPool {
@@ -7,16 +7,24 @@ export declare class KvAttestationPool implements AttestationPool {
     private log;
     private metrics;
     private attestations;
+    private proposals;
     private proposalsForSlot;
     private attestationsForProposal;
     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[]>;
+    getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
+    getAttestationsForSlotAndProposal(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>;
+    hasAttestation(attestation: BlockAttestation): Promise<boolean>;
+    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
+    hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
+    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
 }
 //# sourceMappingURL=kv_attestation_pool.d.ts.map

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":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,iBAAkB,YAAW,eAAe;IAYrD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IAbb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,SAAS,CAGf;IACF,OAAO,CAAC,gBAAgB,CAAqC;IAC7D,OAAO,CAAC,uBAAuB,CAAqC;gBAG1D,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC;IAUtD,OAAO,CAAC,SAAS,CAIf;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAOxC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqChE,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAYjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBhG,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;IA8BnE,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB/D,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAahE,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxE,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAM3E"}