@aztec/p2p 0.0.0-test.0 → 0.0.1-commit.023c3e5

package/src/util.ts

@@ -1,25 +1,41 @@
-import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import { SecretValue } from '@aztec/foundation/config';
+import type { Logger } from '@aztec/foundation/log';
+import type { AztecAsyncKVStore, AztecAsyncSingleton } from '@aztec/kv-store';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 
 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 { 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';
 
-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;
-    components: {
-      connectionManager: ConnectionManager;
-    };
+    pubsub: Pick<
+      GossipSub,
+      'addEventListener' | 'removeEventListener' | 'publish' | 'subscribe' | 'reportMessageValidationResult' | 'direct'
+    > & { score: Pick<GossipSub['score'], 'score'> };
   };
 }
 
+export type FullLibp2p = Libp2p<{
+  identify: Identify;
+  pubsub: GossipSub;
+  components: {
+    connectionManager: ConnectionManager;
+  };
+}>;
+
 /**
  * Converts an address string to a multiaddr string.
  * Example usage:
@@ -28,59 +44,39 @@ 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}`;
-}
-
-/**
- * Splits an <address>:<port> string into its components.
- * @returns The ip6 or ip4 address & port separately
- */
-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>`);
-    }
-  }
-
-  return [addr, port];
+  return `/${multiaddrPrefix}/${address}/${protocol}/${port}`;
 }
 
 /**
  * Queries the public IP address of the machine.
  */
 export async function getPublicIp(): Promise<string> {
-  const resp = await fetch('http://checkip.amazonaws.com/');
+  const resp = await fetch('https://checkip.amazonaws.com/');
   const text = await resp.text();
-  return text.trim();
+  const address = text.trim();
+  if (!isValidIpAddress(address)) {
+    throw new Error(`Received invalid IP address from checkip service: ${address}`);
+  }
+  return address;
+}
+
+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 +100,21 @@ 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;
+  const { p2pIp, queryForIp, p2pBroadcastPort, p2pPort } = config;
 
-  // 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>`,
-      );
-    }
+  // 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;
+  // check if no announce IP was provided
+  if (!p2pIp) {
+    if (queryForIp) {
+      const publicIp = await getPublicIp();
+      config.p2pIp = publicIp;
     }
   }
+  // TODO(md): guard against setting a local ip address as the announce ip
 
   return config;
 }
@@ -153,30 +123,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,6 +1,6 @@
 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,
@@ -9,10 +9,10 @@ import {
   getComponentsVersionsFromConfig,
 } from '@aztec/stdlib/versioning';
 
-import type { SignableENR } from '@chainsafe/enr';
+import type { SignableENR } from '@nethermindeth/enr';
 import xxhashFactory from 'xxhash-wasm';
 
-import { AZTEC_ENR_KEY } from './types/index.js';
+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;
@@ -20,7 +20,7 @@ const xxhash = await xxhashFactory();
 
 /** 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. */
@@ -31,6 +31,13 @@ export function setAztecEnrKey(enr: SignableENR, config: ChainConfig, useXxHash
   return versions;
 }
 
+/** 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));
+  }
+}
+
 /** 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) {

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

@@ -1,56 +0,0 @@
-import { Tx, TxHash } from '@aztec/stdlib/tx';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import type { TxPool } from './tx_pool.js';
-/**
- * In-memory implementation of the Transaction Pool.
- */
-export declare class InMemoryTxPool implements TxPool {
-    private log;
-    /**
-     * Our tx pool, stored as a Map in-memory, with K: tx hash and V: the transaction.
-     */
-    private txs;
-    private minedTxs;
-    private pendingTxs;
-    private metrics;
-    /**
-     * Class constructor for in-memory TxPool. Initiates our transaction pool as a JS Map.
-     * @param log - A logger.
-     */
-    constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    markAsMined(txHashes: TxHash[], blockNumber: number): Promise<void>;
-    markMinedAsPending(txHashes: TxHash[]): Promise<void>;
-    getPendingTxHashes(): Promise<TxHash[]>;
-    getMinedTxHashes(): Promise<[TxHash, number][]>;
-    getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | 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>;
-    getArchivedTxByHash(): 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[]): Promise<void>;
-    /**
-     * Deletes transactions from the pool. Tx hashes that are not present are ignored.
-     * @param txHashes - An array of tx hashes to be removed from the tx pool.
-     * @returns The number of transactions that was deleted from the pool.
-     */
-    deleteTxs(txHashes: TxHash[]): 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[]>;
-}
-//# sourceMappingURL=memory_tx_pool.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAcoB,OAAO,CAAC,GAAG;IAb1E;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;gBACS,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAA8B;IAOjG,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B/C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7C,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAM/C,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAW5E;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAKpD,mBAAmB,IAAI,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAIrD;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD;;;OAGG;IACI,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIjC;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG3C"}

package/dest/mem_pools/tx_pool/memory_tx_pool.js

@@ -1,141 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { Tx, TxHash } from '@aztec/stdlib/tx';
-import { getTelemetryClient } from '@aztec/telemetry-client';
-import { PoolInstrumentation, PoolName } from '../instrumentation.js';
-import { getPendingTxPriority } from './priority.js';
-/**
- * In-memory implementation of the Transaction Pool.
- */ export class InMemoryTxPool {
-    log;
-    /**
-   * Our tx pool, stored as a Map in-memory, with K: tx hash and V: the transaction.
-   */ txs;
-    minedTxs;
-    pendingTxs;
-    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')){
-        this.log = log;
-        this.txs = new Map();
-        this.minedTxs = new Map();
-        this.pendingTxs = new Set();
-        this.metrics = new PoolInstrumentation(telemetry, PoolName.TX_POOL);
-    }
-    markAsMined(txHashes, blockNumber) {
-        const keys = txHashes.map((x)=>x.toBigInt());
-        for (const key of keys){
-            this.minedTxs.set(key, blockNumber);
-            this.pendingTxs.delete(key);
-        }
-        this.metrics.recordRemovedObjects(txHashes.length, 'pending');
-        this.metrics.recordAddedObjects(txHashes.length, 'mined');
-        return Promise.resolve();
-    }
-    markMinedAsPending(txHashes) {
-        if (txHashes.length === 0) {
-            return Promise.resolve();
-        }
-        const keys = txHashes.map((x)=>x.toBigInt());
-        let deleted = 0;
-        let added = 0;
-        for (const key of keys){
-            if (this.minedTxs.delete(key)) {
-                deleted++;
-            }
-            // only add back to the pending set if we have the tx object
-            if (this.txs.has(key)) {
-                added++;
-                this.pendingTxs.add(key);
-            }
-        }
-        this.metrics.recordRemovedObjects(deleted, 'mined');
-        this.metrics.recordAddedObjects(added, 'pending');
-        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()));
-        return txHashes.filter((txHash)=>this.pendingTxs.has(txHash.toBigInt()));
-    }
-    getMinedTxHashes() {
-        return Promise.resolve(Array.from(this.minedTxs.entries()).map(([txHash, blockNumber])=>[
-                TxHash.fromBigInt(txHash),
-                blockNumber
-            ]));
-    }
-    getTxStatus(txHash) {
-        const key = txHash.toBigInt();
-        if (this.pendingTxs.has(key)) {
-            return Promise.resolve('pending');
-        }
-        if (this.minedTxs.has(key)) {
-            return Promise.resolve('mined');
-        }
-        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));
-    }
-    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.
-   */ async addTxs(txs) {
-        let pending = 0;
-        for (const tx of txs){
-            const txHash = await tx.getTxHash();
-            this.log.verbose(`Adding tx ${txHash.toString()} to pool`, {
-                eventName: 'tx-added-to-pool',
-                ...await tx.getStats()
-            });
-            const key = txHash.toBigInt();
-            this.txs.set(key, tx);
-            if (!this.minedTxs.has(key)) {
-                pending++;
-                this.metrics.recordSize(tx);
-                this.pendingTxs.add(key);
-            }
-        }
-        this.metrics.recordAddedObjects(pending, 'pending');
-        return;
-    }
-    /**
-   * Deletes transactions from the pool. Tx hashes that are not present are ignored.
-   * @param txHashes - An array of tx hashes to be removed from the tx pool.
-   * @returns The number of transactions that was deleted from the pool.
-   */ deleteTxs(txHashes) {
-        let deletedMined = 0;
-        let deletedPending = 0;
-        for (const txHash of txHashes){
-            const key = txHash.toBigInt();
-            this.txs.delete(key);
-            deletedPending += this.pendingTxs.delete(key) ? 1 : 0;
-            deletedMined += this.minedTxs.delete(key) ? 1 : 0;
-        }
-        this.metrics.recordRemovedObjects(deletedPending, 'pending');
-        this.metrics.recordRemovedObjects(deletedMined, 'mined');
-        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)));
-    }
-}

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

@@ -1,8 +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;
-    constructor(epochCache: EpochCacheInterface);
-    validate(block: BlockProposal): Promise<PeerErrorSeverity | undefined>;
-}
-//# sourceMappingURL=block_proposal_validator.d.ts.map

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;AAC9D,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;gBAE5B,UAAU,EAAE,mBAAmB;IAIrC,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;CAkB7E"}

package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js

@@ -1,21 +0,0 @@
-import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
-export class BlockProposalValidator {
-    epochCache;
-    constructor(epochCache){
-        this.epochCache = epochCache;
-    }
-    async validate(block) {
-        const { currentProposer, nextProposer, currentSlot, nextSlot } = await this.epochCache.getProposerInCurrentOrNextSlot();
-        // Check that the attestation is for the current or next slot
-        const slotNumberBigInt = block.payload.header.globalVariables.slotNumber.toBigInt();
-        if (slotNumberBigInt !== currentSlot && slotNumberBigInt !== nextSlot) {
-            return PeerErrorSeverity.HighToleranceError;
-        }
-        // Check that the block proposal is from the current or next proposer
-        const proposer = await block.getSender();
-        if (!proposer.equals(currentProposer) && !proposer.equals(nextProposer)) {
-            return PeerErrorSeverity.HighToleranceError;
-        }
-        return undefined;
-    }
-}

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

@@ -1,2 +0,0 @@
-export * from './block_proposal_validator.js';
-//# sourceMappingURL=index.d.ts.map

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';