@aztec/p2p 3.0.0-devnet.5 → 3.0.0-devnet.6-patch.1

package/dest/errors/reqresp.error.d.ts

@@ -25,4 +25,4 @@ export declare class CollectiveReqRespTimeoutError extends Error {
 export declare class InvalidResponseError extends Error {
     constructor();
 }
-//# sourceMappingURL=reqresp.error.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxcmVzcC5lcnJvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Vycm9ycy9yZXFyZXNwLmVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSxLQUFLO0lBQ3RELGNBRUM7Q0FDRjtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSxLQUFLO0lBQ3RELGNBRUM7Q0FDRjtBQUVEOzs7Ozs7O0dBT0c7QUFDSCxxQkFBYSxvQkFBcUIsU0FBUSxLQUFLO0lBQzdDLGNBRUM7Q0FDRiJ9

package/dest/errors/reqresp.error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reqresp.error.d.ts","sourceRoot":"","sources":["../../src/errors/reqresp.error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;;CAIvD;AAED;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;;CAIvD;AAED;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C"}
+{"version":3,"file":"reqresp.error.d.ts","sourceRoot":"","sources":["../../src/errors/reqresp.error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,cAEC;CACF;AAED;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,cAEC;CACF;AAED;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,cAEC;CACF"}

package/dest/index.d.ts

@@ -8,4 +8,4 @@ export * from './mem_pools/attestation_pool/index.js';
 export * from './mem_pools/tx_pool/index.js';
 export * from './msg_validators/index.js';
 export * from './services/index.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyx1Q0FBdUMsQ0FBQztBQUN0RCxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxxQkFBcUIsQ0FBQyJ9

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

@@ -1,3 +1,4 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 /**
  * An Attestation Pool contains attestations collected by a validator
@@ -18,6 +19,14 @@ export interface AttestationPool {
      * @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
      *
@@ -37,7 +46,7 @@ export interface AttestationPool {
      *
      * @param slot - The oldest slot to keep.
      */
-    deleteAttestationsOlderThan(slot: bigint): Promise<void>;
+    deleteAttestationsOlderThan(slot: SlotNumber): Promise<void>;
     /**
      * Delete Attestations for slot
      *
@@ -45,7 +54,7 @@ export interface AttestationPool {
      *
      * @param slot - The slot to delete.
      */
-    deleteAttestationsForSlot(slot: bigint): Promise<void>;
+    deleteAttestationsForSlot(slot: SlotNumber): Promise<void>;
     /**
      * Delete Attestations for slot and proposal
      *
@@ -54,7 +63,7 @@ export interface AttestationPool {
      * @param slot - The slot to delete.
      * @param proposalId - The proposal to delete.
      */
-    deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
+    deleteAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<void>;
     /**
      * Get all Attestations for all proposals for a given slot
      *
@@ -63,7 +72,7 @@ export interface AttestationPool {
      * @param slot - The slot to query
      * @return BlockAttestations
      */
-    getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
+    getAttestationsForSlot(slot: SlotNumber): Promise<BlockAttestation[]>;
     /**
      * Get Attestations for slot and given proposal
      *
@@ -73,8 +82,36 @@ export interface AttestationPool {
      * @param proposalId - The proposal to query
      * @return BlockAttestations
      */
-    getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
+    getAttestationsForSlotAndProposal(slot: SlotNumber, 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 adding this proposal is permitted at current capacity:
+     * - True if the proposal already exists, allow overwrite to keep parity with tests.
+     * - True if the slot is below the proposal cap.
+     * - False if the slot is at/above cap and this would be a new unique proposal.
+     *
+     * @param block - The block proposal to check
+     * @returns True if the proposal can be added (or already exists), false otherwise.
+     */
+    canAddProposal(block: BlockProposal): Promise<boolean>;
+    /**
+     * Returns whether an attestation would be accepted for (slot, proposalId):
+     * - True if the attestation already exists for this sender.
+     * - True if the attestation cap for (slot, proposalId) has not been reached.
+     * - False if the cap is reached and this attestation would be a new unique entry.
+     *
+     * @param attestation - The attestation to check
+     * @param committeeSize - Committee size for the attestation's slot, implementation may add a small buffer
+     * @returns True if the attestation can be added, false otherwise.
+     */
+    canAddAttestation(attestation: BlockAttestation, committeeSize: number): Promise<boolean>;
     /** Returns whether the pool is empty. */
     isEmpty(): Promise<boolean>;
 }
-//# sourceMappingURL=attestation_pool.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy9hdHRlc3RhdGlvbl9wb29sL2F0dGVzdGF0aW9uX3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFekU7Ozs7O0dBS0c7QUFDSCxNQUFNLFdBQVcsZUFBZTtJQUM5Qjs7T0FFRztJQUNILGdCQUFnQixDQUFDLGFBQWEsRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRTlEOzs7Ozs7T0FNRztJQUNILGdCQUFnQixDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGFBQWEsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVqRTs7Ozs7O09BTUc7SUFDSCxnQkFBZ0IsQ0FBQyxZQUFZLEVBQUUsTUFBTSxHQUFHLGFBQWEsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFekU7Ozs7T0FJRztJQUNILGVBQWUsQ0FBQyxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFakU7Ozs7T0FJRztJQUNILGtCQUFrQixDQUFDLFlBQVksRUFBRSxnQkFBZ0IsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVwRTs7Ozs7O09BTUc7SUFDSCwyQkFBMkIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUU3RDs7Ozs7O09BTUc7SUFDSCx5QkFBeUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUUzRDs7Ozs7OztPQU9HO0lBQ0gsb0NBQW9DLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUUxRjs7Ozs7OztPQU9HO0lBQ0gsc0JBQXNCLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDO0lBRXRFOzs7Ozs7OztPQVFHO0lBQ0gsaUNBQWlDLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUM7SUFFckc7Ozs7O09BS0c7SUFDSCxjQUFjLENBQUMsV0FBVyxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUVoRTs7Ozs7Ozs7T0FRRztJQUNILGNBQWMsQ0FBQyxLQUFLLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUV2RDs7Ozs7Ozs7O09BU0c7SUFDSCxpQkFBaUIsQ0FBQyxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsYUFBYSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFMUYseUNBQXlDO0lBQ3pDLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7Q0FDN0IifQ==

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,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;;;;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,yCAAyC;IACzC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7B"}
+{"version":3,"file":"attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,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,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D;;;;;;OAMG;IACH,yBAAyB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D;;;;;;;OAOG;IACH,oCAAoC,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1F;;;;;;;OAOG;IACH,sBAAsB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEtE;;;;;;;;OAQG;IACH,iCAAiC,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAErG;;;;;OAKG;IACH,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhE;;;;;;;;OAQG;IACH,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvD;;;;;;;;;OASG;IACH,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE1F,yCAAyC;IACzC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7B"}

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

@@ -1,3 +1,3 @@
 import type { AttestationPool } from './attestation_pool.js';
 export declare function describeAttestationPool(getAttestationPool: () => AttestationPool): void;
-//# sourceMappingURL=attestation_pool_test_suite.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fcG9vbF90ZXN0X3N1aXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL2F0dGVzdGF0aW9uX3Bvb2wvYXR0ZXN0YXRpb25fcG9vbF90ZXN0X3N1aXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWlCQSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUs3RCx3QkFBZ0IsdUJBQXVCLENBQUMsa0JBQWtCLEVBQUUsTUFBTSxlQUFlLFFBc1poRiJ9

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":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,wBAAgB,uBAAuB,CAAC,kBAAkB,EAAE,MAAM,eAAe,QAqWhF"}
+{"version":3,"file":"attestation_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/attestation_pool_test_suite.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,wBAAgB,uBAAuB,CAAC,kBAAkB,EAAE,MAAM,eAAe,QAsZhF"}

package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js

@@ -1,5 +1,6 @@
-import { Secp256k1Signer } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BlockProposal as BlockProposalClass, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
 import { makeL2BlockHeader } from '@aztec/stdlib/testing';
 import { TxHash } from '@aztec/stdlib/tx';
@@ -27,7 +28,7 @@ export function describeAttestationPool(getAttestationPool) {
     };
     const mockBlockProposal = (signer, slotNumber, archive = Fr.random())=>{
         const header = makeL2BlockHeader(1, 2, slotNumber);
-        const payload = new ConsensusPayload(header.toCheckpointHeader(), archive, header.state);
+        const payload = new ConsensusPayload(header.toCheckpointHeader(), archive);
         const hash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockProposal);
         const signature = signer.sign(hash);
         const txHashes = [
@@ -49,10 +50,14 @@ export function describeAttestationPool(getAttestationPool) {
         const archive = Fr.random();
         const attestations = signers.slice(0, -1).map((signer)=>mockAttestation(signer, slotNumber, archive));
         await ap.addAttestations(attestations);
-        const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
+        const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString());
         expect(retrievedAttestations.length).toBe(attestations.length);
         compareAttestations(retrievedAttestations, attestations);
-        const retrievedAttestationsForSlot = await ap.getAttestationsForSlot(BigInt(slotNumber));
+        // Check hasAttestation for added attestations
+        for (const attestation of attestations){
+            expect(await ap.hasAttestation(attestation)).toBe(true);
+        }
+        const retrievedAttestationsForSlot = await ap.getAttestationsForSlot(SlotNumber(slotNumber));
         expect(retrievedAttestationsForSlot.length).toBe(attestations.length);
         compareAttestations(retrievedAttestationsForSlot, attestations);
         // Add another one
@@ -60,22 +65,28 @@ export function describeAttestationPool(getAttestationPool) {
         await ap.addAttestations([
             newAttestation
         ]);
-        const retrievedAttestationsAfterAdd = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
+        const retrievedAttestationsAfterAdd = await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString());
         expect(retrievedAttestationsAfterAdd.length).toBe(attestations.length + 1);
         compareAttestations(retrievedAttestationsAfterAdd, [
             ...attestations,
             newAttestation
         ]);
-        const retrievedAttestationsForSlotAfterAdd = await ap.getAttestationsForSlot(BigInt(slotNumber));
+        expect(await ap.hasAttestation(newAttestation)).toBe(true);
+        const retrievedAttestationsForSlotAfterAdd = await ap.getAttestationsForSlot(SlotNumber(slotNumber));
         expect(retrievedAttestationsForSlotAfterAdd.length).toBe(attestations.length + 1);
         compareAttestations(retrievedAttestationsForSlotAfterAdd, [
             ...attestations,
             newAttestation
         ]);
         // Delete by slot
-        await ap.deleteAttestationsForSlot(BigInt(slotNumber));
-        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
+        await ap.deleteAttestationsForSlot(SlotNumber(slotNumber));
+        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(SlotNumber(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 ()=>{
         const slotNumber = 420;
@@ -88,7 +99,7 @@ export function describeAttestationPool(getAttestationPool) {
         }
         // Add them to store and check we end up with only one
         await ap.addAttestations(attestations);
-        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString());
+        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString());
         expect(retreivedAttestations.length).toBe(1);
         expect(retreivedAttestations[0].toBuffer()).toEqual(attestations[0].toBuffer());
         expect(retreivedAttestations[0].getSender()?.toString()).toEqual(signer.address.toString());
@@ -96,7 +107,7 @@ export function describeAttestationPool(getAttestationPool) {
         await ap.addAttestations([
             attestations[0]
         ]);
-        expect(await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString())).toHaveLength(1);
+        expect(await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString())).toHaveLength(1);
     });
     it('should store attestations by differing slot', async ()=>{
         const slotNumbers = [
@@ -110,7 +121,7 @@ export function describeAttestationPool(getAttestationPool) {
         for (const attestation of attestations){
             const slot = attestation.payload.header.slotNumber;
             const archive = attestation.archive.toString();
-            const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(slot.toBigInt(), archive);
+            const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(slot, archive);
             expect(retreivedAttestations.length).toBe(1);
             expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
             expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
@@ -134,7 +145,7 @@ export function describeAttestationPool(getAttestationPool) {
         for (const attestation of attestations){
             const slot = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
-            const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(slot.toBigInt(), proposalId);
+            const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(slot, proposalId);
             expect(retreivedAttestations.length).toBe(1);
             expect(retreivedAttestations[0].toBuffer()).toEqual(attestation.toBuffer());
             expect(retreivedAttestations[0].payload.header.slotNumber).toEqual(slot);
@@ -146,12 +157,20 @@ export function describeAttestationPool(getAttestationPool) {
         const attestations = signers.map((signer)=>mockAttestation(signer, slotNumber, archive));
         const proposalId = attestations[0].archive.toString();
         await ap.addAttestations(attestations);
-        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(SlotNumber(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);
-        const gottenAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+        const gottenAfterDelete = await ap.getAttestationsForSlotAndProposal(SlotNumber(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 ()=>{
         const slotNumber = 420;
@@ -159,11 +178,11 @@ export function describeAttestationPool(getAttestationPool) {
         const attestations = signers.map((signer)=>mockAttestation(signer, slotNumber, archive));
         const proposalId = attestations[0].archive.toString();
         await ap.addAttestations(attestations);
-        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), proposalId);
         expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
         compareAttestations(retreivedAttestations, attestations);
-        await ap.deleteAttestationsForSlot(BigInt(slotNumber));
-        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+        await ap.deleteAttestationsForSlot(SlotNumber(slotNumber));
+        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), proposalId);
         expect(retreivedAttestationsAfterDelete.length).toBe(0);
     });
     it('should blanket delete attestations per slot and proposal', async ()=>{
@@ -177,13 +196,13 @@ export function describeAttestationPool(getAttestationPool) {
         const proposalId2 = attestations2[0].archive.toString();
         await ap.addAttestations(attestations);
         await ap.addAttestations(attestations2);
-        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+        const retreivedAttestations = await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), proposalId);
         expect(retreivedAttestations.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
         compareAttestations(retreivedAttestations, attestations);
-        await ap.deleteAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
-        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+        await ap.deleteAttestationsForSlotAndProposal(SlotNumber(slotNumber), proposalId);
+        const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), proposalId);
         expect(retreivedAttestationsAfterDelete.length).toBe(0);
-        const retreivedAttestationsAfterDeleteForOtherProposal = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId2);
+        const retreivedAttestationsAfterDeleteForOtherProposal = await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), proposalId2);
         expect(retreivedAttestationsAfterDeleteForOtherProposal.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
         compareAttestations(retreivedAttestationsAfterDeleteForOtherProposal, attestations2);
     });
@@ -201,18 +220,18 @@ 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.getAttestationsForSlotAndProposal(BigInt(1), proposalId);
+        const attestationsForSlot1 = await ap.getAttestationsForSlotAndProposal(SlotNumber(1), proposalId);
         expect(attestationsForSlot1.length).toBe(signers.length);
         const deleteAttestationsSpy = jest.spyOn(ap, 'deleteAttestationsForSlot');
-        await ap.deleteAttestationsOlderThan(BigInt(73));
-        const attestationsForSlot1AfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(1), proposalId);
+        await ap.deleteAttestationsOlderThan(SlotNumber(73));
+        const attestationsForSlot1AfterDelete = await ap.getAttestationsForSlotAndProposal(SlotNumber(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));
+        expect(deleteAttestationsSpy).toHaveBeenCalledWith(SlotNumber(1));
+        expect(deleteAttestationsSpy).toHaveBeenCalledWith(SlotNumber(2));
+        expect(deleteAttestationsSpy).toHaveBeenCalledWith(SlotNumber(3));
+        expect(deleteAttestationsSpy).toHaveBeenCalledWith(SlotNumber(69));
+        expect(deleteAttestationsSpy).toHaveBeenCalledWith(SlotNumber(72));
     });
     describe('BlockProposal in attestation pool', ()=>{
         it('should add and retrieve block proposal', async ()=>{
@@ -224,11 +243,16 @@ export function describeAttestationPool(getAttestationPool) {
             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;
@@ -256,7 +280,7 @@ export function describeAttestationPool(getAttestationPool) {
             const retrievedProposal = await ap.getBlockProposal(proposalId);
             expect(retrievedProposal).toBeDefined();
             expect(retrievedProposal.toBuffer()).toEqual(proposal2.toBuffer());
-            expect(retrievedProposal.slotNumber.toBigInt()).toBe(BigInt(200));
+            expect(retrievedProposal.slotNumber).toBe(SlotNumber(200));
         });
         it('should delete block proposal when deleting attestations for slot and proposal', async ()=>{
             const slotNumber = 420;
@@ -270,11 +294,13 @@ export function describeAttestationPool(getAttestationPool) {
             // 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);
+            await ap.deleteAttestationsForSlotAndProposal(SlotNumber(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;
@@ -286,11 +312,13 @@ export function describeAttestationPool(getAttestationPool) {
             // 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));
+            await ap.deleteAttestationsForSlot(SlotNumber(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;
@@ -304,10 +332,15 @@ export function describeAttestationPool(getAttestationPool) {
             await ap.addAttestations(attestations);
             // Retrieve both proposal and attestations
             const retrievedProposal = await ap.getBlockProposal(proposalId);
-            const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+            const retrievedAttestations = await ap.getAttestationsForSlotAndProposal(SlotNumber(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/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,7 +1,10 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { BlockAttestation, BlockProposal } 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;
@@ -16,13 +19,19 @@ export declare class KvAttestationPool implements AttestationPool {
     private getProposalKey;
     private getAttestationKey;
     addAttestations(attestations: BlockAttestation[]): Promise<void>;
-    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>;
+    getAttestationsForSlot(slot: SlotNumber): Promise<BlockAttestation[]>;
+    getAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<BlockAttestation[]>;
+    deleteAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void>;
+    deleteAttestationsForSlot(slot: SlotNumber): Promise<void>;
+    deleteAttestationsForSlotAndProposal(slot: SlotNumber, 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>;
+    hasReachedProposalCap(slot: SlotNumber): Promise<boolean>;
+    hasReachedAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean>;
+    canAddProposal(block: BlockProposal): Promise<boolean>;
+    canAddAttestation(attestation: BlockAttestation, committeeSize: number): Promise<boolean>;
 }
-//# sourceMappingURL=kv_attestation_pool.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia3ZfYXR0ZXN0YXRpb25fcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy9hdHRlc3RhdGlvbl9wb29sL2t2X2F0dGVzdGF0aW9uX3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSTdELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0seUJBQXlCLENBQUM7QUFJbkYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFN0QsZUFBTyxNQUFNLHNCQUFzQixJQUFJLENBQUM7QUFDeEMsZUFBTyxNQUFNLHNCQUFzQixLQUFLLENBQUM7QUFFekMscUJBQWEsaUJBQWtCLFlBQVcsZUFBZTtJQVlyRCxPQUFPLENBQUMsS0FBSztJQUViLE9BQU8sQ0FBQyxHQUFHO0lBYmIsT0FBTyxDQUFDLE9BQU8sQ0FBd0M7SUFFdkQsT0FBTyxDQUFDLFlBQVksQ0FBZ0M7SUFDcEQsT0FBTyxDQUFDLFNBQVMsQ0FHZjtJQUNGLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBcUM7SUFDN0QsT0FBTyxDQUFDLHVCQUF1QixDQUFxQztJQUVwRSxZQUNVLEtBQUssRUFBRSxpQkFBaUIsRUFDaEMsU0FBUyxHQUFFLGVBQXNDLEVBQ3pDLEdBQUcseUNBQXlDLEVBUXJEO0lBRUQsT0FBTyxDQUFDLFNBQVMsQ0FJZjtJQUVXLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBS3ZDO0lBRUQsT0FBTyxDQUFDLGNBQWM7SUFZdEIsT0FBTyxDQUFDLGlCQUFpQjtJQUlaLGVBQWUsQ0FBQyxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBbUM1RTtJQUVZLHNCQUFzQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FTakY7SUFFWSxpQ0FBaUMsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FvQmhIO0lBRVksMkJBQTJCLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSzlFO0lBRVkseUJBQXlCLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBdUJ0RTtJQUVZLG9DQUFvQyxDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0JyRztJQUVZLGtCQUFrQixDQUFDLFlBQVksRUFBRSxnQkFBZ0IsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0E0Qi9FO0lBRVksY0FBYyxDQUFDLFdBQVcsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBYzNFO0lBRVksZ0JBQWdCLENBQUMsRUFBRSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsYUFBYSxHQUFHLFNBQVMsQ0FBQyxDQVc1RTtJQUVZLGdCQUFnQixDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsYUFBYSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHcEY7SUFFWSxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FlekU7SUFFWSxxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHckU7SUFFWSx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsYUFBYSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBR25IO0lBRVksY0FBYyxDQUFDLEtBQUssRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUlsRTtJQUVZLGlCQUFpQixDQUFDLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxhQUFhLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FTckc7Q0FDRiJ9

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,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,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAahE,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAM3E"}
+{"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,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACpE,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;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;IAEpE,YACU,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC,EAQrD;IAED,OAAO,CAAC,SAAS,CAIf;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAKvC;IAED,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAmC5E;IAEY,sBAAsB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CASjF;IAEY,iCAAiC,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoBhH;IAEY,2BAA2B,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAK9E;IAEY,yBAAyB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBtE;IAEY,oCAAoC,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBrG;IAEY,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B/E;IAEY,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAc3E;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,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAezE;IAEY,qBAAqB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAGrE;IAEY,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGnH;IAEY,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAIlE;IAEY,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASrG;CACF"}

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,9 +1,13 @@
-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, BlockProposal } 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;
@@ -49,7 +53,7 @@ export class KvAttestationPool {
                 const sender = attestation.getSender();
                 // Skip attestations with invalid signatures
                 if (!sender) {
-                    this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber.toBigInt()}`, {
+                    this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber}`, {
                         signature: attestation.signature.toString(),
                         slotNumber,
                         proposalId
@@ -58,9 +62,9 @@ export class KvAttestationPool {
                 }
                 const address = sender.toString();
                 await this.attestations.set(this.getAttestationKey(slotNumber, proposalId, address), attestation.toBuffer());
-                await this.proposalsForSlot.set(slotNumber.toString(), proposalId.toString());
+                await this.proposalsForSlot.set(slotNumber, proposalId.toString());
                 await this.attestationsForProposal.set(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${address}`, {
+                this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`, {
                     signature: attestation.signature.toString(),
                     slotNumber,
                     address,
@@ -70,8 +74,7 @@ export class KvAttestationPool {
         });
     }
     async getAttestationsForSlot(slot) {
-        const slotFr = new Fr(slot);
-        const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
+        const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slot));
         const attestations = [];
         for (const proposalId of proposalIds){
             attestations.push(...await this.getAttestationsForSlotAndProposal(slot, proposalId));
@@ -95,41 +98,41 @@ export class KvAttestationPool {
     }
     async deleteAttestationsOlderThan(oldestSlot) {
         const olderThan = await toArray(this.proposalsForSlot.keysAsync({
-            end: new Fr(oldestSlot).toString()
+            end: oldestSlot
         }));
         for (const oldSlot of olderThan){
-            await this.deleteAttestationsForSlot(BigInt(oldSlot));
+            await this.deleteAttestationsForSlot(SlotNumber(oldSlot));
         }
     }
     async deleteAttestationsForSlot(slot) {
-        const slotFr = new Fr(slot);
         let numberOfAttestations = 0;
         await this.store.transactionAsync(async ()=>{
-            const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
+            const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slot));
             for (const proposalId of proposalIds){
-                const attestations = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slotFr, proposalId)));
+                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.proposals.delete(proposalId);
-                await this.attestationsForProposal.delete(this.getProposalKey(slotFr, proposalId));
+                await this.attestationsForProposal.delete(this.getProposalKey(slot, proposalId));
             }
+            // Delete from proposalsForSlot
+            await this.proposalsForSlot.delete(slot);
             this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
         });
     }
     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.proposals.delete(proposalId);
-            await this.proposalsForSlot.deleteValue(slotString, proposalId);
-            await this.attestationsForProposal.delete(this.getProposalKey(slotString, proposalId));
+            await this.proposalsForSlot.deleteValue(slot, proposalId);
+            await this.attestationsForProposal.delete(this.getProposalKey(slot, proposalId));
             this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
         });
     }
@@ -141,7 +144,7 @@ export class KvAttestationPool {
                 const sender = attestation.getSender();
                 // Skip attestations with invalid signatures
                 if (!sender) {
-                    this.log.warn(`Skipping deletion of attestation with invalid signature for slot ${slotNumber.toBigInt()}`);
+                    this.log.warn(`Skipping deletion of attestation with invalid signature for slot ${slotNumber}`);
                     continue;
                 }
                 const address = sender.toString();
@@ -154,6 +157,18 @@ export class KvAttestationPool {
             }
         });
     }
+    async hasAttestation(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.attestations.hasAsync(key);
+    }
     async getBlockProposal(id) {
         const buffer = await this.proposals.getAsync(id);
         try {
@@ -165,10 +180,34 @@ export class KvAttestationPool {
         }
         return Promise.resolve(undefined);
     }
+    async hasBlockProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.payload.archive.toString();
+        return await this.proposals.hasAsync(id);
+    }
     async addBlockProposal(blockProposal) {
         await this.store.transactionAsync(async ()=>{
-            await this.proposalsForSlot.set(blockProposal.slotNumber.toString(), blockProposal.archive.toString());
-            await this.proposals.set(blockProposal.payload.archive.toString(), blockProposal.toBuffer());
+            const slotKey = blockProposal.slotNumber;
+            const proposalId = blockProposal.archive.toString();
+            if (!await this.canAddProposal(blockProposal)) {
+                throw new ProposalSlotCapExceededError(`Maximum proposals per slot reached: slot=${slotKey} cap=${MAX_PROPOSALS_PER_SLOT} proposal=${proposalId}`);
+            }
+            await this.proposalsForSlot.set(slotKey, proposalId);
+            // Always update the stored proposal buffer so re-adds overwrite with latest data
+            await this.proposals.set(proposalId, blockProposal.toBuffer());
         });
     }
+    async hasReachedProposalCap(slot) {
+        const uniqueProposalCount = await this.proposalsForSlot.getValueCountAsync(slot);
+        return uniqueProposalCount >= MAX_PROPOSALS_PER_SLOT;
+    }
+    async hasReachedAttestationCap(slot, proposalId, committeeSize) {
+        const limit = committeeSize + ATTESTATION_CAP_BUFFER;
+        return await this.attestationsForProposal.getValueCountAsync(this.getProposalKey(slot, proposalId)) >= limit;
+    }
+    async canAddProposal(block) {
+        return await this.proposals.hasAsync(block.archive.toString()) || !await this.hasReachedProposalCap(block.slotNumber);
+    }
+    async canAddAttestation(attestation, committeeSize) {
+        return await this.hasAttestation(attestation) || !await this.hasReachedAttestationCap(attestation.payload.header.slotNumber, attestation.archive.toString(), committeeSize);
+    }
 }