@aztec/p2p 0.0.1-commit.9ef841308 → 0.0.1-commit.a89ec08

package/src/services/tx_collection/tx_collection.ts

@@ -1,7 +1,7 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { compactArray } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/promise';
+import { type PromiseWithResolvers, RunningPromise } from '@aztec/foundation/promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { L2Block, L2BlockInfo } from '@aztec/stdlib/block';
@@ -19,7 +19,7 @@ import type { TxCollectionConfig } from './config.js';
 import { FastTxCollection } from './fast_tx_collection.js';
 import { FileStoreTxCollection } from './file_store_tx_collection.js';
 import type { FileStoreTxSource } from './file_store_tx_source.js';
-import type { IRequestTracker } from './request_tracker.js';
+import type { IMissingTxsTracker } from './missing_txs_tracker.js';
 import { SlowTxCollection, getProofDeadlineForSlot } from './slow_tx_collection.js';
 import { type TxAddContext, TxCollectionSink } from './tx_collection_sink.js';
 import type { TxSource } from './tx_source.js';
@@ -33,8 +33,10 @@ export type FastCollectionRequestInput =
   | { type: 'proposal'; blockProposal: BlockProposal; blockNumber: BlockNumber };
 
 export type FastCollectionRequest = FastCollectionRequestInput & {
-  requestTracker: IRequestTracker;
+  missingTxTracker: IMissingTxsTracker;
+  deadline: Date;
   blockInfo: L2BlockInfo;
+  promise: PromiseWithResolvers<void>;
 };
 
 /**

package/src/test-helpers/make-test-p2p-clients.ts

@@ -4,9 +4,9 @@ import { SecretValue } from '@aztec/foundation/config';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import { sleep } from '@aztec/foundation/sleep';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 
 import { createP2PClient } from '../client/index.js';
 import type { P2PClient } from '../client/p2p_client.js';

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

@@ -15,7 +15,6 @@ import {
   type TopicValidatorResult,
   TypedEventEmitter,
 } from '@libp2p/interface';
-import type { AddressManager, ConnectionManager } from '@libp2p/interface-internal';
 
 import type { P2PConfig } from '../config.js';
 import type { MemPools } from '../mem_pools/interface.js';
@@ -213,14 +212,6 @@ export class MockPubSub implements PubSubLibp2p {
   get services() {
     return {
       pubsub: this.gossipSub,
-      components: {
-        addressManager: {
-          removeObservedAddr: () => {},
-          addObservedAddr: () => {},
-          confirmObservedAddr: () => {},
-        } as unknown as AddressManager,
-        connectionManager: {} as unknown as ConnectionManager,
-      },
     };
   }
 

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

@@ -2,6 +2,7 @@ import type { EpochCache } from '@aztec/epoch-cache';
 import { timesParallel } from '@aztec/foundation/collection';
 import { SecretValue } from '@aztec/foundation/config';
 import { createLogger } from '@aztec/foundation/log';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import { type ChainConfig, emptyChainConfig } from '@aztec/stdlib/config';
@@ -11,7 +12,6 @@ import type {
   IVCProofVerificationResult,
   WorldStateSynchronizer,
 } from '@aztec/stdlib/interfaces/server';
-import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import type { Tx } from '@aztec/stdlib/tx';
 import { compressComponentVersions } from '@aztec/stdlib/versioning';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';

package/src/test-helpers/testbench-utils.ts

@@ -273,41 +273,17 @@ export class InMemoryAttestationPool {
  * Creates a mock EpochCache for testing.
  */
 export function createMockEpochCache(): EpochCacheInterface {
-  const cache: EpochCacheInterface = {
+  return {
     getCommittee: () => Promise.resolve({ committee: [], seed: 1n, epoch: EpochNumber.ZERO, isEscapeHatchOpen: false }),
     getProposerIndexEncoding: () => '0x' as `0x${string}`,
-    getSlotNow: () => SlotNumber.ZERO,
-    getTargetSlot: () => SlotNumber.ZERO,
-    getEpochNow: () => EpochNumber.ZERO,
-    getTargetEpoch: () => EpochNumber.ZERO,
-    getEpochAndSlotNow: () => ({
-      epoch: EpochNumber.ZERO,
-      slot: SlotNumber.ZERO,
-      ts: 0n,
-      nowMs: 0n,
-    }),
-    isProposerPipeliningEnabled: () => false,
+    getEpochAndSlotNow: () => ({ epoch: EpochNumber.ZERO, slot: SlotNumber.ZERO, ts: 0n, nowMs: 0n }),
     computeProposerIndex: () => 0n,
     getCurrentAndNextSlot: () => ({ currentSlot: SlotNumber.ZERO, nextSlot: SlotNumber.ZERO }),
-    getTargetAndNextSlot: () => ({ targetSlot: SlotNumber.ZERO, nextSlot: SlotNumber.ZERO }),
     getProposerAttesterAddressInSlot: () => Promise.resolve(undefined),
-    getEpochAndSlotInNextL1Slot: () => ({
-      epoch: EpochNumber.ZERO,
-      slot: SlotNumber.ZERO,
-      ts: 0n,
-      nowSeconds: 0n,
-    }),
-    getTargetEpochAndSlotInNextL1Slot: () => ({
-      epoch: EpochNumber.ZERO,
-      slot: SlotNumber.ZERO,
-      ts: 0n,
-      nowSeconds: 0n,
-    }),
+    getEpochAndSlotInNextL1Slot: () => ({ epoch: EpochNumber.ZERO, slot: SlotNumber.ZERO, ts: 0n, now: 0n }),
     isInCommittee: () => Promise.resolve(false),
     getRegisteredValidators: () => Promise.resolve([]),
     filterInCommittee: () => Promise.resolve([]),
-    isEscapeHatchOpen: () => Promise.resolve(false),
-    isEscapeHatchOpenAtSlot: () => Promise.resolve(false),
     getL1Constants: () => ({
       l1StartBlock: 0n,
       l1GenesisTime: 0n,
@@ -319,7 +295,6 @@ export function createMockEpochCache(): EpochCacheInterface {
       rollupManaLimit: Number.MAX_SAFE_INTEGER,
     }),
   };
-  return cache;
 }
 
 /**

package/src/testbench/p2p_client_testbench_worker.ts

@@ -12,13 +12,13 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider, Timer } from '@aztec/foundation/timer';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { ClientProtocolCircuitVerifier, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import { type BlockProposal, P2PMessage } from '@aztec/stdlib/p2p';
 import { ChonkProof } from '@aztec/stdlib/proofs';
 import { makeAztecAddress, makeBlockHeader, makeBlockProposal, mockTx } from '@aztec/stdlib/testing';
@@ -40,7 +40,7 @@ import type { IBatchRequestTxValidator } from '../services/reqresp/batch-tx-requ
 import { RateLimitStatus } from '../services/reqresp/rate-limiter/rate_limiter.js';
 import type { ReqResp } from '../services/reqresp/reqresp.js';
 import type { PeerDiscoveryService } from '../services/service.js';
-import { RequestTracker } from '../services/tx_collection/request_tracker.js';
+import { MissingTxsTracker } from '../services/tx_collection/missing_txs_tracker.js';
 import { AlwaysTrueCircuitVerifier } from '../test-helpers/index.js';
 import {
   BENCHMARK_CONSTANTS,
@@ -273,9 +273,10 @@ async function runAggregatorBenchmark(
         noopTxValidator,
       );
       const fetchedTxs = await collector.collectTxs(
-        RequestTracker.create(txHashes, new Date(Date.now() + timeoutMs)),
+        MissingTxsTracker.fromArray(txHashes),
         blockProposal,
         pinnedPeer,
+        timeoutMs,
       );
       const durationMs = timer.ms();
       return {
@@ -292,9 +293,10 @@ async function runAggregatorBenchmark(
       BENCHMARK_CONSTANTS.FIXED_MAX_RETRY_ATTEMPTS,
     );
     const fetchedTxs = await collector.collectTxs(
-      RequestTracker.create(txHashes, new Date(Date.now() + timeoutMs)),
+      MissingTxsTracker.fromArray(txHashes),
       blockProposal,
       pinnedPeer,
+      timeoutMs,
     );
     const durationMs = timer.ms();
     return {
@@ -321,37 +323,6 @@ let workerConfig: P2PConfig | null = null;
 let workerLogger: Logger | null = null;
 let kvStore: Awaited<ReturnType<typeof openTmpStore>> | null = null;
 
-async function stopWorker() {
-  try {
-    if (workerClient) {
-      await workerClient.stop();
-      workerClient = null;
-    }
-  } catch (e) {
-    workerLogger?.error('Error stopping worker client', e);
-  }
-  try {
-    if (kvStore?.close) {
-      await kvStore.close();
-      kvStore = null;
-    }
-  } catch (e) {
-    workerLogger?.error('Error closing kv store', e);
-  }
-}
-
-function gracefulExit(code: number = 0) {
-  try {
-    if (process.connected) {
-      process.disconnect();
-    }
-  } catch {
-    // IPC channel already closed
-  }
-  // Safety fallback if lingering handles prevent the event loop from draining
-  setTimeout(() => process.exit(code), 5000).unref();
-}
-
 // eslint-disable-next-line @typescript-eslint/no-misused-promises
 process.on('message', async msg => {
   const {
@@ -441,8 +412,13 @@ process.on('message', async msg => {
     const cmd = msg as any;
     switch (cmd.type) {
       case 'STOP':
-        await stopWorker();
-        gracefulExit(0);
+        if (workerClient) {
+          await workerClient.stop();
+        }
+        if (kvStore?.close) {
+          await kvStore.close();
+        }
+        process.exit(0);
         break;
 
       case 'SEND_TX':
@@ -519,12 +495,7 @@ process.on('message', async msg => {
       }
     }
   } catch (err: any) {
-    try {
-      process.send!({ type: 'ERROR', error: err.message });
-    } catch {
-      // IPC channel may be closed
-    }
-    await stopWorker();
-    gracefulExit(1);
+    process.send!({ type: 'ERROR', error: err.message });
+    process.exit(1);
   }
 });

package/src/testbench/worker_client_manager.ts

@@ -72,6 +72,7 @@ class WorkerClientManager {
   destroy() {
     this.cleanup().catch((error: Error) => {
       this.logger.error('Failed to cleanup worker client manager', error);
+      process.exit(1);
     });
   }
 
@@ -489,8 +490,7 @@ class WorkerClientManager {
     };
 
     this.processes[0].send(aggregatorCmd);
-    const aggregatorBudgetMs = config.timeoutMs + BENCHMARK_CONSTANTS.MAX_PEER_WAIT_MS + 30000;
-    const result = await this.waitForBenchResult(0, aggregatorBudgetMs);
+    const result = await this.waitForBenchResult(0, config.timeoutMs + 30000);
 
     this.logger.info(
       `Benchmark complete: fetched=${result.fetchedCount}/${config.txCount}, duration=${result.durationMs.toFixed(0)}ms, success=${result.success}`,

package/src/util.ts

@@ -1,13 +1,13 @@
 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/stdlib/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 { AddressManager, ConnectionManager } from '@libp2p/interface-internal';
+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';
@@ -31,10 +31,6 @@ export interface PubSubLibp2p extends Pick<Libp2p, 'status' | 'start' | 'stop' |
       | 'direct'
       | 'getMeshPeers'
     > & { score: Pick<GossipSub['score'], 'score'> };
-    components: {
-      connectionManager: ConnectionManager;
-      addressManager: AddressManager;
-    };
   };
 }
 
@@ -43,7 +39,6 @@ export type FullLibp2p = Libp2p<{
   pubsub: GossipSub;
   components: {
     connectionManager: ConnectionManager;
-    addressManager: AddressManager;
   };
 }>;
 
@@ -107,15 +102,24 @@ function addressToMultiAddressType(address: string): 'ip4' | 'ip6' | 'dns' {
   }
 }
 
-export function configureP2PClientAddresses(_config: P2PConfig & DataStoreConfig): P2PConfig & DataStoreConfig {
+export async function configureP2PClientAddresses(
+  _config: P2PConfig & DataStoreConfig,
+): Promise<P2PConfig & DataStoreConfig> {
   const config = { ..._config };
-  const { p2pBroadcastPort, p2pPort } = config;
+  const { p2pIp, queryForIp, p2pBroadcastPort, p2pPort } = config;
 
   // If no broadcast port is provided, use the given p2p port as the broadcast port
   if (!p2pBroadcastPort) {
     config.p2pBroadcastPort = p2pPort;
   }
 
+  // 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;

package/dest/services/tx_collection/request_tracker.d.ts

@@ -1,53 +0,0 @@
-import type { DateProvider } from '@aztec/foundation/timer';
-import { TxHash } from '@aztec/stdlib/tx';
-import type { Tx } from '@aztec/stdlib/tx';
-/**
- * Tracks which transactions are still missing and need to be fetched.
- * Manages the request deadline and serves as the sole source of cancellation signal.
- * The request is cancelled when all txs are fetched or the deadline expires.
- */
-export interface IRequestTracker {
-    /** Returns the set of transaction hashes that are still missing. */
-    get missingTxHashes(): Set<string>;
-    /** Size of this.missingTxHashes */
-    get numberOfMissingTxs(): number;
-    /** Are all requested txs fetched */
-    allFetched(): boolean;
-    /** Checks that transaction is still missing */
-    isMissing(txHash: string): boolean;
-    /** Marks a transaction as fetched. Returns true if it was previously missing. */
-    markFetched(tx: Tx): boolean;
-    /** Get list of collected txs */
-    get collectedTxs(): Tx[];
-    /** The deadline for this request. */
-    get deadline(): Date;
-    /** Remaining time in milliseconds until deadline. Returns 0 if already past. */
-    get timeoutMs(): number;
-    /** Checks whether the request is cancelled (deadline expired or all fetched). May trigger cancellation if deadline has passed. */
-    checkCancelled(): boolean;
-    /** Resolves when deadline expires or all txs are fetched. */
-    get cancellationToken(): Promise<void>;
-    /** Externally cancel the request. */
-    cancel(): void;
-}
-export declare class RequestTracker implements IRequestTracker {
-    readonly missingTxHashes: Set<string>;
-    readonly deadline: Date;
-    private readonly dateProvider?;
-    readonly collectedTxs: Tx[];
-    private done;
-    private readonly cancellationTokenPromise;
-    private readonly deadlineTimer;
-    private constructor();
-    static create(hashes: TxHash[] | string[], deadline: Date, dateProvider?: DateProvider): RequestTracker;
-    markFetched(tx: Tx): boolean;
-    get numberOfMissingTxs(): number;
-    allFetched(): boolean;
-    isMissing(txHash: string): boolean;
-    get timeoutMs(): number;
-    checkCancelled(): boolean;
-    get cancellationToken(): Promise<void>;
-    cancel(): void;
-    private finish;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdF90cmFja2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9yZXF1ZXN0X3RyYWNrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTNDOzs7O0dBSUc7QUFDSCxNQUFNLFdBQVcsZUFBZTtJQUM5QixvRUFBb0U7SUFDcEUsSUFBSSxlQUFlLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ25DLG1DQUFtQztJQUNuQyxJQUFJLGtCQUFrQixJQUFJLE1BQU0sQ0FBQztJQUNqQyxvQ0FBb0M7SUFDcEMsVUFBVSxJQUFJLE9BQU8sQ0FBQztJQUN0QiwrQ0FBK0M7SUFDL0MsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDO0lBQ25DLGlGQUFpRjtJQUNqRixXQUFXLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUM7SUFDN0IsZ0NBQWdDO0lBQ2hDLElBQUksWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ3pCLHFDQUFxQztJQUNyQyxJQUFJLFFBQVEsSUFBSSxJQUFJLENBQUM7SUFDckIsZ0ZBQWdGO0lBQ2hGLElBQUksU0FBUyxJQUFJLE1BQU0sQ0FBQztJQUN4QixrSUFBa0k7SUFDbEksY0FBYyxJQUFJLE9BQU8sQ0FBQztJQUMxQiw2REFBNkQ7SUFDN0QsSUFBSSxpQkFBaUIsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdkMscUNBQXFDO0lBQ3JDLE1BQU0sSUFBSSxJQUFJLENBQUM7Q0FDaEI7QUFFRCxxQkFBYSxjQUFlLFlBQVcsZUFBZTthQU9sQyxlQUFlLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQzthQUM1QixRQUFRLEVBQUUsSUFBSTtJQUM5QixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQztJQVJoQyxTQUFnQixZQUFZLEVBQUUsRUFBRSxFQUFFLENBQU07SUFDeEMsT0FBTyxDQUFDLElBQUksQ0FBUztJQUNyQixPQUFPLENBQUMsUUFBUSxDQUFDLHdCQUF3QixDQUE2QjtJQUN0RSxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBNEM7SUFFMUUsT0FBTyxlQW1CTjtJQUVELE9BQWMsTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxNQUFNLEVBQUUsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLFlBQVksQ0FBQyxFQUFFLFlBQVksa0JBRTVGO0lBRUQsV0FBVyxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQVMzQjtJQUVELElBQUksa0JBQWtCLElBQUksTUFBTSxDQUUvQjtJQUVELFVBQVUsSUFBSSxPQUFPLENBRXBCO0lBRUQsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUVqQztJQUVELElBQUksU0FBUyxJQUFJLE1BQU0sQ0FHdEI7SUFFRCxjQUFjLElBQUksT0FBTyxDQVl4QjtJQUVELElBQUksaUJBQWlCLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUVyQztJQUVELE1BQU0sSUFBSSxJQUFJLENBRWI7SUFFRCxPQUFPLENBQUMsTUFBTTtDQVVmIn0=

package/dest/services/tx_collection/request_tracker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"request_tracker.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/request_tracker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,IAAI,eAAe,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,mCAAmC;IACnC,IAAI,kBAAkB,IAAI,MAAM,CAAC;IACjC,oCAAoC;IACpC,UAAU,IAAI,OAAO,CAAC;IACtB,+CAA+C;IAC/C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC,iFAAiF;IACjF,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC7B,gCAAgC;IAChC,IAAI,YAAY,IAAI,EAAE,EAAE,CAAC;IACzB,qCAAqC;IACrC,IAAI,QAAQ,IAAI,IAAI,CAAC;IACrB,gFAAgF;IAChF,IAAI,SAAS,IAAI,MAAM,CAAC;IACxB,kIAAkI;IAClI,cAAc,IAAI,OAAO,CAAC;IAC1B,6DAA6D;IAC7D,IAAI,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,qCAAqC;IACrC,MAAM,IAAI,IAAI,CAAC;CAChB;AAED,qBAAa,cAAe,YAAW,eAAe;aAOlC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC;aAC5B,QAAQ,EAAE,IAAI;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IARhC,SAAgB,YAAY,EAAE,EAAE,EAAE,CAAM;IACxC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA6B;IACtE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4C;IAE1E,OAAO,eAmBN;IAED,OAAc,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,YAAY,kBAE5F;IAED,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAS3B;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,UAAU,IAAI,OAAO,CAEpB;IAED,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEjC;IAED,IAAI,SAAS,IAAI,MAAM,CAGtB;IAED,cAAc,IAAI,OAAO,CAYxB;IAED,IAAI,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAErC;IAED,MAAM,IAAI,IAAI,CAEb;IAED,OAAO,CAAC,MAAM;CAUf"}

package/dest/services/tx_collection/request_tracker.js

@@ -1,84 +0,0 @@
-import { promiseWithResolvers } from '@aztec/foundation/promise';
-export class RequestTracker {
-    missingTxHashes;
-    deadline;
-    dateProvider;
-    collectedTxs;
-    done;
-    cancellationTokenPromise;
-    deadlineTimer;
-    constructor(missingTxHashes, deadline, dateProvider){
-        this.missingTxHashes = missingTxHashes;
-        this.deadline = deadline;
-        this.dateProvider = dateProvider;
-        this.collectedTxs = [];
-        this.done = false;
-        this.cancellationTokenPromise = promiseWithResolvers();
-        if (missingTxHashes.size === 0) {
-            this.finish();
-            return;
-        }
-        const now = this.dateProvider?.now() ?? Date.now();
-        const remaining = deadline.getTime() - now;
-        if (remaining <= 0) {
-            this.finish();
-        } else {
-            this.deadlineTimer = setTimeout(()=>this.finish(), remaining);
-        }
-    }
-    static create(hashes, deadline, dateProvider) {
-        return new RequestTracker(new Set(hashes.map((hash)=>hash.toString())), deadline, dateProvider);
-    }
-    markFetched(tx) {
-        if (this.missingTxHashes.delete(tx.txHash.toString())) {
-            this.collectedTxs.push(tx);
-            if (this.allFetched()) {
-                this.finish();
-            }
-            return true;
-        }
-        return false;
-    }
-    get numberOfMissingTxs() {
-        return this.missingTxHashes.size;
-    }
-    allFetched() {
-        return this.numberOfMissingTxs === 0;
-    }
-    isMissing(txHash) {
-        return this.missingTxHashes.has(txHash.toString());
-    }
-    get timeoutMs() {
-        const now = this.dateProvider?.now() ?? Date.now();
-        return Math.max(0, this.deadline.getTime() - now);
-    }
-    checkCancelled() {
-        if (this.done) {
-            return true;
-        }
-        // Synchronous fallback: check deadline even if setTimeout hasn't fired yet.
-        // This prevents macrotask starvation in tight async loops from blocking cancellation.
-        const now = this.dateProvider?.now() ?? Date.now();
-        if (now >= this.deadline.getTime()) {
-            this.finish();
-            return true;
-        }
-        return false;
-    }
-    get cancellationToken() {
-        return this.cancellationTokenPromise.promise;
-    }
-    cancel() {
-        this.finish();
-    }
-    finish() {
-        if (this.done) {
-            return;
-        }
-        this.done = true;
-        if (this.deadlineTimer) {
-            clearTimeout(this.deadlineTimer);
-        }
-        this.cancellationTokenPromise.resolve();
-    }
-}

package/src/services/tx_collection/request_tracker.ts

@@ -1,127 +0,0 @@
-import { type PromiseWithResolvers, promiseWithResolvers } from '@aztec/foundation/promise';
-import type { DateProvider } from '@aztec/foundation/timer';
-import { TxHash } from '@aztec/stdlib/tx';
-import type { Tx } from '@aztec/stdlib/tx';
-
-/**
- * Tracks which transactions are still missing and need to be fetched.
- * Manages the request deadline and serves as the sole source of cancellation signal.
- * The request is cancelled when all txs are fetched or the deadline expires.
- */
-export interface IRequestTracker {
-  /** Returns the set of transaction hashes that are still missing. */
-  get missingTxHashes(): Set<string>;
-  /** Size of this.missingTxHashes */
-  get numberOfMissingTxs(): number;
-  /** Are all requested txs fetched */
-  allFetched(): boolean;
-  /** Checks that transaction is still missing */
-  isMissing(txHash: string): boolean;
-  /** Marks a transaction as fetched. Returns true if it was previously missing. */
-  markFetched(tx: Tx): boolean;
-  /** Get list of collected txs */
-  get collectedTxs(): Tx[];
-  /** The deadline for this request. */
-  get deadline(): Date;
-  /** Remaining time in milliseconds until deadline. Returns 0 if already past. */
-  get timeoutMs(): number;
-  /** Checks whether the request is cancelled (deadline expired or all fetched). May trigger cancellation if deadline has passed. */
-  checkCancelled(): boolean;
-  /** Resolves when deadline expires or all txs are fetched. */
-  get cancellationToken(): Promise<void>;
-  /** Externally cancel the request. */
-  cancel(): void;
-}
-
-export class RequestTracker implements IRequestTracker {
-  public readonly collectedTxs: Tx[] = [];
-  private done = false;
-  private readonly cancellationTokenPromise: PromiseWithResolvers<void>;
-  private readonly deadlineTimer: ReturnType<typeof setTimeout> | undefined;
-
-  private constructor(
-    public readonly missingTxHashes: Set<string>,
-    public readonly deadline: Date,
-    private readonly dateProvider?: DateProvider,
-  ) {
-    this.cancellationTokenPromise = promiseWithResolvers<void>();
-
-    if (missingTxHashes.size === 0) {
-      this.finish();
-      return;
-    }
-
-    const now = this.dateProvider?.now() ?? Date.now();
-    const remaining = deadline.getTime() - now;
-    if (remaining <= 0) {
-      this.finish();
-    } else {
-      this.deadlineTimer = setTimeout(() => this.finish(), remaining);
-    }
-  }
-
-  public static create(hashes: TxHash[] | string[], deadline: Date, dateProvider?: DateProvider) {
-    return new RequestTracker(new Set(hashes.map(hash => hash.toString())), deadline, dateProvider);
-  }
-
-  markFetched(tx: Tx): boolean {
-    if (this.missingTxHashes.delete(tx.txHash.toString())) {
-      this.collectedTxs.push(tx);
-      if (this.allFetched()) {
-        this.finish();
-      }
-      return true;
-    }
-    return false;
-  }
-
-  get numberOfMissingTxs(): number {
-    return this.missingTxHashes.size;
-  }
-
-  allFetched(): boolean {
-    return this.numberOfMissingTxs === 0;
-  }
-
-  isMissing(txHash: string): boolean {
-    return this.missingTxHashes.has(txHash.toString());
-  }
-
-  get timeoutMs(): number {
-    const now = this.dateProvider?.now() ?? Date.now();
-    return Math.max(0, this.deadline.getTime() - now);
-  }
-
-  checkCancelled(): boolean {
-    if (this.done) {
-      return true;
-    }
-    // Synchronous fallback: check deadline even if setTimeout hasn't fired yet.
-    // This prevents macrotask starvation in tight async loops from blocking cancellation.
-    const now = this.dateProvider?.now() ?? Date.now();
-    if (now >= this.deadline.getTime()) {
-      this.finish();
-      return true;
-    }
-    return false;
-  }
-
-  get cancellationToken(): Promise<void> {
-    return this.cancellationTokenPromise.promise;
-  }
-
-  cancel(): void {
-    this.finish();
-  }
-
-  private finish() {
-    if (this.done) {
-      return;
-    }
-    this.done = true;
-    if (this.deadlineTimer) {
-      clearTimeout(this.deadlineTimer);
-    }
-    this.cancellationTokenPromise.resolve();
-  }
-}