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

package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js

@@ -1,151 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-/**
- * Manages batches of peers for parallel request processing.
- * Tracks active peers and provides deterministic peer assignment for requests.
- *
- * Example with 3 peers and 10 requests:
- *
- * Peers:    [P1]      [P2]     [P3]
- *           ↓ ↓ ↓ ↓   ↓ ↓ ↓   ↓ ↓ ↓
- * Requests: 0,1,2,9 | 3,4,5 | 6,7,8
- *
- * Each peer handles a bucket of consecutive requests.
- * If a peer fails, it is replaced while maintaining the same bucket.
- */ export class BatchConnectionSampler {
-    connectionSampler;
-    logger;
-    batch;
-    requestsPerPeer;
-    /** Tracks peer-index combinations that returned empty/invalid responses */ failedPeerIndices;
-    constructor(connectionSampler, batchSize, maxPeers, exclude, logger = createLogger('p2p:reqresp:batch-connection-sampler')){
-        this.connectionSampler = connectionSampler;
-        this.logger = logger;
-        this.batch = [];
-        this.failedPeerIndices = new Map();
-        if (maxPeers <= 0) {
-            throw new Error('Max peers cannot be 0');
-        }
-        if (batchSize <= 0) {
-            throw new Error('Batch size cannot be 0');
-        }
-        // Calculate how many requests each peer should handle, cannot be 0
-        this.requestsPerPeer = Math.max(1, Math.floor(batchSize / maxPeers));
-        // Sample initial peers
-        const excluding = exclude && new Map(exclude.map((peerId)=>[
-                peerId.toString(),
-                true
-            ]));
-        this.batch = this.connectionSampler.samplePeersBatch(maxPeers, excluding);
-    }
-    /**
-   * Gets the peer responsible for handling a specific request index.
-   * If the primary peer has previously failed for this index, tries other peers.
-   * If all batch peers have failed, attempts to sample a new peer.
-   *
-   * @param index - The request index
-   * @returns The peer assigned to handle this request, or undefined if no peer available
-   */ getPeerForRequest(index) {
-        if (this.batch.length === 0) {
-            return undefined;
-        }
-        // Calculate which peer bucket this index belongs to
-        const primaryPeerIndex = Math.floor(index / this.requestsPerPeer) % this.batch.length;
-        // Try peers starting from primary, wrapping around
-        for(let offset = 0; offset < this.batch.length; offset++){
-            const peerIndex = (primaryPeerIndex + offset) % this.batch.length;
-            const peer = this.batch[peerIndex];
-            const peerKey = peer.toString();
-            const failedIndices = this.failedPeerIndices.get(peerKey);
-            if (!failedIndices || !failedIndices.has(index)) {
-                return peer;
-            }
-        }
-        // All batch peers have failed for this index - try to sample a new peer
-        const newPeer = this.sampleNewPeer();
-        if (newPeer) {
-            return newPeer;
-        }
-        return undefined;
-    }
-    /**
-   * Attempts to sample a new peer that isn't already in the batch.
-   * If successful, adds the peer to the batch.
-   *
-   * @returns The new peer if one was sampled, undefined otherwise
-   */ sampleNewPeer() {
-        // Exclude all current batch peers
-        const excluding = new Map(this.batch.map((p)=>[
-                p.toString(),
-                true
-            ]));
-        const newPeer = this.connectionSampler.getPeer(excluding);
-        if (newPeer) {
-            this.batch.push(newPeer);
-            this.logger.trace('Sampled new peer for exhausted index', {
-                newPeer: newPeer.toString()
-            });
-            return newPeer;
-        }
-        return undefined;
-    }
-    /**
-   * Marks that a peer returned an empty/invalid response for a specific request index.
-   * The peer will not be assigned this index again.
-   *
-   * @param peerId - The peer that failed
-   * @param index - The request index that failed
-   */ markPeerFailedForIndex(peerId, index) {
-        const peerKey = peerId.toString();
-        let failedIndices = this.failedPeerIndices.get(peerKey);
-        if (!failedIndices) {
-            failedIndices = new Set();
-            this.failedPeerIndices.set(peerKey, failedIndices);
-        }
-        failedIndices.add(index);
-        this.logger.trace('Marked peer failed for index', {
-            peerId: peerKey,
-            index
-        });
-    }
-    /**
-   * Removes a peer and replaces it with a new one, maintaining the same position
-   * in the batch array to keep request distribution consistent
-   *
-   * @param peerId - The peer to remove and replace
-   */ removePeerAndReplace(peerId) {
-        const index = this.batch.findIndex((p)=>p === peerId);
-        if (index === -1) {
-            return;
-        }
-        const excluding = new Map([
-            [
-                peerId.toString(),
-                true
-            ]
-        ]);
-        const newPeer = this.connectionSampler.getPeer(excluding); // Q: Shouldn't we accumulate all excluded peers? Otherwise the sampler could return us a previously excluded peer?
-        if (newPeer) {
-            this.batch[index] = newPeer;
-            this.logger.trace('Replaced peer', {
-                peerId,
-                newPeer
-            });
-        } else {
-            // If we couldn't get a replacement, remove the peer and compact the array
-            this.batch.splice(index, 1);
-            this.logger.trace('Removed peer', {
-                peerId
-            });
-        }
-    }
-    /**
-   * Gets the number of active peers
-   */ get activePeerCount() {
-        return this.batch.length;
-    }
-    /**
-   * Gets the number of requests each peer is assigned to handle
-   */ get requestsPerBucket() {
-        return this.requestsPerPeer;
-    }
-}

package/dest/services/reqresp/protocols/block.d.ts

@@ -1,9 +0,0 @@
-import type { L2BlockSource } from '@aztec/stdlib/block';
-import type { ReqRespSubProtocolHandler } from '../interface.js';
-/**
- * Handler for L2 Block requests
- * @param l2BlockSource - source for L2 blocks
- * @returns the Block request handler
- * */
-export declare function reqRespBlockHandler(l2BlockSource: L2BlockSource): ReqRespSubProtocolHandler;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9yZXFyZXNwL3Byb3RvY29scy9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUl6RCxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBR2pFOzs7O0tBSUs7QUFDTCx3QkFBZ0IsbUJBQW1CLENBQUMsYUFBYSxFQUFFLGFBQWEsR0FBRyx5QkFBeUIsQ0FzQjNGIn0=

package/dest/services/reqresp/protocols/block.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/protocols/block.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAGjE;;;;KAIK;AACL,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,yBAAyB,CAsB3F"}

package/dest/services/reqresp/protocols/block.js

@@ -1,32 +0,0 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { ReqRespStatus, ReqRespStatusError } from '../status.js';
-/**
- * Handler for L2 Block requests
- * @param l2BlockSource - source for L2 blocks
- * @returns the Block request handler
- * */ export function reqRespBlockHandler(l2BlockSource) {
-    /**
-   * @param peerId - the peer ID of the requester
-   * @param msg - the block request message, which is expected to contain valid block number as a Buffer
-   * @returns a Buffer containing the requested block data, or an empty Buffer if the block is not found
-   * @throws  ReqRespStatusError if the input msg is not a valid block number
-   * */ return async (_peerId, msg)=>{
-        let blockNumber;
-        try {
-            blockNumber = Fr.fromBuffer(msg);
-        } catch (err) {
-            throw new ReqRespStatusError(ReqRespStatus.BADLY_FORMED_REQUEST, {
-                cause: err
-            });
-        }
-        try {
-            const foundBlock = await l2BlockSource.getBlock(BlockNumber(Number(blockNumber)));
-            return foundBlock ? foundBlock.toBuffer() : Buffer.alloc(0);
-        } catch (err) {
-            throw new ReqRespStatusError(ReqRespStatus.INTERNAL_ERROR, {
-                cause: err
-            });
-        }
-    };
-}

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

@@ -1,51 +0,0 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { type Logger } from '@aztec/foundation/log';
-import { DateProvider } from '@aztec/foundation/timer';
-import { type Tx, TxHash } from '@aztec/stdlib/tx';
-import type { PeerId } from '@libp2p/interface';
-import type { BatchTxRequesterLibP2PService } from '../reqresp/batch-tx-requester/interface.js';
-import type { TxCollectionConfig } from './config.js';
-import { type MissingTxsCollector } from './proposal_tx_collector.js';
-import type { FastCollectionRequest, FastCollectionRequestInput } from './tx_collection.js';
-import type { TxCollectionSink } from './tx_collection_sink.js';
-import type { TxSource } from './tx_source.js';
-export declare class FastTxCollection {
-    private nodes;
-    private txCollectionSink;
-    private config;
-    private dateProvider;
-    private log;
-    protected requests: Set<FastCollectionRequest>;
-    private missingTxsCollector;
-    constructor(p2pService: BatchTxRequesterLibP2PService, nodes: TxSource[], txCollectionSink: TxCollectionSink, config: TxCollectionConfig, dateProvider?: DateProvider, log?: Logger, missingTxsCollector?: MissingTxsCollector);
-    stop(): Promise<void>;
-    getFastCollectionRequests(): Set<FastCollectionRequest>;
-    collectFastFor(input: FastCollectionRequestInput, txHashes: TxHash[] | string[], opts: {
-        deadline: Date;
-        pinnedPeer?: PeerId;
-    }): Promise<Tx[]>;
-    protected collectFast(request: FastCollectionRequest, opts: {
-        pinnedPeer?: PeerId;
-    }): Promise<void>;
-    private collectFastFromNodes;
-    private collectFastFromNode;
-    private collectFastViaReqResp;
-    /** Returns the TxAddContext for the given request, used by the sink to add txs to the pool correctly. */
-    private getAddContext;
-    /**
-     * Handle txs by marking them as found for the requests that are waiting for them, and resolves the request if all its txs have been found.
-     * Called internally and from the main tx collection manager whenever the tx pool emits a tx-added event.
-     */
-    foundTxs(txs: Tx[]): void;
-    /**
-     * Stop collecting all txs for blocks less than or requal to the block number specified.
-     * To be called when we no longer care about gathering txs up to a certain block, eg when they become proven or finalized.
-     */
-    stopCollectingForBlocksUpTo(blockNumber: BlockNumber): void;
-    /**
-     * Stop collecting all txs for blocks greater than the block number specified.
-     * To be called when there is a chain prune and previously mined txs are no longer relevant.
-     */
-    stopCollectingForBlocksAfter(blockNumber: BlockNumber): void;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFzdF90eF9jb2xsZWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9mYXN0X3R4X2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxPQUFPLEVBQUUsWUFBWSxFQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFaEUsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBR2hELE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sNENBQTRDLENBQUM7QUFDaEcsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdEQsT0FBTyxFQUVMLEtBQUssbUJBQW1CLEVBRXpCLE1BQU0sNEJBQTRCLENBQUM7QUFFcEMsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM1RixPQUFPLEtBQUssRUFBZ0IsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUUvQyxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLEtBQUs7SUFDYixPQUFPLENBQUMsZ0JBQWdCO0lBQ3hCLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFlBQVk7SUFDcEIsT0FBTyxDQUFDLEdBQUc7SUFUYixTQUFTLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFhO0lBQzNELE9BQU8sQ0FBQyxtQkFBbUIsQ0FBc0I7SUFFakQsWUFDRSxVQUFVLEVBQUUsNkJBQTZCLEVBQ2pDLEtBQUssRUFBRSxRQUFRLEVBQUUsRUFDakIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLE1BQU0sRUFBRSxrQkFBa0IsRUFDMUIsWUFBWSxHQUFFLFlBQWlDLEVBQy9DLEdBQUcsR0FBRSxNQUFrRCxFQUMvRCxtQkFBbUIsQ0FBQyxFQUFFLG1CQUFtQixFQVMxQztJQUVZLElBQUksa0JBS2hCO0lBRU0seUJBQXlCLCtCQUUvQjtJQUVZLGNBQWMsQ0FDekIsS0FBSyxFQUFFLDBCQUEwQixFQUNqQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxFQUFFLEVBQzdCLElBQUksRUFBRTtRQUFFLFFBQVEsRUFBRSxJQUFJLENBQUM7UUFBQyxVQUFVLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxpQkFrQzlDO0lBRUQsVUFBZ0IsV0FBVyxDQUFDLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxJQUFJLEVBQUU7UUFBRSxVQUFVLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxpQkF5Q3hGO1lBUWEsb0JBQW9CO1lBZ0JwQixtQkFBbUI7WUEwRm5CLHFCQUFxQjtJQWtEbkMseUdBQXlHO0lBQ3pHLE9BQU8sQ0FBQyxhQUFhO0lBUXJCOzs7T0FHRztJQUNJLFFBQVEsQ0FBQyxHQUFHLEVBQUUsRUFBRSxFQUFFLFFBcUJ4QjtJQUVEOzs7T0FHRztJQUNJLDJCQUEyQixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsSUFBSSxDQU1qRTtJQUVEOzs7T0FHRztJQUNJLDRCQUE0QixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsSUFBSSxDQU1sRTtDQUNGIn0=

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

@@ -1 +0,0 @@
-{"version":3,"file":"fast_tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/fast_tx_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAW,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAEL,KAAK,mBAAmB,EAEzB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAC5F,OAAO,KAAK,EAAgB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,GAAG;IATb,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAa;IAC3D,OAAO,CAAC,mBAAmB,CAAsB;IAEjD,YACE,UAAU,EAAE,6BAA6B,EACjC,KAAK,EAAE,QAAQ,EAAE,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,kBAAkB,EAC1B,YAAY,GAAE,YAAiC,EAC/C,GAAG,GAAE,MAAkD,EAC/D,mBAAmB,CAAC,EAAE,mBAAmB,EAS1C;IAEY,IAAI,kBAKhB;IAEM,yBAAyB,+BAE/B;IAEY,cAAc,CACzB,KAAK,EAAE,0BAA0B,EACjC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAC7B,IAAI,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,iBAkC9C;IAED,UAAgB,WAAW,CAAC,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,iBAyCxF;YAQa,oBAAoB;YAgBpB,mBAAmB;YA0FnB,qBAAqB;IAkDnC,yGAAyG;IACzG,OAAO,CAAC,aAAa;IAQrB;;;OAGG;IACI,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,QAqBxB;IAED;;;OAGG;IACI,2BAA2B,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAMjE;IAED;;;OAGG;IACI,4BAA4B,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAMlE;CACF"}

package/dest/services/tx_collection/fast_tx_collection.js

@@ -1,311 +0,0 @@
-import { times } from '@aztec/foundation/collection';
-import { createLogger } from '@aztec/foundation/log';
-import { sleep } from '@aztec/foundation/sleep';
-import { DateProvider, elapsed } from '@aztec/foundation/timer';
-import { TxHash } from '@aztec/stdlib/tx';
-import { BatchTxRequesterCollector, SendBatchRequestCollector } from './proposal_tx_collector.js';
-import { RequestTracker } from './request_tracker.js';
-export class FastTxCollection {
-    nodes;
-    txCollectionSink;
-    config;
-    dateProvider;
-    log;
-    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
-    requests;
-    missingTxsCollector;
-    constructor(p2pService, nodes, txCollectionSink, config, dateProvider = new DateProvider(), log = createLogger('p2p:tx_collection_service'), missingTxsCollector){
-        this.nodes = nodes;
-        this.txCollectionSink = txCollectionSink;
-        this.config = config;
-        this.dateProvider = dateProvider;
-        this.log = log;
-        this.requests = new Set();
-        const batchTxRequesterConfig = this.config;
-        const missingTxsCollectorType = this.config.txCollectionMissingTxsCollectorType;
-        this.missingTxsCollector = missingTxsCollector ?? (missingTxsCollectorType === 'old' ? new SendBatchRequestCollector(p2pService) : new BatchTxRequesterCollector(p2pService, log, dateProvider, undefined, batchTxRequesterConfig));
-    }
-    async stop() {
-        this.requests.forEach((request)=>{
-            request.requestTracker.cancel();
-        });
-        await Promise.resolve();
-    }
-    getFastCollectionRequests() {
-        return this.requests;
-    }
-    async collectFastFor(input, txHashes, opts) {
-        const timeout = opts.deadline.getTime() - this.dateProvider.now();
-        if (timeout <= 0) {
-            this.log.warn(`Deadline for fast tx collection is in the past (${timeout}ms)`, {
-                deadline: opts.deadline.getTime(),
-                now: this.dateProvider.now()
-            });
-            return [];
-        }
-        const blockInfo = input.type === 'proposal' ? {
-            ...input.blockProposal.toBlockInfo(),
-            blockNumber: input.blockNumber
-        } : {
-            ...input.block.toBlockInfo()
-        };
-        const request = {
-            ...input,
-            blockInfo,
-            requestTracker: RequestTracker.create(txHashes, opts.deadline, this.dateProvider)
-        };
-        const [duration] = await elapsed(()=>this.collectFast(request, {
-                ...opts
-            }));
-        this.log.verbose(`Collected ${request.requestTracker.collectedTxs.length} txs out of ${txHashes.length} for ${input.type} at slot ${blockInfo.slotNumber}`, {
-            ...blockInfo,
-            duration,
-            requestType: input.type,
-            missingTxs: [
-                ...request.requestTracker.missingTxHashes
-            ]
-        });
-        return request.requestTracker.collectedTxs;
-    }
-    async collectFast(request, opts) {
-        this.requests.add(request);
-        const { blockInfo } = request;
-        this.log.debug(`Starting fast collection of ${request.requestTracker.numberOfMissingTxs} txs for ${request.type} at slot ${blockInfo.slotNumber}`, {
-            ...blockInfo,
-            requestType: request.type,
-            deadline: request.requestTracker.deadline
-        });
-        try {
-            // Start blasting all nodes for the txs. We give them a little time to respond before we start reqresp.
-            // We race against the cancellation token to exit as soon as all txs are collected, the deadline expires,
-            // or the request is externally cancelled.
-            const nodeCollectionPromise = this.collectFastFromNodes(request);
-            const waitBeforeReqResp = sleep(this.config.txCollectionFastNodesTimeoutBeforeReqRespMs);
-            await Promise.race([
-                request.requestTracker.cancellationToken,
-                waitBeforeReqResp
-            ]);
-            // If we have collected all txs or the request was cancelled, we can stop here.
-            // Wait for node collection to settle so inner tasks finish before we return.
-            if (request.requestTracker.checkCancelled()) {
-                if (request.requestTracker.allFetched()) {
-                    this.log.debug(`All txs collected for slot ${blockInfo.slotNumber} without reqresp`, blockInfo);
-                }
-                await nodeCollectionPromise;
-                return;
-            }
-            // Start blasting reqresp for the remaining txs. Note that node collection keeps running in parallel.
-            // We stop when we have collected all txs, timed out, or both node collection and reqresp have given up.
-            // Inner tasks observe requestTracker.checkCancelled() and stop themselves, so this settles shortly after cancellation.
-            await Promise.allSettled([
-                this.collectFastViaReqResp(request, opts),
-                nodeCollectionPromise
-            ]);
-        } catch (err) {
-            this.log.error(`Error collecting txs for ${request.type} for slot ${blockInfo.slotNumber}`, err, {
-                ...blockInfo,
-                missingTxs: request.requestTracker.missingTxHashes.values().map((txHash)=>txHash.toString())
-            });
-        } finally{
-            // Ensure no unresolved promises and remove the request from the set
-            request.requestTracker.cancel();
-            this.requests.delete(request);
-        }
-    }
-    /**
-   * Starts collecting txs from all configured nodes. We send `txCollectionFastMaxParallelRequestsPerNode` requests
-   * in parallel to each node. We keep track of the number of attempts made to collect each tx, so we can prioritize
-   * the txs that have been requested less often whenever we need to send a new batch of requests. We ensure that no
-   * tx is requested more than once at the same time to the same node.
-   */ async collectFastFromNodes(request) {
-        if (this.nodes.length === 0) {
-            return;
-        }
-        // Keep a shared priority queue of all txs pending to be requested, sorted by the number of attempts made to collect them.
-        const attemptsPerTx = [
-            ...request.requestTracker.missingTxHashes
-        ].map((txHash)=>({
-                txHash,
-                attempts: 0,
-                found: false
-            }));
-        // Returns once we have finished all node loops. Each loop finishes when the deadline is hit, or all txs have been collected.
-        await Promise.allSettled(this.nodes.map((node)=>this.collectFastFromNode(request, node, attemptsPerTx)));
-    }
-    async collectFastFromNode(request, node, attemptsPerTx) {
-        const notFinished = ()=>!request.requestTracker.checkCancelled();
-        const maxParallelRequests = this.config.txCollectionFastMaxParallelRequestsPerNode;
-        const maxBatchSize = this.config.txCollectionNodeRpcMaxBatchSize;
-        const activeRequestsToThisNode = new Set(); // Track the txs being actively requested to this node
-        const processBatch = async ()=>{
-            while(notFinished()){
-                // Pull tx hashes from the attemptsPerTx array, which is sorted by attempts,
-                // so we prioritize txs that have been requested less often.
-                const batch = [];
-                let index = 0;
-                while(batch.length < maxBatchSize){
-                    const txToRequest = attemptsPerTx[index++];
-                    if (!txToRequest) {
-                        break;
-                    } else if (!request.requestTracker.isMissing(txToRequest.txHash)) {
-                        // Mark as found if it was found somewhere else, we'll then remove it from the array.
-                        // We don't delete it now since 'array.splice' is pretty expensive, so we do it after sorting.
-                        txToRequest.found = true;
-                    } else if (!activeRequestsToThisNode.has(txToRequest.txHash)) {
-                        // If the tx is not alredy being requested to this node, add it to the current batch and increase attempts.
-                        // Note that we increase the attempts *before* making the request, so the next `collectFastFromNode` that
-                        // needs to grab txs to send, will pick txs that have been requested less often, instead of all requesting
-                        // the same txs at the same time.
-                        batch.push(txToRequest);
-                        activeRequestsToThisNode.add(txToRequest.txHash);
-                        txToRequest.attempts++;
-                    }
-                }
-                // After modifying the array by removing txs or updating attempts, re-sort it and trim the found txs from the end.
-                attemptsPerTx.sort((a, b)=>a.found === b.found ? a.attempts - b.attempts : Number(a.found) - Number(b.found));
-                const firstFoundTxIndex = attemptsPerTx.findIndex((tx)=>tx.found);
-                if (firstFoundTxIndex !== -1) {
-                    attemptsPerTx.length = firstFoundTxIndex;
-                }
-                // If we see no more txs to request, we can stop this "process" loop
-                if (batch.length === 0) {
-                    return;
-                }
-                const txHashes = batch.map(({ txHash })=>txHash);
-                // Collect this batch from the node
-                await this.txCollectionSink.collect(async ()=>{
-                    const result = await node.getTxsByHash(txHashes.map(TxHash.fromString));
-                    for (const tx of result.validTxs){
-                        request.requestTracker.markFetched(tx);
-                    }
-                    return result;
-                }, txHashes, {
-                    description: `fast ${node.getInfo()}`,
-                    node: node.getInfo(),
-                    method: 'fast-node-rpc',
-                    ...request.blockInfo
-                }, this.getAddContext(request));
-                // Clear from the active requests the txs we just requested
-                for (const requestedTx of batch){
-                    activeRequestsToThisNode.delete(requestedTx.txHash);
-                }
-                // Sleep a bit until hitting the node again, but wake up immediately on cancellation
-                if (notFinished()) {
-                    await Promise.race([
-                        sleep(this.config.txCollectionFastNodeIntervalMs),
-                        request.requestTracker.cancellationToken
-                    ]);
-                }
-            }
-        };
-        // Kick off N parallel requests to the node, up to the maxParallelRequests limit
-        await Promise.all(times(maxParallelRequests, processBatch));
-    }
-    async collectFastViaReqResp(request, opts) {
-        const pinnedPeer = opts.pinnedPeer;
-        const blockInfo = request.blockInfo;
-        const slotNumber = blockInfo.slotNumber;
-        if (request.requestTracker.timeoutMs < 100) {
-            this.log.warn(`Not initiating fast reqresp for txs for ${request.type} at slot ${blockInfo.slotNumber} due to timeout`, {
-                timeoutMs: request.requestTracker.timeoutMs,
-                ...blockInfo
-            });
-            return;
-        }
-        this.log.debug(`Starting fast reqresp for ${request.requestTracker.numberOfMissingTxs} txs for ${request.type} at slot ${blockInfo.slotNumber}`, {
-            ...blockInfo,
-            timeoutMs: request.requestTracker.timeoutMs,
-            pinnedPeer
-        });
-        try {
-            await this.txCollectionSink.collect(async ()=>{
-                let result;
-                if (request.type === 'proposal') {
-                    result = await this.missingTxsCollector.collectTxs(request.requestTracker, request.blockProposal, pinnedPeer);
-                } else if (request.type === 'block') {
-                    const blockTxsSource = {
-                        txHashes: request.block.body.txEffects.map((e)=>e.txHash),
-                        archive: request.block.archive.root
-                    };
-                    result = await this.missingTxsCollector.collectTxs(request.requestTracker, blockTxsSource, pinnedPeer);
-                } else {
-                    throw new Error(`Unknown request type: ${request.type}`);
-                }
-                return {
-                    validTxs: result,
-                    invalidTxHashes: []
-                };
-            }, Array.from(request.requestTracker.missingTxHashes), {
-                description: `reqresp for slot ${slotNumber}`,
-                method: 'fast-req-resp',
-                ...opts,
-                ...request.blockInfo
-            }, this.getAddContext(request));
-        } catch (err) {
-            this.log.error(`Error sending fast reqresp request for txs`, err, {
-                txs: [
-                    ...request.requestTracker.missingTxHashes
-                ],
-                ...blockInfo
-            });
-        }
-    }
-    /** Returns the TxAddContext for the given request, used by the sink to add txs to the pool correctly. */ getAddContext(request) {
-        if (request.type === 'proposal') {
-            return {
-                type: 'proposal',
-                blockHeader: request.blockProposal.blockHeader
-            };
-        } else {
-            return {
-                type: 'mined',
-                block: request.block
-            };
-        }
-    }
-    /**
-   * Handle txs by marking them as found for the requests that are waiting for them, and resolves the request if all its txs have been found.
-   * Called internally and from the main tx collection manager whenever the tx pool emits a tx-added event.
-   */ foundTxs(txs) {
-        for (const request of this.requests){
-            for (const tx of txs){
-                const txHash = tx.txHash.toString();
-                // Remove the tx hash from the missing set, and add it to the found set.
-                if (request.requestTracker.markFetched(tx)) {
-                    this.log.trace(`Found tx ${txHash} for fast collection request`, {
-                        ...request.blockInfo,
-                        txHash: tx.txHash.toString(),
-                        type: request.type
-                    });
-                    if (request.requestTracker.allFetched()) {
-                        this.log.trace(`All txs found for fast collection request`, {
-                            ...request.blockInfo,
-                            type: request.type
-                        });
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    /**
-   * Stop collecting all txs for blocks less than or requal to the block number specified.
-   * To be called when we no longer care about gathering txs up to a certain block, eg when they become proven or finalized.
-   */ stopCollectingForBlocksUpTo(blockNumber) {
-        for (const request of this.requests){
-            if (request.blockInfo.blockNumber <= blockNumber) {
-                request.requestTracker.cancel();
-            }
-        }
-    }
-    /**
-   * Stop collecting all txs for blocks greater than the block number specified.
-   * To be called when there is a chain prune and previously mined txs are no longer relevant.
-   */ stopCollectingForBlocksAfter(blockNumber) {
-        for (const request of this.requests){
-            if (request.blockInfo.blockNumber > blockNumber) {
-                request.requestTracker.cancel();
-            }
-        }
-    }
-}

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

@@ -1,48 +0,0 @@
-import type { Logger } from '@aztec/foundation/log';
-import type { DateProvider } from '@aztec/foundation/timer';
-import { type Tx } from '@aztec/stdlib/tx';
-import type { PeerId } from '@libp2p/interface';
-import type { BatchTxRequesterConfig } from '../reqresp/batch-tx-requester/config.js';
-import type { BatchTxRequesterLibP2PService } from '../reqresp/batch-tx-requester/interface.js';
-import type { IBatchRequestTxValidator } from '../reqresp/batch-tx-requester/tx_validator.js';
-import { type BlockTxsSource } from '../reqresp/index.js';
-import type { IRequestTracker } from './request_tracker.js';
-/**
- * Strategy interface for collecting missing transactions for a block or proposal.
- * Allows swapping between different tx collection implementations for benchmarking.
- */
-export interface MissingTxsCollector {
-    /**
-     * Collect missing transactions for a block or proposal.
-     * @param requestTracker - The missing transactions tracker
-     * @param blockTxsSource - The block or proposal containing the transactions
-     * @param pinnedPeer - Optional peer expected to have the transactions
-     * @returns The collected transactions
-     */
-    collectTxs(requestTracker: IRequestTracker, blockTxsSource: BlockTxsSource, pinnedPeer: PeerId | undefined): Promise<Tx[]>;
-}
-/**
- * Collects transactions using the BatchTxRequester implementation.
- * This uses a smart/dumb peer strategy with parallel workers.
- */
-export declare class BatchTxRequesterCollector implements MissingTxsCollector {
-    private p2pService;
-    private log;
-    private dateProvider;
-    private txValidator?;
-    private batchTxRequesterConfig?;
-    constructor(p2pService: BatchTxRequesterLibP2PService, log: Logger, dateProvider: DateProvider, txValidator?: IBatchRequestTxValidator | undefined, batchTxRequesterConfig?: Partial<BatchTxRequesterConfig> | undefined);
-    collectTxs(requestTracker: IRequestTracker, blockTxsSource: BlockTxsSource, pinnedPeer: PeerId | undefined): Promise<Tx[]>;
-}
-/**
- * Collects transactions using the sendBatchRequest implementation from ReqResp.
- * This is the original implementation that balances requests across peers.
- */
-export declare class SendBatchRequestCollector implements MissingTxsCollector {
-    private p2pService;
-    private maxPeers;
-    private maxRetryAttempts;
-    constructor(p2pService: BatchTxRequesterLibP2PService, maxPeers?: number, maxRetryAttempts?: number);
-    collectTxs(requestTracker: IRequestTracker, _blockTxsSource: BlockTxsSource, pinnedPeer: PeerId | undefined): Promise<Tx[]>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdHhfY29sbGVjdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9wcm9wb3NhbF90eF9jb2xsZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFVLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHaEQsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUN0RixPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQ2hHLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDOUYsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUE0QyxNQUFNLHFCQUFxQixDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyxtQkFBbUI7SUFDbEM7Ozs7OztPQU1HO0lBQ0gsVUFBVSxDQUNSLGNBQWMsRUFBRSxlQUFlLEVBQy9CLGNBQWMsRUFBRSxjQUFjLEVBQzlCLFVBQVUsRUFBRSxNQUFNLEdBQUcsU0FBUyxHQUM3QixPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztDQUNsQjtBQUVEOzs7R0FHRztBQUNILHFCQUFhLHlCQUEwQixZQUFXLG1CQUFtQjtJQUVqRSxPQUFPLENBQUMsVUFBVTtJQUNsQixPQUFPLENBQUMsR0FBRztJQUNYLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFDcEIsT0FBTyxDQUFDLHNCQUFzQixDQUFDO0lBTGpDLFlBQ1UsVUFBVSxFQUFFLDZCQUE2QixFQUN6QyxHQUFHLEVBQUUsTUFBTSxFQUNYLFlBQVksRUFBRSxZQUFZLEVBQzFCLFdBQVcsQ0FBQyxzQ0FBMEIsRUFDdEMsc0JBQXNCLENBQUMsNkNBQWlDLEVBQzlEO0lBRUUsVUFBVSxDQUNkLGNBQWMsRUFBRSxlQUFlLEVBQy9CLGNBQWMsRUFBRSxjQUFjLEVBQzlCLFVBQVUsRUFBRSxNQUFNLEdBQUcsU0FBUyxHQUM3QixPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0F5QmY7Q0FDRjtBQUtEOzs7R0FHRztBQUNILHFCQUFhLHlCQUEwQixZQUFXLG1CQUFtQjtJQUVqRSxPQUFPLENBQUMsVUFBVTtJQUNsQixPQUFPLENBQUMsUUFBUTtJQUNoQixPQUFPLENBQUMsZ0JBQWdCO0lBSDFCLFlBQ1UsVUFBVSxFQUFFLDZCQUE2QixFQUN6QyxRQUFRLEdBQUUsTUFBMEIsRUFDcEMsZ0JBQWdCLEdBQUUsTUFBbUMsRUFDM0Q7SUFFRSxVQUFVLENBQ2QsY0FBYyxFQUFFLGVBQWUsRUFDL0IsZUFBZSxFQUFFLGNBQWMsRUFDL0IsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLEdBQzdCLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQVdmO0NBQ0YifQ==

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

@@ -1 +0,0 @@
-{"version":3,"file":"proposal_tx_collector.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/proposal_tx_collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,EAAU,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,KAAK,cAAc,EAA4C,MAAM,qBAAqB,CAAC;AACpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;OAMG;IACH,UAAU,CACR,cAAc,EAAE,eAAe,EAC/B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;CAClB;AAED;;;GAGG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IAEjE,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,sBAAsB,CAAC;IALjC,YACU,UAAU,EAAE,6BAA6B,EACzC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,YAAY,EAC1B,WAAW,CAAC,sCAA0B,EACtC,sBAAsB,CAAC,6CAAiC,EAC9D;IAEE,UAAU,CACd,cAAc,EAAE,eAAe,EAC/B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,EAAE,EAAE,CAAC,CAyBf;CACF;AAKD;;;GAGG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IAEjE,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,gBAAgB;IAH1B,YACU,UAAU,EAAE,6BAA6B,EACzC,QAAQ,GAAE,MAA0B,EACpC,gBAAgB,GAAE,MAAmC,EAC3D;IAEE,UAAU,CACd,cAAc,EAAE,eAAe,EAC/B,eAAe,EAAE,cAAc,EAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,EAAE,EAAE,CAAC,CAWf;CACF"}