@aztec/p2p 3.0.0-nightly.20251127 → 3.0.0-nightly.20251201.2

package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BlockProposal as BlockProposalClass, ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '@aztec/stdlib/p2p';
@@ -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,14 +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);
         // Check hasAttestation for added attestations
         for (const attestation of attestations){
             expect(await ap.hasAttestation(attestation)).toBe(true);
         }
-        const retrievedAttestationsForSlot = await ap.getAttestationsForSlot(BigInt(slotNumber));
+        const retrievedAttestationsForSlot = await ap.getAttestationsForSlot(SlotNumber(slotNumber));
         expect(retrievedAttestationsForSlot.length).toBe(attestations.length);
         compareAttestations(retrievedAttestationsForSlot, attestations);
         // Add another one
@@ -64,22 +65,22 @@ 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
         ]);
         expect(await ap.hasAttestation(newAttestation)).toBe(true);
-        const retrievedAttestationsForSlotAfterAdd = await ap.getAttestationsForSlot(BigInt(slotNumber));
+        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){
@@ -98,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());
@@ -106,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 = [
@@ -120,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);
@@ -144,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);
@@ -156,7 +157,7 @@ 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
@@ -164,7 +165,7 @@ export function describeAttestationPool(getAttestationPool) {
             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){
@@ -177,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 ()=>{
@@ -195,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);
     });
@@ -219,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 ()=>{
@@ -279,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;
@@ -295,7 +296,7 @@ export function describeAttestationPool(getAttestationPool) {
             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();
@@ -313,7 +314,7 @@ export function describeAttestationPool(getAttestationPool) {
             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();
@@ -331,7 +332,7 @@ 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);

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,3 +1,4 @@
+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';
@@ -18,19 +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: bigint): Promise<boolean>;
-    hasReachedAttestationCap(slot: bigint, proposalId: string, committeeSize: number): Promise<boolean>;
+    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;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;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;IAiB7D,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMrD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKnG,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAOtD,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAUvG"}
+{"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,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
@@ -52,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
@@ -61,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,
@@ -73,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));
@@ -98,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}`);
         });
     }
@@ -144,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();
@@ -186,7 +186,7 @@ export class KvAttestationPool {
     }
     async addBlockProposal(blockProposal) {
         await this.store.transactionAsync(async ()=>{
-            const slotKey = blockProposal.slotNumber.toString();
+            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}`);
@@ -197,8 +197,7 @@ export class KvAttestationPool {
         });
     }
     async hasReachedProposalCap(slot) {
-        const slotKey = new Fr(slot).toString();
-        const uniqueProposalCount = await this.proposalsForSlot.getValueCountAsync(slotKey);
+        const uniqueProposalCount = await this.proposalsForSlot.getValueCountAsync(slot);
         return uniqueProposalCount >= MAX_PROPOSALS_PER_SLOT;
     }
     async hasReachedAttestationCap(slot, proposalId, committeeSize) {
@@ -206,9 +205,9 @@ export class KvAttestationPool {
         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.toBigInt());
+        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.toBigInt(), attestation.archive.toString(), committeeSize);
+        return await this.hasAttestation(attestation) || !await this.hasReachedAttestationCap(attestation.payload.header.slotNumber, attestation.archive.toString(), committeeSize);
     }
 }

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

@@ -1,3 +1,4 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
@@ -10,20 +11,20 @@ export declare class InMemoryAttestationPool implements AttestationPool {
     constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     private poolStats;
     isEmpty(): Promise<boolean>;
-    getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
-    getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
+    getAttestationsForSlot(slot: SlotNumber): Promise<BlockAttestation[]>;
+    getAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<BlockAttestation[]>;
     addAttestations(attestations: BlockAttestation[]): Promise<void>;
-    deleteAttestationsOlderThan(oldestSlot: bigint): Promise<void>;
-    deleteAttestationsForSlot(slot: bigint): Promise<void>;
-    deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
+    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>;
     addBlockProposal(blockProposal: BlockProposal): Promise<void>;
     getBlockProposal(id: string): Promise<BlockProposal | undefined>;
     hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
-    hasReachedProposalCap(slot: bigint): Promise<boolean>;
-    hasReachedAttestationCap(slot: bigint, proposalId: string, committeeSize: number): Promise<boolean>;
+    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=memory_attestation_pool.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5X2F0dGVzdGF0aW9uX3Bvb2wuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9tZW1vcnlfYXR0ZXN0YXRpb25fcG9vbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0seUJBQXlCLENBQUM7QUFHbkYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHN0QscUJBQWEsdUJBQXdCLFlBQVcsZUFBZTs7SUFZM0QsT0FBTyxDQUFDLEdBQUc7SUFYYixPQUFPLENBQUMsT0FBTyxDQUF3QztJQUd2RCxPQUFPLENBQUMsWUFBWSxDQUdsQjtJQUNGLE9BQU8sQ0FBQyxTQUFTLENBQTZCO0lBRTlDLFlBQ0UsU0FBUyxHQUFFLGVBQXNDLEVBQ3pDLEdBQUcseUNBQXVDLEVBS25EO0lBRUQsT0FBTyxDQUFDLFNBQVMsQ0FJZjtJQUVLLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWpDO0lBRU0sc0JBQXNCLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQU0zRTtJQUVNLGlDQUFpQyxDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQVMxRztJQUVNLGVBQWUsQ0FBQyxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBK0J0RTtJQWNZLDJCQUEyQixDQUFDLFVBQVUsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQW1COUU7SUFFTSx5QkFBeUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FnQmhFO0lBRU0sb0NBQW9DLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FjL0Y7SUFFTSxrQkFBa0IsQ0FBQyxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBc0J6RTtJQUVNLGNBQWMsQ0FBQyxXQUFXLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXFCckU7SUFFTSxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FRbkU7SUFFTSxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBRXRFO0lBRU0sZ0JBQWdCLENBQUMsWUFBWSxFQUFFLE1BQU0sR0FBRyxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUc5RTtJQUVNLHFCQUFxQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUkvRDtJQUVNLHdCQUF3QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxhQUFhLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FJN0c7SUFFWSxjQUFjLENBQUMsS0FBSyxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWxFO0lBRVksaUJBQWlCLENBQUMsV0FBVyxFQUFFLGdCQUFnQixFQUFFLGFBQWEsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVNyRztDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,qBAAa,uBAAwB,YAAW,eAAe;;IAQ3D,OAAO,CAAC,GAAG;IAPb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;IACpH,OAAO,CAAC,SAAS,CAA6B;gBAG5C,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC;IAOpD,OAAO,CAAC,SAAS,CAIf;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAWhG,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C1D,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBrF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBnE,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAuB/D,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAIhE,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxE,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMrD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM7F,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAMtD,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAUvG"}
+{"version":3,"file":"memory_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/memory_attestation_pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,qBAAa,uBAAwB,YAAW,eAAe;;IAY3D,OAAO,CAAC,GAAG;IAXb,OAAO,CAAC,OAAO,CAAwC;IAGvD,OAAO,CAAC,YAAY,CAGlB;IACF,OAAO,CAAC,SAAS,CAA6B;IAE9C,YACE,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC,EAKnD;IAED,OAAO,CAAC,SAAS,CAIf;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAEjC;IAEM,sBAAsB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAM3E;IAEM,iCAAiC,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAS1G;IAEM,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BtE;IAcY,2BAA2B,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB9E;IAEM,yBAAyB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhE;IAEM,oCAAoC,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAc/F;IAEM,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBzE;IAEM,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBrE;IAEM,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAQnE;IAEM,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAEtE;IAEM,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG9E;IAEM,qBAAqB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAI/D;IAEM,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAI7G;IAEY,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAElE;IAEY,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASrG;CACF"}

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -5,6 +5,7 @@ import { ATTESTATION_CAP_BUFFER, MAX_PROPOSALS_PER_SLOT } from './kv_attestation
 export class InMemoryAttestationPool {
     log;
     metrics;
+    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
     attestations;
     proposals;
     constructor(telemetry = getTelemetryClient(), log = createLogger('p2p:attestation_pool')){
@@ -43,17 +44,17 @@ export class InMemoryAttestationPool {
             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
                 });
                 continue;
             }
-            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
+            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber);
             const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
             proposalAttestationMap.set(sender.toString(), attestation);
-            this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${sender}`, {
+            this.log.verbose(`Added attestation for slot ${slotNumber} from ${sender}`, {
                 signature: attestation.signature.toString(),
                 slotNumber,
                 address: sender,
@@ -118,7 +119,7 @@ export class InMemoryAttestationPool {
     deleteAttestations(attestations) {
         for (const attestation of attestations){
             const slotNumber = attestation.payload.header.slotNumber;
-            const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
+            const slotAttestationMap = this.attestations.get(slotNumber);
             if (slotAttestationMap) {
                 const proposalId = attestation.archive.toString();
                 const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
@@ -126,7 +127,7 @@ export class InMemoryAttestationPool {
                     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;
                     }
                     proposalAttestationMap.delete(sender.toString());
@@ -144,7 +145,7 @@ export class InMemoryAttestationPool {
         if (!sender) {
             return Promise.resolve(false);
         }
-        const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
+        const slotAttestationMap = this.attestations.get(slotNumber);
         if (!slotAttestationMap) {
             return Promise.resolve(false);
         }
@@ -157,7 +158,7 @@ export class InMemoryAttestationPool {
     addBlockProposal(blockProposal) {
         // We initialize slot-proposal mapping if it does not exist
         // This is important to ensure we can delete this proposal if there were not attestations for it
-        const slotProposalMapping = getSlotOrDefault(this.attestations, blockProposal.slotNumber.toBigInt());
+        const slotProposalMapping = getSlotOrDefault(this.attestations, blockProposal.slotNumber);
         slotProposalMapping.set(blockProposal.payload.archive.toString(), new Map());
         this.proposals.set(blockProposal.payload.archive.toString(), blockProposal);
         return Promise.resolve();
@@ -180,11 +181,11 @@ export class InMemoryAttestationPool {
         return Promise.resolve(limit <= 0 || count >= limit);
     }
     async canAddProposal(block) {
-        return this.proposals.has(block.archive.toString()) || !await this.hasReachedProposalCap(block.slotNumber.toBigInt());
+        return this.proposals.has(block.archive.toString()) || !await this.hasReachedProposalCap(block.slotNumber);
     }
     async canAddAttestation(attestation, committeeSize) {
         const sender = attestation.getSender();
-        const slot = attestation.payload.header.slotNumber.toBigInt();
+        const slot = attestation.payload.header.slotNumber;
         const pid = attestation.archive.toString();
         return !!sender && ((this.attestations.get(slot)?.get(pid)?.has(sender.toString()) ?? false) || !await this.hasReachedAttestationCap(slot, pid, committeeSize));
     }
@@ -196,7 +197,8 @@ export class InMemoryAttestationPool {
  * @param map - The map to fetch from
  * @param slot - The slot to fetch
  * @returns The slot mapping
- */ function getSlotOrDefault(map, slot) {
+ */ function getSlotOrDefault(// eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+map, slot) {
     if (!map.has(slot)) {
         map.set(slot, new Map());
     }