@aztec/p2p 0.0.1-commit.e6bd8901 → 0.0.1-commit.ec5f612

package/src/mem_pools/attestation_pool/kv_attestation_pool.ts

@@ -1,320 +0,0 @@
-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 type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store';
-import {
-  BlockProposal,
-  CheckpointAttestation,
-  CheckpointProposal,
-  type CheckpointProposalCore,
-} 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<CheckpointAttestation>;
-
-  private proposals: AztecAsyncMap<
-    /*  proposal.payload.archive  */ string,
-    /* buffer representation of proposal */ Buffer
-  >;
-
-  // Checkpoint attestation storage
-  private checkpointAttestations: AztecAsyncMap<string, Buffer>;
-  private checkpointProposals: AztecAsyncMap<string, Buffer>;
-  private checkpointProposalsForSlot: AztecAsyncMultiMap<number, string>;
-  private checkpointAttestationsForProposal: AztecAsyncMultiMap<string, string>;
-
-  constructor(
-    private store: AztecAsyncKVStore,
-    telemetry: TelemetryClient = getTelemetryClient(),
-    private log = createLogger('aztec:attestation_pool'),
-  ) {
-    this.proposals = store.openMap('proposals');
-
-    // 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);
-  }
-
-  private poolStats: PoolStatsCallback = async () => {
-    return {
-      itemCount: await this.checkpointAttestations.sizeAsync(),
-    };
-  };
-
-  public async isEmpty(): Promise<boolean> {
-    for await (const _ of this.checkpointAttestations.entriesAsync()) {
-      return false;
-    }
-    for await (const _ of this.proposals.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 addBlockProposal(blockProposal: BlockProposal): Promise<void> {
-    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());
-    });
-  }
-
-  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.archive.toString();
-    return await this.proposals.hasAsync(id);
-  }
-
-  public async addCheckpointProposal(proposal: CheckpointProposal): Promise<void> {
-    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());
-      }
-    });
-  }
-
-  public async getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined> {
-    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);
-  }
-
-  public async hasCheckpointProposal(idOrProposal: string | CheckpointProposal): Promise<boolean> {
-    const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
-    return await this.checkpointProposals.hasAsync(id);
-  }
-
-  public async addCheckpointAttestations(attestations: CheckpointAttestation[]): 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 checkpoint attestation with invalid signature for slot ${slotNumber}`, {
-            signature: attestation.signature.toString(),
-            slotNumber,
-            proposalId,
-          });
-          continue;
-        }
-
-        const address = sender.toString();
-
-        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,
-          proposalId,
-        });
-      }
-    });
-  }
-
-  public async getCheckpointAttestationsForSlot(slot: SlotNumber): Promise<CheckpointAttestation[]> {
-    const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
-    const attestations: CheckpointAttestation[] = [];
-
-    for (const proposalId of proposalIds) {
-      attestations.push(...(await this.getCheckpointAttestationsForSlotAndProposal(slot, proposalId)));
-    }
-
-    return attestations;
-  }
-
-  public async getCheckpointAttestationsForSlotAndProposal(
-    slot: SlotNumber,
-    proposalId: string,
-  ): Promise<CheckpointAttestation[]> {
-    const attestationIds = await toArray(
-      this.checkpointAttestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)),
-    );
-    const attestations: CheckpointAttestation[] = [];
-
-    for (const id of attestationIds) {
-      const buf = await this.checkpointAttestations.getAsync(id);
-
-      if (!buf) {
-        throw new Error('Checkpoint attestation not found ' + id);
-      }
-
-      const attestation = CheckpointAttestation.fromBuffer(buf);
-      attestations.push(attestation);
-    }
-
-    return attestations;
-  }
-
-  public async deleteCheckpointAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void> {
-    const olderThan = await toArray(this.checkpointProposalsForSlot.keysAsync({ end: oldestSlot }));
-    for (const oldSlot of olderThan) {
-      await this.deleteCheckpointAttestationsForSlot(SlotNumber(oldSlot));
-    }
-  }
-
-  private async deleteCheckpointAttestationsForSlot(slot: SlotNumber): Promise<void> {
-    let numberOfAttestations = 0;
-    await this.store.transactionAsync(async () => {
-      const proposalIds = await toArray(this.checkpointProposalsForSlot.getValuesAsync(slot));
-      for (const proposalId of proposalIds) {
-        const attestations = await toArray(
-          this.checkpointAttestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)),
-        );
-
-        numberOfAttestations += attestations.length;
-        for (const attestation of attestations) {
-          await this.checkpointAttestations.delete(attestation);
-        }
-
-        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}`);
-    });
-  }
-
-  public async hasCheckpointAttestation(attestation: CheckpointAttestation): 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.checkpointAttestations.hasAsync(key);
-  }
-
-  public canAddProposal(_block: BlockProposal): Promise<boolean> {
-    // TODO(palla/mbps): implement proposal cap logic
-    return Promise.resolve(true);
-  }
-
-  public async canAddCheckpointProposal(proposal: CheckpointProposal): Promise<boolean> {
-    // 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))
-    );
-  }
-
-  public async canAddCheckpointAttestation(
-    attestation: CheckpointAttestation,
-    committeeSize: number,
-  ): Promise<boolean> {
-    return (
-      (await this.hasCheckpointAttestation(attestation)) ||
-      !(await this.hasReachedCheckpointAttestationCap(
-        attestation.payload.header.slotNumber,
-        attestation.archive.toString(),
-        committeeSize,
-      ))
-    );
-  }
-
-  public async hasReachedCheckpointProposalCap(slot: SlotNumber): Promise<boolean> {
-    const uniqueProposalCount = await this.checkpointProposalsForSlot.getValueCountAsync(slot);
-    return uniqueProposalCount >= MAX_PROPOSALS_PER_SLOT;
-  }
-
-  public async hasReachedCheckpointAttestationCap(
-    slot: SlotNumber,
-    proposalId: string,
-    committeeSize: number,
-  ): Promise<boolean> {
-    const limit = committeeSize + ATTESTATION_CAP_BUFFER;
-    return (
-      (await this.checkpointAttestationsForProposal.getValueCountAsync(this.getProposalKey(slot, proposalId))) >= limit
-    );
-  }
-}

package/src/mem_pools/attestation_pool/memory_attestation_pool.ts

@@ -1,264 +0,0 @@
-import type { SlotNumber } from '@aztec/foundation/branded-types';
-import { createLogger } from '@aztec/foundation/log';
-import type {
-  BlockProposal,
-  CheckpointAttestation,
-  CheckpointProposal,
-  CheckpointProposalCore,
-} 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';
-import { ATTESTATION_CAP_BUFFER, MAX_PROPOSALS_PER_SLOT } from './kv_attestation_pool.js';
-
-export class InMemoryAttestationPool implements AttestationPool {
-  private metrics: PoolInstrumentation<CheckpointAttestation>;
-
-  private proposals: Map<string, BlockProposal>;
-
-  // Checkpoint attestations
-  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
-  private checkpointAttestations: Map<
-    /*slot=*/ SlotNumber,
-    Map</*proposalId*/ string, Map</*address=*/ string, CheckpointAttestation>>
-  >;
-  private checkpointProposals: Map<string, CheckpointProposalCore>;
-
-  constructor(
-    telemetry: TelemetryClient = getTelemetryClient(),
-    private log = createLogger('p2p:attestation_pool'),
-  ) {
-    this.proposals = new Map();
-    this.checkpointAttestations = new Map();
-    this.checkpointProposals = new Map();
-    this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL, this.poolStats);
-  }
-
-  private poolStats: PoolStatsCallback = () => {
-    return Promise.resolve({
-      itemCount: this.checkpointAttestations.size,
-    });
-  };
-
-  public isEmpty(): Promise<boolean> {
-    return Promise.resolve(this.checkpointAttestations.size === 0 && this.proposals.size === 0);
-  }
-
-  public addBlockProposal(blockProposal: BlockProposal): Promise<void> {
-    // Strip signedTxs before storing to avoid holding full tx data in memory
-    this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs());
-    return Promise.resolve();
-  }
-
-  public getBlockProposal(id: string): Promise<BlockProposal | undefined> {
-    return Promise.resolve(this.proposals.get(id));
-  }
-
-  public hasBlockProposal(idOrProposal: string | BlockProposal): Promise<boolean> {
-    const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
-    return Promise.resolve(this.proposals.has(id));
-  }
-
-  public canAddProposal(_block: BlockProposal): Promise<boolean> {
-    // TODO(palla/mbps): See when to allow
-    return Promise.resolve(true);
-  }
-
-  // Checkpoint attestation methods
-
-  public async addCheckpointProposal(proposal: CheckpointProposal): Promise<void> {
-    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()}`,
-      );
-    }
-
-    const slotProposalMapping = getCheckpointSlotOrDefault(this.checkpointAttestations, proposal.slotNumber);
-    slotProposalMapping.set(proposal.archive.toString(), new Map<string, CheckpointAttestation>());
-
-    // Store the checkpoint proposal as core (without lastBlock) to avoid duplication
-    this.checkpointProposals.set(proposal.archive.toString(), proposal.toCore());
-
-    // Store the extracted block proposal separately
-    if (blockProposal) {
-      this.proposals.set(blockProposal.archive.toString(), blockProposal.withoutSignedTxs());
-    }
-
-    return Promise.resolve();
-  }
-
-  public getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined> {
-    return Promise.resolve(this.checkpointProposals.get(id));
-  }
-
-  public hasCheckpointProposal(idOrProposal: string | CheckpointProposal): Promise<boolean> {
-    const id = typeof idOrProposal === 'string' ? idOrProposal : idOrProposal.archive.toString();
-    return Promise.resolve(this.checkpointProposals.has(id));
-  }
-
-  public addCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void> {
-    for (const attestation of attestations) {
-      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 checkpoint attestation with invalid signature for slot ${slotNumber}`, {
-          signature: attestation.signature.toString(),
-          slotNumber,
-          proposalId,
-        });
-        continue;
-      }
-
-      const slotAttestationMap = getCheckpointSlotOrDefault(this.checkpointAttestations, slotNumber);
-      const proposalAttestationMap = getCheckpointProposalOrDefault(slotAttestationMap, proposalId);
-      proposalAttestationMap.set(sender.toString(), attestation);
-
-      this.log.verbose(`Added checkpoint attestation for slot ${slotNumber} from ${sender}`, {
-        signature: attestation.signature.toString(),
-        slotNumber,
-        address: sender,
-        proposalId,
-      });
-    }
-
-    return Promise.resolve();
-  }
-
-  public getCheckpointAttestationsForSlot(slot: SlotNumber): Promise<CheckpointAttestation[]> {
-    return Promise.resolve(
-      Array.from(this.checkpointAttestations.get(slot)?.values() ?? []).flatMap(proposalAttestationMap =>
-        Array.from(proposalAttestationMap.values()),
-      ),
-    );
-  }
-
-  public getCheckpointAttestationsForSlotAndProposal(
-    slot: SlotNumber,
-    proposalId: string,
-  ): Promise<CheckpointAttestation[]> {
-    const slotAttestationMap = this.checkpointAttestations.get(slot);
-    if (slotAttestationMap) {
-      const proposalAttestationMap = slotAttestationMap.get(proposalId);
-      if (proposalAttestationMap) {
-        return Promise.resolve(Array.from(proposalAttestationMap.values()));
-      }
-    }
-    return Promise.resolve([]);
-  }
-
-  public deleteCheckpointAttestationsOlderThan(oldestSlot: SlotNumber): Promise<void> {
-    const olderThan = [];
-
-    const slots = this.checkpointAttestations.keys();
-    for (const slot of slots) {
-      if (slot < oldestSlot) {
-        olderThan.push(slot);
-      } else {
-        break;
-      }
-    }
-
-    for (const oldSlot of olderThan) {
-      const proposalIds = this.checkpointAttestations.get(oldSlot)?.keys();
-      proposalIds?.forEach(proposalId => this.checkpointProposals.delete(proposalId));
-      this.checkpointAttestations.delete(oldSlot);
-    }
-    return Promise.resolve();
-  }
-
-  public hasReachedCheckpointProposalCap(slot: SlotNumber): Promise<boolean> {
-    const slotAttestationMap = this.checkpointAttestations.get(slot);
-    const proposalCount = slotAttestationMap?.size ?? 0;
-    return Promise.resolve(proposalCount >= MAX_PROPOSALS_PER_SLOT);
-  }
-
-  public hasReachedCheckpointAttestationCap(
-    slot: SlotNumber,
-    proposalId: string,
-    committeeSize: number,
-  ): Promise<boolean> {
-    const limit = committeeSize + ATTESTATION_CAP_BUFFER;
-    const count = this.checkpointAttestations.get(slot)?.get(proposalId)?.size ?? 0;
-    return Promise.resolve(limit <= 0 || count >= limit);
-  }
-
-  public async canAddCheckpointProposal(proposal: CheckpointProposal): Promise<boolean> {
-    return (
-      this.checkpointProposals.has(proposal.archive.toString()) ||
-      !(await this.hasReachedCheckpointProposalCap(proposal.slotNumber))
-    );
-  }
-
-  public async canAddCheckpointAttestation(
-    attestation: CheckpointAttestation,
-    committeeSize: number,
-  ): Promise<boolean> {
-    const sender = attestation.getSender();
-    const slot = attestation.payload.header.slotNumber;
-    const pid = attestation.archive.toString();
-    return (
-      !!sender &&
-      ((this.checkpointAttestations.get(slot)?.get(pid)?.has(sender.toString()) ?? false) ||
-        !(await this.hasReachedCheckpointAttestationCap(slot, pid, committeeSize)))
-    );
-  }
-
-  public hasCheckpointAttestation(attestation: CheckpointAttestation): Promise<boolean> {
-    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.checkpointAttestations.get(slotNumber);
-    if (!slotAttestationMap) {
-      return Promise.resolve(false);
-    }
-
-    const proposalAttestationMap = slotAttestationMap.get(proposalId);
-    if (!proposalAttestationMap) {
-      return Promise.resolve(false);
-    }
-
-    return Promise.resolve(proposalAttestationMap.has(sender.toString()));
-  }
-}
-
-// Checkpoint attestation helper functions
-
-function getCheckpointSlotOrDefault(
-  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
-  map: Map<SlotNumber, Map<string, Map<string, CheckpointAttestation>>>,
-  slot: SlotNumber,
-): Map<string, Map<string, CheckpointAttestation>> {
-  if (!map.has(slot)) {
-    map.set(slot, new Map<string, Map<string, CheckpointAttestation>>());
-  }
-  return map.get(slot)!;
-}
-
-function getCheckpointProposalOrDefault(
-  map: Map<string, Map<string, CheckpointAttestation>>,
-  proposalId: string,
-): Map<string, CheckpointAttestation> {
-  if (!map.has(proposalId)) {
-    map.set(proposalId, new Map<string, CheckpointAttestation>());
-  }
-  return map.get(proposalId)!;
-}