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

package/src/services/tx_provider_instrumentation.ts

@@ -1,4 +1,4 @@
-import { Metrics, type TelemetryClient, type UpDownCounter } from '@aztec/telemetry-client';
+import { type Histogram, Metrics, type TelemetryClient, type UpDownCounter } from '@aztec/telemetry-client';
 
 export class TxProviderInstrumentation {
   private txFromProposalCount: UpDownCounter;
@@ -6,24 +6,23 @@ export class TxProviderInstrumentation {
   private txFromP2PCount: UpDownCounter;
   private missingTxsCount: UpDownCounter;
 
+  private fractionOfTxsRequestedFromP2P: Histogram;
+  private txsRequestDelay: Histogram;
+
   constructor(client: TelemetryClient, name: string) {
     const meter = client.getMeter(name);
 
-    this.txFromProposalCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_PROPOSALS_COUNT, {
-      description: 'The number of txs taken from block proposals',
-    });
+    this.txFromProposalCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_PROPOSALS_COUNT);
+
+    this.txFromMempoolCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_MEMPOOL_COUNT);
+
+    this.txFromP2PCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_P2P_COUNT);
 
-    this.txFromMempoolCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_MEMPOOL_COUNT, {
-      description: 'The number of txs taken from the local mempool',
-    });
+    this.missingTxsCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_MISSING_TXS_COUNT);
 
-    this.txFromP2PCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_TXS_FROM_P2P_COUNT, {
-      description: 'The number of txs taken from the p2p network',
-    });
+    this.fractionOfTxsRequestedFromP2P = meter.createHistogram(Metrics.TX_PROVIDER_P2P_TXS_REQUESTED_FRACTION);
 
-    this.missingTxsCount = meter.createUpDownCounter(Metrics.TX_PROVIDER_MISSING_TXS_COUNT, {
-      description: 'The number of txs not found anywhere',
-    });
+    this.txsRequestDelay = meter.createHistogram(Metrics.TX_PROVIDER_P2P_TXS_REQUEST_DELAY);
   }
 
   incTxsFromProposals(count: number) {
@@ -34,8 +33,13 @@ export class TxProviderInstrumentation {
     this.txFromMempoolCount.add(count);
   }
 
-  incTxsFromP2P(count: number) {
+  incTxsFromP2P(count: number, total: number) {
     this.txFromP2PCount.add(count);
+    this.fractionOfTxsRequestedFromP2P.record(count / total);
+  }
+
+  recordTxsRequestDelay(delay: number) {
+    this.txsRequestDelay.record(delay);
   }
 
   incMissingTxs(count: number) {

package/src/test-helpers/mock-pubsub.ts

@@ -39,7 +39,7 @@ export function getMockPubSubP2PServiceFactory<T extends P2PClientType>(
     peerId: PeerId,
     deps: {
       packageVersion: string;
-      mempools: MemPools<T>;
+      mempools: MemPools;
       l2BlockSource: L2BlockSource & ContractDataSource;
       epochCache: EpochCacheInterface;
       proofVerifier: ClientProtocolCircuitVerifier;

package/src/test-helpers/mock-tx-helpers.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { mockTx } from '@aztec/stdlib/testing';

package/src/test-helpers/reqresp-nodes.ts

@@ -112,7 +112,7 @@ export async function createTestLibP2PService<T extends P2PClientType>(
   archiver: L2BlockSource & ContractDataSource,
   worldStateSynchronizer: WorldStateSynchronizer,
   epochCache: EpochCache,
-  mempools: MemPools<T>,
+  mempools: MemPools,
   telemetry: TelemetryClient,
   port: number = 0,
   peerId?: PeerId,

package/src/testbench/p2p_client_testbench_worker.ts

@@ -6,7 +6,7 @@
 import { MockL2BlockSource } from '@aztec/archiver/test';
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { EthAddress } from '@aztec/foundation/eth-address';
+import { SecretValue } from '@aztec/foundation/config';
 import { createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
@@ -56,6 +56,7 @@ function mockTxPool(): TxPool {
     hasTx: () => Promise.resolve(false),
     updateConfig: () => {},
     markTxsAsNonEvictable: () => Promise.resolve(),
+    clearNonEvictableTxs: () => Promise.resolve(),
     cleanupDeletedMinedTxs: () => Promise.resolve(0),
   };
   return Object.assign(new EventEmitter(), pool);
@@ -64,35 +65,37 @@ function mockTxPool(): TxPool {
 function mockAttestationPool(): AttestationPool {
   return {
     isEmpty: () => Promise.resolve(false),
-    addAttestations: () => Promise.resolve(),
-    deleteAttestations: () => Promise.resolve(),
-    deleteAttestationsOlderThan: () => Promise.resolve(),
-    deleteAttestationsForSlot: () => Promise.resolve(),
-    deleteAttestationsForSlotAndProposal: () => Promise.resolve(),
-    getAttestationsForSlot: () => Promise.resolve([]),
-    getAttestationsForSlotAndProposal: () => Promise.resolve([]),
     addBlockProposal: () => Promise.resolve(),
     getBlockProposal: () => Promise.resolve(undefined),
     hasBlockProposal: () => Promise.resolve(false),
-    hasAttestation: () => Promise.resolve(false),
     canAddProposal: () => Promise.resolve(true),
-    canAddAttestation: () => Promise.resolve(true),
+    // Checkpoint attestation methods
+    addCheckpointProposal: () => Promise.resolve(),
+    getCheckpointProposal: () => Promise.resolve(undefined),
+    hasCheckpointProposal: () => Promise.resolve(false),
+    addCheckpointAttestations: () => Promise.resolve(),
+    getCheckpointAttestationsForSlot: () => Promise.resolve([]),
+    getCheckpointAttestationsForSlotAndProposal: () => Promise.resolve([]),
+    deleteCheckpointAttestationsOlderThan: () => Promise.resolve(),
+    hasReachedCheckpointProposalCap: () => Promise.resolve(false),
+    hasReachedCheckpointAttestationCap: () => Promise.resolve(false),
+    canAddCheckpointProposal: () => Promise.resolve(true),
+    canAddCheckpointAttestation: () => Promise.resolve(true),
+    hasCheckpointAttestation: () => Promise.resolve(false),
   };
 }
 
 function mockEpochCache(): EpochCacheInterface {
   return {
-    getCommittee: () => Promise.resolve({ committee: [], seed: 1n, epoch: EpochNumber.ZERO }),
+    getCommittee: () => Promise.resolve({ committee: [], seed: 1n, epoch: EpochNumber.ZERO, isEscapeHatchOpen: false }),
     getProposerIndexEncoding: () => '0x' as `0x${string}`,
-    getEpochAndSlotNow: () => ({ epoch: EpochNumber.ZERO, slot: SlotNumber.ZERO, ts: 0n }),
+    getEpochAndSlotNow: () => ({ epoch: EpochNumber.ZERO, slot: SlotNumber.ZERO, ts: 0n, nowMs: 0n }),
     computeProposerIndex: () => 0n,
-    getProposerAttesterAddressInCurrentOrNextSlot: () =>
-      Promise.resolve({
-        currentProposer: EthAddress.ZERO,
-        nextProposer: EthAddress.ZERO,
-        currentSlot: SlotNumber.ZERO,
-        nextSlot: SlotNumber.ZERO,
-      }),
+    getCurrentAndNextSlot: () => ({
+      currentSlot: SlotNumber.ZERO,
+      nextSlot: SlotNumber.ZERO,
+    }),
+    getProposerAttesterAddressInSlot: () => Promise.resolve(undefined),
     getEpochAndSlotInNextL1Slot: () => ({ epoch: EpochNumber.ZERO, slot: SlotNumber.ZERO, ts: 0n, now: 0n }),
     isInCommittee: () => Promise.resolve(false),
     getRegisteredValidators: () => Promise.resolve([]),
@@ -126,7 +129,7 @@ class TestLibP2PService<T extends P2PClientType = P2PClientType.Full> extends Li
     peerDiscoveryService: PeerDiscoveryService,
     reqresp: ReqResp,
     peerManager: PeerManager,
-    mempools: MemPools<T>,
+    mempools: MemPools,
     archiver: L2BlockSource & ContractDataSource,
     epochCache: EpochCacheInterface,
     proofVerifier: ClientProtocolCircuitVerifier,
@@ -188,9 +191,25 @@ class TestLibP2PService<T extends P2PClientType = P2PClientType.Full> extends Li
 
 // eslint-disable-next-line @typescript-eslint/no-misused-promises
 process.on('message', async msg => {
-  const { type, config, clientIndex } = msg as { type: string; config: P2PConfig; clientIndex: number };
+  // Note: peerIdPrivateKey comes as a raw string (not SecretValue) because
+  // SecretValue's private fields can't be serialized via IPC
+  const {
+    type,
+    config: rawConfig,
+    clientIndex,
+  } = msg as {
+    type: string;
+    config: Omit<P2PConfig, 'peerIdPrivateKey'> & { peerIdPrivateKey?: string };
+    clientIndex: number;
+  };
   try {
     if (type === 'START') {
+      // Re-wrap the peerIdPrivateKey with SecretValue
+      const config: P2PConfig = {
+        ...rawConfig,
+        peerIdPrivateKey: rawConfig.peerIdPrivateKey ? new SecretValue(rawConfig.peerIdPrivateKey) : undefined,
+      } as P2PConfig;
+
       const txPool = mockTxPool();
       const attestationPool = mockAttestationPool();
       const epochCache = mockEpochCache();
@@ -223,14 +242,15 @@ process.on('message', async msg => {
       );
 
       // Create test service with validation disabled
+      // Note: Parameter order must match LibP2PService constructor
       const testService = new TestLibP2PService(
         P2PClientType.Full,
         config,
         (client as any).p2pService.node,
         (client as any).p2pService.peerDiscoveryService,
-        (client as any).p2pService.mempools,
         (client as any).p2pService.reqresp,
         (client as any).p2pService.peerManager,
+        (client as any).p2pService.mempools,
         (client as any).p2pService.archiver,
         epochCache,
         proofVerifier,

package/src/testbench/worker_client_manager.ts

@@ -73,7 +73,12 @@ class WorkerClientManager {
     clientIndex: number,
   ): [ChildProcess, Promise<void>] {
     const childProcess = fork(workerPath);
-    childProcess.send({ type: 'START', config, clientIndex });
+    // Extract the raw peerIdPrivateKey value since SecretValue can't be serialized via IPC
+    const serializedConfig = {
+      ...config,
+      peerIdPrivateKey: config.peerIdPrivateKey?.getValue(),
+    };
+    childProcess.send({ type: 'START', config: serializedConfig, clientIndex });
 
     // Handle unexpected child process exit
     childProcess.on('exit', (code, signal) => {

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

@@ -1,80 +0,0 @@
-import type { TypedEventEmitter } from '@aztec/foundation/types';
-import { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import type { TxPool, TxPoolEvents, TxPoolOptions } from './tx_pool.js';
-declare const InMemoryTxPool_base: new () => TypedEventEmitter<TxPoolEvents>;
-/**
- * In-memory implementation of the Transaction Pool.
- */
-export declare class InMemoryTxPool extends InMemoryTxPool_base 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 deletedMinedTxHashes;
-    private blockToDeletedMinedTxHash;
-    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);
-    private countTx;
-    isEmpty(): Promise<boolean>;
-    markAsMined(txHashes: TxHash[], blockHeader: BlockHeader): Promise<void>;
-    markMinedAsPending(txHashes: TxHash[]): Promise<void>;
-    getPendingTxHashes(): Promise<TxHash[]>;
-    getMinedTxHashes(): Promise<[TxHash, number][]>;
-    getPendingTxCount(): Promise<number>;
-    getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | 'deleted' | undefined>;
-    /**
-     * Checks if a transaction exists in the pool and returns it.
-     * @param txHash - The generated tx hash.
-     * @returns The transaction, if found, 'undefined' otherwise.
-     */
-    getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-    getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
-    hasTxs(txHashes: TxHash[]): Promise<boolean[]>;
-    hasTx(txHash: TxHash): Promise<boolean>;
-    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[], opts?: {
-        source?: string;
-    }): Promise<number>;
-    /**
-     * Deletes transactions from the pool. Tx hashes that are not present are ignored.
-     * Mined transactions are soft-deleted with a timestamp, pending transactions are permanently deleted.
-     * @param txHashes - An array of tx hashes to be deleted from the tx pool.
-     * @returns Empty promise.
-     */
-    deleteTxs(txHashes: TxHash[], opts?: {
-        permanently?: boolean;
-    }): Promise<void>;
-    /**
-     * Gets all the transactions stored in the pool.
-     * @returns Array of tx objects in the order they were added to the pool.
-     */
-    getAllTxs(): Promise<Tx[]>;
-    /**
-     * Gets the hashes of all transactions currently in the tx pool.
-     * @returns An array of transaction hashes found in the tx pool.
-     */
-    getAllTxHashes(): Promise<TxHash[]>;
-    updateConfig(_config: TxPoolOptions): void;
-    markTxsAsNonEvictable(_: TxHash[]): Promise<void>;
-    /**
-     * Permanently deletes deleted mined transactions from blocks up to and including the specified block number.
-     * @param blockNumber - Block number threshold. Deleted mined txs from this block or earlier will be permanently deleted.
-     * @returns The number of transactions permanently deleted.
-     */
-    cleanupDeletedMinedTxs(blockNumber: number): Promise<number>;
-}
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5X3R4X3Bvb2wuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9tZW1vcnlfdHhfcG9vbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWpFLE9BQU8sRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzNELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQU1uRixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLGFBQWEsRUFBRSxNQUFNLGNBQWMsQ0FBQzs7QUFFeEU7O0dBRUc7QUFDSCxxQkFBYSxjQUFlLFNBQVEsbUJBQTRELFlBQVcsTUFBTTtJQWtCN0csT0FBTyxDQUFDLEdBQUc7SUFqQmI7O09BRUc7SUFDSCxPQUFPLENBQUMsR0FBRyxDQUFrQjtJQUM3QixPQUFPLENBQUMsUUFBUSxDQUFzQjtJQUN0QyxPQUFPLENBQUMsVUFBVSxDQUFjO0lBQ2hDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBc0I7SUFDbEQsT0FBTyxDQUFDLHlCQUF5QixDQUEyQjtJQUU1RCxPQUFPLENBQUMsT0FBTyxDQUEwQjtJQUV6Qzs7O09BR0c7SUFDSCxZQUNFLFNBQVMsR0FBRSxlQUFzQyxFQUN6QyxHQUFHLHlDQUE4QixFQVMxQztJQUVELE9BQU8sQ0FBQyxPQUFPLENBT2I7SUFFSyxPQUFPLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUVqQztJQUVNLFdBQVcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBb0I5RTtJQUVNLGtCQUFrQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZ0IzRDtJQUVZLGtCQUFrQixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQVduRDtJQUVNLGdCQUFnQixJQUFJLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDLENBSXJEO0lBRU0saUJBQWlCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUcxQztJQUVNLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLEdBQUcsT0FBTyxHQUFHLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FhdkY7SUFFRDs7OztPQUlHO0lBQ0ksV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FHMUQ7SUFFRCxZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsRUFBRSxDQUFDLENBRTVEO0lBQ0QsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FFN0M7SUFFSyxLQUFLLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRzVDO0lBRU0sbUJBQW1CLElBQUksT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FFcEQ7SUFFRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLEdBQUcsRUFBRSxFQUFFLEVBQUUsRUFBRSxJQUFJLEdBQUU7UUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0F3QnhFO0lBRUQ7Ozs7O09BS0c7SUFDSSxTQUFTLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1FBQUUsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBMkJwRjtJQUVEOzs7T0FHRztJQUNJLFNBQVMsSUFBSSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FFaEM7SUFFRDs7O09BR0c7SUFDSSxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBRXpDO0lBRUQsWUFBWSxDQUFDLE9BQU8sRUFBRSxhQUFhLEdBQUcsSUFBSSxDQUFHO0lBRTdDLHFCQUFxQixDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRWhEO0lBRUQ7Ozs7T0FJRztJQUNJLHNCQUFzQixDQUFDLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTBCbEU7Q0FDRiJ9

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":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAMnF,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;;AAExE;;GAEG;AACH,qBAAa,cAAe,SAAQ,mBAA4D,YAAW,MAAM;IAkB7G,OAAO,CAAC,GAAG;IAjBb;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,oBAAoB,CAAsB;IAClD,OAAO,CAAC,yBAAyB,CAA2B;IAE5D,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;IACH,YACE,SAAS,GAAE,eAAsC,EACzC,GAAG,yCAA8B,EAS1C;IAED,OAAO,CAAC,OAAO,CAOb;IAEK,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAEjC;IAEM,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB9E;IAEM,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB3D;IAEY,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAWnD;IAEM,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAIrD;IAEM,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAG1C;IAEM,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAavF;IAED;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAG1D;IAED,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAE5D;IACD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAE7C;IAEK,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAG5C;IAEM,mBAAmB,IAAI,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAEpD;IAED;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBxE;IAED;;;;;OAKG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BpF;IAED;;;OAGG;IACI,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEhC;IAED;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAEzC;IAED,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAG;IAE7C,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhD;IAED;;;;OAIG;IACI,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA0BlE;CACF"}

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"}