@aztec/p2p 0.0.1-commit.88e6f9396 → 0.0.1-commit.8c0b8ff

package/src/services/tx_collection/missing_txs_tracker.ts

@@ -0,0 +1,52 @@
+import { TxHash } from '@aztec/stdlib/tx';
+import type { Tx } from '@aztec/stdlib/tx';
+
+/**
+ * Tracks which transactions are still missing and need to be fetched.
+ * Allows external code to mark transactions as fetched, enabling coordination
+ * between multiple fetching mechanisms (e.g., BatchTxRequester and Rpc Node requests).
+ */
+export interface IMissingTxsTracker {
+  /** 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 are 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[];
+}
+
+export class MissingTxsTracker implements IMissingTxsTracker {
+  public readonly collectedTxs: Tx[] = [];
+
+  private constructor(public readonly missingTxHashes: Set<string>) {}
+
+  public static fromArray(hashes: TxHash[] | string[]) {
+    return new MissingTxsTracker(new Set(hashes.map(hash => hash.toString())));
+  }
+
+  markFetched(tx: Tx): boolean {
+    if (this.missingTxHashes.delete(tx.txHash.toString())) {
+      this.collectedTxs.push(tx);
+      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());
+  }
+}

package/src/services/tx_collection/proposal_tx_collector.ts

@@ -9,7 +9,7 @@ import type { BatchTxRequesterConfig } from '../reqresp/batch-tx-requester/confi
 import type { BatchTxRequesterLibP2PService } from '../reqresp/batch-tx-requester/interface.js';
 import type { IBatchRequestTxValidator } from '../reqresp/batch-tx-requester/tx_validator.js';
 import { type BlockTxsSource, ReqRespSubProtocol, chunkTxHashesRequest } from '../reqresp/index.js';
-import type { IRequestTracker } from './request_tracker.js';
+import type { IMissingTxsTracker } from './missing_txs_tracker.js';
 
 /**
  * Strategy interface for collecting missing transactions for a block or proposal.
@@ -18,15 +18,17 @@ import type { IRequestTracker } from './request_tracker.js';
 export interface MissingTxsCollector {
   /**
    * Collect missing transactions for a block or proposal.
-   * @param requestTracker - The missing transactions tracker
+   * @param missingTxsTracker - The missing transactions tracker
    * @param blockTxsSource - The block or proposal containing the transactions
    * @param pinnedPeer - Optional peer expected to have the transactions
+   * @param timeoutMs - Timeout in milliseconds
    * @returns The collected transactions
    */
   collectTxs(
-    requestTracker: IRequestTracker,
+    missingTxsTracker: IMissingTxsTracker,
     blockTxsSource: BlockTxsSource,
     pinnedPeer: PeerId | undefined,
+    timeoutMs: number,
   ): Promise<Tx[]>;
 }
 
@@ -44,9 +46,10 @@ export class BatchTxRequesterCollector implements MissingTxsCollector {
   ) {}
 
   async collectTxs(
-    requestTracker: IRequestTracker,
+    missingTxsTracker: IMissingTxsTracker,
     blockTxsSource: BlockTxsSource,
     pinnedPeer: PeerId | undefined,
+    timeoutMs: number,
   ): Promise<Tx[]> {
     const {
       batchTxRequesterSmartParallelWorkerCount: smartParallelWorkerCount,
@@ -56,9 +59,10 @@ export class BatchTxRequesterCollector implements MissingTxsCollector {
     } = this.batchTxRequesterConfig ?? {};
 
     const batchRequester = new BatchTxRequester(
-      requestTracker,
+      missingTxsTracker,
       blockTxsSource,
       pinnedPeer,
+      timeoutMs,
       this.p2pService,
       this.log,
       this.dateProvider,
@@ -90,15 +94,16 @@ export class SendBatchRequestCollector implements MissingTxsCollector {
   ) {}
 
   async collectTxs(
-    requestTracker: IRequestTracker,
+    missingTxsTracker: IMissingTxsTracker,
     _blockTxsSource: BlockTxsSource,
     pinnedPeer: PeerId | undefined,
+    timeoutMs: number,
   ): Promise<Tx[]> {
     const txs = await this.p2pService.reqResp.sendBatchRequest<ReqRespSubProtocol.TX>(
       ReqRespSubProtocol.TX,
-      chunkTxHashesRequest(Array.from(requestTracker.missingTxHashes).map(TxHash.fromString)),
+      chunkTxHashesRequest(Array.from(missingTxsTracker.missingTxHashes).map(TxHash.fromString)),
       pinnedPeer,
-      requestTracker.timeoutMs,
+      timeoutMs,
       this.maxPeers,
       this.maxRetryAttempts,
     );

package/src/services/tx_collection/slow_tx_collection.ts

@@ -196,7 +196,7 @@ export class SlowTxCollection {
     // from mined unproven blocks it has seen in the past.
     const fastRequests = this.fastCollection.getFastCollectionRequests();
     const fastCollectionTxs: Set<string> = new Set(
-      fastRequests.values().flatMap(r => Array.from(r.requestTracker.missingTxHashes)),
+      fastRequests.values().flatMap(r => Array.from(r.missingTxTracker.missingTxHashes)),
     );
 
     // Return all missing txs that are not in fastCollectionTxs and are ready for reqresp if requested

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/services/tx_collection/tx_source.ts

@@ -2,7 +2,7 @@ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { type AztecNode, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
-import type { Tx, TxHash } from '@aztec/stdlib/tx';
+import type { Tx, TxHash, TxValidator } from '@aztec/stdlib/tx';
 import { type ComponentsVersions, getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 import { makeTracedFetch } from '@aztec/telemetry-client';
 
@@ -16,12 +16,13 @@ export interface TxSource {
 export class NodeRpcTxSource implements TxSource {
   constructor(
     private readonly client: Pick<AztecNode, 'getTxsByHash'>,
+    private readonly txValidator: TxValidator,
     private readonly info: string,
   ) {}
 
-  public static fromUrl(nodeUrl: string, versions: ComponentsVersions): NodeRpcTxSource {
+  public static fromUrl(nodeUrl: string, txValidator: TxValidator, versions: ComponentsVersions): NodeRpcTxSource {
     const client = createAztecNodeClient(nodeUrl, versions, makeTracedFetch([1, 2, 3], false));
-    return new NodeRpcTxSource(client, nodeUrl);
+    return new NodeRpcTxSource(client, txValidator, nodeUrl);
   }
 
   public getInfo() {
@@ -38,8 +39,8 @@ export class NodeRpcTxSource implements TxSource {
     const invalidTxHashes: string[] = [];
     await Promise.all(
       txs.map(async tx => {
-        const isValid = await tx.validateTxHash();
-        if (isValid) {
+        const validation = await this.txValidator.validateTx(tx);
+        if (validation.result === 'valid') {
           validTxs.push(tx);
         } else {
           invalidTxHashes.push(tx.getTxHash().toString());
@@ -50,7 +51,7 @@ export class NodeRpcTxSource implements TxSource {
   }
 }
 
-export function createNodeRpcTxSources(urls: string[], chainConfig: ChainConfig) {
+export function createNodeRpcTxSources(urls: string[], txValidator: TxValidator, chainConfig: ChainConfig) {
   const versions = getComponentsVersionsFromConfig(chainConfig, protocolContractsHash, getVKTreeRoot());
-  return urls.map(url => NodeRpcTxSource.fromUrl(url, versions));
+  return urls.map(url => NodeRpcTxSource.fromUrl(url, txValidator, versions));
 }

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/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

@@ -4,7 +4,7 @@
  * Used when running testbench commands.
  */
 import { MockL2BlockSource } from '@aztec/archiver/test';
-import type { EpochCache, EpochCacheInterface } from '@aztec/epoch-cache';
+import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { SecretValue } from '@aztec/foundation/config';
 import { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
@@ -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';
@@ -28,7 +28,6 @@ import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-clien
 import type { Message, PeerId } from '@libp2p/interface';
 import { TopicValidatorResult } from '@libp2p/interface';
 import { peerIdFromString } from '@libp2p/peer-id';
-import { mock } from 'jest-mock-extended';
 
 import type { P2PClient } from '../client/index.js';
 import type { P2PConfig } from '../config.js';
@@ -41,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,
@@ -50,6 +49,7 @@ import {
   InMemoryAttestationPool,
   InMemoryTxPool,
   UNLIMITED_RATE_LIMIT_QUOTA,
+  createMockEpochCache,
   createMockWorldStateSynchronizer,
   filterTxsByDistribution,
 } from '../test-helpers/index.js';
@@ -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 {
@@ -344,7 +346,7 @@ process.on('message', async msg => {
       workerConfig = config;
       workerTxPool = new InMemoryTxPool();
       workerAttestationPool = new InMemoryAttestationPool();
-      const epochCache = mock<EpochCache>();
+      const epochCache = createMockEpochCache();
       const worldState = createMockWorldStateSynchronizer();
       const l2BlockSource = new MockL2BlockSource();
 

package/src/testbench/worker_client_manager.ts

@@ -490,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,7 +1,7 @@
 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';

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();
-  }
-}