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

package/src/versioning.ts

@@ -1,33 +1,21 @@
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import type { ChainConfig } from '@aztec/stdlib/config';
-import {
-  type ComponentsVersions,
-  checkCompressedComponentVersion,
-  compressComponentVersions,
-  getComponentsVersionsFromConfig,
-} from '@aztec/stdlib/versioning';
+import { compressComponentVersions, getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 
 import type { SignableENR } from '@nethermindeth/enr';
-import xxhashFactory from 'xxhash-wasm';
 
 import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from './types/index.js';
 
-const USE_XX_HASH = false; // Enable to reduce the size of the ENR record for production
-const XX_HASH_LEN = 8;
-const xxhash = await xxhashFactory();
-
 /** Returns the component versions based on config and this build. */
 export function getVersions(config: ChainConfig) {
   return getComponentsVersionsFromConfig(config, protocolContractsHash, getVKTreeRoot());
 }
 
 /** Sets the aztec key on the ENR record with versioning info. */
-export function setAztecEnrKey(enr: SignableENR, config: ChainConfig, useXxHash = USE_XX_HASH) {
+export function setAztecEnrKey(enr: SignableENR, config: ChainConfig) {
   const versions = getVersions(config);
-  const value = versionsToEnrValue(versions, useXxHash);
-  enr.set(AZTEC_ENR_KEY, value);
+  enr.set(AZTEC_ENR_KEY, Buffer.from(compressComponentVersions(versions)));
   return versions;
 }
 
@@ -37,21 +25,3 @@ export function setAztecClientVersionEnrKey(enr: SignableENR, clientVersion: str
     enr.set(AZTEC_ENR_CLIENT_VERSION_KEY, Buffer.from(clientVersion));
   }
 }
-
-/** Checks the given value from an ENR record against the expected versions. */
-export function checkAztecEnrVersion(enrValue: Buffer, expectedVersions: ComponentsVersions) {
-  if (enrValue.length === XX_HASH_LEN) {
-    const expected = versionsToEnrValue(expectedVersions, true);
-    if (!Buffer.from(enrValue).equals(expected)) {
-      throw new Error(`Expected ENR version ${expected.toString('hex')} but received ${enrValue.toString('hex')}`);
-    }
-  } else {
-    const actual = Buffer.from(enrValue).toString();
-    checkCompressedComponentVersion(actual, expectedVersions);
-  }
-}
-
-function versionsToEnrValue(versions: ComponentsVersions, useXxHash: boolean) {
-  const compressed = compressComponentVersions(versions);
-  return useXxHash ? toBufferBE(xxhash.h64(compressed), XX_HASH_LEN) : Buffer.from(compressed);
-}

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

@@ -1,30 +0,0 @@
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import type { AttestationPool } from './attestation_pool.js';
-export declare class KvAttestationPool implements AttestationPool {
-    private store;
-    private log;
-    private metrics;
-    private attestations;
-    private proposals;
-    private proposalsForSlot;
-    private attestationsForProposal;
-    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>;
-    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
-    hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean>;
-    addBlockProposal(blockProposal: BlockProposal): Promise<void>;
-}
-//# sourceMappingURL=kv_attestation_pool.d.ts.map

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

@@ -1 +0,0 @@
-{"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"}

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,190 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { toArray } from '@aztec/foundation/iterable';
-import { createLogger } from '@aztec/foundation/log';
-import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { PoolInstrumentation, PoolName } from '../instrumentation.js';
-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.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();
-        const proposalIdStr = typeof proposalId === 'string' ? proposalId : Buffer.isBuffer(proposalId) ? Fr.fromBuffer(proposalId).toString() : proposalId.toString();
-        return `${slotStr}-${proposalIdStr}`;
-    }
-    getAttestationKey(slot, proposalId, address) {
-        return `${this.getProposalKey(slot, proposalId)}-${address}`;
-    }
-    async addAttestations(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 attestation with invalid signature for slot ${slotNumber.toBigInt()}`, {
-                        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.attestationsForProposal.set(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${address}`, {
-                    signature: attestation.signature.toString(),
-                    slotNumber,
-                    address,
-                    proposalId
-                });
-            }
-        });
-    }
-    async getAttestationsForSlot(slot) {
-        const slotFr = new Fr(slot);
-        const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slotFr.toString()));
-        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
-        for (const id of attestationIds){
-            const buf = await this.attestations.getAsync(id);
-            if (!buf) {
-                // this should not happen unless we lost writes
-                throw new Error('Attestation not found ' + id);
-            }
-            const attestation = BlockAttestation.fromBuffer(buf);
-            attestations.push(attestation);
-        }
-        return attestations;
-    }
-    async deleteAttestationsOlderThan(oldestSlot) {
-        const olderThan = await toArray(this.proposalsForSlot.keysAsync({
-            end: new Fr(oldestSlot).toString()
-        }));
-        for (const oldSlot of olderThan){
-            await this.deleteAttestationsForSlot(BigInt(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()));
-            for (const proposalId of proposalIds){
-                const attestations = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slotFr, 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.attestationsForProposal.deleteValue(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
-            }
-        });
-    }
-    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 ()=>{
-            await this.proposalsForSlot.set(blockProposal.slotNumber.toString(), blockProposal.archive.toString());
-            await this.proposals.set(blockProposal.payload.archive.toString(), blockProposal.toBuffer());
-        });
-    }
-}

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

@@ -1,25 +0,0 @@
-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 {
-    #private;
-    private log;
-    private metrics;
-    private attestations;
-    private proposals;
-    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>;
-}
-//# sourceMappingURL=memory_attestation_pool.d.ts.map

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

@@ -1 +0,0 @@
-{"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"}

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -1,197 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { PoolInstrumentation, PoolName } from '../instrumentation.js';
-export class InMemoryAttestationPool {
-    log;
-    metrics;
-    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.proposals = new Map();
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
-    }
-    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);
-            if (proposalAttestationMap) {
-                return Promise.resolve(Array.from(proposalAttestationMap.values()));
-            }
-        }
-        return Promise.resolve([]);
-    }
-    addAttestations(attestations) {
-        for (const attestation of attestations){
-            // Perf: order and group by slot before insertion
-            const slotNumber = attestation.payload.header.slotNumber;
-            const proposalId = attestation.archive.toString();
-            const sender = attestation.getSender();
-            // Skip attestations with invalid signatures
-            if (!sender) {
-                this.log.warn(`Skipping attestation with invalid signature for slot ${slotNumber.toBigInt()}`, {
-                    signature: attestation.signature.toString(),
-                    slotNumber,
-                    proposalId
-                });
-                continue;
-            }
-            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
-            const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-            proposalAttestationMap.set(sender.toString(), attestation);
-            this.log.verbose(`Added attestation for slot ${slotNumber.toBigInt()} from ${sender}`, {
-                signature: attestation.signature.toString(),
-                slotNumber,
-                address: sender,
-                proposalId
-            });
-        }
-        return Promise.resolve();
-    }
-    #getNumberOfAttestationsInSlot(slot) {
-        let total = 0;
-        const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
-        if (slotAttestationMap) {
-            for (const proposalAttestationMap of slotAttestationMap.values() ?? []){
-                total += proposalAttestationMap.size;
-            }
-        }
-        return total;
-    }
-    async deleteAttestationsOlderThan(oldestSlot) {
-        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.
-        // Note: this will only prune correctly if attestations are added in order of rising slot, it is important that we do not allow
-        // insertion of attestations that are old. #(https://github.com/AztecProtocol/aztec-packages/issues/10322)
-        const slots = this.attestations.keys();
-        for (const slot of slots){
-            if (slot < oldestSlot) {
-                olderThan.push(slot);
-            } else {
-                break;
-            }
-        }
-        for (const oldSlot of olderThan){
-            await this.deleteAttestationsForSlot(oldSlot);
-        }
-        return Promise.resolve();
-    }
-    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 and ${proposalIdsToDeleteCount} proposals for slot ${slot}`);
-        return Promise.resolve();
-    }
-    deleteAttestationsForSlotAndProposal(slot, proposalId) {
-        const slotAttestationMap = getSlotOrDefault(this.attestations, slot);
-        if (slotAttestationMap) {
-            if (slotAttestationMap.has(proposalId)) {
-                const numberOfAttestations = slotAttestationMap.get(proposalId)?.size ?? 0;
-                slotAttestationMap.delete(proposalId);
-                this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-            }
-        }
-        this.proposals.delete(proposalId);
-        return Promise.resolve();
-    }
-    deleteAttestations(attestations) {
-        for (const attestation of attestations){
-            const slotNumber = attestation.payload.header.slotNumber;
-            const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
-            if (slotAttestationMap) {
-                const proposalId = attestation.archive.toString();
-                const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-                if (proposalAttestationMap) {
-                    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;
-                    }
-                    proposalAttestationMap.delete(sender.toString());
-                    this.log.debug(`Deleted attestation for slot ${slotNumber} from ${sender}`);
-                }
-            }
-        }
-        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.toBigInt());
-        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.toBigInt());
-        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));
-    }
-}
-/**
- * Get Slot or Default
- *
- * Fetch the slot mapping, if it does not exist, then create a mapping and return it
- * @param map - The map to fetch from
- * @param slot - The slot to fetch
- * @returns The slot mapping
- */ function getSlotOrDefault(map, slot) {
-    if (!map.has(slot)) {
-        map.set(slot, new Map());
-    }
-    return map.get(slot);
-}
-/**
- * Get Proposal or Default
- *
- * Fetch the proposal mapping, if it does not exist, then create a mapping and return it
- * @param map - The map to fetch from
- * @param proposalId - The proposal id to fetch
- * @returns The proposal mapping
- */ function getProposalOrDefault(map, proposalId) {
-    if (!map.has(proposalId)) {
-        map.set(proposalId, new Map());
-    }
-    return map.get(proposalId);
-}

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts

@@ -1,150 +0,0 @@
-import { type Logger } from '@aztec/foundation/log';
-import type { TypedEventEmitter } from '@aztec/foundation/types';
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { MerkleTreeReadOperations, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import { ArchiveCache } from '../../msg_validators/tx_validator/archive_cache.js';
-import { GasTxValidator } from '../../msg_validators/tx_validator/gas_validator.js';
-import type { TxPool, TxPoolEvents, TxPoolOptions } from './tx_pool.js';
-declare const AztecKVTxPool_base: new () => TypedEventEmitter<TxPoolEvents>;
-/**
- * KV implementation of the Transaction Pool.
- */
-export declare class AztecKVTxPool extends AztecKVTxPool_base implements TxPool {
-    #private;
-    /** The tx evicion logic will kick after pool size is greater than maxTxPoolSize * txPoolOverflowFactor */
-    txPoolOverflowFactor: number;
-    /**
-     * Class constructor for KV TxPool. Initiates our transaction pool as an AztecMap.
-     * @param store - A KV store for live txs in the pool.
-     * @param archive - A KV store for archived txs.
-     * @param telemetry - A telemetry client.
-     * @param archivedTxLimit - The number of txs to archive.
-     * @param log - A logger.
-     */
-    constructor(store: AztecAsyncKVStore, archive: AztecAsyncKVStore, worldStateSynchronizer: WorldStateSynchronizer, telemetry?: TelemetryClient, config?: TxPoolOptions, log?: Logger);
-    private countTxs;
-    isEmpty(): Promise<boolean>;
-    /**
-     * Marks transactions as mined in a block and updates the pool state accordingly.
-     * Removes the transactions from the pending set and adds them to the mined set.
-     * Also evicts any transactions that become invalid after the block is mined.
-     * @param txHashes - Array of transaction hashes that were mined
-     * @param blockHeader - The header of the block the transactions were mined in
-     */
-    markAsMined(txHashes: TxHash[], blockHeader: BlockHeader): Promise<void>;
-    markMinedAsPending(txHashes: TxHash[]): Promise<void>;
-    getPendingTxHashes(): Promise<TxHash[]>;
-    getMinedTxHashes(): Promise<[TxHash, number][]>;
-    getPendingTxCount(): Promise<number>;
-    getMinedTxCount(): Promise<number>;
-    getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | 'deleted' | undefined>;
-    /**
-     * Checks if a transaction exists in the pool and returns it.
-     * @param txHash - The generated tx hash.
-     * @returns The transaction, if found, 'undefined' otherwise.
-     */
-    getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-    getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
-    hasTxs(txHashes: TxHash[]): Promise<boolean[]>;
-    hasTx(txHash: TxHash): Promise<boolean>;
-    /**
-     * Checks if an archived tx exists and returns it.
-     * @param txHash - The tx hash.
-     * @returns The transaction metadata, if found, 'undefined' otherwise.
-     */
-    getArchivedTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-    /**
-     * Adds a list of transactions to the pool. Duplicates are ignored.
-     * @param txs - An array of txs to be added to the pool.
-     * @returns Empty promise.
-     */
-    addTxs(txs: Tx[], opts?: {
-        source?: string;
-    }): Promise<number>;
-    /**
-     * Deletes transactions from the pool. Tx hashes that are not present are ignored.
-     * Mined transactions are soft-deleted with a timestamp, pending transactions are permanently deleted.
-     * @param txHashes - An array of tx hashes to be deleted from the tx pool.
-     * @returns Empty promise.
-     */
-    deleteTxs(txHashes: TxHash[], opts?: {
-        eviction?: boolean;
-        permanently?: boolean;
-    }): Promise<void>;
-    /**
-     * Gets all the transactions stored in the pool.
-     * @returns Array of tx objects in the order they were added to the pool.
-     */
-    getAllTxs(): Promise<Tx[]>;
-    /**
-     * Gets the hashes of all transactions currently in the tx pool.
-     * @returns An array of transaction hashes found in the tx pool.
-     */
-    getAllTxHashes(): Promise<TxHash[]>;
-    updateConfig({ maxTxPoolSize, txPoolOverflowFactor, archivedTxLimit }: TxPoolOptions): void;
-    markTxsAsNonEvictable(txHashes: TxHash[]): Promise<void>;
-    /**
-     * Permanently deletes deleted mined transactions from blocks up to and including the specified block number.
-     * @param blockNumber - Block number threshold. Deleted mined txs from this block or earlier will be permanently deleted.
-     * @returns The number of transactions permanently deleted.
-     */
-    cleanupDeletedMinedTxs(blockNumber: number): Promise<number>;
-    /**
-     * Creates a GasTxValidator instance.
-     * @param db - DB for the validator to use
-     * @returns A GasTxValidator instance
-     */
-    protected createGasTxValidator(db: MerkleTreeReadOperations): GasTxValidator;
-    /**
-     * Creates an ArchiveCache instance.
-     * @param db - DB for the cache to use
-     * @returns An ArchiveCache instance
-     */
-    protected createArchiveCache(db: MerkleTreeReadOperations): ArchiveCache;
-    /**
-     * Checks if a cached transaction exists in the in-memory pending tx pool and returns it.
-     * Otherwise, it checks the tx pool, updates the pending tx pool, and returns the tx.
-     * @param txHash - The generated tx hash.
-     * @returns The transaction, if found, 'undefined' otherwise.
-     */
-    private getPendingTxByHash;
-    /**
-     * Archives a list of txs for future reference. The number of archived txs is limited by the specified archivedTxLimit.
-     * @param txs - The list of transactions to archive.
-     * @returns Empty promise.
-     */
-    private archiveTxs;
-    /**
-     * Evicts pending txs with the lowest priority fees from the pool to accomodate the max tx count and cumulative max tx size
-     * after new txs are added.
-     *
-     * @param newTxHashes - The tx hashes of the new txs added to the pool.
-     * @returns The total number of txs evicted from the pool and the number of new txs that were evicted.
-     */
-    private evictLowPriorityTxs;
-    /**
-     * Evicts invalid pending txs from the pool after a txs from a block are mined.
-     * Eviction criteria includes:
-     *   - txs with nullifiers that are already included in the mined block
-     *   - txs with an insufficient fee payer balance
-     *   - txs with an expiration timestamp lower than that of the mined block
-     *
-     * @param minedTxHashes - The tx hashes of the txs mined in the block.
-     * @param blockHeader - The header of the mined block.
-     * @returns The total number of txs evicted from the pool.
-     */
-    private evictInvalidTxsAfterMining;
-    /**
-     * Evicts pending txs that no longer have valid archive roots or fee payer balances from the pool after a reorg.
-     *
-     * @param txHashes - The tx hashes of the txs that were moved from mined to pending.
-     * @returns The total number of txs evicted from the pool.
-     */
-    private evictInvalidTxsAfterReorg;
-    private addPendingTxIndices;
-    private removePendingTxIndices;
-}
-export {};
-//# sourceMappingURL=aztec_kv_tx_pool.d.ts.map

package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"aztec_kv_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/aztec_kv_tx_pool.ts"],"names":[],"mappings":"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"}