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

package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
@@ -42,7 +43,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
   const mockBlockProposal = (signer: Secp256k1Signer, slotNumber: number, archive: Fr = Fr.random()): BlockProposal => {
     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);
@@ -68,7 +69,10 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     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);
 
@@ -77,7 +81,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       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);
 
@@ -85,21 +89,21 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     const newAttestation = mockAttestation(signers[NUMBER_OF_SIGNERS_PER_TEST - 1], slotNumber, archive);
     await ap.addAttestations([newAttestation]);
     const retrievedAttestationsAfterAdd = await ap.getAttestationsForSlotAndProposal(
-      BigInt(slotNumber),
+      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));
+    await ap.deleteAttestationsForSlot(SlotNumber(slotNumber));
 
     const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(
-      BigInt(slotNumber),
+      SlotNumber(slotNumber),
       archive.toString(),
     );
     expect(retreivedAttestationsAfterDelete.length).toBe(0);
@@ -124,14 +128,17 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     // 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());
 
     // Try adding them on another operation and check they are still not duplicated
     await ap.addAttestations([attestations[0]]);
-    expect(await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), archive.toString())).toHaveLength(1);
+    expect(await ap.getAttestationsForSlotAndProposal(SlotNumber(slotNumber), archive.toString())).toHaveLength(1);
   });
 
   it('should store attestations by differing slot', async () => {
@@ -144,7 +151,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       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);
@@ -162,7 +169,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       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);
@@ -177,7 +184,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     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);
 
@@ -188,7 +195,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     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
@@ -205,13 +212,16 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     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));
+    await ap.deleteAttestationsForSlot(SlotNumber(slotNumber));
 
-    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(
+      SlotNumber(slotNumber),
+      proposalId,
+    );
     expect(retreivedAttestationsAfterDelete.length).toBe(0);
   });
 
@@ -229,17 +239,20 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
     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);
+    await ap.deleteAttestationsForSlotAndProposal(SlotNumber(slotNumber), proposalId);
 
-    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(slotNumber), proposalId);
+    const retreivedAttestationsAfterDelete = await ap.getAttestationsForSlotAndProposal(
+      SlotNumber(slotNumber),
+      proposalId,
+    );
     expect(retreivedAttestationsAfterDelete.length).toBe(0);
 
     const retreivedAttestationsAfterDeleteForOtherProposal = await ap.getAttestationsForSlotAndProposal(
-      BigInt(slotNumber),
+      SlotNumber(slotNumber),
       proposalId2,
     );
     expect(retreivedAttestationsAfterDeleteForOtherProposal.length).toBe(NUMBER_OF_SIGNERS_PER_TEST);
@@ -255,22 +268,22 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
     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));
+    await ap.deleteAttestationsOlderThan(SlotNumber(73));
 
-    const attestationsForSlot1AfterDelete = await ap.getAttestationsForSlotAndProposal(BigInt(1), proposalId);
+    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', () => {
@@ -334,7 +347,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       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 () => {
@@ -354,7 +367,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       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);
@@ -377,7 +390,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
       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);
@@ -400,7 +413,7 @@ export function describeAttestationPool(getAttestationPool: () => AttestationPoo
 
       // 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);

package/src/mem_pools/attestation_pool/kv_attestation_pool.ts

@@ -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';
@@ -20,7 +21,7 @@ export class KvAttestationPool implements AttestationPool {
     /*  proposal.payload.archive  */ string,
     /* buffer representation of proposal */ Buffer
   >;
-  private proposalsForSlot: AztecAsyncMultiMap<string, string>;
+  private proposalsForSlot: AztecAsyncMultiMap<number, string>;
   private attestationsForProposal: AztecAsyncMultiMap<string, string>;
 
   constructor(
@@ -74,7 +75,7 @@ export class KvAttestationPool implements AttestationPool {
 
         // 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,
@@ -86,13 +87,13 @@ export class KvAttestationPool implements AttestationPool {
 
         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,
@@ -102,9 +103,8 @@ export class KvAttestationPool implements AttestationPool {
     });
   }
 
-  public async getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]> {
-    const slotFr = new Fr(slot);
-    const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
+  public async getAttestationsForSlot(slot: SlotNumber): Promise<BlockAttestation[]> {
+    const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slot));
     const attestations: BlockAttestation[] = [];
 
     for (const proposalId of proposalIds) {
@@ -114,7 +114,7 @@ export class KvAttestationPool implements AttestationPool {
     return attestations;
   }
 
-  public async getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
+  public async getAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<BlockAttestation[]> {
     const attestationIds = await toArray(
       this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)),
     );
@@ -136,21 +136,20 @@ export class KvAttestationPool implements AttestationPool {
     return attestations;
   }
 
-  public async deleteAttestationsOlderThan(oldestSlot: bigint): Promise<void> {
-    const olderThan = await toArray(this.proposalsForSlot.keysAsync({ end: new Fr(oldestSlot).toString() }));
+  public async deleteAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void> {
+    const olderThan = await toArray(this.proposalsForSlot.keysAsync({ end: oldestSlot }));
     for (const oldSlot of olderThan) {
-      await this.deleteAttestationsForSlot(BigInt(oldSlot));
+      await this.deleteAttestationsForSlot(SlotNumber(oldSlot));
     }
   }
 
-  public async deleteAttestationsForSlot(slot: bigint): Promise<void> {
-    const slotFr = new Fr(slot);
+  public async deleteAttestationsForSlot(slot: SlotNumber): Promise<void> {
     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)),
+          this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)),
         );
 
         numberOfAttestations += attestations.length;
@@ -159,17 +158,19 @@ export class KvAttestationPool implements AttestationPool {
         }
 
         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}`);
     });
   }
 
-  public async deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void> {
+  public async deleteAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<void> {
     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)),
       );
@@ -180,8 +181,8 @@ export class KvAttestationPool implements AttestationPool {
       }
 
       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}`);
     });
@@ -196,7 +197,7 @@ export class KvAttestationPool implements AttestationPool {
 
         // 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;
         }
 
@@ -253,7 +254,7 @@ export class KvAttestationPool implements AttestationPool {
 
   public async addBlockProposal(blockProposal: BlockProposal): Promise<void> {
     await this.store.transactionAsync(async () => {
-      const slotKey = blockProposal.slotNumber.toString();
+      const slotKey = blockProposal.slotNumber;
       const proposalId = blockProposal.archive.toString();
 
       if (!(await this.canAddProposal(blockProposal))) {
@@ -268,21 +269,19 @@ export class KvAttestationPool implements AttestationPool {
     });
   }
 
-  public async hasReachedProposalCap(slot: bigint): Promise<boolean> {
-    const slotKey = new Fr(slot).toString();
-    const uniqueProposalCount = await this.proposalsForSlot.getValueCountAsync(slotKey);
+  public async hasReachedProposalCap(slot: SlotNumber): Promise<boolean> {
+    const uniqueProposalCount = await this.proposalsForSlot.getValueCountAsync(slot);
     return uniqueProposalCount >= MAX_PROPOSALS_PER_SLOT;
   }
 
-  public async hasReachedAttestationCap(slot: bigint, proposalId: string, committeeSize: number): Promise<boolean> {
+  public async hasReachedAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean> {
     const limit = committeeSize + ATTESTATION_CAP_BUFFER;
     return (await this.attestationsForProposal.getValueCountAsync(this.getProposalKey(slot, proposalId))) >= limit;
   }
 
   public async canAddProposal(block: BlockProposal): Promise<boolean> {
     return (
-      (await this.proposals.hasAsync(block.archive.toString())) ||
-      !(await this.hasReachedProposalCap(block.slotNumber.toBigInt()))
+      (await this.proposals.hasAsync(block.archive.toString())) || !(await this.hasReachedProposalCap(block.slotNumber))
     );
   }
 
@@ -290,7 +289,7 @@ export class KvAttestationPool implements AttestationPool {
     return (
       (await this.hasAttestation(attestation)) ||
       !(await this.hasReachedAttestationCap(
-        attestation.payload.header.slotNumber.toBigInt(),
+        attestation.payload.header.slotNumber,
         attestation.archive.toString(),
         committeeSize,
       ))

package/src/mem_pools/attestation_pool/memory_attestation_pool.ts

@@ -1,3 +1,4 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
@@ -9,7 +10,11 @@ import { ATTESTATION_CAP_BUFFER, MAX_PROPOSALS_PER_SLOT } from './kv_attestation
 export class InMemoryAttestationPool implements AttestationPool {
   private metrics: PoolInstrumentation<BlockAttestation>;
 
-  private attestations: Map</*slot=*/ bigint, Map</*proposalId*/ string, Map</*address=*/ string, BlockAttestation>>>;
+  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+  private attestations: Map<
+    /*slot=*/ SlotNumber,
+    Map</*proposalId*/ string, Map</*address=*/ string, BlockAttestation>>
+  >;
   private proposals: Map<string, BlockProposal>;
 
   constructor(
@@ -31,7 +36,7 @@ export class InMemoryAttestationPool implements AttestationPool {
     return Promise.resolve(this.attestations.size === 0);
   }
 
-  public getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]> {
+  public getAttestationsForSlot(slot: SlotNumber): Promise<BlockAttestation[]> {
     return Promise.resolve(
       Array.from(this.attestations.get(slot)?.values() ?? []).flatMap(proposalAttestationMap =>
         Array.from(proposalAttestationMap.values()),
@@ -39,7 +44,7 @@ export class InMemoryAttestationPool implements AttestationPool {
     );
   }
 
-  public getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]> {
+  public getAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<BlockAttestation[]> {
     const slotAttestationMap = this.attestations.get(slot);
     if (slotAttestationMap) {
       const proposalAttestationMap = slotAttestationMap.get(proposalId);
@@ -60,7 +65,7 @@ export class InMemoryAttestationPool implements AttestationPool {
 
       // 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,
@@ -68,11 +73,11 @@ export class InMemoryAttestationPool implements AttestationPool {
         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,
@@ -83,7 +88,7 @@ export class InMemoryAttestationPool implements AttestationPool {
     return Promise.resolve();
   }
 
-  #getNumberOfAttestationsInSlot(slot: bigint): number {
+  #getNumberOfAttestationsInSlot(slot: SlotNumber): number {
     let total = 0;
     const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
 
@@ -95,7 +100,7 @@ export class InMemoryAttestationPool implements AttestationPool {
     return total;
   }
 
-  public async deleteAttestationsOlderThan(oldestSlot: bigint): Promise<void> {
+  public async deleteAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void> {
     const olderThan = [];
 
     // Entries are iterated in insertion order, so we can break as soon as we find a slot that is older than the oldestSlot.
@@ -116,7 +121,7 @@ export class InMemoryAttestationPool implements AttestationPool {
     return Promise.resolve();
   }
 
-  public deleteAttestationsForSlot(slot: bigint): Promise<void> {
+  public deleteAttestationsForSlot(slot: SlotNumber): Promise<void> {
     // We count the number of attestations we are removing
     const numberOfAttestations = this.#getNumberOfAttestationsInSlot(slot);
     const proposalIdsToDelete = this.attestations.get(slot)?.keys();
@@ -134,7 +139,7 @@ export class InMemoryAttestationPool implements AttestationPool {
     return Promise.resolve();
   }
 
-  public deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void> {
+  public deleteAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<void> {
     const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
     if (slotAttestationMap) {
       if (slotAttestationMap.has(proposalId)) {
@@ -153,7 +158,7 @@ export class InMemoryAttestationPool implements AttestationPool {
   public deleteAttestations(attestations: BlockAttestation[]): Promise<void> {
     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);
@@ -162,7 +167,7 @@ export class InMemoryAttestationPool implements AttestationPool {
 
           // 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;
           }
 
@@ -184,7 +189,7 @@ export class InMemoryAttestationPool implements AttestationPool {
       return Promise.resolve(false);
     }
 
-    const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
+    const slotAttestationMap = this.attestations.get(slotNumber);
     if (!slotAttestationMap) {
       return Promise.resolve(false);
     }
@@ -200,7 +205,7 @@ export class InMemoryAttestationPool implements AttestationPool {
   public addBlockProposal(blockProposal: BlockProposal): Promise<void> {
     // 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<string, BlockAttestation>());
 
     this.proposals.set(blockProposal.payload.archive.toString(), blockProposal);
@@ -216,27 +221,25 @@ export class InMemoryAttestationPool implements AttestationPool {
     return Promise.resolve(this.proposals.has(id));
   }
 
-  public hasReachedProposalCap(slot: bigint): Promise<boolean> {
+  public hasReachedProposalCap(slot: SlotNumber): Promise<boolean> {
     const slotAttestationMap = this.attestations.get(slot);
     const proposalCount = slotAttestationMap?.size ?? 0;
     return Promise.resolve(proposalCount >= MAX_PROPOSALS_PER_SLOT);
   }
 
-  public hasReachedAttestationCap(slot: bigint, proposalId: string, committeeSize: number): Promise<boolean> {
+  public hasReachedAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean> {
     const limit = committeeSize + ATTESTATION_CAP_BUFFER;
     const count = this.attestations.get(slot)?.get(proposalId)?.size ?? 0;
     return Promise.resolve(limit <= 0 || count >= limit);
   }
 
   public async canAddProposal(block: BlockProposal): Promise<boolean> {
-    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));
   }
 
   public async canAddAttestation(attestation: BlockAttestation, committeeSize: number): Promise<boolean> {
     const sender = attestation.getSender();
-    const slot = attestation.payload.header.slotNumber.toBigInt();
+    const slot = attestation.payload.header.slotNumber;
     const pid = attestation.archive.toString();
     return (
       !!sender &&
@@ -255,8 +258,9 @@ export class InMemoryAttestationPool implements AttestationPool {
  * @returns The slot mapping
  */
 function getSlotOrDefault(
-  map: Map<bigint, Map<string, Map<string, BlockAttestation>>>,
-  slot: bigint,
+  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+  map: Map<SlotNumber, Map<string, Map<string, BlockAttestation>>>,
+  slot: SlotNumber,
 ): Map<string, Map<string, BlockAttestation>> {
   if (!map.has(slot)) {
     map.set(slot, new Map<string, Map<string, BlockAttestation>>());

package/src/mem_pools/attestation_pool/mocks.ts

@@ -33,7 +33,7 @@ export const mockAttestation = (
 ): BlockAttestation => {
   // Use arbitrary numbers for all other than slot
   const header = makeL2BlockHeader(1, 2, slot);
-  const payload = new ConsensusPayload(header.toCheckpointHeader(), archive, header.state);
+  const payload = new ConsensusPayload(header.toCheckpointHeader(), archive);
 
   const attestationHash = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
   const attestationSignature = signer.sign(attestationHash);

package/src/msg_validators/attestation_validator/attestation_validator.ts

@@ -13,47 +13,45 @@ export class AttestationValidator implements P2PValidator<BlockAttestation> {
   }
 
   async validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined> {
-    const slotNumberBigInt = message.payload.header.slotNumber.toBigInt();
+    const slotNumber = message.payload.header.slotNumber;
 
     try {
       const { currentProposer, nextProposer, currentSlot, nextSlot } =
         await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
 
-      if (slotNumberBigInt !== currentSlot && slotNumberBigInt !== nextSlot) {
-        this.logger.warn(
-          `Attestation slot ${slotNumberBigInt} is not current (${currentSlot}) or next (${nextSlot}) slot`,
-        );
+      if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
+        this.logger.warn(`Attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
         return PeerErrorSeverity.HighToleranceError;
       }
 
       // Verify the signature is valid
       const attester = message.getSender();
       if (attester === undefined) {
-        this.logger.warn(`Invalid signature in attestation for slot ${slotNumberBigInt}`);
+        this.logger.warn(`Invalid signature in attestation for slot ${slotNumber}`);
         return PeerErrorSeverity.LowToleranceError;
       }
 
       // Verify the attester is in the committee for this slot
-      if (!(await this.epochCache.isInCommittee(slotNumberBigInt, attester))) {
-        this.logger.warn(`Attester ${attester.toString()} is not in committee for slot ${slotNumberBigInt}`);
+      if (!(await this.epochCache.isInCommittee(slotNumber, attester))) {
+        this.logger.warn(`Attester ${attester.toString()} is not in committee for slot ${slotNumber}`);
         return PeerErrorSeverity.HighToleranceError;
       }
 
       // Verify the proposer signature matches the expected proposer for this slot
       const proposer = message.getProposer();
-      const expectedProposer = slotNumberBigInt === currentSlot ? currentProposer : nextProposer;
+      const expectedProposer = slotNumber === currentSlot ? currentProposer : nextProposer;
       if (!expectedProposer) {
-        this.logger.warn(`No proposer defined for slot ${slotNumberBigInt}`);
+        this.logger.warn(`No proposer defined for slot ${slotNumber}`);
         return PeerErrorSeverity.HighToleranceError;
       }
       if (!proposer) {
-        this.logger.warn(`Invalid proposer signature in attestation for slot ${slotNumberBigInt}`);
+        this.logger.warn(`Invalid proposer signature in attestation for slot ${slotNumber}`);
         return PeerErrorSeverity.LowToleranceError;
       }
       if (!proposer.equals(expectedProposer)) {
         this.logger.warn(
           `Proposer signature mismatch in attestation. ` +
-            `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumberBigInt}`,
+            `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumber}`,
         );
         return PeerErrorSeverity.HighToleranceError;
       }
@@ -62,7 +60,7 @@ export class AttestationValidator implements P2PValidator<BlockAttestation> {
     } catch (e) {
       // People shouldn't be sending us attestations if the committee doesn't exist
       if (e instanceof NoCommitteeError) {
-        this.logger.warn(`No committee exists for attestation for slot ${slotNumberBigInt}`);
+        this.logger.warn(`No committee exists for attestation for slot ${slotNumber}`);
         return PeerErrorSeverity.LowToleranceError;
       }
       throw e;

package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts

@@ -43,7 +43,7 @@ export class FishermanAttestationValidator extends AttestationValidator {
     }
 
     // fisherman validation: verify attestation payload matches proposal payload
-    const slotNumberBigInt = message.payload.header.slotNumber.toBigInt();
+    const slotNumberBigInt = message.payload.header.slotNumber;
     const attester = message.getSender();
     const proposer = message.getProposer();