@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,23 +1,41 @@
+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';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
+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;
     metrics;
     attestations;
+    proposals;
     proposalsForSlot;
     attestationsForProposal;
     constructor(store, telemetry = getTelemetryClient(), log = createLogger('aztec:attestation_pool')){
         this.store = store;
         this.log = log;
+        this.poolStats = async ()=>{
+            return {
+                itemCount: await this.attestations.sizeAsync()
+            };
+        };
         this.attestations = store.openMap('attestations');
+        this.proposals = store.openMap('proposals');
         this.proposalsForSlot = store.openMultiMap('proposals_for_slot');
         this.attestationsForProposal = store.openMultiMap('attestations_for_proposal');
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
+        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
+    }
+    poolStats;
+    async isEmpty() {
+        for await (const _ of this.attestations.entriesAsync()){
+            return false;
+        }
+        return true;
     }
     getProposalKey(slot, proposalId) {
         const slotStr = typeof slot === 'string' ? slot : new Fr(slot).toString();
@@ -30,18 +48,40 @@ export class KvAttestationPool {
     async addAttestations(attestations) {
         await this.store.transactionAsync(async ()=>{
             for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+                const slotNumber = attestation.payload.header.slotNumber;
                 const proposalId = attestation.archive;
-                const address = (await attestation.getSender()).toString();
+                const sender = attestation.getSender();
+                // Skip attestations with invalid signatures
+                if (!sender) {
+                    this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber}`, {
+                        signature: attestation.signature.toString(),
+                        slotNumber,
+                        proposalId
+                    });
+                    continue;
+                }
+                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} from ${address}`);
+                this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`, {
+                    signature: attestation.signature.toString(),
+                    slotNumber,
+                    address,
+                    proposalId
+                });
             }
         });
-        this.metrics.recordAddedObjects(attestations.length);
     }
-    async getAttestationsForSlot(slot, proposalId) {
+    async getAttestationsForSlot(slot) {
+        const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slot));
+        const attestations = [];
+        for (const proposalId of proposalIds){
+            attestations.push(...await this.getAttestationsForSlotAndProposal(slot, proposalId));
+        }
+        return attestations;
+    }
+    async getAttestationsForSlotAndProposal(slot, proposalId) {
         const attestationIds = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
         const attestations = [];
         // alternatively iterate this.attestaions starting from slot-proposal-EthAddress.zero
@@ -58,55 +98,116 @@ 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.attestationsForProposal.delete(this.getProposalKey(slotFr, proposalId));
+                await this.proposals.delete(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}`);
         });
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
     }
     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.proposalsForSlot.deleteValue(slotString, proposalId);
-            await this.attestationsForProposal.delete(this.getProposalKey(slotString, proposalId));
+            await this.proposals.delete(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}`);
         });
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
     }
     async deleteAttestations(attestations) {
         await this.store.transactionAsync(async ()=>{
             for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+                const slotNumber = attestation.payload.header.slotNumber;
                 const proposalId = attestation.archive;
-                const address = (await attestation.getSender()).toString();
-                await this.attestations.delete(this.getAttestationKey(slotNumber, proposalId, address));
+                const sender = attestation.getSender();
+                // Skip attestations with invalid signatures
+                if (!sender) {
+                    this.log.warn(`Skipping deletion of attestation with invalid signature for slot ${slotNumber}`);
+                    continue;
+                }
+                const address = sender.toString();
+                const key = this.getAttestationKey(slotNumber, proposalId, address);
+                if (await this.attestations.hasAsync(key)) {
+                    await this.attestations.delete(key);
+                }
                 await this.attestationsForProposal.deleteValue(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
                 this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
             }
         });
-        this.metrics.recordRemovedObjects(attestations.length);
+    }
+    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 {
+            if (buffer && buffer.length > 0) {
+                return BlockProposal.fromBuffer(buffer);
+            }
+        } catch  {
+            return Promise.resolve(undefined);
+        }
+        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 ()=>{
+            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);
     }
 }

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

@@ -1,4 +1,5 @@
-import type { BlockAttestation } from '@aztec/stdlib/p2p';
+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';
 export declare class InMemoryAttestationPool implements AttestationPool {
@@ -6,12 +7,24 @@ export declare class InMemoryAttestationPool implements AttestationPool {
     private log;
     private metrics;
     private attestations;
+    private proposals;
     constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    getAttestationsForSlot(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
+    private poolStats;
+    isEmpty(): Promise<boolean>;
+    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: 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,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAKE,OAAO,CAAC,GAAG;IAJ1E,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;gBAExG,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAAuC;IAK1G,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAW/E,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgChE,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe/E,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBjF"}
+{"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

@@ -1,16 +1,32 @@
 import { createLogger } from '@aztec/foundation/log';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { PoolInstrumentation, PoolName } from '../instrumentation.js';
+import { ATTESTATION_CAP_BUFFER, MAX_PROPOSALS_PER_SLOT } from './kv_attestation_pool.js';
 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')){
         this.log = log;
+        this.poolStats = ()=>{
+            return Promise.resolve({
+                itemCount: this.attestations.size
+            });
+        };
         this.attestations = new Map();
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
+        this.proposals = new Map();
+        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
     }
-    getAttestationsForSlot(slot, proposalId) {
+    poolStats;
+    isEmpty() {
+        return Promise.resolve(this.attestations.size === 0);
+    }
+    getAttestationsForSlot(slot) {
+        return Promise.resolve(Array.from(this.attestations.get(slot)?.values() ?? []).flatMap((proposalAttestationMap)=>Array.from(proposalAttestationMap.values())));
+    }
+    getAttestationsForSlotAndProposal(slot, proposalId) {
         const slotAttestationMap = this.attestations.get(slot);
         if (slotAttestationMap) {
             const proposalAttestationMap = slotAttestationMap.get(proposalId);
@@ -20,19 +36,31 @@ export class InMemoryAttestationPool {
         }
         return Promise.resolve([]);
     }
-    async addAttestations(attestations) {
+    addAttestations(attestations) {
         for (const attestation of attestations){
             // Perf: order and group by slot before insertion
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
+            const slotNumber = attestation.payload.header.slotNumber;
             const proposalId = attestation.archive.toString();
-            const address = await attestation.getSender();
-            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
+            const sender = attestation.getSender();
+            // Skip attestations with invalid signatures
+            if (!sender) {
+                this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber}`, {
+                    signature: attestation.signature.toString(),
+                    slotNumber,
+                    proposalId
+                });
+                continue;
+            }
+            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber);
             const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-            proposalAttestationMap.set(address.toString(), attestation);
-            this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`);
+            proposalAttestationMap.set(sender.toString(), attestation);
+            this.log.verbose(`Added attestation for slot ${slotNumber} from ${sender}`, {
+                signature: attestation.signature.toString(),
+                slotNumber,
+                address: sender,
+                proposalId
+            });
         }
-        // TODO: set these to pending or something ????
-        this.metrics.recordAddedObjects(attestations.length);
         return Promise.resolve();
     }
     #getNumberOfAttestationsInSlot(slot) {
@@ -66,9 +94,14 @@ export class InMemoryAttestationPool {
     deleteAttestationsForSlot(slot) {
         // We count the number of attestations we are removing
         const numberOfAttestations = this.#getNumberOfAttestationsInSlot(slot);
+        const proposalIdsToDelete = this.attestations.get(slot)?.keys();
+        let proposalIdsToDeleteCount = 0;
+        proposalIdsToDelete?.forEach((proposalId)=>{
+            this.proposals.delete(proposalId);
+            proposalIdsToDeleteCount++;
+        });
         this.attestations.delete(slot);
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
+        this.log.verbose(`Removed ${numberOfAttestations} attestations and ${proposalIdsToDeleteCount} proposals for slot ${slot}`);
         return Promise.resolve();
     }
     deleteAttestationsForSlotAndProposal(slot, proposalId) {
@@ -78,28 +111,84 @@ export class InMemoryAttestationPool {
                 const numberOfAttestations = slotAttestationMap.get(proposalId)?.size ?? 0;
                 slotAttestationMap.delete(proposalId);
                 this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-                this.metrics.recordRemovedObjects(numberOfAttestations);
             }
         }
+        this.proposals.delete(proposalId);
         return Promise.resolve();
     }
-    async deleteAttestations(attestations) {
+    deleteAttestations(attestations) {
         for (const attestation of attestations){
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
-            const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
+            const slotNumber = attestation.payload.header.slotNumber;
+            const slotAttestationMap = this.attestations.get(slotNumber);
             if (slotAttestationMap) {
                 const proposalId = attestation.archive.toString();
                 const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
                 if (proposalAttestationMap) {
-                    const address = await attestation.getSender();
-                    proposalAttestationMap.delete(address.toString());
-                    this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
+                    const sender = attestation.getSender();
+                    // Skip attestations with invalid signatures
+                    if (!sender) {
+                        this.log.warn(`Skipping deletion of attestation with invalid signature for slot ${slotNumber}`);
+                        continue;
+                    }
+                    proposalAttestationMap.delete(sender.toString());
+                    this.log.debug(`Deleted attestation for slot ${slotNumber} from ${sender}`);
                 }
             }
         }
-        this.metrics.recordRemovedObjects(attestations.length);
         return Promise.resolve();
     }
+    hasAttestation(attestation) {
+        const slotNumber = attestation.payload.header.slotNumber;
+        const proposalId = attestation.archive.toString();
+        const sender = attestation.getSender();
+        // Attestations with invalid signatures are never in the pool
+        if (!sender) {
+            return Promise.resolve(false);
+        }
+        const slotAttestationMap = this.attestations.get(slotNumber);
+        if (!slotAttestationMap) {
+            return Promise.resolve(false);
+        }
+        const proposalAttestationMap = slotAttestationMap.get(proposalId);
+        if (!proposalAttestationMap) {
+            return Promise.resolve(false);
+        }
+        return Promise.resolve(proposalAttestationMap.has(sender.toString()));
+    }
+    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);
+        slotProposalMapping.set(blockProposal.payload.archive.toString(), new Map());
+        this.proposals.set(blockProposal.payload.archive.toString(), blockProposal);
+        return Promise.resolve();
+    }
+    getBlockProposal(id) {
+        return Promise.resolve(this.proposals.get(id));
+    }
+    hasBlockProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.payload.archive.toString();
+        return Promise.resolve(this.proposals.has(id));
+    }
+    hasReachedProposalCap(slot) {
+        const slotAttestationMap = this.attestations.get(slot);
+        const proposalCount = slotAttestationMap?.size ?? 0;
+        return Promise.resolve(proposalCount >= MAX_PROPOSALS_PER_SLOT);
+    }
+    hasReachedAttestationCap(slot, proposalId, committeeSize) {
+        const limit = committeeSize + ATTESTATION_CAP_BUFFER;
+        const count = this.attestations.get(slot)?.get(proposalId)?.size ?? 0;
+        return Promise.resolve(limit <= 0 || count >= limit);
+    }
+    async canAddProposal(block) {
+        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;
+        const pid = attestation.archive.toString();
+        return !!sender && ((this.attestations.get(slot)?.get(pid)?.has(sender.toString()) ?? false) || !await this.hasReachedAttestationCap(slot, pid, committeeSize));
+    }
 }
 /**
  * Get Slot or Default
@@ -108,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());
     }