@aztec/p2p 0.0.1-commit.fce3e4f → 0.0.1-commit.ff7989d6c

package/dest/mem_pools/tx_pool/memory_tx_pool.js

@@ -1,238 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { Tx, TxHash } from '@aztec/stdlib/tx';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import EventEmitter from 'node:events';
-import { PoolInstrumentation, PoolName } from '../instrumentation.js';
-import { getPendingTxPriority } from './priority.js';
-/**
- * In-memory implementation of the Transaction Pool.
- */ export class InMemoryTxPool extends EventEmitter {
-    log;
-    /**
-   * Our tx pool, stored as a Map in-memory, with K: tx hash and V: the transaction.
-   */ txs;
-    minedTxs;
-    pendingTxs;
-    deletedMinedTxHashes;
-    blockToDeletedMinedTxHash;
-    metrics;
-    /**
-   * Class constructor for in-memory TxPool. Initiates our transaction pool as a JS Map.
-   * @param log - A logger.
-   */ constructor(telemetry = getTelemetryClient(), log = createLogger('p2p:tx_pool')){
-        super(), this.log = log, this.countTx = ()=>{
-            return Promise.resolve({
-                itemCount: {
-                    mined: this.minedTxs.size,
-                    pending: this.pendingTxs.size
-                }
-            });
-        };
-        this.txs = new Map();
-        this.minedTxs = new Map();
-        this.pendingTxs = new Set();
-        this.deletedMinedTxHashes = new Map();
-        this.blockToDeletedMinedTxHash = new Map();
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.TX_POOL, this.countTx);
-    }
-    countTx;
-    isEmpty() {
-        return Promise.resolve(this.txs.size === 0);
-    }
-    markAsMined(txHashes, blockHeader) {
-        const keys = txHashes.map((x)=>x.toBigInt());
-        for (const key of keys){
-            // If this tx was previously soft-deleted, remove it from the deleted sets
-            if (this.deletedMinedTxHashes.has(key)) {
-                const originalBlock = this.deletedMinedTxHashes.get(key);
-                this.deletedMinedTxHashes.delete(key);
-                // Remove from block-to-hash mapping
-                const txHashesForBlock = this.blockToDeletedMinedTxHash.get(originalBlock);
-                if (txHashesForBlock) {
-                    txHashesForBlock.delete(key);
-                    if (txHashesForBlock.size === 0) {
-                        this.blockToDeletedMinedTxHash.delete(originalBlock);
-                    }
-                }
-            }
-            this.minedTxs.set(key, blockHeader.globalVariables.blockNumber);
-            this.pendingTxs.delete(key);
-        }
-        return Promise.resolve();
-    }
-    markMinedAsPending(txHashes) {
-        if (txHashes.length === 0) {
-            return Promise.resolve();
-        }
-        const keys = txHashes.map((x)=>x.toBigInt());
-        for (const key of keys){
-            this.minedTxs.delete(key);
-            // only add back to the pending set if we have the tx object
-            if (this.txs.has(key)) {
-                this.pendingTxs.add(key);
-            }
-        }
-        return Promise.resolve();
-    }
-    async getPendingTxHashes() {
-        const txs = (await this.getAllTxs()).sort((tx1, tx2)=>-getPendingTxPriority(tx1).localeCompare(getPendingTxPriority(tx2)));
-        const txHashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
-        // No need to check deleted since pending txs are never soft-deleted
-        return txHashes.filter((txHash)=>{
-            const key = txHash.toBigInt();
-            return this.pendingTxs.has(key);
-        });
-    }
-    getMinedTxHashes() {
-        return Promise.resolve(Array.from(this.minedTxs.entries()).map(([txHash, blockNumber])=>[
-                TxHash.fromBigInt(txHash),
-                blockNumber
-            ]));
-    }
-    getPendingTxCount() {
-        // Soft-deleted transactions are always mined, never pending
-        return Promise.resolve(this.pendingTxs.size);
-    }
-    getTxStatus(txHash) {
-        const key = txHash.toBigInt();
-        if (this.deletedMinedTxHashes.has(key)) {
-            return Promise.resolve('deleted');
-        }
-        if (this.minedTxs.has(key)) {
-            return Promise.resolve('mined');
-        }
-        if (this.pendingTxs.has(key)) {
-            return Promise.resolve('pending');
-        }
-        return Promise.resolve(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) {
-        const result = this.txs.get(txHash.toBigInt());
-        return Promise.resolve(result === undefined ? undefined : Tx.clone(result));
-    }
-    getTxsByHash(txHashes) {
-        return Promise.all(txHashes.map((txHash)=>this.getTxByHash(txHash)));
-    }
-    hasTxs(txHashes) {
-        return Promise.resolve(txHashes.map((txHash)=>this.txs.has(txHash.toBigInt())));
-    }
-    async hasTx(txHash) {
-        const result = await this.hasTxs([
-            txHash
-        ]);
-        return result[0];
-    }
-    getArchivedTxByHash() {
-        return Promise.resolve(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, opts = {}) {
-        const added = [];
-        for (const tx of txs){
-            const txHash = tx.getTxHash();
-            this.log.verbose(`Adding tx ${txHash.toString()} to pool`, {
-                eventName: 'tx-added-to-pool',
-                ...tx.getStats()
-            });
-            const key = txHash.toBigInt();
-            if (!this.txs.has(key)) {
-                added.push(tx);
-                this.txs.set(key, tx);
-            }
-            if (!this.minedTxs.has(key)) {
-                this.metrics.recordSize(tx);
-                this.pendingTxs.add(key);
-            }
-        }
-        if (added.length > 0) {
-            this.emit('txs-added', {
-                ...opts,
-                txs: added
-            });
-        }
-        return Promise.resolve(added.length);
-    }
-    /**
-   * 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, opts) {
-        for (const txHash of txHashes){
-            const key = txHash.toBigInt();
-            if (this.txs.has(key)) {
-                if (this.minedTxs.has(key)) {
-                    const blockNumber = this.minedTxs.get(key);
-                    this.minedTxs.delete(key);
-                    // Soft-delete mined transactions: remove from mined set but keep in storage
-                    if (opts?.permanently) {
-                        // Permanently delete mined transactions if specified
-                        this.txs.delete(key);
-                    } else {
-                        this.deletedMinedTxHashes.set(key, blockNumber);
-                        if (!this.blockToDeletedMinedTxHash.has(blockNumber)) {
-                            this.blockToDeletedMinedTxHash.set(blockNumber, new Set());
-                        }
-                        this.blockToDeletedMinedTxHash.get(blockNumber).add(key);
-                    }
-                } else {
-                    // Permanently delete pending transactions
-                    this.txs.delete(key);
-                    this.pendingTxs.delete(key);
-                }
-            }
-        }
-        return Promise.resolve();
-    }
-    /**
-   * Gets all the transactions stored in the pool.
-   * @returns Array of tx objects in the order they were added to the pool.
-   */ getAllTxs() {
-        return Promise.resolve(Array.from(this.txs.values()).map((x)=>Tx.clone(x)));
-    }
-    /**
-   * Gets the hashes of all transactions currently in the tx pool.
-   * @returns An array of transaction hashes found in the tx pool.
-   */ getAllTxHashes() {
-        return Promise.resolve(Array.from(this.txs.keys()).map((x)=>TxHash.fromBigInt(x)));
-    }
-    updateConfig(_config) {}
-    markTxsAsNonEvictable(_) {
-        return Promise.resolve();
-    }
-    /**
-   * 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) {
-        let deletedCount = 0;
-        const blocksToDelete = [];
-        // Find all blocks up to the specified block number
-        for (const [block, txHashes] of this.blockToDeletedMinedTxHash.entries()){
-            if (block <= blockNumber) {
-                // Permanently delete all transactions from this block
-                for (const txHash of txHashes){
-                    this.txs.delete(txHash);
-                    this.deletedMinedTxHashes.delete(txHash);
-                    deletedCount++;
-                }
-                blocksToDelete.push(block);
-            }
-        }
-        // Clean up block-to-hash mapping
-        for (const block of blocksToDelete){
-            this.blockToDeletedMinedTxHash.delete(block);
-        }
-        if (deletedCount > 0) {
-            this.log.debug(`Permanently deleted ${deletedCount} deleted mined txs from blocks up to ${blockNumber}`);
-        }
-        return Promise.resolve(deletedCount);
-    }
-}

package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts

@@ -1,12 +0,0 @@
-import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { type BlockProposal, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p';
-export declare class BlockProposalValidator implements P2PValidator<BlockProposal> {
-    private epochCache;
-    private logger;
-    private txsPermitted;
-    constructor(epochCache: EpochCacheInterface, opts: {
-        txsPermitted: boolean;
-    });
-    validate(block: BlockProposal): Promise<PeerErrorSeverity | undefined>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRzlELE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBRSxLQUFLLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTdGLHFCQUFhLHNCQUF1QixZQUFXLFlBQVksQ0FBQyxhQUFhLENBQUM7SUFDeEUsT0FBTyxDQUFDLFVBQVUsQ0FBc0I7SUFDeEMsT0FBTyxDQUFDLE1BQU0sQ0FBUztJQUN2QixPQUFPLENBQUMsWUFBWSxDQUFVO0lBRTlCLFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUE7S0FBRSxFQUkzRTtJQUVLLFFBQVEsQ0FBQyxLQUFLLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsQ0ErRTNFO0NBQ0YifQ==

package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/block_proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE7F,qBAAa,sBAAuB,YAAW,YAAY,CAAC,aAAa,CAAC;IACxE,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAU;IAE9B,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAI3E;IAEK,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CA+E3E;CACF"}

package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js

@@ -1,82 +0,0 @@
-import { NoCommitteeError } from '@aztec/ethereum';
-import { createLogger } from '@aztec/foundation/log';
-import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
-export class BlockProposalValidator {
-    epochCache;
-    logger;
-    txsPermitted;
-    constructor(epochCache, opts){
-        this.epochCache = epochCache;
-        this.txsPermitted = opts.txsPermitted;
-        this.logger = createLogger('p2p:block_proposal_validator');
-    }
-    async validate(block) {
-        try {
-            // Check signature validity first - invalid signatures are a high-severity issue
-            const proposer = block.getSender();
-            if (!proposer) {
-                this.logger.debug(`Penalizing peer for block proposal with invalid signature`);
-                return PeerErrorSeverity.MidToleranceError;
-            }
-            // Check if transactions are permitted when the proposal contains transaction hashes
-            const embeddedTxCount = block.txs?.length ?? 0;
-            if (!this.txsPermitted && (block.txHashes.length > 0 || embeddedTxCount > 0)) {
-                this.logger.debug(`Penalizing peer for block proposal with ${block.txHashes.length} transaction(s) when transactions are not permitted`);
-                return PeerErrorSeverity.MidToleranceError;
-            }
-            // If there are embedded txs, they must be listed in txHashes; if there are no txHashes, there must be no txs
-            const hashSet = new Set(block.txHashes.map((h)=>h.toString()));
-            const missingTxHashes = embeddedTxCount > 0 ? block.txs.filter((tx)=>!hashSet.has(tx.getTxHash().toString())).map((tx)=>tx.getTxHash().toString()) : [];
-            if (embeddedTxCount > 0 && missingTxHashes.length > 0) {
-                this.logger.warn('Penalizing peer for embedded transaction(s) not included in txHashes', {
-                    embeddedTxCount,
-                    txHashesLength: block.txHashes.length,
-                    missingTxHashes
-                });
-                return PeerErrorSeverity.MidToleranceError;
-            }
-            const { currentProposer, nextProposer, currentSlot, nextSlot } = await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
-            // Check that the attestation is for the current or next slot
-            const slotNumber = block.payload.header.slotNumber;
-            if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
-                this.logger.debug(`Penalizing peer for invalid slot number ${slotNumber}`, {
-                    currentSlot,
-                    nextSlot
-                });
-                return PeerErrorSeverity.HighToleranceError;
-            }
-            // Check that the block proposal is from the current or next proposer
-            if (slotNumber === currentSlot && currentProposer !== undefined && !proposer.equals(currentProposer)) {
-                this.logger.debug(`Penalizing peer for invalid proposer for current slot ${slotNumber}`, {
-                    currentProposer,
-                    nextProposer,
-                    proposer: proposer.toString()
-                });
-                return PeerErrorSeverity.MidToleranceError;
-            }
-            if (slotNumber === nextSlot && nextProposer !== undefined && !proposer.equals(nextProposer)) {
-                this.logger.debug(`Penalizing peer for invalid proposer for next slot ${slotNumber}`, {
-                    currentProposer,
-                    nextProposer,
-                    proposer: proposer.toString()
-                });
-                return PeerErrorSeverity.MidToleranceError;
-            }
-            // Validate tx hashes for all txs embedded in the proposal
-            if (!(await Promise.all(block.txs?.map((tx)=>tx.validateTxHash()) ?? [])).every((v)=>v)) {
-                this.logger.warn(`Penalizing peer for invalid tx hashes in block proposal`, {
-                    proposer,
-                    slotNumber
-                });
-                return PeerErrorSeverity.LowToleranceError;
-            }
-            return undefined;
-        } catch (e) {
-            // People shouldn't be sending us block proposals if the committee doesn't exist
-            if (e instanceof NoCommitteeError) {
-                return PeerErrorSeverity.LowToleranceError;
-            }
-            throw e;
-        }
-    }
-}

package/dest/msg_validators/block_proposal_validator/index.d.ts

@@ -1,2 +0,0 @@
-export * from './block_proposal_validator.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9ibG9ja19wcm9wb3NhbF92YWxpZGF0b3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywrQkFBK0IsQ0FBQyJ9

package/dest/msg_validators/block_proposal_validator/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/block_proposal_validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC"}

package/dest/msg_validators/block_proposal_validator/index.js

@@ -1 +0,0 @@
-export * from './block_proposal_validator.js';

package/src/mem_pools/attestation_pool/kv_attestation_pool.ts

@@ -1,298 +0,0 @@
-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 type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store';
-import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
-import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
-
-import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
-import { PoolInstrumentation, PoolName, type PoolStatsCallback } from '../instrumentation.js';
-import type { AttestationPool } from './attestation_pool.js';
-
-export const MAX_PROPOSALS_PER_SLOT = 5;
-export const ATTESTATION_CAP_BUFFER = 10;
-
-export class KvAttestationPool implements AttestationPool {
-  private metrics: PoolInstrumentation<BlockAttestation>;
-
-  private attestations: AztecAsyncMap<string, Buffer>;
-  private proposals: AztecAsyncMap<
-    /*  proposal.payload.archive  */ string,
-    /* buffer representation of proposal */ Buffer
-  >;
-  private proposalsForSlot: AztecAsyncMultiMap<number, string>;
-  private attestationsForProposal: AztecAsyncMultiMap<string, string>;
-
-  constructor(
-    private store: AztecAsyncKVStore,
-    telemetry: TelemetryClient = getTelemetryClient(),
-    private log = createLogger('aztec:attestation_pool'),
-  ) {
-    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);
-  }
-
-  private poolStats: PoolStatsCallback = async () => {
-    return {
-      itemCount: await this.attestations.sizeAsync(),
-    };
-  };
-
-  public async isEmpty(): Promise<boolean> {
-    for await (const _ of this.attestations.entriesAsync()) {
-      return false;
-    }
-    return true;
-  }
-
-  private getProposalKey(slot: number | bigint | Fr | string, proposalId: Fr | string | Buffer): string {
-    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}`;
-  }
-
-  private getAttestationKey(slot: number | bigint | Fr | string, proposalId: Fr | string, address: string): string {
-    return `${this.getProposalKey(slot, proposalId)}-${address}`;
-  }
-
-  public async addAttestations(attestations: BlockAttestation[]): Promise<void> {
-    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}`, {
-            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, 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}`, {
-          signature: attestation.signature.toString(),
-          slotNumber,
-          address,
-          proposalId,
-        });
-      }
-    });
-  }
-
-  public async getAttestationsForSlot(slot: SlotNumber): Promise<BlockAttestation[]> {
-    const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slot));
-    const attestations: BlockAttestation[] = [];
-
-    for (const proposalId of proposalIds) {
-      attestations.push(...(await this.getAttestationsForSlotAndProposal(slot, proposalId)));
-    }
-
-    return attestations;
-  }
-
-  public async getAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<BlockAttestation[]> {
-    const attestationIds = await toArray(
-      this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)),
-    );
-    const attestations: BlockAttestation[] = [];
-
-    // 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;
-  }
-
-  public async deleteAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void> {
-    const olderThan = await toArray(this.proposalsForSlot.keysAsync({ end: oldestSlot }));
-    for (const oldSlot of olderThan) {
-      await this.deleteAttestationsForSlot(SlotNumber(oldSlot));
-    }
-  }
-
-  public async deleteAttestationsForSlot(slot: SlotNumber): Promise<void> {
-    let numberOfAttestations = 0;
-    await this.store.transactionAsync(async () => {
-      const proposalIds = await toArray(this.proposalsForSlot.getValuesAsync(slot));
-      for (const proposalId of proposalIds) {
-        const attestations = await toArray(
-          this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)),
-        );
-
-        numberOfAttestations += attestations.length;
-        for (const attestation of attestations) {
-          await this.attestations.delete(attestation);
-        }
-
-        await this.proposals.delete(proposalId);
-        await this.attestationsForProposal.delete(this.getProposalKey(slot, proposalId));
-      }
-
-      // Delete from proposalsForSlot
-      await this.proposalsForSlot.delete(slot);
-
-      this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-    });
-  }
-
-  public async deleteAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<void> {
-    let numberOfAttestations = 0;
-    await this.store.transactionAsync(async () => {
-      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(slot, proposalId);
-      await this.attestationsForProposal.delete(this.getProposalKey(slot, proposalId));
-
-      this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-    });
-  }
-
-  public async deleteAttestations(attestations: BlockAttestation[]): Promise<void> {
-    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}`);
-          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}`);
-      }
-    });
-  }
-
-  public async hasAttestation(attestation: BlockAttestation): Promise<boolean> {
-    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);
-  }
-
-  public async getBlockProposal(id: string): Promise<BlockProposal | undefined> {
-    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);
-  }
-
-  public async hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean> {
-    const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.payload.archive.toString();
-    return await this.proposals.hasAsync(id);
-  }
-
-  public async addBlockProposal(blockProposal: BlockProposal): Promise<void> {
-    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());
-    });
-  }
-
-  public async hasReachedProposalCap(slot: SlotNumber): Promise<boolean> {
-    const uniqueProposalCount = await this.proposalsForSlot.getValueCountAsync(slot);
-    return uniqueProposalCount >= MAX_PROPOSALS_PER_SLOT;
-  }
-
-  public async hasReachedAttestationCap(slot: SlotNumber, proposalId: string, committeeSize: number): Promise<boolean> {
-    const limit = committeeSize + ATTESTATION_CAP_BUFFER;
-    return (await this.attestationsForProposal.getValueCountAsync(this.getProposalKey(slot, proposalId))) >= limit;
-  }
-
-  public async canAddProposal(block: BlockProposal): Promise<boolean> {
-    return (
-      (await this.proposals.hasAsync(block.archive.toString())) || !(await this.hasReachedProposalCap(block.slotNumber))
-    );
-  }
-
-  public async canAddAttestation(attestation: BlockAttestation, committeeSize: number): Promise<boolean> {
-    return (
-      (await this.hasAttestation(attestation)) ||
-      !(await this.hasReachedAttestationCap(
-        attestation.payload.header.slotNumber,
-        attestation.archive.toString(),
-        committeeSize,
-      ))
-    );
-  }
-}