@aztec/p2p 0.0.1-commit.2448fdb → 0.0.1-commit.2606882

package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js

@@ -1,19 +1,18 @@
 import { chunkWrapAround } from '@aztec/foundation/collection';
-import { TimeoutError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
 import { FifoMemoryQueue, Semaphore } from '@aztec/foundation/queue';
 import { sleep } from '@aztec/foundation/sleep';
-import { DateProvider, executeTimeout } from '@aztec/foundation/timer';
+import { DateProvider } from '@aztec/foundation/timer';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import { TxHash } from '@aztec/stdlib/tx';
-import { peerIdFromString } from '@libp2p/peer-id';
+import { strict as assert } from 'assert';
 import { ReqRespSubProtocol } from '.././interface.js';
 import { BlockTxsRequest, BlockTxsResponse } from '.././protocols/index.js';
 import { ReqRespStatus } from '.././status.js';
 import { DEFAULT_BATCH_TX_REQUESTER_BAD_PEER_THRESHOLD, DEFAULT_BATCH_TX_REQUESTER_DUMB_PARALLEL_WORKER_COUNT, DEFAULT_BATCH_TX_REQUESTER_SMART_PARALLEL_WORKER_COUNT, DEFAULT_BATCH_TX_REQUESTER_TX_BATCH_SIZE } from './config.js';
 import { MissingTxMetadataCollection } from './missing_txs.js';
 import { PeerCollection } from './peer_collection.js';
-import { BatchRequestTxValidator } from './tx_validator.js';
+import { createBatchRequestTxValidator } from './tx_validator.js';
 /*
  * Tries to fetch all missing transaction until deadline is hit.
  * Transactions are yield by calling run*() method
@@ -31,79 +30,64 @@ import { BatchRequestTxValidator } from './tx_validator.js';
  * - Bad peer:
  *    - Is the peer which was unable to send us successful response N times in a row
  * */ export class BatchTxRequester {
+    requestTracker;
     blockTxsSource;
     pinnedPeer;
-    timeoutMs;
     p2pService;
     logger;
-    dateProvider;
     opts;
     peers;
     txsMetadata;
-    deadline;
     smartRequesterSemaphore;
     txQueue;
     txValidator;
     smartParallelWorkerCount;
     dumbParallelWorkerCount;
     txBatchSize;
-    constructor(missingTxsTracker, blockTxsSource, pinnedPeer, timeoutMs, p2pService, logger, dateProvider, opts){
+    constructor(requestTracker, blockTxsSource, pinnedPeer, p2pService, logger, dateProvider, opts){
+        this.requestTracker = requestTracker;
         this.blockTxsSource = blockTxsSource;
         this.pinnedPeer = pinnedPeer;
-        this.timeoutMs = timeoutMs;
         this.p2pService = p2pService;
         this.logger = logger ?? createLogger('p2p:reqresp_batch');
-        this.dateProvider = dateProvider ?? new DateProvider();
         this.opts = opts ?? {};
         this.smartParallelWorkerCount = this.opts.smartParallelWorkerCount ?? DEFAULT_BATCH_TX_REQUESTER_SMART_PARALLEL_WORKER_COUNT;
         this.dumbParallelWorkerCount = this.opts.dumbParallelWorkerCount ?? DEFAULT_BATCH_TX_REQUESTER_DUMB_PARALLEL_WORKER_COUNT;
         this.txBatchSize = this.opts.txBatchSize ?? DEFAULT_BATCH_TX_REQUESTER_TX_BATCH_SIZE;
-        this.deadline = this.dateProvider.now() + this.timeoutMs;
         this.txQueue = new FifoMemoryQueue(this.logger);
-        this.txValidator = this.opts.txValidator ?? new BatchRequestTxValidator(this.p2pService.txValidatorConfig);
+        this.txValidator = this.opts.txValidator ?? createBatchRequestTxValidator(this.p2pService.txValidatorConfig);
         if (this.opts.peerCollection) {
             this.peers = this.opts.peerCollection;
         } else {
-            const initialPeers = this.p2pService.connectionSampler.getPeerListSortedByConnectionCountAsc();
             const badPeerThreshold = this.opts.badPeerThreshold ?? DEFAULT_BATCH_TX_REQUESTER_BAD_PEER_THRESHOLD;
-            this.peers = new PeerCollection(initialPeers, this.pinnedPeer, this.dateProvider, badPeerThreshold, this.p2pService.peerScoring);
+            this.peers = new PeerCollection(this.p2pService.connectionSampler, this.pinnedPeer, dateProvider ?? new DateProvider(), badPeerThreshold, this.p2pService.peerScoring);
         }
-        this.txsMetadata = new MissingTxMetadataCollection(missingTxsTracker, this.txBatchSize);
+        this.txsMetadata = new MissingTxMetadataCollection(requestTracker, this.txBatchSize);
         this.smartRequesterSemaphore = this.opts.semaphore ?? new Semaphore(0);
     }
     /*
-   * Fetches all missing transactions and yields them  one by one
+   * Fetches all missing transactions and yields them one by one
    * */ async *run() {
-        // Our timeout is represented in milliseconds but queue expects seconds
-        // We also want to make sure we wait at least 1 second in case of very low timeouts
-        const timeoutQueueAfter = Math.max(Math.ceil(this.timeoutMs / 1_000), 1);
         try {
             if (this.txsMetadata.getMissingTxHashes().size === 0) {
                 return undefined;
             }
-            // Start workers in background
-            const workersPromise = executeTimeout(()=>Promise.allSettled([
-                    this.smartRequester(),
-                    this.dumbRequester(),
-                    this.pinnedPeerRequester()
-                ]), this.timeoutMs).finally(()=>{
+            // Start workers in background. Workers stop themselves via requestTracker.checkCancelled().
+            const workersPromise = Promise.allSettled([
+                this.smartRequester(),
+                this.dumbRequester(),
+                this.pinnedPeerRequester()
+            ]).finally(()=>{
                 this.txQueue.end();
             });
+            // Yield txs as workers put them on the queue. The queue's end() drains remaining items
+            // before returning null, so we don't lose any txs.
             while(true){
-                const tx = await this.txQueue.get(timeoutQueueAfter);
-                // null indicates that the queue has ended
+                const tx = await this.txQueue.get();
                 if (tx === null) {
                     break;
                 }
                 yield tx;
-                if (this.shouldStop()) {
-                    // Drain queue before ending
-                    let remaining;
-                    while((remaining = this.txQueue.getImmediate()) !== undefined){
-                        yield remaining;
-                    }
-                    break;
-                }
             }
             this.unlockSmartRequesterSemaphores();
             await workersPromise;
@@ -177,7 +161,6 @@ import { BatchRequestTxValidator } from './tx_validator.js';
     /*
    * Starts dumb worker loops
    * */ async dumbRequester() {
-        const nextPeerIndex = this.makeRoundRobinIndexer();
         const nextBatchIndex = this.makeRoundRobinIndexer();
         // Chunk missing tx hashes into batches of txBatchSize, wrapping around to ensure no peer gets less than txBatchSize
         const txChunks = ()=>{
@@ -205,15 +188,10 @@ import { BatchRequestTxValidator } from './tx_validator.js';
                 txs
             };
         };
-        const nextPeer = ()=>{
-            const peers = this.peers.getDumbPeersToQuery();
-            const idx = nextPeerIndex(()=>peers.length);
-            return idx === undefined ? undefined : peerIdFromString(peers[idx]);
-        };
-        const workerCount = Math.min(this.dumbParallelWorkerCount, this.peers.getAllPeers().size);
+        const workerCount = this.dumbParallelWorkerCount;
         const workers = Array.from({
             length: workerCount
-        }, (_, index)=>this.dumbWorkerLoop(nextPeer, makeRequest, index + 1));
+        }, (_, index)=>this.dumbWorkerLoop(this.peers.nextDumbPeerToQuery.bind(this.peers), makeRequest, index + 1));
         await Promise.allSettled(workers);
     }
     /*
@@ -257,12 +235,6 @@ import { BatchRequestTxValidator } from './tx_validator.js';
     /*
    * Starts smart worker loops
    * */ async smartRequester() {
-        const nextPeerIndex = this.makeRoundRobinIndexer();
-        const nextPeer = ()=>{
-            const peers = this.peers.getSmartPeersToQuery();
-            const idx = nextPeerIndex(()=>peers.length);
-            return idx === undefined ? undefined : peerIdFromString(peers[idx]);
-        };
         const makeRequest = (pid)=>{
             const txs = this.txsMetadata.getTxsToRequestFromThePeer(pid);
             const blockRequest = BlockTxsRequest.fromTxsSourceAndMissingTxs(this.blockTxsSource, txs);
@@ -275,8 +247,8 @@ import { BatchRequestTxValidator } from './tx_validator.js';
             };
         };
         const workers = Array.from({
-            length: Math.min(this.smartParallelWorkerCount, this.peers.getAllPeers().size)
-        }, (_, index)=>this.smartWorkerLoop(nextPeer, makeRequest, index + 1));
+            length: this.smartParallelWorkerCount
+        }, (_, index)=>this.smartWorkerLoop(this.peers.nextSmartPeerToQuery.bind(this.peers), makeRequest, index + 1));
         await Promise.allSettled(workers);
     }
     /*
@@ -294,35 +266,40 @@ import { BatchRequestTxValidator } from './tx_validator.js';
    * */ async smartWorkerLoop(pickNextPeer, request, workerIndex) {
         try {
             this.logger.trace(`Smart worker ${workerIndex} started`);
-            await executeTimeout((_)=>this.smartRequesterSemaphore.acquire(), this.timeoutMs);
+            await Promise.race([
+                this.smartRequesterSemaphore.acquire(),
+                this.requestTracker.cancellationToken
+            ]);
+            if (this.requestTracker.checkCancelled()) {
+                return;
+            }
             this.logger.trace(`Smart worker ${workerIndex} acquired semaphore`);
             while(!this.shouldStop()){
                 const peerId = pickNextPeer();
                 const weRanOutOfPeersToQuery = peerId === undefined;
                 if (weRanOutOfPeersToQuery) {
                     this.logger.debug(`Worker loop smart: No more peers to query`);
-                    // If there are no more dumb peers to query then none of our peers can become smart,
-                    // thus we can simply exit this worker
-                    const noMoreDumbPeersToQuery = this.peers.getDumbPeersToQuery().length === 0;
-                    if (noMoreDumbPeersToQuery) {
-                        // These might be either smart peers that will get unblocked after _some time_
-                        const nextSmartPeerDelay = this.peers.getNextSmartPeerAvailabilityDelayMs();
-                        const thereAreSomeRateLimitedSmartPeers = nextSmartPeerDelay !== undefined;
-                        if (thereAreSomeRateLimitedSmartPeers) {
-                            await this.sleepClampedToDeadline(nextSmartPeerDelay);
-                            continue;
-                        }
-                        this.logger.debug(`Worker loop smart: No more smart peers to query killing ${workerIndex}`);
-                        break;
+                    // If we have rate limited peers wait for them.
+                    const nextSmartPeerDelay = this.peers.getNextSmartPeerAvailabilityDelayMs();
+                    const thereAreSomeRateLimitedSmartPeers = nextSmartPeerDelay !== undefined;
+                    if (thereAreSomeRateLimitedSmartPeers) {
+                        await this.sleepClampedToDeadline(nextSmartPeerDelay);
+                        continue;
                     }
-                    // Otherwise there are still some dumb peers that could become smart.
                     // We end up here when all known smart peers became temporarily unavailable via combination of
                     // (bad, in-flight, or rate-limited) or in some weird scenario all current smart peers turn bad which is permanent
-                    // but dumb peers still exist that could become smart.
+                    // but there are dumb peers that could be promoted
+                    // or new peer can join as dumb and be promoted later
                     //
                     // When a dumb peer responds with valid txIndices, it gets
                     // promoted to smart and releases the semaphore, waking this worker.
-                    await executeTimeout((_)=>this.smartRequesterSemaphore.acquire(), this.timeoutMs);
+                    await Promise.race([
+                        this.smartRequesterSemaphore.acquire(),
+                        this.requestTracker.cancellationToken
+                    ]);
+                    if (this.requestTracker.checkCancelled()) {
+                        break;
+                    }
                     this.logger.debug(`Worker loop smart: acquired next smart peer`);
                     continue;
                 }
@@ -345,11 +322,7 @@ import { BatchRequestTxValidator } from './tx_validator.js';
                 });
             }
         } catch (err) {
-            if (err instanceof TimeoutError) {
-                this.logger.debug(`Smart worker ${workerIndex} timed out waiting for semaphore`);
-            } else {
-                this.logger.error(`Smart worker ${workerIndex} encountered an error: ${err}`);
-            }
+            this.logger.error(`Smart worker ${workerIndex} encountered an error: ${err}`);
         } finally{
             this.logger.debug(`Smart worker ${workerIndex} finished`);
         }
@@ -369,6 +342,13 @@ import { BatchRequestTxValidator } from './tx_validator.js';
                 return;
             }
             const blockResponse = BlockTxsResponse.fromBuffer(response.data);
+            // Validate response. Peers will be penalised by the validator if they send invalid response.
+            const isValid = await this.p2pService.validateRequestedBlockTxsConsistency(request, blockResponse, peerId);
+            if (!isValid) {
+                this.logger.debug(`Peer ${peerId.toString()} sent invalid response`);
+                this.handleFailResponseFromPeer(peerId, ReqRespStatus.INTERNAL_ERROR);
+                return;
+            }
             await this.handleSuccessResponseFromPeer(peerId, blockResponse);
         } catch (err) {
             this.logger.error(`Failed to get valid response from peer ${peerId.toString()}: ${err.message}`, {
@@ -384,16 +364,23 @@ import { BatchRequestTxValidator } from './tx_validator.js';
    * Handles failed response form the peer
    * There are 3 scenarios
    * - RATE_LIMIT_EXCEEDED: We mark this and don't query this peer again for some_time
+   * - INTERNAL_ERROR: We use this to cover cases where the request-response consistency validation fails.
    * - FAILURE and UNKNOWN: We penalise this, if peer has been penalised this way N times they are not queried again
    *   this implies we will query these peers couple of more times and give them a chance to "redeem" themselves before completely ignoring them
    */ handleFailResponseFromPeer(peerId, responseStatus) {
-        //TODO: Should we ban these peers?
-        if (responseStatus === ReqRespStatus.FAILURE || responseStatus === ReqRespStatus.UNKNOWN) {
-            this.peers.penalisePeer(peerId, PeerErrorSeverity.HighToleranceError);
-            return;
-        }
-        if (responseStatus === ReqRespStatus.RATE_LIMIT_EXCEEDED) {
-            this.peers.markPeerRateLimitExceeded(peerId);
+        switch(responseStatus){
+            case ReqRespStatus.RATE_LIMIT_EXCEEDED:
+                this.peers.markPeerRateLimitExceeded(peerId);
+                return;
+            case ReqRespStatus.INTERNAL_ERROR:
+                this.peers.markPeerDumb(peerId);
+                this.txsMetadata.clearPeerData(peerId);
+                return;
+            default:
+                this.peers.penalisePeer(peerId, PeerErrorSeverity.HighToleranceError);
+                this.peers.markPeerDumb(peerId);
+                this.txsMetadata.clearPeerData(peerId);
+                return;
         }
     }
     /*
@@ -409,16 +396,16 @@ import { BatchRequestTxValidator } from './tx_validator.js';
    * Handles received txs.
    * Transactions are validated and then put on async queue
    * to be yielded by main running loop
-   * */ async handleReceivedTxs(peerId, txs) {
+   */ async handleReceivedTxs(peerId, txs) {
         const newTxs = txs.filter((tx)=>!this.txsMetadata.alreadyFetched(tx.txHash));
         if (newTxs.length === 0) {
             return;
         }
-        //TODO: this validation can be slow, maybe spawn worker just for validation
+        // TODO: this validation can be slow, maybe spawn worker just for validation
         // We could use the async queue for communication.
         const validationResults = await Promise.allSettled(newTxs.map(async (tx)=>({
                 tx,
-                isValid: (await this.txValidator.validateRequestedTx(tx)).result === 'valid'
+                isValid: (await this.txValidator.validateTx(tx)).result === 'valid'
             })));
         let hasInvalidTx = false;
         validationResults.forEach((result)=>{
@@ -431,6 +418,9 @@ import { BatchRequestTxValidator } from './tx_validator.js';
             }
         });
         if (hasInvalidTx) {
+            this.logger.warn(`Penalizing peer ${peerId.toString()} for sending invalid transactions in batch response`, {
+                peerId
+            });
             this.peers.penalisePeer(peerId, PeerErrorSeverity.LowToleranceError);
         } else {
             // If we have received successful response from the peer, they have "redeemed" themselves and not considered bad anymore
@@ -458,10 +448,10 @@ import { BatchRequestTxValidator } from './tx_validator.js';
         if (smartPeersAreDisabled) {
             return;
         }
-        // If block response is invalid we still want to query this peer in the future
-        // Because they sent successful response, so they might become smart peer in the future
-        // Or send us needed txs
-        if (!this.isBlockResponseValid(response)) {
+        // If the peer doesn't have the block, we mark them as dumb.
+        if (!response.peerHasBlock()) {
+            this.peers.markPeerDumb(peerId);
+            this.txsMetadata.clearPeerData(peerId);
             return;
         }
         // We mark peer as "smart" only if they have some txs we are missing
@@ -473,16 +463,12 @@ import { BatchRequestTxValidator } from './tx_validator.js';
         this.peers.markPeerSmart(peerId);
         this.markTxsPeerHas(peerId, response);
         // Unblock smart workers
-        if (this.peers.getSmartPeersToQuery().length <= this.smartParallelWorkerCount) {
-            this.smartRequesterSemaphore.release();
-        }
-    }
-    isBlockResponseValid(response) {
-        const archiveRootsMatch = this.blockTxsSource.archive.toString() === response.archiveRoot.toString();
-        const peerHasSomeTxsFromProposal = !response.txIndices.isEmpty();
-        return archiveRootsMatch && peerHasSomeTxsFromProposal;
+        this.smartRequesterSemaphore.release();
     }
     peerHasSomeTxsWeAreMissing(_peerId, response) {
+        if (response.txIndices.isEmpty()) {
+            return false;
+        }
         const txsPeerHas = new Set(this.extractHashesPeerHasFromResponse(response).map((h)=>h.toString()));
         return this.txsMetadata.getMissingTxHashes().intersection(txsPeerHas).size > 0;
     }
@@ -492,14 +478,9 @@ import { BatchRequestTxValidator } from './tx_validator.js';
         this.txsMetadata.markPeerHas(peerId, txsPeerHas);
     }
     extractHashesPeerHasFromResponse(response) {
-        const hashes = [];
-        const indicesOfHashesPeerHas = new Set(response.txIndices.getTrueIndices());
-        this.blockTxsSource.txHashes.forEach((hash, idx)=>{
-            if (indicesOfHashesPeerHas.has(idx)) {
-                hashes.push(hash);
-            }
-        });
-        return hashes;
+        // Should already have been validated, but just in case.
+        assert(response.txIndices.getLength() === this.blockTxsSource.txHashes.length);
+        return response.txIndices.getTrueIndices().map((idx)=>this.blockTxsSource.txHashes[idx]);
     }
     /*
    * Helper function to crate round robin indexer -
@@ -523,23 +504,12 @@ import { BatchRequestTxValidator } from './tx_validator.js';
         };
     }
     /*
-   * @returns true if all missing txs have been fetched */ fetchedAllTxs() {
-        return this.txsMetadata.getMissingTxHashes().size == 0;
-    }
-    /*
-   * Checks if the BatchTxRequester should stop fetching missing txs
-   * Conditions for stopping are:
-   * - There have been no missing transactions to start with
-   * - All transactions have been fetched
-   * - The deadline has been hit (no more time to fetch)
-   * - This process has been cancelled via abortSignal
-   *
-   * @returns true if BatchTxRequester should stop, otherwise false*/ shouldStop() {
-        const aborted = this.opts.abortSignal?.aborted ?? false;
-        if (aborted) {
+   * Checks if the BatchTxRequester should stop fetching missing txs.
+   * Delegates to requestTracker which covers: deadline hit, all txs fetched, or external cancellation. */ shouldStop() {
+        if (this.requestTracker.checkCancelled()) {
             this.unlockSmartRequesterSemaphores();
         }
-        return aborted || this.fetchedAllTxs() || this.dateProvider.now() > this.deadline;
+        return this.requestTracker.checkCancelled();
     }
     /*
    * Helper function which unlocks all smart requester semaphores
@@ -553,10 +523,12 @@ import { BatchRequestTxValidator } from './tx_validator.js';
    * Sleeps for the given duration, but clamped to the deadline.
    * This ensures we don't sleep past the deadline.
    * */ async sleepClampedToDeadline(durationMs) {
-        const remaining = this.deadline - this.dateProvider.now();
-        const thereIsTimeRemaining = remaining > 0;
-        if (thereIsTimeRemaining) {
-            await sleep(Math.min(durationMs, remaining));
+        if (this.requestTracker.checkCancelled()) {
+            return;
         }
+        await Promise.race([
+            sleep(durationMs),
+            this.requestTracker.cancellationToken
+        ]);
     }
 }

package/dest/services/reqresp/batch-tx-requester/interface.d.ts

@@ -1,11 +1,12 @@
 import type { ISemaphore } from '@aztec/foundation/queue';
 import type { PeerErrorSeverity } from '@aztec/stdlib/p2p';
-import type { Tx, TxHash } from '@aztec/stdlib/tx';
+import type { Tx, TxHash, TxValidator } from '@aztec/stdlib/tx';
 import type { PeerId } from '@libp2p/interface';
 import type { ConnectionSampler } from '../connection-sampler/connection_sampler.js';
+import type { BlockTxsRequest, BlockTxsResponse } from '../index.js';
 import type { ReqRespInterface } from '../interface.js';
 import type { IPeerCollection } from './peer_collection.js';
-import type { BatchRequestTxValidatorConfig, IBatchRequestTxValidator } from './tx_validator.js';
+import type { BatchRequestTxValidatorConfig } from './tx_validator.js';
 export interface IPeerPenalizer {
     penalizePeer(peerId: PeerId, penalty: PeerErrorSeverity): void;
 }
@@ -18,19 +19,23 @@ export interface ITxMetadataCollection {
     markNotInFlightBySmartPeer(txHash: TxHash): void;
     alreadyFetched(txHash: TxHash): boolean;
     markPeerHas(peerId: PeerId, txHashes: TxHash[]): void;
+    /** Remove all tx metadata associations for a peer (e.g. on demotion from smart to dumb). */
+    clearPeerData(peerId: PeerId): void;
 }
 /**
  * Interface for BatchTxRequester dependencies that can be injected from upstream
  */
 export interface BatchTxRequesterLibP2PService {
     /** ReqResp interface for sending requests to peers */
-    reqResp: Pick<ReqRespInterface, 'sendBatchRequest' | 'sendRequestToPeer'>;
+    reqResp: Pick<ReqRespInterface, 'sendRequestToPeer'>;
     /** Connection sampler for getting peer lists */
     connectionSampler: Pick<ConnectionSampler, 'getPeerListSortedByConnectionCountAsc'>;
     /** Configuration needed for transaction validation */
     txValidatorConfig: BatchRequestTxValidatorConfig;
     /** Peer scoring for penalizing peers */
     peerScoring: IPeerPenalizer;
+    /** Validate the requested block transactions request-response consistency */
+    validateRequestedBlockTxsConsistency: (request: BlockTxsRequest, response: BlockTxsResponse, peerId: PeerId) => Promise<boolean>;
 }
 export interface BatchTxRequesterOptions {
     smartParallelWorkerCount?: number;
@@ -39,8 +44,7 @@ export interface BatchTxRequesterOptions {
     badPeerThreshold?: number;
     semaphore?: ISemaphore;
     peerCollection?: IPeerCollection;
-    abortSignal?: AbortSignal;
     /** Optional tx validator for testing - if not provided, one is created from p2pService.txValidatorConfig */
-    txValidator?: IBatchRequestTxValidator;
+    txValidator?: TxValidator;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9iYXRjaC10eC1yZXF1ZXN0ZXIvaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDckYsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWpHLE1BQU0sV0FBVyxjQUFjO0lBQzdCLFlBQVksQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsR0FBRyxJQUFJLENBQUM7Q0FDaEU7QUFFRCxNQUFNLFdBQVcscUJBQXFCO0lBQ3BDLGtCQUFrQixJQUFJLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNsQyxXQUFXLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQztJQUM3QywwQkFBMEIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxDQUFDO0lBQ25ELGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUNwQyx1QkFBdUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUM5QywwQkFBMEIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUNqRCxjQUFjLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUM7SUFFeEMsV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQztDQUN2RDtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLDZCQUE2QjtJQUM1QyxzREFBc0Q7SUFDdEQsT0FBTyxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxrQkFBa0IsR0FBRyxtQkFBbUIsQ0FBQyxDQUFDO0lBQzFFLGdEQUFnRDtJQUNoRCxpQkFBaUIsRUFBRSxJQUFJLENBQUMsaUJBQWlCLEVBQUUsdUNBQXVDLENBQUMsQ0FBQztJQUNwRixzREFBc0Q7SUFDdEQsaUJBQWlCLEVBQUUsNkJBQTZCLENBQUM7SUFDakQsd0NBQXdDO0lBQ3hDLFdBQVcsRUFBRSxjQUFjLENBQUM7Q0FDN0I7QUFFRCxNQUFNLFdBQVcsdUJBQXVCO0lBQ3RDLHdCQUF3QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2xDLHVCQUF1QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pDLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNyQixnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUUxQixTQUFTLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDdkIsY0FBYyxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQ2pDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsQ0FBQztJQUMxQiw0R0FBNEc7SUFDNUcsV0FBVyxDQUFDLEVBQUUsd0JBQXdCLENBQUM7Q0FDeEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9iYXRjaC10eC1yZXF1ZXN0ZXIvaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZDQUE2QyxDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFdkUsTUFBTSxXQUFXLGNBQWM7SUFDN0IsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLGlCQUFpQixHQUFHLElBQUksQ0FBQztDQUNoRTtBQUVELE1BQU0sV0FBVyxxQkFBcUI7SUFDcEMsa0JBQWtCLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2xDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDO0lBQzdDLDBCQUEwQixDQUFDLElBQUksRUFBRSxNQUFNLEdBQUcsTUFBTSxFQUFFLENBQUM7SUFDbkQsYUFBYSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsSUFBSSxDQUFDO0lBQ3BDLHVCQUF1QixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsSUFBSSxDQUFDO0lBQzlDLDBCQUEwQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsSUFBSSxDQUFDO0lBQ2pELGNBQWMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQztJQUV4QyxXQUFXLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDO0lBQ3RELDRGQUE0RjtJQUM1RixhQUFhLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUM7Q0FDckM7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyw2QkFBNkI7SUFDNUMsc0RBQXNEO0lBQ3RELE9BQU8sRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztJQUNyRCxnREFBZ0Q7SUFDaEQsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUFFLHVDQUF1QyxDQUFDLENBQUM7SUFDcEYsc0RBQXNEO0lBQ3RELGlCQUFpQixFQUFFLDZCQUE2QixDQUFDO0lBQ2pELHdDQUF3QztJQUN4QyxXQUFXLEVBQUUsY0FBYyxDQUFDO0lBQzVCLDZFQUE2RTtJQUM3RSxvQ0FBb0MsRUFBRSxDQUNwQyxPQUFPLEVBQUUsZUFBZSxFQUN4QixRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLE1BQU0sRUFBRSxNQUFNLEtBQ1gsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0NBQ3ZCO0FBRUQsTUFBTSxXQUFXLHVCQUF1QjtJQUN0Qyx3QkFBd0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQyx1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNqQyxXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDckIsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFMUIsU0FBUyxDQUFDLEVBQUUsVUFBVSxDQUFDO0lBQ3ZCLGNBQWMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUNqQyw0R0FBNEc7SUFDNUcsV0FBVyxDQUFDLEVBQUUsV0FBVyxDQUFDO0NBQzNCIn0=

package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/batch-tx-requester/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,6BAA6B,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAEjG,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAChE;AAED,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC7C,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9C,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACjD,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAExC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACvD;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,sDAAsD;IACtD,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,mBAAmB,CAAC,CAAC;IAC1E,gDAAgD;IAChD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,uCAAuC,CAAC,CAAC;IACpF,sDAAsD;IACtD,iBAAiB,EAAE,6BAA6B,CAAC;IACjD,wCAAwC;IACxC,WAAW,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,uBAAuB;IACtC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,4GAA4G;IAC5G,WAAW,CAAC,EAAE,wBAAwB,CAAC;CACxC"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/batch-tx-requester/interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAEvE,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAChE;AAED,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IAC7C,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9C,0BAA0B,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACjD,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAExC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACtD,4FAA4F;IAC5F,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,sDAAsD;IACtD,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;IACrD,gDAAgD;IAChD,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,uCAAuC,CAAC,CAAC;IACpF,sDAAsD;IACtD,iBAAiB,EAAE,6BAA6B,CAAC;IACjD,wCAAwC;IACxC,WAAW,EAAE,cAAc,CAAC;IAC5B,6EAA6E;IAC7E,oCAAoC,EAAE,CACpC,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACtC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,4GAA4G;IAC5G,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}

package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts

@@ -1,6 +1,6 @@
 import { type Tx, TxHash } from '@aztec/stdlib/tx';
 import type { PeerId } from '@libp2p/interface';
-import type { IMissingTxsTracker } from '../../tx_collection/missing_txs_tracker.js';
+import type { IRequestTracker } from '../../tx_collection/request_tracker.js';
 import type { ITxMetadataCollection } from './interface.js';
 declare class MissingTxMetadata {
     readonly txHash: string;
@@ -15,10 +15,10 @@ declare class MissingTxMetadata {
     isInFlight(): boolean;
 }
 export declare class MissingTxMetadataCollection implements ITxMetadataCollection {
-    private missingTxsTracker;
+    private requestTracker;
     private readonly txBatchSize;
     private txMetadata;
-    constructor(missingTxsTracker: IMissingTxsTracker, txBatchSize?: number);
+    constructor(requestTracker: IRequestTracker, txBatchSize?: number);
     getPrioritizingNotInFlightAndLowerRequestCount(txs: string[]): MissingTxMetadata[];
     getMissingTxHashes(): Set<string>;
     getTxsPeerHas(peer: PeerId): Set<string>;
@@ -29,6 +29,7 @@ export declare class MissingTxMetadataCollection implements ITxMetadataCollectio
     alreadyFetched(txHash: TxHash): boolean;
     markFetched(peerId: PeerId, tx: Tx): boolean;
     markPeerHas(peerId: PeerId, txHash: TxHash[]): void;
+    clearPeerData(peerId: PeerId): void;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlzc2luZ190eHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9yZXFyZXNwL2JhdGNoLXR4LXJlcXVlc3Rlci9taXNzaW5nX3R4cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUVyRixPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRTVELGNBQU0saUJBQWlCO2FBRUgsTUFBTSxFQUFFLE1BQU07SUFDdkIsY0FBYztJQUNkLGFBQWE7SUFDYixFQUFFLEVBQUUsRUFBRSxHQUFHLFNBQVM7YUFDVCxLQUFLO0lBTHZCLFlBQ2tCLE1BQU0sRUFBRSxNQUFNLEVBQ3ZCLGNBQWMsU0FBSSxFQUNsQixhQUFhLFNBQUksRUFDakIsRUFBRSxHQUFFLEVBQUUsR0FBRyxTQUFxQixFQUNyQixLQUFLLGNBQW9CLEVBQ3ZDO0lBRUcsZUFBZSxTQUVyQjtJQUVNLFlBQVksU0FFbEI7SUFFTSxlQUFlLFNBRXJCO0lBRU0sVUFBVSxJQUFJLE9BQU8sQ0FFM0I7Q0FDRjtBQU9ELHFCQUFhLDJCQUE0QixZQUFXLHFCQUFxQjtJQUlyRSxPQUFPLENBQUMsaUJBQWlCO0lBQ3pCLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVztJQUo5QixPQUFPLENBQUMsVUFBVSxDQUF3QztJQUUxRCxZQUNVLGlCQUFpQixFQUFFLGtCQUFrQixFQUM1QixXQUFXLEdBQUUsTUFBaUQsRUFHaEY7SUFFTSw4Q0FBOEMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLEdBQUcsaUJBQWlCLEVBQUUsQ0FleEY7SUFFTSxrQkFBa0IsSUFBSSxHQUFHLENBQUMsTUFBTSxDQUFDLENBRXZDO0lBRU0sYUFBYSxDQUFDLElBQUksRUFBRSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQVc5QztJQUVNLDBCQUEwQixDQUFDLElBQUksRUFBRSxNQUFNLEdBQUcsTUFBTSxFQUFFLENBdUJ4RDtJQUVNLGFBQWEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxRQUVsQztJQU9NLHVCQUF1QixDQUFDLE1BQU0sRUFBRSxNQUFNLFFBRTVDO0lBTU0sMEJBQTBCLENBQUMsTUFBTSxFQUFFLE1BQU0sUUFFL0M7SUFFTSxjQUFjLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBRTdDO0lBRU0sV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBY2xEO0lBRU0sV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxRQVVsRDtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlzc2luZ190eHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9yZXFyZXNwL2JhdGNoLXR4LXJlcXVlc3Rlci9taXNzaW5nX3R4cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFFOUUsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUU1RCxjQUFNLGlCQUFpQjthQUVILE1BQU0sRUFBRSxNQUFNO0lBQ3ZCLGNBQWM7SUFDZCxhQUFhO0lBQ2IsRUFBRSxFQUFFLEVBQUUsR0FBRyxTQUFTO2FBQ1QsS0FBSztJQUx2QixZQUNrQixNQUFNLEVBQUUsTUFBTSxFQUN2QixjQUFjLFNBQUksRUFDbEIsYUFBYSxTQUFJLEVBQ2pCLEVBQUUsR0FBRSxFQUFFLEdBQUcsU0FBcUIsRUFDckIsS0FBSyxjQUFvQixFQUN2QztJQUVHLGVBQWUsU0FFckI7SUFFTSxZQUFZLFNBRWxCO0lBRU0sZUFBZSxTQUVyQjtJQUVNLFVBQVUsSUFBSSxPQUFPLENBRTNCO0NBQ0Y7QUFPRCxxQkFBYSwyQkFBNEIsWUFBVyxxQkFBcUI7SUFJckUsT0FBTyxDQUFDLGNBQWM7SUFDdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXO0lBSjlCLE9BQU8sQ0FBQyxVQUFVLENBQXdDO0lBRTFELFlBQ1UsY0FBYyxFQUFFLGVBQWUsRUFDdEIsV0FBVyxHQUFFLE1BQWlELEVBR2hGO0lBRU0sOENBQThDLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxHQUFHLGlCQUFpQixFQUFFLENBZXhGO0lBRU0sa0JBQWtCLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUV2QztJQUVNLGFBQWEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FXOUM7SUFFTSwwQkFBMEIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxDQXVCeEQ7SUFFTSxhQUFhLENBQUMsTUFBTSxFQUFFLE1BQU0sUUFFbEM7SUFPTSx1QkFBdUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxRQUU1QztJQU1NLDBCQUEwQixDQUFDLE1BQU0sRUFBRSxNQUFNLFFBRS9DO0lBRU0sY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUU3QztJQUVNLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQWNsRDtJQUVNLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFVbEQ7SUFFTSxhQUFhLENBQUMsTUFBTSxFQUFFLE1BQU0sUUFLbEM7Q0FDRiJ9

package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"missing_txs.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/batch-tx-requester/missing_txs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAErF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5D,cAAM,iBAAiB;aAEH,MAAM,EAAE,MAAM;IACvB,cAAc;IACd,aAAa;IACb,EAAE,EAAE,EAAE,GAAG,SAAS;aACT,KAAK;IALvB,YACkB,MAAM,EAAE,MAAM,EACvB,cAAc,SAAI,EAClB,aAAa,SAAI,EACjB,EAAE,GAAE,EAAE,GAAG,SAAqB,EACrB,KAAK,cAAoB,EACvC;IAEG,eAAe,SAErB;IAEM,YAAY,SAElB;IAEM,eAAe,SAErB;IAEM,UAAU,IAAI,OAAO,CAE3B;CACF;AAOD,qBAAa,2BAA4B,YAAW,qBAAqB;IAIrE,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAJ9B,OAAO,CAAC,UAAU,CAAwC;IAE1D,YACU,iBAAiB,EAAE,kBAAkB,EAC5B,WAAW,GAAE,MAAiD,EAGhF;IAEM,8CAA8C,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,iBAAiB,EAAE,CAexF;IAEM,kBAAkB,IAAI,GAAG,CAAC,MAAM,CAAC,CAEvC;IAEM,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAW9C;IAEM,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAuBxD;IAEM,aAAa,CAAC,MAAM,EAAE,MAAM,QAElC;IAOM,uBAAuB,CAAC,MAAM,EAAE,MAAM,QAE5C;IAMM,0BAA0B,CAAC,MAAM,EAAE,MAAM,QAE/C;IAEM,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7C;IAEM,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAclD;IAEM,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAUlD;CACF"}
+{"version":3,"file":"missing_txs.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/batch-tx-requester/missing_txs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5D,cAAM,iBAAiB;aAEH,MAAM,EAAE,MAAM;IACvB,cAAc;IACd,aAAa;IACb,EAAE,EAAE,EAAE,GAAG,SAAS;aACT,KAAK;IALvB,YACkB,MAAM,EAAE,MAAM,EACvB,cAAc,SAAI,EAClB,aAAa,SAAI,EACjB,EAAE,GAAE,EAAE,GAAG,SAAqB,EACrB,KAAK,cAAoB,EACvC;IAEG,eAAe,SAErB;IAEM,YAAY,SAElB;IAEM,eAAe,SAErB;IAEM,UAAU,IAAI,OAAO,CAE3B;CACF;AAOD,qBAAa,2BAA4B,YAAW,qBAAqB;IAIrE,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAJ9B,OAAO,CAAC,UAAU,CAAwC;IAE1D,YACU,cAAc,EAAE,eAAe,EACtB,WAAW,GAAE,MAAiD,EAGhF;IAEM,8CAA8C,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,iBAAiB,EAAE,CAexF;IAEM,kBAAkB,IAAI,GAAG,CAAC,MAAM,CAAC,CAEvC;IAEM,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAW9C;IAEM,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAuBxD;IAEM,aAAa,CAAC,MAAM,EAAE,MAAM,QAElC;IAOM,uBAAuB,CAAC,MAAM,EAAE,MAAM,QAE5C;IAMM,0BAA0B,CAAC,MAAM,EAAE,MAAM,QAE/C;IAEM,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7C;IAEM,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAclD;IAEM,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAUlD;IAEM,aAAa,CAAC,MAAM,EAAE,MAAM,QAKlC;CACF"}

package/dest/services/reqresp/batch-tx-requester/missing_txs.js

@@ -31,14 +31,14 @@ class MissingTxMetadata {
  * This could be better optimized but given expected count of missing txs (N < 100)
  * At the moment there is no need for it. And benefit is that we have everything in single store
  * */ export class MissingTxMetadataCollection {
-    missingTxsTracker;
+    requestTracker;
     txBatchSize;
     txMetadata;
-    constructor(missingTxsTracker, txBatchSize = DEFAULT_BATCH_TX_REQUESTER_TX_BATCH_SIZE){
-        this.missingTxsTracker = missingTxsTracker;
+    constructor(requestTracker, txBatchSize = DEFAULT_BATCH_TX_REQUESTER_TX_BATCH_SIZE){
+        this.requestTracker = requestTracker;
         this.txBatchSize = txBatchSize;
         this.txMetadata = new Map();
-        missingTxsTracker.missingTxHashes.forEach((hash)=>this.txMetadata.set(hash, new MissingTxMetadata(hash)));
+        requestTracker.missingTxHashes.forEach((hash)=>this.txMetadata.set(hash, new MissingTxMetadata(hash)));
     }
     getPrioritizingNotInFlightAndLowerRequestCount(txs) {
         const filtered = Array.from(this.txMetadata.values()).filter((txMeta)=>txs.includes(txMeta.txHash.toString()));
@@ -57,7 +57,7 @@ class MissingTxMetadata {
         ];
     }
     getMissingTxHashes() {
-        return this.missingTxsTracker.missingTxHashes;
+        return this.requestTracker.missingTxHashes;
     }
     getTxsPeerHas(peer) {
         const peerIdStr = peer.toString();
@@ -102,7 +102,7 @@ class MissingTxMetadata {
         this.txMetadata.get(txHash.toString())?.markNotInFlight();
     }
     alreadyFetched(txHash) {
-        return !this.missingTxsTracker.isMissing(txHash.toString());
+        return !this.requestTracker.isMissing(txHash.toString());
     }
     markFetched(peerId, tx) {
         const txHashStr = tx.txHash.toString();
@@ -116,7 +116,7 @@ class MissingTxMetadata {
             return false;
         }
         txMeta.peers.add(peerId.toString());
-        return this.missingTxsTracker.markFetched(tx);
+        return this.requestTracker.markFetched(tx);
     }
     markPeerHas(peerId, txHash) {
         const peerIdStr = peerId.toString();
@@ -127,4 +127,10 @@ class MissingTxMetadata {
             }
         });
     }
+    clearPeerData(peerId) {
+        const peerIdStr = peerId.toString();
+        for (const txMeta of this.txMetadata.values()){
+            txMeta.peers.delete(peerIdStr);
+        }
+    }
 }