@aztec/p2p 0.0.1-commit.b655e406 → 0.0.1-commit.d1f2d6c

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

@@ -1,30 +1,40 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
+import { BlockProposal, CheckpointAttestation, CheckpointProposal, type CheckpointProposalCore } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
+export declare const MAX_PROPOSALS_PER_SLOT = 5;
+export declare const ATTESTATION_CAP_BUFFER = 10;
 export declare class KvAttestationPool implements AttestationPool {
     private store;
     private log;
     private metrics;
-    private attestations;
     private proposals;
-    private proposalsForSlot;
-    private attestationsForProposal;
+    private checkpointAttestations;
+    private checkpointProposals;
+    private checkpointProposalsForSlot;
+    private checkpointAttestationsForProposal;
     constructor(store: AztecAsyncKVStore, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     private poolStats;
     isEmpty(): Promise<boolean>;
     private getProposalKey;
     private getAttestationKey;
-    addAttestations(attestations: BlockAttestation[]): Promise<void>;
-    getAttestationsForSlot(slot: bigint): Promise<BlockAttestation[]>;
-    getAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<BlockAttestation[]>;
-    deleteAttestationsOlderThan(oldestSlot: bigint): Promise<void>;
-    deleteAttestationsForSlot(slot: bigint): Promise<void>;
-    deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
-    deleteAttestations(attestations: BlockAttestation[]): Promise<void>;
-    hasAttestation(attestation: BlockAttestation): Promise<boolean>;
+    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
     getBlockProposal(id: string): Promise<BlockProposal | undefined>;
     hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
-    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
+    addCheckpointProposal(proposal: CheckpointProposal): Promise<void>;
+    getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined>;
+    hasCheckpointProposal(idOrProposal: string | CheckpointProposal): Promise<boolean>;
+    addCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
+    getCheckpointAttestationsForSlot(slot: SlotNumber): Promise<CheckpointAttestation[]>;
+    getCheckpointAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<CheckpointAttestation[]>;
+    deleteCheckpointAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void>;
+    private deleteCheckpointAttestationsForSlot;
+    hasCheckpointAttestation(attestation: CheckpointAttestation): Promise<boolean>;
+    canAddProposal(_block: BlockProposal): Promise<boolean>;
+    canAddCheckpointProposal(proposal: CheckpointProposal): Promise<boolean>;
+    canAddCheckpointAttestation(attestation: CheckpointAttestation, committeeSize: number): Promise<boolean>;
+    hasReachedCheckpointProposalCap(slot: SlotNumber): Promise<boolean>;
+    hasReachedCheckpointAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean>;
 }
-//# sourceMappingURL=kv_attestation_pool.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia3ZfYXR0ZXN0YXRpb25fcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy9hdHRlc3RhdGlvbl9wb29sL2t2X2F0dGVzdGF0aW9uX3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSTdELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sRUFDTCxhQUFhLEVBQ2IscUJBQXFCLEVBQ3JCLGtCQUFrQixFQUNsQixLQUFLLHNCQUFzQixFQUM1QixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUluRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUU3RCxlQUFPLE1BQU0sc0JBQXNCLElBQUksQ0FBQztBQUN4QyxlQUFPLE1BQU0sc0JBQXNCLEtBQUssQ0FBQztBQUV6QyxxQkFBYSxpQkFBa0IsWUFBVyxlQUFlO0lBZXJELE9BQU8sQ0FBQyxLQUFLO0lBRWIsT0FBTyxDQUFDLEdBQUc7SUFoQmIsT0FBTyxDQUFDLE9BQU8sQ0FBNkM7SUFFNUQsT0FBTyxDQUFDLFNBQVMsQ0FHZjtJQUdGLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBZ0M7SUFDOUQsT0FBTyxDQUFDLG1CQUFtQixDQUFnQztJQUMzRCxPQUFPLENBQUMsMEJBQTBCLENBQXFDO0lBQ3ZFLE9BQU8sQ0FBQyxpQ0FBaUMsQ0FBcUM7SUFFOUUsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ2hDLFNBQVMsR0FBRSxlQUFzQyxFQUN6QyxHQUFHLHlDQUF5QyxFQVdyRDtJQUVELE9BQU8sQ0FBQyxTQUFTLENBSWY7SUFFVyxPQUFPLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVF2QztJQUVELE9BQU8sQ0FBQyxjQUFjO0lBWXRCLE9BQU8sQ0FBQyxpQkFBaUI7SUFJWixnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNekU7SUFFWSxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBVzVFO0lBRVksZ0JBQWdCLENBQUMsWUFBWSxFQUFFLE1BQU0sR0FBRyxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUdwRjtJQUVZLHFCQUFxQixDQUFDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBNEI5RTtJQUVZLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixHQUFHLFNBQVMsQ0FBQyxDQVcxRjtJQUVZLHFCQUFxQixDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsa0JBQWtCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUc5RjtJQUVZLHlCQUF5QixDQUFDLFlBQVksRUFBRSxxQkFBcUIsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQzNGO0lBRVksZ0NBQWdDLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQVNoRztJQUVZLDJDQUEyQyxDQUN0RCxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxHQUNqQixPQUFPLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQWtCbEM7SUFFWSxxQ0FBcUMsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLeEY7WUFFYSxtQ0FBbUM7SUF3QnBDLHdCQUF3QixDQUFDLFdBQVcsRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBYzFGO0lBRU0sY0FBYyxDQUFDLE1BQU0sRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUc3RDtJQUVZLHdCQUF3QixDQUFDLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBTXBGO0lBRVksMkJBQTJCLENBQ3RDLFdBQVcsRUFBRSxxQkFBcUIsRUFDbEMsYUFBYSxFQUFFLE1BQU0sR0FDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVNsQjtJQUVZLCtCQUErQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUcvRTtJQUVZLGtDQUFrQyxDQUM3QyxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxFQUNsQixhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBS2xCO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"kv_attestation_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/attestation_pool/kv_attestation_pool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,iBAAkB,YAAW,eAAe;IAYrD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IAbb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,SAAS,CAGf;IACF,OAAO,CAAC,gBAAgB,CAAqC;IAC7D,OAAO,CAAC,uBAAuB,CAAqC;gBAG1D,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC;IAUtD,OAAO,CAAC,SAAS,CAIf;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAOxC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqChE,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAYjE,iCAAiC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBhG,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBrF,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BnE,cAAc,CAAC,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB/D,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAahE,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxE,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAM3E"}
+{"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,EACL,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,sBAAsB,EAC5B,MAAM,mBAAmB,CAAC;AAC3B,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;IAerD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IAhBb,OAAO,CAAC,OAAO,CAA6C;IAE5D,OAAO,CAAC,SAAS,CAGf;IAGF,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,0BAA0B,CAAqC;IACvE,OAAO,CAAC,iCAAiC,CAAqC;IAE9E,YACU,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC,EAWrD;IAED,OAAO,CAAC,SAAS,CAIf;IAEW,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAQvC;IAED,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;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,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B9E;IAEY,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAW1F;IAEY,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAG9F;IAEY,yBAAyB,CAAC,YAAY,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC3F;IAEY,gCAAgC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAShG;IAEY,2CAA2C,CACtD,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAkBlC;IAEY,qCAAqC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAKxF;YAEa,mCAAmC;IAwBpC,wBAAwB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAc1F;IAEM,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG7D;IAEY,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMpF;IAEY,2BAA2B,CACtC,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CASlB;IAEY,+BAA+B,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAG/E;IAEY,kCAAkC,CAC7C,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CAKlB;CACF"}

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,34 +1,45 @@
-import { Fr } from '@aztec/foundation/fields';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
-import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
+import { BlockProposal, CheckpointAttestation, CheckpointProposal } 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;
+    // Checkpoint attestation storage
+    checkpointAttestations;
+    checkpointProposals;
+    checkpointProposalsForSlot;
+    checkpointAttestationsForProposal;
     constructor(store, telemetry = getTelemetryClient(), log = createLogger('aztec:attestation_pool')){
         this.store = store;
         this.log = log;
         this.poolStats = async ()=>{
             return {
-                itemCount: await this.attestations.sizeAsync()
+                itemCount: await this.checkpointAttestations.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');
+        // Initialize checkpoint attestation storage
+        this.checkpointAttestations = store.openMap('checkpoint_attestations');
+        this.checkpointProposals = store.openMap('checkpoint_proposals');
+        this.checkpointProposalsForSlot = store.openMultiMap('checkpoint_proposals_for_slot');
+        this.checkpointAttestationsForProposal = store.openMultiMap('checkpoint_attestations_for_proposal');
         this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
     }
     poolStats;
     async isEmpty() {
-        for await (const _ of this.attestations.entriesAsync()){
+        for await (const _ of this.checkpointAttestations.entriesAsync()){
+            return false;
+        }
+        for await (const _ of this.proposals.entriesAsync()){
             return false;
         }
         return true;
@@ -41,7 +52,65 @@ export class KvAttestationPool {
     getAttestationKey(slot, proposalId, address) {
         return `${this.getProposalKey(slot, proposalId)}-${address}`;
     }
-    async addAttestations(attestations) {
+    async addBlockProposal(blockProposal) {
+        await this.store.transactionAsync(async ()=>{
+            const proposalId = blockProposal.archive.toString();
+            // Strip signedTxs before storing to avoid persisting full tx data
+            await this.proposals.set(proposalId, blockProposal.withoutSignedTxs().toBuffer());
+        });
+    }
+    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.archive.toString();
+        return await this.proposals.hasAsync(id);
+    }
+    async addCheckpointProposal(proposal) {
+        if (!await this.canAddCheckpointProposal(proposal)) {
+            throw new ProposalSlotCapExceededError(`Maximum checkpoint proposals per slot reached: slot=${proposal.slotNumber} cap=${MAX_PROPOSALS_PER_SLOT} proposal=${proposal.archive.toString()}`);
+        }
+        // Extract and validate the block proposal if present
+        const blockProposal = proposal.getBlockProposal();
+        if (blockProposal && !await this.canAddProposal(blockProposal)) {
+            throw new ProposalSlotCapExceededError(`Maximum block proposals per slot reached when extracting from checkpoint: slot=${proposal.slotNumber} proposal=${blockProposal.archive.toString()}`);
+        }
+        await this.store.transactionAsync(async ()=>{
+            const slotKey = proposal.slotNumber;
+            const proposalId = proposal.archive.toString();
+            await this.checkpointProposalsForSlot.set(slotKey, proposalId);
+            // Store the checkpoint proposal as core (without lastBlock) to avoid duplication
+            await this.checkpointProposals.set(proposalId, proposal.toCore().toBuffer());
+            // Store the extracted block proposal separately
+            if (blockProposal) {
+                await this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs().toBuffer());
+            }
+        });
+    }
+    async getCheckpointProposal(id) {
+        const buffer = await this.checkpointProposals.getAsync(id);
+        try {
+            if (buffer && buffer.length > 0) {
+                return CheckpointProposal.fromBuffer(buffer);
+            }
+        } catch  {
+            return Promise.resolve(undefined);
+        }
+        return Promise.resolve(undefined);
+    }
+    async hasCheckpointProposal(idOrProposal) {
+        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
+        return await this.checkpointProposals.hasAsync(id);
+    }
+    async addCheckpointAttestations(attestations) {
         await this.store.transactionAsync(async ()=>{
             for (const attestation of attestations){
                 const slotNumber = attestation.payload.header.slotNumber;
@@ -49,7 +118,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 checkpoint attestation with invalid signature for slot ${slotNumber}`, {
                         signature: attestation.signature.toString(),
                         slotNumber,
                         proposalId
@@ -57,10 +126,10 @@ export class KvAttestationPool {
                     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.attestationsForProposal.set(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${address}`, {
+                await this.checkpointAttestations.set(this.getAttestationKey(slotNumber, proposalId, address), attestation.toBuffer());
+                await this.checkpointProposalsForSlot.set(slotNumber, proposalId.toString());
+                await this.checkpointAttestationsForProposal.set(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
+                this.log.verbose(`Added checkpoint attestation for slot ${slotNumber} from ${address}`, {
                     signature: attestation.signature.toString(),
                     slotNumber,
                     address,
@@ -69,92 +138,53 @@ export class KvAttestationPool {
             }
         });
     }
-    async getAttestationsForSlot(slot) {
-        const slotFr = new Fr(slot);
-        const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
+    async getCheckpointAttestationsForSlot(slot) {
+        const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
         const attestations = [];
         for (const proposalId of proposalIds){
-            attestations.push(...await this.getAttestationsForSlotAndProposal(slot, proposalId));
+            attestations.push(...await this.getCheckpointAttestationsForSlotAndProposal(slot, proposalId));
         }
         return attestations;
     }
-    async getAttestationsForSlotAndProposal(slot, proposalId) {
-        const attestationIds = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
+    async getCheckpointAttestationsForSlotAndProposal(slot, proposalId) {
+        const attestationIds = await toArray(this.checkpointAttestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
         const attestations = [];
-        // alternatively iterate this.attestaions starting from slot-proposal-EthAddress.zero
         for (const id of attestationIds){
-            const buf = await this.attestations.getAsync(id);
+            const buf = await this.checkpointAttestations.getAsync(id);
             if (!buf) {
-                // this should not happen unless we lost writes
-                throw new Error('Attestation not found ' + id);
+                throw new Error('Checkpoint attestation not found ' + id);
             }
-            const attestation = BlockAttestation.fromBuffer(buf);
+            const attestation = CheckpointAttestation.fromBuffer(buf);
             attestations.push(attestation);
         }
         return attestations;
     }
-    async deleteAttestationsOlderThan(oldestSlot) {
-        const olderThan = await toArray(this.proposalsForSlot.keysAsync({
-            end: new Fr(oldestSlot).toString()
+    async deleteCheckpointAttestationsOlderThan(oldestSlot) {
+        const olderThan = await toArray(this.checkpointProposalsForSlot.keysAsync({
+            end: oldestSlot
         }));
         for (const oldSlot of olderThan){
-            await this.deleteAttestationsForSlot(BigInt(oldSlot));
+            await this.deleteCheckpointAttestationsForSlot(SlotNumber(oldSlot));
         }
     }
-    async deleteAttestationsForSlot(slot) {
-        const slotFr = new Fr(slot);
+    async deleteCheckpointAttestationsForSlot(slot) {
         let numberOfAttestations = 0;
         await this.store.transactionAsync(async ()=>{
-            const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
+            const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
             for (const proposalId of proposalIds){
-                const attestations = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slotFr, proposalId)));
+                const attestations = await toArray(this.checkpointAttestationsForProposal.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));
-            }
-            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));
-            this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-        });
-    }
-    async deleteAttestations(attestations) {
-        await this.store.transactionAsync(async ()=>{
-            for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.slotNumber;
-                const proposalId = attestation.archive;
-                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()}`);
-                    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.checkpointAttestations.delete(attestation);
                 }
-                await this.attestationsForProposal.deleteValue(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
+                await this.checkpointProposals.delete(proposalId);
+                await this.checkpointAttestationsForProposal.delete(this.getProposalKey(slot, proposalId));
             }
+            await this.checkpointProposalsForSlot.delete(slot);
+            this.log.verbose(`Removed ${numberOfAttestations} checkpoint attestations for slot ${slot}`);
         });
     }
-    async hasAttestation(attestation) {
+    async hasCheckpointAttestation(attestation) {
         const slotNumber = attestation.payload.header.slotNumber;
         const proposalId = attestation.archive;
         const sender = attestation.getSender();
@@ -164,27 +194,25 @@ export class KvAttestationPool {
         }
         const address = sender.toString();
         const key = this.getAttestationKey(slotNumber, proposalId, address);
-        return await this.attestations.hasAsync(key);
+        return await this.checkpointAttestations.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);
+    canAddProposal(_block) {
+        // TODO(palla/mbps): implement proposal cap logic
+        return Promise.resolve(true);
     }
-    async hasBlockProposal(idOrProposal) {
-        const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.payload.archive.toString();
-        return await this.proposals.hasAsync(id);
+    async canAddCheckpointProposal(proposal) {
+        // TODO(palla/mbps): Adjust checkpoint proposal limit to 1. Also connect to slashing condition in the caller.
+        return await this.checkpointProposals.hasAsync(proposal.archive.toString()) || !await this.hasReachedCheckpointProposalCap(proposal.slotNumber);
     }
-    async addBlockProposal(blockProposal) {
-        await this.store.transactionAsync(async ()=>{
-            await this.proposalsForSlot.set(blockProposal.slotNumber.toString(), blockProposal.archive.toString());
-            await this.proposals.set(blockProposal.payload.archive.toString(), blockProposal.toBuffer());
-        });
+    async canAddCheckpointAttestation(attestation, committeeSize) {
+        return await this.hasCheckpointAttestation(attestation) || !await this.hasReachedCheckpointAttestationCap(attestation.payload.header.slotNumber, attestation.archive.toString(), committeeSize);
+    }
+    async hasReachedCheckpointProposalCap(slot) {
+        const uniqueProposalCount = await this.checkpointProposalsForSlot.getValueCountAsync(slot);
+        return uniqueProposalCount >= MAX_PROPOSALS_PER_SLOT;
+    }
+    async hasReachedCheckpointAttestationCap(slot, proposalId, committeeSize) {
+        const limit = committeeSize + ATTESTATION_CAP_BUFFER;
+        return await this.checkpointAttestationsForProposal.getValueCountAsync(this.getProposalKey(slot, proposalId)) >= limit;
     }
 }

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

@@ -1,25 +1,31 @@
-import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
+import type { SlotNumber } from '@aztec/foundation/branded-types';
+import type { BlockProposal, CheckpointAttestation, CheckpointProposal, CheckpointProposalCore } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { AttestationPool } from './attestation_pool.js';
 export declare class InMemoryAttestationPool implements AttestationPool {
-    #private;
     private log;
     private metrics;
-    private attestations;
     private proposals;
+    private checkpointAttestations;
+    private checkpointProposals;
     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[]>;
-    addAttestations(attestations: BlockAttestation[]): Promise<void>;
-    deleteAttestationsOlderThan(oldestSlot: bigint): Promise<void>;
-    deleteAttestationsForSlot(slot: bigint): Promise<void>;
-    deleteAttestationsForSlotAndProposal(slot: bigint, proposalId: string): Promise<void>;
-    deleteAttestations(attestations: BlockAttestation[]): Promise<void>;
-    hasAttestation(attestation: BlockAttestation): Promise<boolean>;
     addBlockProposal(blockProposal: BlockProposal): Promise<void>;
     getBlockProposal(id: string): Promise<BlockProposal | undefined>;
     hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
+    canAddProposal(_block: BlockProposal): Promise<boolean>;
+    addCheckpointProposal(proposal: CheckpointProposal): Promise<void>;
+    getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined>;
+    hasCheckpointProposal(idOrProposal: string | CheckpointProposal): Promise<boolean>;
+    addCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
+    getCheckpointAttestationsForSlot(slot: SlotNumber): Promise<CheckpointAttestation[]>;
+    getCheckpointAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<CheckpointAttestation[]>;
+    deleteCheckpointAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void>;
+    hasReachedCheckpointProposalCap(slot: SlotNumber): Promise<boolean>;
+    hasReachedCheckpointAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean>;
+    canAddCheckpointProposal(proposal: CheckpointProposal): Promise<boolean>;
+    canAddCheckpointAttestation(attestation: CheckpointAttestation, committeeSize: number): Promise<boolean>;
+    hasCheckpointAttestation(attestation: CheckpointAttestation): Promise<boolean>;
 }
-//# sourceMappingURL=memory_attestation_pool.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5X2F0dGVzdGF0aW9uX3Bvb2wuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvYXR0ZXN0YXRpb25fcG9vbC9tZW1vcnlfYXR0ZXN0YXRpb25fcG9vbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFDVixhQUFhLEVBQ2IscUJBQXFCLEVBQ3JCLGtCQUFrQixFQUNsQixzQkFBc0IsRUFDdkIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0seUJBQXlCLENBQUM7QUFJbkYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHN0QscUJBQWEsdUJBQXdCLFlBQVcsZUFBZTtJQWUzRCxPQUFPLENBQUMsR0FBRztJQWRiLE9BQU8sQ0FBQyxPQUFPLENBQTZDO0lBRTVELE9BQU8sQ0FBQyxTQUFTLENBQTZCO0lBSTlDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FHNUI7SUFDRixPQUFPLENBQUMsbUJBQW1CLENBQXNDO0lBRWpFLFlBQ0UsU0FBUyxHQUFFLGVBQXNDLEVBQ3pDLEdBQUcseUNBQXVDLEVBTW5EO0lBRUQsT0FBTyxDQUFDLFNBQVMsQ0FJZjtJQUVLLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWpDO0lBRU0sZ0JBQWdCLENBQUMsYUFBYSxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSW5FO0lBRU0sZ0JBQWdCLENBQUMsRUFBRSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsYUFBYSxHQUFHLFNBQVMsQ0FBQyxDQUV0RTtJQUVNLGdCQUFnQixDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsYUFBYSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHOUU7SUFFTSxjQUFjLENBQUMsTUFBTSxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRzdEO0lBSVkscUJBQXFCLENBQUMsUUFBUSxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0EyQjlFO0lBRU0scUJBQXFCLENBQUMsRUFBRSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDLENBRXBGO0lBRU0scUJBQXFCLENBQUMsWUFBWSxFQUFFLE1BQU0sR0FBRyxrQkFBa0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBR3hGO0lBRU0seUJBQXlCLENBQUMsWUFBWSxFQUFFLHFCQUFxQixFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTZCckY7SUFFTSxnQ0FBZ0MsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLENBTTFGO0lBRU0sMkNBQTJDLENBQ2hELElBQUksRUFBRSxVQUFVLEVBQ2hCLFVBQVUsRUFBRSxNQUFNLEdBQ2pCLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLENBU2xDO0lBRU0scUNBQXFDLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBa0JsRjtJQUVNLCtCQUErQixDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUl6RTtJQUVNLGtDQUFrQyxDQUN2QyxJQUFJLEVBQUUsVUFBVSxFQUNoQixVQUFVLEVBQUUsTUFBTSxFQUNsQixhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBSWxCO0lBRVksd0JBQXdCLENBQUMsUUFBUSxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FLcEY7SUFFWSwyQkFBMkIsQ0FDdEMsV0FBVyxFQUFFLHFCQUFxQixFQUNsQyxhQUFhLEVBQUUsTUFBTSxHQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLENBU2xCO0lBRU0sd0JBQXdCLENBQUMsV0FBVyxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FxQnBGO0NBQ0YifQ==

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;AAE7D,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;CAIhF"}
+{"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,EACV,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,qBAAa,uBAAwB,YAAW,eAAe;IAe3D,OAAO,CAAC,GAAG;IAdb,OAAO,CAAC,OAAO,CAA6C;IAE5D,OAAO,CAAC,SAAS,CAA6B;IAI9C,OAAO,CAAC,sBAAsB,CAG5B;IACF,OAAO,CAAC,mBAAmB,CAAsC;IAEjE,YACE,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAuC,EAMnD;IAED,OAAO,CAAC,SAAS,CAIf;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAEjC;IAEM,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAInE;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,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAG7D;IAIY,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B9E;IAEM,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAEpF;IAEM,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAGxF;IAEM,yBAAyB,CAAC,YAAY,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BrF;IAEM,gCAAgC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAM1F;IAEM,2CAA2C,CAChD,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CASlC;IAEM,qCAAqC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlF;IAEM,+BAA+B,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAIzE;IAEM,kCAAkC,CACvC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CAIlB;IAEY,wBAAwB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAKpF;IAEY,2BAA2B,CACtC,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,OAAO,CAAC,CASlB;IAEM,wBAAwB,CAAC,WAAW,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBpF;CACF"}