@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.017a351

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

@@ -0,0 +1,35 @@
+import { type Tx, TxHash } from '@aztec/stdlib/tx';
+import type { PeerId } from '@libp2p/interface';
+import type { IRequestTracker } from '../../tx_collection/request_tracker.js';
+import type { ITxMetadataCollection } from './interface.js';
+declare class MissingTxMetadata {
+    readonly txHash: string;
+    requestedCount: number;
+    inFlightCount: number;
+    tx: Tx | undefined;
+    readonly peers: Set<string>;
+    constructor(txHash: string, requestedCount?: number, inFlightCount?: number, tx?: Tx | undefined, peers?: Set<string>);
+    markAsRequested(): void;
+    markInFlight(): void;
+    markNotInFlight(): void;
+    isInFlight(): boolean;
+}
+export declare class MissingTxMetadataCollection implements ITxMetadataCollection {
+    private requestTracker;
+    private readonly txBatchSize;
+    private txMetadata;
+    constructor(requestTracker: IRequestTracker, txBatchSize?: number);
+    getPrioritizingNotInFlightAndLowerRequestCount(txs: string[]): MissingTxMetadata[];
+    getMissingTxHashes(): Set<string>;
+    getTxsPeerHas(peer: PeerId): Set<string>;
+    getTxsToRequestFromThePeer(peer: PeerId): TxHash[];
+    markRequested(txHash: TxHash): void;
+    markInFlightBySmartPeer(txHash: TxHash): void;
+    markNotInFlightBySmartPeer(txHash: TxHash): void;
+    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlzc2luZ190eHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9yZXFyZXNwL2JhdGNoLXR4LXJlcXVlc3Rlci9taXNzaW5nX3R4cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFFOUUsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUU1RCxjQUFNLGlCQUFpQjthQUVILE1BQU0sRUFBRSxNQUFNO0lBQ3ZCLGNBQWM7SUFDZCxhQUFhO0lBQ2IsRUFBRSxFQUFFLEVBQUUsR0FBRyxTQUFTO2FBQ1QsS0FBSztJQUx2QixZQUNrQixNQUFNLEVBQUUsTUFBTSxFQUN2QixjQUFjLFNBQUksRUFDbEIsYUFBYSxTQUFJLEVBQ2pCLEVBQUUsR0FBRSxFQUFFLEdBQUcsU0FBcUIsRUFDckIsS0FBSyxjQUFvQixFQUN2QztJQUVHLGVBQWUsU0FFckI7SUFFTSxZQUFZLFNBRWxCO0lBRU0sZUFBZSxTQUVyQjtJQUVNLFVBQVUsSUFBSSxPQUFPLENBRTNCO0NBQ0Y7QUFPRCxxQkFBYSwyQkFBNEIsWUFBVyxxQkFBcUI7SUFJckUsT0FBTyxDQUFDLGNBQWM7SUFDdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXO0lBSjlCLE9BQU8sQ0FBQyxVQUFVLENBQXdDO0lBRTFELFlBQ1UsY0FBYyxFQUFFLGVBQWUsRUFDdEIsV0FBVyxHQUFFLE1BQWlELEVBR2hGO0lBRU0sOENBQThDLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxHQUFHLGlCQUFpQixFQUFFLENBZXhGO0lBRU0sa0JBQWtCLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUV2QztJQUVNLGFBQWEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FXOUM7SUFFTSwwQkFBMEIsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxDQXVCeEQ7SUFFTSxhQUFhLENBQUMsTUFBTSxFQUFFLE1BQU0sUUFFbEM7SUFPTSx1QkFBdUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxRQUU1QztJQU1NLDBCQUEwQixDQUFDLE1BQU0sRUFBRSxNQUFNLFFBRS9DO0lBRU0sY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUU3QztJQUVNLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQWNsRDtJQUVNLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFVbEQ7SUFFTSxhQUFhLENBQUMsTUFBTSxFQUFFLE1BQU0sUUFLbEM7Q0FDRiJ9

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

@@ -0,0 +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,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

@@ -0,0 +1,136 @@
+import { TxHash } from '@aztec/stdlib/tx';
+import { DEFAULT_BATCH_TX_REQUESTER_TX_BATCH_SIZE } from './config.js';
+class MissingTxMetadata {
+    txHash;
+    requestedCount;
+    inFlightCount;
+    tx;
+    peers;
+    constructor(txHash, requestedCount = 0, inFlightCount = 0, tx = undefined, peers = new Set()){
+        this.txHash = txHash;
+        this.requestedCount = requestedCount;
+        this.inFlightCount = inFlightCount;
+        this.tx = tx;
+        this.peers = peers;
+    }
+    markAsRequested() {
+        this.requestedCount++;
+    }
+    markInFlight() {
+        this.inFlightCount++;
+    }
+    markNotInFlight() {
+        this.inFlightCount = Math.max(--this.inFlightCount, 0);
+    }
+    isInFlight() {
+        return this.inFlightCount > 0;
+    }
+}
+/*
+ * Single source or truth for transactions we are fetching
+ * 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 {
+    requestTracker;
+    txBatchSize;
+    txMetadata;
+    constructor(requestTracker, txBatchSize = DEFAULT_BATCH_TX_REQUESTER_TX_BATCH_SIZE){
+        this.requestTracker = requestTracker;
+        this.txBatchSize = txBatchSize;
+        this.txMetadata = new Map();
+        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()));
+        const [notInFlight, inFlight] = filtered.reduce((buckets, tx)=>{
+            tx.isInFlight() ? buckets[1].push(tx) : buckets[0].push(tx);
+            return buckets;
+        }, [
+            [],
+            []
+        ]);
+        notInFlight.sort((a, b)=>a.requestedCount - b.requestedCount);
+        inFlight.sort((a, b)=>a.inFlightCount - b.inFlightCount);
+        return [
+            ...notInFlight,
+            ...inFlight
+        ];
+    }
+    getMissingTxHashes() {
+        return this.requestTracker.missingTxHashes;
+    }
+    getTxsPeerHas(peer) {
+        const peerIdStr = peer.toString();
+        const txsPeerHas = new Set();
+        this.txMetadata.values().forEach((txMeta)=>{
+            if (txMeta.peers.has(peerIdStr)) {
+                txsPeerHas.add(txMeta.txHash.toString());
+            }
+        });
+        return txsPeerHas;
+    }
+    getTxsToRequestFromThePeer(peer) {
+        const txsPeerHas = this.getTxsPeerHas(peer);
+        const missingTxHashes = this.getMissingTxHashes();
+        const txsToRequest = txsPeerHas.intersection(missingTxHashes);
+        if (txsToRequest.size >= this.txBatchSize) {
+            return this.getPrioritizingNotInFlightAndLowerRequestCount(Array.from(txsToRequest)).map((t)=>TxHash.fromString(t.txHash)).slice(0, this.txBatchSize);
+        }
+        // Otherwise fill the txs to request till txBatchSize with random txs we are missing
+        // Who knows, maybe we get lucky and peer received these txs in the meantime
+        const countToFill = this.txBatchSize - txsToRequest.size;
+        const txsToFill = this.getPrioritizingNotInFlightAndLowerRequestCount(Array.from(this.getMissingTxHashes().difference(txsToRequest))).slice(0, countToFill).map((t)=>TxHash.fromString(t.txHash));
+        return [
+            ...Array.from(txsToRequest).map((t)=>TxHash.fromString(t)),
+            ...txsToFill
+        ];
+    }
+    markRequested(txHash) {
+        this.txMetadata.get(txHash.toString())?.markAsRequested();
+    }
+    /*
+   * This should be called only when requesting tx from smart peer
+   * Because the smart peer should return this tx, whereas
+   * "dumb" peer might return it, or might not - we don't know
+   * */ markInFlightBySmartPeer(txHash) {
+        this.txMetadata.get(txHash.toString())?.markInFlight();
+    }
+    /*
+   * This should be called only when requesting tx from smart peer
+   * Because the smart peer should return this tx, whereas
+   * "dumb" peer might return it, or might not - we don't know*/ markNotInFlightBySmartPeer(txHash) {
+        this.txMetadata.get(txHash.toString())?.markNotInFlight();
+    }
+    alreadyFetched(txHash) {
+        return !this.requestTracker.isMissing(txHash.toString());
+    }
+    markFetched(peerId, tx) {
+        const txHashStr = tx.txHash.toString();
+        const txMeta = this.txMetadata.get(txHashStr);
+        if (!txMeta) {
+            //TODO: what to do about peer which sent txs we didn't request?
+            // 1. don't request from it in the scope of this batch request
+            // 2. ban it immediately?
+            // 3. track it and ban it?
+            //
+            return false;
+        }
+        txMeta.peers.add(peerId.toString());
+        return this.requestTracker.markFetched(tx);
+    }
+    markPeerHas(peerId, txHash) {
+        const peerIdStr = peerId.toString();
+        txHash.map((t)=>t.toString()).forEach((txh)=>{
+            const txMeta = this.txMetadata.get(txh);
+            if (txMeta) {
+                txMeta.peers.add(peerIdStr);
+            }
+        });
+    }
+    clearPeerData(peerId) {
+        const peerIdStr = peerId.toString();
+        for (const txMeta of this.txMetadata.values()){
+            txMeta.peers.delete(peerIdStr);
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+import type { DateProvider } from '@aztec/foundation/timer';
+import type { PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import type { PeerId } from '@libp2p/interface';
+import type { ConnectionSampler } from '../connection-sampler/connection_sampler.js';
+import type { IPeerPenalizer } from './interface.js';
+export declare const RATE_LIMIT_EXCEEDED_PEER_CACHE_TTL = 1000;
+export interface IPeerCollection {
+    markPeerSmart(peerId: PeerId): void;
+    markPeerDumb(peerId: PeerId): void;
+    /** Sample next peer in round-robin fashion. No smart peers if returns undefined */
+    nextSmartPeerToQuery(): PeerId | undefined;
+    /** Sample next peer in round-robin fashion. No dumb peers if returns undefined */
+    nextDumbPeerToQuery(): PeerId | undefined;
+    thereAreSomeDumbRatelimitExceededPeers(): boolean;
+    penalisePeer(peerId: PeerId, severity: PeerErrorSeverity): void;
+    unMarkPeerAsBad(peerId: PeerId): void;
+    getBadPeers(): Set<string>;
+    markPeerInFlight(peerId: PeerId): void;
+    unMarkPeerInFlight(peerId: PeerId): void;
+    markPeerRateLimitExceeded(peerId: PeerId): void;
+    getRateLimitExceededPeers(): Set<string>;
+    getPeerRateLimitDelayMs(peerId: PeerId): number | undefined;
+    getNextDumbPeerAvailabilityDelayMs(): number | undefined;
+    getNextSmartPeerAvailabilityDelayMs(): number | undefined;
+}
+export declare class PeerCollection implements IPeerCollection {
+    private readonly connectionSampler;
+    private readonly pinnedPeerId;
+    private readonly dateProvider;
+    private readonly badPeerThreshold;
+    private readonly peerPenalizer?;
+    private readonly smartPeers;
+    private readonly inFlightPeers;
+    private readonly rateLimitExceededPeers;
+    private readonly peerPenaltyCounters;
+    private readonly badPeers;
+    constructor(connectionSampler: Pick<ConnectionSampler, 'getPeerListSortedByConnectionCountAsc'>, pinnedPeerId: PeerId | undefined, dateProvider: DateProvider, badPeerThreshold?: number, peerPenalizer?: IPeerPenalizer | undefined);
+    markPeerSmart(peerId: PeerId): void;
+    markPeerDumb(peerId: PeerId): void;
+    private queriedSmartPeers;
+    private queriedDumbPeers;
+    private static nextPeer;
+    nextSmartPeerToQuery(): PeerId | undefined;
+    nextDumbPeerToQuery(): PeerId | undefined;
+    private get availableSmartPeers();
+    private get availableDumbPeers();
+    thereAreSomeDumbRatelimitExceededPeers(): boolean;
+    markPeerInFlight(peerId: PeerId): void;
+    unMarkPeerInFlight(peerId: PeerId): void;
+    markPeerRateLimitExceeded(peerId: PeerId): void;
+    getRateLimitExceededPeers(): Set<string>;
+    penalisePeer(peerId: PeerId, severity: PeerErrorSeverity): void;
+    unMarkPeerAsBad(peerId: PeerId): void;
+    getBadPeers(): Set<string>;
+    getPeerRateLimitDelayMs(peerId: PeerId): number | undefined;
+    getNextDumbPeerAvailabilityDelayMs(): number | undefined;
+    getNextSmartPeerAvailabilityDelayMs(): number | undefined;
+    private getNextRateLimitDelayMs;
+    private orderedPeers;
+    private get peers();
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVlcl9jb2xsZWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9iYXRjaC10eC1yZXF1ZXN0ZXIvcGVlcl9jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHaEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVyRixPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVyRCxlQUFPLE1BQU0sa0NBQWtDLE9BQU8sQ0FBQztBQUV2RCxNQUFNLFdBQVcsZUFBZTtJQUM5QixhQUFhLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUM7SUFDcEMsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsSUFBSSxDQUFDO0lBRW5DLG1GQUFtRjtJQUNuRixvQkFBb0IsSUFBSSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQzNDLGtGQUFrRjtJQUNsRixtQkFBbUIsSUFBSSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBRTFDLHNDQUFzQyxJQUFJLE9BQU8sQ0FBQztJQUNsRCxZQUFZLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsaUJBQWlCLEdBQUcsSUFBSSxDQUFDO0lBQ2hFLGVBQWUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUN0QyxXQUFXLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzNCLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsSUFBSSxDQUFDO0lBQ3ZDLGtCQUFr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

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

@@ -0,0 +1 @@
+{"version":3,"file":"peer_collection.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/batch-tx-requester/peer_collection.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,176 @@
+import { peerIdFromString } from '@libp2p/peer-id';
+import { DEFAULT_BATCH_TX_REQUESTER_BAD_PEER_THRESHOLD } from './config.js';
+export const RATE_LIMIT_EXCEEDED_PEER_CACHE_TTL = 1000; // 1s
+export class PeerCollection {
+    connectionSampler;
+    pinnedPeerId;
+    dateProvider;
+    badPeerThreshold;
+    peerPenalizer;
+    smartPeers;
+    inFlightPeers;
+    rateLimitExceededPeers;
+    peerPenaltyCounters;
+    badPeers;
+    constructor(connectionSampler, pinnedPeerId, dateProvider, badPeerThreshold = DEFAULT_BATCH_TX_REQUESTER_BAD_PEER_THRESHOLD, peerPenalizer){
+        this.connectionSampler = connectionSampler;
+        this.pinnedPeerId = pinnedPeerId;
+        this.dateProvider = dateProvider;
+        this.badPeerThreshold = badPeerThreshold;
+        this.peerPenalizer = peerPenalizer;
+        this.smartPeers = new Set();
+        this.inFlightPeers = new Set();
+        this.rateLimitExceededPeers = new Map();
+        this.peerPenaltyCounters = new Map();
+        this.badPeers = new Set();
+        this.queriedSmartPeers = new Set();
+        this.queriedDumbPeers = new Set();
+        this.orderedPeers = new Set();
+        // Pinned peer is treated specially, always mark it as in-flight
+        // and never return it as part of smart/dumb peers
+        if (this.pinnedPeerId) {
+            const peerIdStr = this.pinnedPeerId.toString();
+            this.inFlightPeers.add(peerIdStr);
+        }
+    }
+    markPeerSmart(peerId) {
+        this.smartPeers.add(peerId.toString());
+    }
+    markPeerDumb(peerId) {
+        this.smartPeers.delete(peerId.toString());
+    }
+    // We keep track of all peers that are queried for peer sampling algorithm
+    queriedSmartPeers;
+    queriedDumbPeers;
+    static nextPeer(allPeers, queried) {
+        if (allPeers.size === 0) {
+            return undefined;
+        }
+        const availablePeers = allPeers.difference(queried);
+        let [first] = availablePeers;
+        if (first === undefined) {
+            // We queried all peers. Start over
+            [first] = allPeers;
+            queried.clear();
+        }
+        queried.add(first);
+        return peerIdFromString(first);
+    }
+    nextSmartPeerToQuery() {
+        return PeerCollection.nextPeer(this.availableSmartPeers, this.queriedSmartPeers);
+    }
+    nextDumbPeerToQuery() {
+        return PeerCollection.nextPeer(this.availableDumbPeers, this.queriedDumbPeers);
+    }
+    get availableSmartPeers() {
+        return this.peers.intersection(this.smartPeers.difference(this.getBadPeers().union(this.inFlightPeers).union(this.getRateLimitExceededPeers())));
+    }
+    get availableDumbPeers() {
+        return this.peers.difference(this.smartPeers.union(this.getBadPeers()).union(this.inFlightPeers).union(this.getRateLimitExceededPeers()));
+    }
+    thereAreSomeDumbRatelimitExceededPeers() {
+        return this.getRateLimitExceededPeers().difference(this.smartPeers.union(this.badPeers).union(this.inFlightPeers)).size > 0;
+    }
+    markPeerInFlight(peerId) {
+        this.inFlightPeers.add(peerId.toString());
+    }
+    unMarkPeerInFlight(peerId) {
+        // Never unmark the pinned peer as in-flight
+        if (this.pinnedPeerId && this.pinnedPeerId.toString() === peerId.toString()) {
+            return;
+        }
+        this.inFlightPeers.delete(peerId.toString());
+    }
+    markPeerRateLimitExceeded(peerId) {
+        const ttl = this.dateProvider.now() + RATE_LIMIT_EXCEEDED_PEER_CACHE_TTL;
+        this.rateLimitExceededPeers.set(peerId.toString(), ttl);
+    }
+    getRateLimitExceededPeers() {
+        const now = this.dateProvider.now();
+        const rateLimitedPeers = new Set();
+        for (const [peerId, expirationTime] of this.rateLimitExceededPeers){
+            if (expirationTime <= now) {
+                this.rateLimitExceededPeers.delete(peerId);
+            } else {
+                rateLimitedPeers.add(peerId);
+            }
+        }
+        return rateLimitedPeers;
+    }
+    penalisePeer(peerId, severity) {
+        const key = peerId.toString();
+        const newPenaltyCount = (this.peerPenaltyCounters.get(key) ?? 0) + 1;
+        this.peerPenaltyCounters.set(key, newPenaltyCount);
+        this.peerPenalizer?.penalizePeer(peerId, severity);
+        if (newPenaltyCount > this.badPeerThreshold) {
+            this.badPeers.add(key);
+        }
+    }
+    unMarkPeerAsBad(peerId) {
+        const key = peerId.toString();
+        this.badPeers.delete(key);
+        this.peerPenaltyCounters.delete(key);
+    }
+    getBadPeers() {
+        return new Set(this.badPeers);
+    }
+    getPeerRateLimitDelayMs(peerId) {
+        const key = peerId.toString();
+        const expiry = this.rateLimitExceededPeers.get(key);
+        const peerIsNotRateLimited = expiry === undefined;
+        if (peerIsNotRateLimited) {
+            return undefined;
+        }
+        const now = this.dateProvider.now();
+        const rateLimitHasExpired = expiry <= now;
+        if (rateLimitHasExpired) {
+            this.rateLimitExceededPeers.delete(key);
+            return undefined;
+        }
+        return expiry - now;
+    }
+    getNextDumbPeerAvailabilityDelayMs() {
+        // Note: this _is_ suboptimal
+        // (we could've tracked rate limits ) per dumb/smart peers - different collections
+        // but everything is in memory and small scale so this, wile suboptimal is not slow
+        return this.getNextRateLimitDelayMs((peerIdStr)=>!this.smartPeers.has(peerIdStr) && !this.getBadPeers().has(peerIdStr) && !this.inFlightPeers.has(peerIdStr) && this.peers.has(peerIdStr));
+    }
+    getNextSmartPeerAvailabilityDelayMs() {
+        return this.getNextRateLimitDelayMs((peerIdStr)=>this.smartPeers.has(peerIdStr) && !this.getBadPeers().has(peerIdStr) && !this.inFlightPeers.has(peerIdStr));
+    }
+    getNextRateLimitDelayMs(filter) {
+        const now = this.dateProvider.now();
+        let minExpiry;
+        for (const [peerIdStr, expiry] of this.rateLimitExceededPeers){
+            const rateLimitHasExpired = expiry <= now;
+            if (rateLimitHasExpired) {
+                this.rateLimitExceededPeers.delete(peerIdStr);
+                continue;
+            }
+            const peerDoesNotMatchFilter = !filter(peerIdStr);
+            if (peerDoesNotMatchFilter) {
+                continue;
+            }
+            minExpiry = minExpiry === undefined ? expiry : Math.min(minExpiry, expiry);
+        }
+        const noRateLimitedPeersMatchFilter = minExpiry === undefined;
+        if (noRateLimitedPeersMatchFilter) {
+            return undefined;
+        }
+        return minExpiry - now;
+    }
+    orderedPeers;
+    get peers() {
+        const pinnedStr = this.pinnedPeerId?.toString();
+        const currentlyConnected = new Set(this.connectionSampler.getPeerListSortedByConnectionCountAsc().map((p)=>p.toString()).filter((p)=>p !== pinnedStr));
+        // Remove disconnected peers, preserving order of the rest.
+        this.orderedPeers = this.orderedPeers.intersection(currentlyConnected);
+        // Append newly connected peers at the end (lowest priority).
+        for (const peer of currentlyConnected){
+            if (!this.orderedPeers.has(peer)) {
+                this.orderedPeers.add(peer);
+            }
+        }
+        return this.orderedPeers;
+    }
+}

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

@@ -0,0 +1,11 @@
+import type { ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server';
+import type { TxValidator } from '@aztec/stdlib/tx';
+import type { TxValidationCache } from '../../../msg_validators/tx_validator/tx_validation_cache.js';
+export interface BatchRequestTxValidatorConfig {
+    l1ChainId: number;
+    rollupVersion: number;
+    proofVerifier: ClientProtocolCircuitVerifier;
+    txValidationCache?: TxValidationCache;
+}
+export declare function createBatchRequestTxValidator(config: BatchRequestTxValidatorConfig): TxValidator;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9iYXRjaC10eC1yZXF1ZXN0ZXIvdHhfdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDckYsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2REFBNkQsQ0FBQztBQUVyRyxNQUFNLFdBQVcsNkJBQTZCO0lBQzVDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixhQUFhLEVBQUUsNkJBQTZCLENBQUM7SUFDN0MsaUJBQWlCLENBQUMsRUFBRSxpQkFBaUIsQ0FBQztDQUN2QztBQUVELHdCQUFnQiw2QkFBNkIsQ0FBQyxNQUFNLEVBQUUsNkJBQTZCLEdBQUcsV0FBVyxDQVVoRyJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"tx_validator.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/batch-tx-requester/tx_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6DAA6D,CAAC;AAErG,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,6BAA6B,CAAC;IAC7C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,6BAA6B,GAAG,WAAW,CAUhG"}

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

@@ -0,0 +1,7 @@
+import { createTxValidatorForOnDemandReceivedTxs } from '../../../msg_validators/index.js';
+export function createBatchRequestTxValidator(config) {
+    return createTxValidatorForOnDemandReceivedTxs(config.proofVerifier, {
+        l1ChainId: config.l1ChainId,
+        rollupVersion: config.rollupVersion
+    }, /*bindings=*/ undefined, config.txValidationCache);
+}

package/dest/services/reqresp/config.d.ts

@@ -1,16 +1,18 @@
-import { type ConfigMapping } from '@aztec/foundation/config';
-export declare const DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS = 2000;
-export declare const DEFAULT_OVERALL_REQUEST_TIMEOUT_MS = 4000;
+import { type ConfigMappingsType } from '@aztec/foundation/config';
+export declare const DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS = 10000;
+export declare const DEFAULT_OVERALL_REQUEST_TIMEOUT_MS = 10000;
+export declare const DEFAULT_REQRESP_DIAL_TIMEOUT_MS = 5000;
+export declare const DEFAULT_OPTIMISTIC_NEGOTIATION = false;
 export declare const DEFAULT_P2P_REQRESP_CONFIG: P2PReqRespConfig;
 export interface P2PReqRespConfig {
-    /**
-     * The overall timeout for a request response operation.
-     */
+    /** The overall timeout for a request response operation. */
     overallRequestTimeoutMs: number;
-    /**
-     * The timeout for an individual request response peer interaction.
-     */
+    /** The timeout for an individual request response peer interaction. */
     individualRequestTimeoutMs: number;
+    /** Whether to use optimistic protocol negotiation when dialing to another peer (opposite of `negotiateFully`). */
+    p2pOptimisticNegotiation: boolean;
+    /** How long to wait for the dial protocol to establish a connection */
+    dialTimeoutMs: number;
 }
-export declare const p2pReqRespConfigMappings: Record<keyof P2PReqRespConfig, ConfigMapping>;
-//# sourceMappingURL=config.d.ts.map
+export declare const p2pReqRespConfigMappings: ConfigMappingsType<P2PReqRespConfig>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQTJDLE1BQU0sMEJBQTBCLENBQUM7QUFFNUcsZUFBTyxNQUFNLHFDQUFxQyxRQUFTLENBQUM7QUFDNUQsZUFBTyxNQUFNLGtDQUFrQyxRQUFTLENBQUM7QUFDekQsZUFBTyxNQUFNLCtCQUErQixPQUFRLENBQUM7QUFDckQsZUFBTyxNQUFNLDhCQUE4QixRQUFRLENBQUM7QUFHcEQsZUFBTyxNQUFNLDBCQUEwQixFQUFFLGdCQUt4QyxDQUFDO0FBRUYsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQiw0REFBNEQ7SUFDNUQsdUJBQXVCLEVBQUUsTUFBTSxDQUFDO0lBRWhDLHVFQUF1RTtJQUN2RSwwQkFBMEIsRUFBRSxNQUFNLENBQUM7SUFFbkMsa0hBQWtIO0lBQ2xILHdCQUF3QixFQUFFLE9BQU8sQ0FBQztJQUVsQyx1RUFBdUU7SUFDdkUsYUFBYSxFQUFFLE1BQU0sQ0FBQztDQUN2QjtBQUVELGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FzQnpFLENBQUMifQ==

package/dest/services/reqresp/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/services/reqresp/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAsB,MAAM,0BAA0B,CAAC;AAElF,eAAO,MAAM,qCAAqC,OAAO,CAAC;AAC1D,eAAO,MAAM,kCAAkC,OAAO,CAAC;AAGvD,eAAO,MAAM,0BAA0B,EAAE,gBAGxC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;OAEG;IACH,0BAA0B,EAAE,MAAM,CAAC;CACpC;AAED,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,gBAAgB,EAAE,aAAa,CAWlF,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/services/reqresp/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA2C,MAAM,0BAA0B,CAAC;AAE5G,eAAO,MAAM,qCAAqC,QAAS,CAAC;AAC5D,eAAO,MAAM,kCAAkC,QAAS,CAAC;AACzD,eAAO,MAAM,+BAA+B,OAAQ,CAAC;AACrD,eAAO,MAAM,8BAA8B,QAAQ,CAAC;AAGpD,eAAO,MAAM,0BAA0B,EAAE,gBAKxC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,4DAA4D;IAC5D,uBAAuB,EAAE,MAAM,CAAC;IAEhC,uEAAuE;IACvE,0BAA0B,EAAE,MAAM,CAAC;IAEnC,kHAAkH;IAClH,wBAAwB,EAAE,OAAO,CAAC;IAElC,uEAAuE;IACvE,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAsBzE,CAAC"}

package/dest/services/reqresp/config.js

@@ -1,10 +1,14 @@
-import { numberConfigHelper } from '@aztec/foundation/config';
-export const DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS = 2000;
-export const DEFAULT_OVERALL_REQUEST_TIMEOUT_MS = 4000;
+import { booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
+export const DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS = 10_000;
+export const DEFAULT_OVERALL_REQUEST_TIMEOUT_MS = 10_000; // Not currently used
+export const DEFAULT_REQRESP_DIAL_TIMEOUT_MS = 5_000;
+export const DEFAULT_OPTIMISTIC_NEGOTIATION = false;
 // For use in tests.
 export const DEFAULT_P2P_REQRESP_CONFIG = {
     overallRequestTimeoutMs: DEFAULT_OVERALL_REQUEST_TIMEOUT_MS,
-    individualRequestTimeoutMs: DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS
+    individualRequestTimeoutMs: DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS,
+    dialTimeoutMs: DEFAULT_REQRESP_DIAL_TIMEOUT_MS,
+    p2pOptimisticNegotiation: DEFAULT_OPTIMISTIC_NEGOTIATION
 };
 export const p2pReqRespConfigMappings = {
     overallRequestTimeoutMs: {
@@ -16,5 +20,15 @@ export const p2pReqRespConfigMappings = {
         env: 'P2P_REQRESP_INDIVIDUAL_REQUEST_TIMEOUT_MS',
         description: 'The timeout for an individual request response peer interaction.',
         ...numberConfigHelper(DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS)
+    },
+    dialTimeoutMs: {
+        env: 'P2P_REQRESP_DIAL_TIMEOUT_MS',
+        description: 'How long to wait for the dial protocol to establish a connection',
+        ...numberConfigHelper(DEFAULT_REQRESP_DIAL_TIMEOUT_MS)
+    },
+    p2pOptimisticNegotiation: {
+        env: 'P2P_REQRESP_OPTIMISTIC_NEGOTIATION',
+        description: 'Whether to use optimistic protocol negotiation when dialing to another peer (opposite of `negotiateFully`).',
+        ...booleanConfigHelper(DEFAULT_OPTIMISTIC_NEGOTIATION)
     }
 };

package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts

@@ -3,7 +3,7 @@ export declare class RandomSampler {
     random(max: number): number;
 }
 /**
- * A class that samples peers from the libp2p node and returns a peer that we don't already have a connection open to.
+ * A class that samples peers from the libp2p node and returns a peer that we don't already have a reqresp connection open to.
  * If we already have a connection open, we try to sample a different peer.
  * We do this MAX_SAMPLE_ATTEMPTS times, if we still don't find a peer we just go for it.
  *
@@ -11,16 +11,17 @@ export declare class RandomSampler {
  */
 export declare class ConnectionSampler {
     private readonly libp2p;
-    private readonly cleanupIntervalMs;
     private readonly sampler;
     private readonly logger;
+    private readonly opts;
     private cleanupInterval;
-    private abortController;
-    private readonly activeConnectionsCount;
-    private readonly streams;
-    private dialQueue;
-    constructor(libp2p: Libp2p, cleanupIntervalMs?: number, // Default to 1 minute
-    sampler?: RandomSampler);
+    protected readonly activeConnectionsCount: Map<string, number>;
+    protected readonly streams: Set<Stream>;
+    private abortOnStop;
+    constructor(libp2p: Libp2p, sampler: RandomSampler, logger?: import("@aztec/foundation/log").Logger, opts?: {
+        cleanupIntervalMs?: number;
+        p2pOptimisticNegotiation?: boolean;
+    });
     /**
      * Stops the cleanup job and closes all active connections
      */
@@ -32,30 +33,44 @@ export declare class ConnectionSampler {
      * @returns
      */
     getPeer(excluding?: Map<string, boolean>): PeerId | undefined;
+    /**
+     * Samples a peer from a list of peers, excluding those that have active (reqresp) connections or are in the exclusion list
+     *
+     * @param peers - The list of peers to sample from
+     * @param excluding - The peers to exclude from the sampling
+     * @returns - A peer from the list, or undefined if no peers are available,
+     *          - a boolean indicating if the peer has active connections, and
+     *          - all sampled peers - to enable optional resampling
+     *
+     * @dev The provided list peers, should be mutated by this function. This allows batch sampling
+     *      to be performed without making extra copies of the list.
+     */
+    getPeerFromList(peers: PeerId[], excluding?: Map<string, boolean>): {
+        peer: PeerId | undefined;
+        sampledPeers: PeerId[];
+    };
+    getPeerListSortedByConnectionCountAsc(excluding?: Set<string>): PeerId[];
     /**
      * Samples a batch of unique peers from the libp2p node, prioritizing peers without active connections
      *
      * @param numberToSample - The number of peers to sample
+     * @param excluding - The peers to exclude from the sampling
      * @returns Array of unique sampled peers, prioritizing those without active connections
      */
-    samplePeersBatch(numberToSample: number): PeerId[];
+    samplePeersBatch(numberToSample: number, excluding?: Map<string, boolean>): PeerId[];
     /**
      * Dials a protocol and returns the stream
      *
      * @param peerId - The peer id
      * @param protocol - The protocol
+     * @param timeout - Abort connection if it takes too long
      * @returns The stream
      */
-    dialProtocol(peerId: PeerId, protocol: string): Promise<Stream>;
+    dialProtocol(peerId: PeerId, protocol: string, timeout?: number): Promise<Stream>;
     /**
      * Closes a stream and updates the active connections count
-     *
-     * @param streamId - The stream id
-     */
-    close(streamId: string): Promise<void>;
-    /**
-     * Cleans up stale connections that we have lost accounting for
      */
+    close(stream: Stream): Promise<void>;
     private cleanupStaleConnections;
 }
-//# sourceMappingURL=connection_sampler.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbl9zYW1wbGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9jb25uZWN0aW9uLXNhbXBsZXIvY29ubmVjdGlvbl9zYW1wbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJaEUscUJBQWEsYUFBYTtJQUN4QixNQUFNLENBQUMsR0FBRyxFQUFFLE1BQU0sVUFFakI7Q0FDRjtBQUVEOzs7Ozs7R0FNRztBQUNILHFCQUFhLGlCQUFpQjtJQVkxQixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPO0lBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFkdkIsT0FBTyxDQUFDLGVBQWUsQ0FBaUI7SUFHeEMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxzQkFBc0IsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFhO0lBRzNFLFNBQVMsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBYTtJQUVwRCxPQUFPLENBQUMsV0FBVyxDQUEwQztJQUU3RCxZQUNtQixNQUFNLEVBQUUsTUFBTSxFQUNkLE9BQU8sRUFBRSxhQUFhLEVBQ3RCLE1BQU0seUNBQWlELEVBQ3ZELElBQUksR0FBRTtRQUFFLGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQUMsd0JBQXdCLENBQUMsRUFBRSxPQUFPLENBQUE7S0FBTyxFQU0vRjtJQUVEOztPQUVHO0lBQ0csSUFBSSxrQkFTVDtJQUVEOzs7OztPQUtHO0lBQ0gsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FLNUQ7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNILGVBQWUsQ0FDYixLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQ2YsU0FBUyxDQUFDLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsR0FDL0I7UUFDRCxJQUFJLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztRQUN6QixZQUFZLEVBQUUsTUFBTSxFQUFFLENBQUM7S0FDeEIsQ0FxQ0E7SUFTTSxxQ0FBcUMsQ0FBQyxTQUFTLENBQUMsRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsTUFBTSxFQUFFLENBTzlFO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsZ0JBQWdCLENBQUMsY0FBYyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxHQUFHLE1BQU0sRUFBRSxDQXNDbkY7SUFJRDs7Ozs7OztPQU9HO0lBQ0csWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQXFCdEY7SUFFRDs7T0FFRztJQUNHLEtBQUssQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FpQ3pDO1lBS2EsdUJBQXVCO0NBdUJ0QyJ9

package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection_sampler.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/connection-sampler/connection_sampler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAShE,qBAAa,aAAa;IACxB,MAAM,CAAC,GAAG,EAAE,MAAM;CAGnB;AAED;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAY1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAb1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;IACzE,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,eAAe,CAA0C;IAEjE,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAkC;IACzE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2C;IAGnE,OAAO,CAAC,SAAS,CAAkC;gBAGhC,MAAM,EAAE,MAAM,EACd,iBAAiB,GAAE,MAAc,EAAE,sBAAsB;IACzD,OAAO,GAAE,aAAmC;IAO/D;;OAEG;IACG,IAAI;IAaV;;;;;OAKG;IACH,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,SAAS;IA+B7D;;;;;OAKG;IACH,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE;IAkClD;;;;;;OAMG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBrE;;;;OAIG;IACG,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B5C;;OAEG;YACW,uBAAuB;CAetC"}
+{"version":3,"file":"connection_sampler.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/connection-sampler/connection_sampler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhE,qBAAa,aAAa;IACxB,MAAM,CAAC,GAAG,EAAE,MAAM,UAEjB;CACF;AAED;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAY1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAdvB,OAAO,CAAC,eAAe,CAAiB;IAGxC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAG3E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAEpD,OAAO,CAAC,WAAW,CAA0C;IAE7D,YACmB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,aAAa,EACtB,MAAM,yCAAiD,EACvD,IAAI,GAAE;QAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAAC,wBAAwB,CAAC,EAAE,OAAO,CAAA;KAAO,EAM/F;IAED;;OAEG;IACG,IAAI,kBAST;IAED;;;;;OAKG;IACH,OAAO,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,SAAS,CAK5D;IAED;;;;;;;;;;;OAWG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EAAE,EACf,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B;QACD,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAqCA;IASM,qCAAqC,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAO9E;IAED;;;;;;OAMG;IACH,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAsCnF;IAID;;;;;;;OAOG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAqBtF;IAED;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCzC;YAKa,uBAAuB;CAuBtC"}