@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.017a351

package/src/util.ts

@@ -1,25 +1,51 @@
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
+import { SecretValue } from '@aztec/foundation/config';
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import type { AztecAsyncKVStore, AztecAsyncSingleton } from '@aztec/kv-store';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 
 import type { GossipSub } from '@chainsafe/libp2p-gossipsub';
 import { generateKeyPair, marshalPrivateKey, unmarshalPrivateKey } from '@libp2p/crypto/keys';
+import type { Identify } from '@libp2p/identify';
 import type { PeerId, PrivateKey } from '@libp2p/interface';
-import type { ConnectionManager } from '@libp2p/interface-internal';
+import type { AddressManager, ConnectionManager } from '@libp2p/interface-internal';
 import { createFromPrivKey } from '@libp2p/peer-id-factory';
 import { resolve } from 'dns/promises';
+import { promises as fs } from 'fs';
 import type { Libp2p } from 'libp2p';
+import net from 'net';
+import path from 'path';
 
-import type { P2PConfig } from './config.js';
+import { DEFAULT_PUBLIC_IP_SERVICES, type P2PConfig } from './config.js';
 
-export interface PubSubLibp2p extends Libp2p {
+const PEER_ID_DATA_DIR_FILE = 'p2p-private-key';
+
+export interface PubSubLibp2p extends Pick<Libp2p, 'status' | 'start' | 'stop' | 'peerId'> {
   services: {
-    pubsub: GossipSub;
+    pubsub: Pick<
+      GossipSub,
+      | 'addEventListener'
+      | 'removeEventListener'
+      | 'publish'
+      | 'subscribe'
+      | 'reportMessageValidationResult'
+      | 'direct'
+      | 'getMeshPeers'
+    > & { score: Pick<GossipSub['score'], 'score'> };
     components: {
-      connectionManager: ConnectionManager;
+      addressManager: Pick<AddressManager, 'addObservedAddr' | 'confirmObservedAddr' | 'removeObservedAddr'>;
     };
   };
 }
 
+export type FullLibp2p = Libp2p<{
+  identify: Identify;
+  pubsub: GossipSub;
+  components: {
+    connectionManager: ConnectionManager;
+    addressManager: AddressManager;
+  };
+}>;
+
 /**
  * Converts an address string to a multiaddr string.
  * Example usage:
@@ -28,59 +54,48 @@ export interface PubSubLibp2p extends Libp2p {
  * @param address - The address string to convert. Has to be in the format <addr>:<port>.
  * @param protocol - The protocol to use in the multiaddr string.
  * @returns A multiaddr compliant string.  */
-export function convertToMultiaddr(address: string, protocol: 'tcp' | 'udp'): string {
-  const [addr, port] = splitAddressPort(address, false);
-
-  const multiaddrPrefix = addressToMultiAddressType(addr);
+export function convertToMultiaddr(address: string, port: number, protocol: 'tcp' | 'udp'): string {
+  const multiaddrPrefix = addressToMultiAddressType(address);
   if (multiaddrPrefix === 'dns') {
     throw new Error('Invalid address format. Expected an IPv4 or IPv6 address.');
   }
 
-  return `/${multiaddrPrefix}/${addr}/${protocol}/${port}`;
+  return `/${multiaddrPrefix}/${address}/${protocol}/${port}`;
 }
 
 /**
- * Splits an <address>:<port> string into its components.
- * @returns The ip6 or ip4 address & port separately
+ * Queries the public IP address of the machine, trying multiple services in order.
+ * @param services - HTTPS URLs to try; defaults to {@link DEFAULT_PUBLIC_IP_SERVICES}.
  */
-export function splitAddressPort(address: string, allowEmptyAddress: boolean): [string, string] {
-  let addr: string;
-  let port: string;
-
-  if (address.startsWith('[')) {
-    // IPv6 address enclosed in square brackets
-    const match = address.match(/^\[([^\]]+)\]:(\d+)$/);
-    if (!match) {
-      throw new Error(`Invalid IPv6 address format:${address}. Expected format: [<addr>]:<port>`);
-    }
-    [, addr, port] = match;
-  } else {
-    // IPv4 address
-    [addr, port] = address.split(':');
-    if ((!addr && !allowEmptyAddress) || !port) {
-      throw new Error(`Invalid address format: ${address}. Expected format: <addr>:<port>`);
+export async function getPublicIp(services: string[] = DEFAULT_PUBLIC_IP_SERVICES): Promise<string> {
+  const errors: string[] = [];
+  for (const url of services) {
+    try {
+      const resp = await fetch(url, { signal: AbortSignal.timeout(5000) });
+      const text = await resp.text();
+      const address = text.trim();
+      if (isValidIpAddress(address)) {
+        return address;
+      }
+      errors.push(`${url}: invalid IP "${address}"`);
+    } catch (err: any) {
+      errors.push(`${url}: ${err.message ?? err}`);
     }
   }
-
-  return [addr, port];
+  throw new Error(`Failed to determine public IP from all services:\n${errors.join('\n')}`);
 }
 
-/**
- * Queries the public IP address of the machine.
- */
-export async function getPublicIp(): Promise<string> {
-  const resp = await fetch('http://checkip.amazonaws.com/');
-  const text = await resp.text();
-  return text.trim();
+export function isValidIpAddress(address: string): boolean {
+  const netType = net.isIP(address);
+  return netType === 4;
 }
 
-export async function resolveAddressIfNecessary(address: string): Promise<string> {
-  const [addr, port] = splitAddressPort(address, false);
-  const multiaddrPrefix = addressToMultiAddressType(addr);
+export async function resolveAddressIfNecessary(address: string, port: string): Promise<string> {
+  const multiaddrPrefix = addressToMultiAddressType(address);
   if (multiaddrPrefix === 'dns') {
-    const resolvedAddresses = await resolve(addr);
+    const resolvedAddresses = await resolve(address);
     if (resolvedAddresses.length === 0) {
-      throw new Error(`Could not resolve address: ${addr}`);
+      throw new Error(`Could not resolve address: ${address}`);
     }
     return `${resolvedAddresses[0]}:${port}`;
   } else {
@@ -104,47 +119,23 @@ export async function configureP2PClientAddresses(
   _config: P2PConfig & DataStoreConfig,
 ): Promise<P2PConfig & DataStoreConfig> {
   const config = { ..._config };
-  const {
-    tcpAnnounceAddress: configTcpAnnounceAddress,
-    udpAnnounceAddress: configUdpAnnounceAddress,
-    queryForIp,
-  } = config;
-
-  config.tcpAnnounceAddress = configTcpAnnounceAddress
-    ? await resolveAddressIfNecessary(configTcpAnnounceAddress)
-    : undefined;
-  config.udpAnnounceAddress = configUdpAnnounceAddress
-    ? await resolveAddressIfNecessary(configUdpAnnounceAddress)
-    : undefined;
-
-  // create variable for re-use if needed
-  let publicIp;
-
-  // check if no announce IP was provided
-  const splitTcpAnnounceAddress = splitAddressPort(configTcpAnnounceAddress || '', true);
-  if (splitTcpAnnounceAddress.length == 2 && splitTcpAnnounceAddress[0] === '') {
-    if (queryForIp) {
-      publicIp = await getPublicIp();
-      const tcpAnnounceAddress = `${publicIp}:${splitTcpAnnounceAddress[1]}`;
-      config.tcpAnnounceAddress = tcpAnnounceAddress;
-    } else {
-      throw new Error(
-        `Invalid announceTcpAddress provided: ${configTcpAnnounceAddress}. Expected format: <addr>:<port>`,
-      );
-    }
+  const { p2pIp, queryForIp, p2pBroadcastPort, p2pPort } = config;
+  const logger = createLogger('p2p:config');
+
+  // If no broadcast port is provided, use the given p2p port as the broadcast port
+  if (!p2pBroadcastPort) {
+    config.p2pBroadcastPort = p2pPort;
   }
 
-  const splitUdpAnnounceAddress = splitAddressPort(configUdpAnnounceAddress || '', true);
-  if (splitUdpAnnounceAddress.length == 2 && splitUdpAnnounceAddress[0] === '') {
-    // If announceUdpAddress is not provided, use announceTcpAddress
-    if (!queryForIp && config.tcpAnnounceAddress) {
-      config.udpAnnounceAddress = config.tcpAnnounceAddress;
-    } else if (queryForIp) {
-      const udpPublicIp = publicIp || (await getPublicIp());
-      const udpAnnounceAddress = `${udpPublicIp}:${splitUdpAnnounceAddress[1]}`;
-      config.udpAnnounceAddress = udpAnnounceAddress;
-    }
+  // Resolve the initial public IP so the ENR and announce address are set at startup.
+  // If queryForIp is enabled, discv5 will also track IP changes at runtime via enrUpdate.
+  if (!p2pIp && queryForIp) {
+    config.p2pIp = await getPublicIp(config.publicIpServices);
+    logger.info('Resolved initial public IP for P2P', { ip: config.p2pIp, queryForIp });
+  } else if (p2pIp) {
+    logger.info('Using configured static P2P IP', { ip: p2pIp, queryForIp });
   }
+  // TODO(md): guard against setting a local ip address as the announce ip
 
   return config;
 }
@@ -153,30 +144,74 @@ export async function configureP2PClientAddresses(
  * Get the peer id private key
  *
  * 1. Check if we have a peer id private key in the config
- * 2. If not, check we have a peer id private key persisted in the node
- * 3. If not, create a new one, then persist it in the node
+ * 2. If not, check if we have a peer id private key persisted in a file
+ * 3. If no file path or data directory is provided, check if we have a peer id private key in the node's store
+ * 4. If not, create a new one, then persist it in a file if a file path or data directory is provided or in the node's store otherwise
  *
  */
 export async function getPeerIdPrivateKey(
-  config: { peerIdPrivateKey?: string },
+  config: { peerIdPrivateKey?: SecretValue<string>; peerIdPrivateKeyPath?: string; dataDirectory?: string },
   store: AztecAsyncKVStore,
-): Promise<string> {
-  const peerIdPrivateKeySingleton = store.openSingleton<string>('peerIdPrivateKey');
-  if (config.peerIdPrivateKey) {
-    await peerIdPrivateKeySingleton.set(config.peerIdPrivateKey);
+  logger: Logger,
+): Promise<SecretValue<string>> {
+  const peerIdPrivateKeyFilePath =
+    config.peerIdPrivateKeyPath ??
+    (config.dataDirectory ? path.join(config.dataDirectory, PEER_ID_DATA_DIR_FILE) : undefined);
+  let peerIdPrivateKeySingleton: AztecAsyncSingleton<string> | undefined;
+
+  const writePrivateKeyToFile = async (filePath: string, privateKey: string) => {
+    await fs.mkdir(path.dirname(filePath), { recursive: true });
+    await fs.writeFile(filePath, privateKey);
+  };
+
+  // If the peerIdPrivateKey is provided in the config, we use it and persist it in either a file or the node's store
+  if (config.peerIdPrivateKey && config.peerIdPrivateKey.getValue().trim()) {
+    if (peerIdPrivateKeyFilePath) {
+      await writePrivateKeyToFile(peerIdPrivateKeyFilePath, config.peerIdPrivateKey.getValue());
+    } else {
+      peerIdPrivateKeySingleton = store.openSingleton<string>('peerIdPrivateKey');
+      await peerIdPrivateKeySingleton.set(config.peerIdPrivateKey.getValue());
+    }
     return config.peerIdPrivateKey;
   }
 
-  const storedPeerIdPrivateKey = await peerIdPrivateKeySingleton.getAsync();
+  // Check to see if we have a peer id private key stored in a file or the node's store
+  let storedPeerIdPrivateKey: string | undefined;
+  const privateKeyFileExists =
+    peerIdPrivateKeyFilePath &&
+    (await fs
+      .access(peerIdPrivateKeyFilePath)
+      .then(() => true)
+      .catch(() => false));
+  if (peerIdPrivateKeyFilePath && privateKeyFileExists) {
+    await fs.access(peerIdPrivateKeyFilePath);
+    storedPeerIdPrivateKey = await fs.readFile(peerIdPrivateKeyFilePath, 'utf8');
+  } else {
+    peerIdPrivateKeySingleton = store.openSingleton<string>('peerIdPrivateKey');
+    storedPeerIdPrivateKey = await peerIdPrivateKeySingleton.getAsync();
+  }
   if (storedPeerIdPrivateKey) {
-    return storedPeerIdPrivateKey;
+    if (peerIdPrivateKeyFilePath && !privateKeyFileExists) {
+      logger.verbose(`Peer ID private key found in the node's store, persisting it to ${peerIdPrivateKeyFilePath}`);
+      await writePrivateKeyToFile(peerIdPrivateKeyFilePath, storedPeerIdPrivateKey);
+    }
+    return new SecretValue(storedPeerIdPrivateKey);
   }
 
+  // Generate and persist a new private key
   const newPeerIdPrivateKey = await generateKeyPair('secp256k1');
   const privateKeyString = Buffer.from(marshalPrivateKey(newPeerIdPrivateKey)).toString('hex');
+  if (peerIdPrivateKeyFilePath) {
+    logger.verbose(`Creating new peer ID private key and persisting it to ${peerIdPrivateKeyFilePath}`);
+    await writePrivateKeyToFile(peerIdPrivateKeyFilePath, privateKeyString);
+  } else {
+    logger.warn(
+      'Creating new peer ID private key and persisting it to the lmdb store. Key will be lost on rollup upgrade, specify the peer id private key path and restart the node to persist the peer id private key to a file',
+    );
+    await peerIdPrivateKeySingleton!.set(privateKeyString);
+  }
 
-  await peerIdPrivateKeySingleton.set(privateKeyString);
-  return privateKeyString;
+  return new SecretValue(privateKeyString);
 }
 
 /**

package/src/versioning.ts

@@ -1,50 +1,27 @@
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+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 '@chainsafe/enr';
-import xxhashFactory from 'xxhash-wasm';
+import type { SignableENR } from '@nethermindeth/enr';
 
-import { 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();
+import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from './types/index.js';
 
 /** Returns the component versions based on config and this build. */
 export function getVersions(config: ChainConfig) {
-  return getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot());
+  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;
 }
 
-/** 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);
+/** Sets the Aztec client version on ENR record **/
+export function setAztecClientVersionEnrKey(enr: SignableENR, clientVersion: string) {
+  if (clientVersion) {
+    enr.set(AZTEC_ENR_CLIENT_VERSION_KEY, Buffer.from(clientVersion));
   }
 }
-
-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,22 +0,0 @@
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { BlockAttestation } 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 proposalsForSlot;
-    private attestationsForProposal;
-    constructor(store: AztecAsyncKVStore, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    private getProposalKey;
-    private getAttestationKey;
-    addAttestations(attestations: BlockAttestation[]): Promise<void>;
-    getAttestationsForSlot(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>;
-}
-//# 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,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,iBAAkB,YAAW,eAAe;IAQrD,OAAO,CAAC,KAAK;IAEb,OAAO,CAAC,GAAG;IATb,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,gBAAgB,CAAqC;IAC7D,OAAO,CAAC,uBAAuB,CAAqC;gBAG1D,KAAK,EAAE,iBAAiB,EAChC,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAAyC;IAStD,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IAIZ,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBhE,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBrF,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;CAkBjF"}

package/dest/mem_pools/attestation_pool/kv_attestation_pool.js

@@ -1,112 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { toArray } from '@aztec/foundation/iterable';
-import { createLogger } from '@aztec/foundation/log';
-import { BlockAttestation } from '@aztec/stdlib/p2p';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { PoolInstrumentation, PoolName } from '../instrumentation.js';
-export class KvAttestationPool {
-    store;
-    log;
-    metrics;
-    attestations;
-    proposalsForSlot;
-    attestationsForProposal;
-    constructor(store, telemetry = getTelemetryClient(), log = createLogger('aztec:attestation_pool')){
-        this.store = store;
-        this.log = log;
-        this.attestations = store.openMap('attestations');
-        this.proposalsForSlot = store.openMultiMap('proposals_for_slot');
-        this.attestationsForProposal = store.openMultiMap('attestations_for_proposal');
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
-    }
-    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.globalVariables.slotNumber;
-                const proposalId = attestation.archive;
-                const address = (await attestation.getSender()).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} from ${address}`);
-            }
-        });
-        this.metrics.recordAddedObjects(attestations.length);
-    }
-    async getAttestationsForSlot(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.attestationsForProposal.delete(this.getProposalKey(slotFr, proposalId));
-            }
-        });
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
-    }
-    async deleteAttestationsForSlotAndProposal(slot, proposalId) {
-        let numberOfAttestations = 0;
-        await this.store.transactionAsync(async ()=>{
-            const slotString = new Fr(slot).toString();
-            const attestations = await toArray(this.attestationsForProposal.getValuesAsync(this.getProposalKey(slot, proposalId)));
-            numberOfAttestations += attestations.length;
-            for (const attestation of attestations){
-                await this.attestations.delete(attestation);
-            }
-            await this.proposalsForSlot.deleteValue(slotString, proposalId);
-            await this.attestationsForProposal.delete(this.getProposalKey(slotString, proposalId));
-        });
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot} and proposal ${proposalId}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
-    }
-    async deleteAttestations(attestations) {
-        await this.store.transactionAsync(async ()=>{
-            for (const attestation of attestations){
-                const slotNumber = attestation.payload.header.globalVariables.slotNumber;
-                const proposalId = attestation.archive;
-                const address = (await attestation.getSender()).toString();
-                await this.attestations.delete(this.getAttestationKey(slotNumber, proposalId, address));
-                await this.attestationsForProposal.deleteValue(this.getProposalKey(slotNumber, proposalId), this.getAttestationKey(slotNumber, proposalId, address));
-                this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
-            }
-        });
-        this.metrics.recordRemovedObjects(attestations.length);
-    }
-}

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

@@ -1,17 +0,0 @@
-import type { BlockAttestation } 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;
-    constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    getAttestationsForSlot(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>;
-}
-//# 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,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,uBAAwB,YAAW,eAAe;;IAKE,OAAO,CAAC,GAAG;IAJ1E,OAAO,CAAC,OAAO,CAAwC;IAEvD,OAAO,CAAC,YAAY,CAAgG;gBAExG,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAAuC;IAK1G,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAW/E,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgChE,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBpE,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWtD,oCAAoC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe/E,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBjF"}

package/dest/mem_pools/attestation_pool/memory_attestation_pool.js

@@ -1,129 +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;
-    constructor(telemetry = getTelemetryClient(), log = createLogger('p2p:attestation_pool')){
-        this.log = log;
-        this.attestations = new Map();
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.ATTESTATION_POOL);
-    }
-    getAttestationsForSlot(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([]);
-    }
-    async addAttestations(attestations) {
-        for (const attestation of attestations){
-            // Perf: order and group by slot before insertion
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
-            const proposalId = attestation.archive.toString();
-            const address = await attestation.getSender();
-            const slotAttestationMap = getSlotOrDefault(this.attestations, slotNumber.toBigInt());
-            const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-            proposalAttestationMap.set(address.toString(), attestation);
-            this.log.verbose(`Added attestation for slot ${slotNumber} from ${address}`);
-        }
-        // TODO: set these to pending or something ????
-        this.metrics.recordAddedObjects(attestations.length);
-        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);
-        this.attestations.delete(slot);
-        this.log.verbose(`Removed ${numberOfAttestations} attestations for slot ${slot}`);
-        this.metrics.recordRemovedObjects(numberOfAttestations);
-        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.metrics.recordRemovedObjects(numberOfAttestations);
-            }
-        }
-        return Promise.resolve();
-    }
-    async deleteAttestations(attestations) {
-        for (const attestation of attestations){
-            const slotNumber = attestation.payload.header.globalVariables.slotNumber;
-            const slotAttestationMap = this.attestations.get(slotNumber.toBigInt());
-            if (slotAttestationMap) {
-                const proposalId = attestation.archive.toString();
-                const proposalAttestationMap = getProposalOrDefault(slotAttestationMap, proposalId);
-                if (proposalAttestationMap) {
-                    const address = await attestation.getSender();
-                    proposalAttestationMap.delete(address.toString());
-                    this.log.debug(`Deleted attestation for slot ${slotNumber} from ${address}`);
-                }
-            }
-        }
-        this.metrics.recordRemovedObjects(attestations.length);
-        return Promise.resolve();
-    }
-}
-/**
- * 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);
-}