@aztec/p2p 0.0.1-commit.04852196a → 0.0.1-commit.04d373f

package/src/client/p2p_client.ts

@@ -1,12 +1,18 @@
-import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  type CheckpointProposalHash,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/promise';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { AztecAsyncKVStore, AztecAsyncSingleton } from '@aztec/kv-store';
 import { L2TipsKVStore } from '@aztec/kv-store/stores';
 import {
+  type BlockData,
+  type BlockHash,
   type CheckpointId,
   type EthAddress,
   type L2Block,
@@ -18,6 +24,7 @@ import {
   type L2TipsStore,
 } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
+import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { type PeerInfo, tryStop } from '@aztec/stdlib/interfaces/server';
 import { type BlockProposal, CheckpointAttestation, type CheckpointProposal, type TopicType } from '@aztec/stdlib/p2p';
 import type { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
@@ -28,15 +35,11 @@ import type { ENR } from '@nethermindeth/enr';
 
 import { type P2PConfig, getP2PDefaultConfig } from '../config.js';
 import { TxPoolError } from '../errors/tx-pool.error.js';
-import type { AttestationPoolApi } from '../mem_pools/attestation_pool/attestation_pool.js';
+import type { AttestationPoolApi, ProposalsForSlot } from '../mem_pools/attestation_pool/attestation_pool.js';
 import type { MemPools } from '../mem_pools/interface.js';
 import type { TxPoolV2 } from '../mem_pools/tx_pool_v2/interfaces.js';
 import type { AuthRequest, StatusMessage } from '../services/index.js';
-import {
-  ReqRespSubProtocol,
-  type ReqRespSubProtocolHandler,
-  type ReqRespSubProtocolValidators,
-} from '../services/reqresp/interface.js';
+import { ReqRespSubProtocol, type ReqRespSubProtocolHandler } from '../services/reqresp/interface.js';
 import type {
   DuplicateAttestationInfo,
   DuplicateProposalInfo,
@@ -95,6 +98,7 @@ export class P2PClient extends WithTracer implements P2P {
     private _dateProvider: DateProvider = new DateProvider(),
     private telemetry: TelemetryClient = getTelemetryClient(),
     private log = createLogger('p2p'),
+    initialBlockHash: BlockHash,
   ) {
     super(telemetry, 'P2PClient');
 
@@ -110,7 +114,7 @@ export class P2PClient extends WithTracer implements P2P {
       this.telemetry,
     );
 
-    this.l2Tips = new L2TipsKVStore(store, 'p2p_client');
+    this.l2Tips = new L2TipsKVStore(store, 'p2p_client', initialBlockHash);
     this.synchedLatestSlot = store.openSingleton('p2p_pool_last_l2_slot');
   }
 
@@ -164,7 +168,7 @@ export class P2PClient extends WithTracer implements P2P {
         const from = BlockNumber(oldFinalizedBlockNum + 1);
         const limit = event.block.number - from + 1;
         if (limit > 0) {
-          const oldBlocks = await this.l2BlockSource.getBlocks(from, limit);
+          const oldBlocks = await this.l2BlockSource.getBlocksData({ from, limit });
           await this.handleFinalizedL2Blocks(oldBlocks);
         }
         break;
@@ -257,8 +261,11 @@ export class P2PClient extends WithTracer implements P2P {
       });
     }
 
-    this.blockStream!.start();
-    await this.txCollection.start();
+    // Should never happen: all branches above call initBlockStream()
+    if (!this.blockStream) {
+      throw new Error('Block stream not initialized');
+    }
+    this.blockStream.start();
     this.txFileStore?.start();
 
     // Start slot monitor to call prepareForSlot when the slot changes
@@ -272,12 +279,8 @@ export class P2PClient extends WithTracer implements P2P {
     return this.syncPromise;
   }
 
-  addReqRespSubProtocol(
-    subProtocol: ReqRespSubProtocol,
-    handler: ReqRespSubProtocolHandler,
-    validator: ReqRespSubProtocolValidators[ReqRespSubProtocol],
-  ): Promise<void> {
-    return this.p2pService.addReqRespSubProtocol(subProtocol, handler, validator);
+  addReqRespSubProtocol(subProtocol: ReqRespSubProtocol, handler: ReqRespSubProtocolHandler): Promise<void> {
+    return this.p2pService.addReqRespSubProtocol(subProtocol, handler);
   }
 
   private initBlockStream(startingBlock?: BlockNumber) {
@@ -319,7 +322,11 @@ export class P2PClient extends WithTracer implements P2P {
   /** Triggers a sync to the archiver. Used for testing. */
   public async sync() {
     this.initBlockStream();
-    await this.blockStream!.sync();
+    // Should never happen: initBlockStream() creates blockStream if absent
+    if (!this.blockStream) {
+      throw new Error('Block stream not initialized');
+    }
+    await this.blockStream.sync();
   }
 
   @trackSpan('p2pClient.broadcastProposal', async proposal => ({
@@ -357,6 +364,19 @@ export class P2PClient extends WithTracer implements P2P {
       // Store our own last-block proposal so we can respond to req/resp requests for it.
       await this.attestationPool.tryAddBlockProposal(blockProposal);
     }
+    const checkpointCore = proposal.toCore();
+    const { count } = await this.attestationPool.tryAddCheckpointProposal(checkpointCore);
+    if (count > 1) {
+      if (this.config.broadcastEquivocatedProposals) {
+        this.log.warn(`Broadcasting equivocated checkpoint proposal for slot ${proposal.slotNumber}`, {
+          slot: proposal.slotNumber,
+          archive: proposal.archive.toString(),
+          count,
+        });
+      } else {
+        throw new Error(`Attempted to broadcast a duplicate checkpoint proposal for slot ${proposal.slotNumber}`);
+      }
+    }
     return this.p2pService.propagate(proposal);
   }
 
@@ -367,10 +387,10 @@ export class P2PClient extends WithTracer implements P2P {
 
   public async getCheckpointAttestationsForSlot(
     slot: SlotNumber,
-    proposalId?: string,
+    proposalPayloadHash?: CheckpointProposalHash,
   ): Promise<CheckpointAttestation[]> {
-    return await (proposalId
-      ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalId)
+    return await (proposalPayloadHash
+      ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalPayloadHash)
       : this.attestationPool.getCheckpointAttestationsForSlot(slot));
   }
 
@@ -378,6 +398,10 @@ export class P2PClient extends WithTracer implements P2P {
     return this.attestationPool.addOwnCheckpointAttestations(attestations);
   }
 
+  public getProposalsForSlot(slot: SlotNumber): Promise<ProposalsForSlot> {
+    return this.attestationPool.getProposalsForSlot(slot);
+  }
+
   public hasBlockProposalsForSlot(slot: SlotNumber): Promise<boolean> {
     return this.attestationPool.hasBlockProposalsForSlot(slot);
   }
@@ -388,8 +412,12 @@ export class P2PClient extends WithTracer implements P2P {
     this.p2pService.registerBlockReceivedCallback(handler);
   }
 
-  public registerCheckpointProposalHandler(handler: P2PCheckpointReceivedCallback): void {
-    this.p2pService.registerCheckpointReceivedCallback(handler);
+  public registerValidatorCheckpointProposalHandler(handler: P2PCheckpointReceivedCallback): void {
+    this.p2pService.registerValidatorCheckpointReceivedCallback(handler);
+  }
+
+  public registerAllNodesCheckpointProposalHandler(handler: P2PCheckpointReceivedCallback): void {
+    this.p2pService.registerAllNodesCheckpointReceivedCallback(handler);
   }
 
   public registerDuplicateProposalCallback(callback: (info: DuplicateProposalInfo) => void): void {
@@ -400,6 +428,10 @@ export class P2PClient extends WithTracer implements P2P {
     this.p2pService.registerDuplicateAttestationCallback(callback);
   }
 
+  public registerCheckpointAttestationCallback(callback: (attestation: CheckpointAttestation) => void): void {
+    this.p2pService.registerCheckpointAttestationCallback(callback);
+  }
+
   public async getPendingTxs(limit?: number, after?: TxHash): Promise<Tx[]> {
     if (limit !== undefined && limit <= 0) {
       throw new TypeError('limit must be greater than 0');
@@ -570,13 +602,10 @@ export class P2PClient extends WithTracer implements P2P {
    */
   public async getStatus(): Promise<P2PSyncState> {
     const blockNumber = await this.getSyncedLatestBlockNum();
-    const blockHash =
-      blockNumber === 0
-        ? GENESIS_BLOCK_HEADER_HASH.toString()
-        : await this.l2BlockSource
-            .getBlockHeader(blockNumber)
-            .then(header => header?.hash())
-            .then(hash => hash?.toString());
+    const blockHash = await this.l2BlockSource
+      .getBlockData({ number: blockNumber })
+      .then(data => data?.header.hash())
+      .then(hash => hash?.toString());
 
     return {
       state: this.currentState,
@@ -607,13 +636,13 @@ export class P2PClient extends WithTracer implements P2P {
 
     await this.handleMinedBlocks(blocks);
     await this.maybeCallPrepareForSlot();
-    await this.startCollectingMissingTxs(blocks);
+    await this.collectingMissingTxs(blocks);
     const lastBlock = blocks.at(-1)!;
     await this.synchedLatestSlot.set(BigInt(lastBlock.header.getSlot()));
   }
 
-  /** Request txs for unproven blocks so the prover node has more chances to get them. */
-  private async startCollectingMissingTxs(blocks: L2Block[]): Promise<void> {
+  /** Request txs for unproven blocks so the prover node can prove. */
+  private async collectingMissingTxs(blocks: L2Block[]): Promise<void> {
     try {
       // TODO(#15435): If the archiver has lagged behind L1, the reported proven block number may
       // be much lower than the actual one, and it does not update until the pending chain is
@@ -621,7 +650,7 @@ export class P2PClient extends WithTracer implements P2P {
       // are already proven, but the archiver has not yet updated its state. Until this is properly
       // fixed, it is mitigated by the expiration date of collection requests, which depends on
       // the slot number of the block.
-      const provenBlockNumber = await this.l2BlockSource.getProvenBlockNumber();
+      const provenBlockNumber = (await this.l2BlockSource.getBlockNumber({ tag: 'proven' })) ?? BlockNumber.ZERO;
       const unprovenBlocks = blocks.filter(block => block.number > provenBlockNumber);
       for (const block of unprovenBlocks) {
         const txHashes = block.body.txEffects.map(txEffect => txEffect.txHash);
@@ -633,7 +662,17 @@ export class P2PClient extends WithTracer implements P2P {
             `Starting collection of ${missingTxHashes.length} missing txs for unproven mined block ${block.number}`,
             { missingTxHashes, blockNumber: block.number, blockHash: await block.hash().then(h => h.toString()) },
           );
-          this.txCollection.startCollecting(block, missingTxHashes);
+          // Both `slashDataWithholdingToleranceSlots` and `p2pMissingTxCollectionDeadlineSlots`
+          // count *full slots after the block slot* — value N means collection runs until
+          // `slotStart(block.slot + N + 1)`. Take the larger of the two so collection never
+          // gives up before the data-withholding slash verdict is rendered.
+          const blockSlot = block.header.getSlot();
+          const toleranceSlots = this.config.slashDataWithholdingToleranceSlots;
+          const configuredSlots = this.config.p2pMissingTxCollectionDeadlineSlots ?? 0;
+          const deadlineSlot = SlotNumber(blockSlot + Math.max(toleranceSlots, configuredSlots) + 1);
+          const deadlineSeconds = getTimestampForSlot(deadlineSlot, this.epochCache.getL1Constants());
+          const deadline = new Date(Number(deadlineSeconds) * 1000);
+          await this.txCollection.collectFastForBlock(block, missingTxHashes, { deadline });
         }
       }
     } catch (err) {
@@ -646,7 +685,7 @@ export class P2PClient extends WithTracer implements P2P {
    * @param blocks - A list of finalized L2 blocks.
    * @returns Empty promise.
    */
-  private async handleFinalizedL2Blocks(blocks: L2Block[]): Promise<void> {
+  private async handleFinalizedL2Blocks(blocks: BlockData[]): Promise<void> {
     if (!blocks.length) {
       return;
     }
@@ -669,31 +708,50 @@ export class P2PClient extends WithTracer implements P2P {
   }
 
   /**
-   * Returns true if the prune crossed a checkpoint boundary.
-   * If the old and new checkpoint numbers are the same, the prune is within a single checkpoint.
-   * If they differ, the prune spans across checkpoints (epoch prune).
+   * Returns true if the prune is an epoch prune (new checkpoint number is less than old).
+   * If the checkpoint number stays the same or increases, the prune is within a checkpoint.
    */
   private async isEpochPrune(newCheckpoint: CheckpointId): Promise<boolean> {
     const tips = await this.l2Tips.getL2Tips();
     const oldCheckpointNumber = tips.checkpointed.checkpoint.number;
-    if (oldCheckpointNumber <= CheckpointNumber.ZERO) {
+    if (oldCheckpointNumber <= CheckpointNumber.INITIAL) {
       return false;
     }
-    const isEpochPrune = oldCheckpointNumber !== newCheckpoint.number;
-    this.log.info(
-      `Detected epoch prune: ${isEpochPrune}. Old checkpoint: ${oldCheckpointNumber}, new checkpoint: ${newCheckpoint.number}`,
-    );
+    const newCheckpointNumber = newCheckpoint.number;
+    // We check that the new checkpoint number is less than the old checkpoint number in order to consider it an epoch prune.
+    // To be more certain that it is an epoch prune, we will check that at least 2 checkpoints were removed.
+    // This means we should avoid thinking checkpoints removed by L1 re-orgs are epoch prunes
+    const thresholdForEpochPrune = CheckpointNumber(oldCheckpointNumber - 2);
+    const isEpochPrune = newCheckpointNumber <= thresholdForEpochPrune;
+    if (isEpochPrune) {
+      this.log.info(`Detected epoch prune to ${newCheckpointNumber}`, {
+        oldCheckpointNumber,
+        newCheckpointNumber,
+        thresholdForEpochPrune,
+      });
+    }
     return isEpochPrune;
   }
 
   /** Checks if the slot has changed and calls prepareForSlot if so. */
   private async maybeCallPrepareForSlot(): Promise<void> {
-    const { currentSlot } = this.epochCache.getCurrentAndNextSlot();
-    if (currentSlot <= this.lastSlotProcessed) {
+    // If we have a proposed checkpoint available, we want to prepare the target slot - otherwise we prepare the current slot
+    const l2Tips = await this.l2Tips.getL2Tips();
+    const hasProposedCheckpoint = l2Tips.proposedCheckpoint.checkpoint.number > l2Tips.checkpointed.checkpoint.number;
+
+    let slot;
+    if (this.epochCache.isProposerPipeliningEnabled() && hasProposedCheckpoint) {
+      const { targetSlot } = this.epochCache.getTargetAndNextSlot();
+      slot = targetSlot;
+    } else {
+      const { currentSlot } = this.epochCache.getCurrentAndNextSlot();
+      slot = currentSlot;
+    }
+    if (slot <= this.lastSlotProcessed) {
       return;
     }
-    this.lastSlotProcessed = currentSlot;
-    await this.txPool.prepareForSlot(currentSlot);
+    this.lastSlotProcessed = slot;
+    await this.txPool.prepareForSlot(slot);
   }
 
   private async startServiceIfSynched() {

package/src/client/test/{tx_proposal_collector/README.md → p2p_client.batch_tx_requester.bench.README.md}

@@ -1,6 +1,6 @@
-# ProposalTxCollector Benchmarks
+# BatchTxRequester Benchmarks
 
-This benchmark suite measures **how quickly a proposer node can fetch missing transactions from P2P peers** when building a block proposal. It compares two alternative transaction-collection implementations under several controlled "who-has-which-txs" distributions.
+This benchmark suite measures **how quickly a proposer node can fetch missing transactions from P2P peers** when building a block proposal under several controlled "who-has-which-txs" distributions.
 
 ## Purpose
 
@@ -10,12 +10,6 @@ This benchmark answers:
 
 - How long does it take to fetch **N missing txs** (N ∈ **{10, 50, 100, 500}**)?
 - How do different **peer availability patterns** affect performance?
-- Which collector strategy performs better under each pattern?
-
-The suite compares two collectors:
-
-- **`BatchTxRequesterCollector`** (collector type: `batch-requester`)
-- **`SendBatchRequestCollector`** (collector type: `send-batch-request`)
 
 ## Architecture
 
@@ -24,7 +18,7 @@ The benchmark runs a small simulated network on localhost:
 ```
 ┌─────────────────────────────────────────────────────────────────────┐
 │                        Test Process (Driver)                        │
-│   p2p_client.proposal_tx_collector.bench.test.ts                    │
+│   p2p_client.batch_tx_requester.bench.test.ts                       │
 │   ┌─────────────────────────────────────────────────────────────┐   │
 │   │            WorkerClientManager                              │   │
 │   │         (src/testbench/worker_client_manager.ts)            │   │
@@ -34,7 +28,7 @@ The benchmark runs a small simulated network on localhost:
 │         ▼                    ▼                    ▼                 │
 │   ┌───────────┐        ┌───────────┐        ┌───────────┐           │
 │   │ Worker 0  │◄──────►│ Worker 1  │◄──────►│ Worker N-1│           │
-│   │ (Collector│  P2P   │(Responder)│  P2P   │(Responder)│           │
+│   │(Aggregator│  P2P   │(Responder)│  P2P   │(Responder)│           │
 │   │  Node)    │        │           │        │           │           │
 │   │ TxPool:[] │        │ TxPool:   │        │ TxPool:   │           │
 │   │           │        │ [txs...]  │        │ [txs...]  │           │
@@ -54,12 +48,12 @@ Using separate OS processes makes the setup closer to real networking behavior (
 
 The network is intentionally asymmetric:
 
-- **Worker 0 is the collector/proposer node**
+- **Worker 0 is the aggregator/proposer node**
   - Starts with an **empty tx pool** (`[]`)
-  - Is the only worker instructed to run the collector for each `BENCH_REQRESP` command
+  - Is the only worker instructed to run `BatchTxRequester` for each `BENCH_REQRESP` command
 - **Workers 1..N-1 are responder peers**
   - Locally generate and filter txs according to the distribution pattern
-  - Respond to req/resp queries made by Worker 0's collector
+  - Respond to req/resp queries made by Worker 0's `BatchTxRequester`
 
 This models a proposer that has only `txHashes` in a proposal and must fetch the full tx bodies from the network.
 
@@ -72,7 +66,7 @@ Each benchmark case generates `missingTxCount` mock txs and assigns them to peer
 **Every responder peer has every transaction.**
 
 - Simulates the best-case: high replication / high gossip success
-- Expectation: collector should quickly succeed; differences mostly reflect collector overhead and batching strategy
+- Expectation: the requester should quickly succeed; differences mostly reflect requester overhead and batching strategy
 
 ### `sparse`
 
@@ -81,7 +75,7 @@ Each benchmark case generates `missingTxCount` mock txs and assigns them to peer
 Each responder is bucketed and holds txs whose index falls into its bucket or the "next" bucket (striped by tx index).
 
 - Simulates partial propagation, churn, or uneven mempool convergence
-- Expectation: collector must query multiple peers and cope with "misses"
+- Expectation: the requester must query multiple peers and cope with "misses"
 
 ### `pinned-only`
 
@@ -92,33 +86,13 @@ Each responder is bucketed and holds txs whose index falls into its bucket or th
 
 > **Guardrail:** the pinned peer index must be within `(0, numberOfPeers)` (Worker 0 cannot be pinned).
 
-## Collectors Under Test
-
-### `BatchTxRequesterCollector` (`batch-requester`)
-
-```typescript
-new BatchTxRequesterCollector(p2pService, logger, new DateProvider())
-```
-
-Uses the P2P service plus internal logic to fetch missing txs, coordinating requests in a batched or staged way.
-
-### `SendBatchRequestCollector` (`send-batch-request`)
-
-```typescript
-const maxPeers = 10;
-const maxRetryAttempts = Math.max(peerIds.length, 3);
-new SendBatchRequestCollector(p2pService, maxPeers, maxRetryAttempts)
-```
-
-Explicitly caps the number of peers it will involve (`maxPeers`) and uses a retry budget derived from peer count.
-
 ## Test Parameters
 
 | Parameter | Value | Description |
 |-----------|-------|-------------|
 | `PEERS_PER_RUN` | 30 | Number of worker processes spawned |
 | `MISSING_TX_COUNTS` | 10, 50, 100, 500 | Number of missing transactions to fetch |
-| `TIMEOUT_MS` | 30,000 ms | Collector timeout per case |
+| `TIMEOUT_MS` | 30,000 ms | Per-case timeout for the requester |
 | `TEST_TIMEOUT_MS` | 600,000 ms | Overall Jest timeout (10 minutes) |
 
 ## Running
@@ -127,13 +101,13 @@ From the p2p package:
 
 ```bash
 cd yarn-project/p2p
-yarn test src/client/test/tx_proposal_collector/p2p_client.proposal_tx_collector.bench.test.ts
+yarn test src/client/test/p2p_client.batch_tx_requester.bench.test.ts
 ```
 
 Or from repo root:
 
 ```bash
-yarn test p2p_client.proposal_tx_collector.bench.test.ts
+yarn test p2p_client.batch_tx_requester.bench.test.ts
 ```
 
 The benchmark is intentionally long due to spawning many processes and running multiple cases.
@@ -145,14 +119,12 @@ The benchmark is intentionally long due to spawning many processes and running m
 If no env vars are set, the suite prints a table:
 
 ```
-| Collector           | Distribution | Missing | Duration (ms) | Fetched | Success |
-|---------------------|--------------|---------|---------------|---------|---------|
-| batch-requester     | pinned-only  |      10 |           123 |      10 |   Yes   |
-| send-batch-request  | pinned-only  |      10 |           145 |      10 |   Yes   |
+| Distribution | Missing | Duration (ms) | Fetched | Success |
+|--------------|---------|---------------|---------|---------|
+| pinned-only  |      10 |           123 |      10 |   Yes   |
+| pinned-only  |      50 |           145 |      50 |   Yes   |
 ```
 
-Plus a comparison summary stating which collector was faster per `(distribution, missing)` pair.
-
 ### JSON metrics (for CI/dashboards)
 
 ```bash
@@ -160,8 +132,8 @@ BENCH_OUTPUT=/path/results.json yarn test ...
 ```
 
 Writes JSON metrics like:
-- `ProposalTxCollector/<collector>/<distribution>/missing_<N>/duration` (ms)
-- `ProposalTxCollector/<collector>/<distribution>/missing_<N>/fetched` (txs)
+- `BatchTxRequester/<distribution>/missing_<N>/duration` (ms)
+- `BatchTxRequester/<distribution>/missing_<N>/fetched` (txs)
 
 ### Markdown file output
 
@@ -175,14 +147,14 @@ Writes the pretty table + summary to disk.
 
 For each case the benchmark records:
 
-- `durationMs`: wall-clock time spent inside the collector call
-- `fetchedCount`: how many txs were returned by the collector
+- `durationMs`: wall-clock time spent inside the requester call
+- `fetchedCount`: how many txs were returned by the requester
 - `success`: `fetchedCount === missingTxCount`
 
 **Guidelines:**
 
 - **Always check `Success` first.** A faster run that fetched fewer txs is not a win.
-- Compare collectors **within the same distribution + missing count** only.
+- Compare runs **within the same distribution + missing count** only.
 - Expect `pinned-only` to highlight pinned-peer behavior (fast if pinned peer is used effectively; slow if the algorithm wastes time sampling other peers).
 - Expect `sparse` to be the most "network-like" stress case, since many peers won't have each requested tx.
 
@@ -193,7 +165,7 @@ Inside each worker, the benchmark intentionally reduces variability:
 - **Unlimited rate limits** are installed so the req/resp rate limiter doesn't dominate results
 - **Deterministic tx generation** ensures all workers see the same tx set without large IPC payloads
 
-This makes the benchmark better for *comparing collectors* (A vs B), but it is **not** a perfect model of production networking conditions.
+This makes the benchmark better for tracking regressions, but it is **not** a perfect model of production networking conditions.
 
 ## Limitations
 
@@ -207,9 +179,7 @@ This benchmark does **not** measure:
 
 | File | Purpose |
 |------|---------|
-| `p2p_client.proposal_tx_collector.bench.test.ts` | Test suite (cases, distributions, output formatting) |
-| `proposal_tx_collector_worker.ts` | Collector-specific worker implementation |
-| `proposal_tx_collector_worker_protocol.ts` | IPC message types and serialization |
+| `p2p_client.batch_tx_requester.bench.test.ts` | Test suite (cases, distributions, output formatting) |
 | `src/testbench/worker_client_manager.ts` | Worker process manager (forking, IPC, orchestration) |
 | `src/testbench/p2p_client_testbench_worker.ts` | General testbench worker implementation |
 | `src/test-helpers/testbench-utils.ts` | Shared mocks and utilities (InMemoryTxPool, InMemoryAttestationPool, etc.) |