@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/services/peer-manager/peer_scoring.d.ts

@@ -1,4 +1,5 @@
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { PeerId } from '@libp2p/interface';
 import type { P2PConfig } from '../../config.js';
 export declare enum PeerScoreState {
@@ -15,7 +16,8 @@ export declare class PeerScoring {
     peerPenalties: {
         [key in PeerErrorSeverity]: number;
     };
-    constructor(config: P2PConfig);
+    private peerStateCounter;
+    constructor(config: P2PConfig, telemetry?: TelemetryClient);
     penalizePeer(peerId: PeerId, penalty: PeerErrorSeverity): number;
     updateScore(peerId: string, scoreDelta: number): number;
     decayAllScores(): void;
@@ -23,6 +25,9 @@ export declare class PeerScoring {
     getScoreState(peerId: string): PeerScoreState;
     getStats(): {
         medianScore: number;
+        healthyCount: number;
+        disconnectCount: number;
+        bannedCount: number;
     };
 }
-//# sourceMappingURL=peer_scoring.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVlcl9zY29yaW5nLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvcGVlci1tYW5hZ2VyL3BlZXJfc2NvcmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN0RCxPQUFPLEVBR0wsS0FBSyxlQUFlLEVBSXJCLE1BQU0seUJBQXlCLENBQUM7QUFFakMsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFRakQsb0JBQVksY0FBYztJQUN4QixNQUFNLElBQUE7SUFDTixVQUFVLElBQUE7SUFDVixPQUFPLElBQUE7Q0FDUjtBQU1ELHFCQUFhLFdBQVc7SUFDdEIsT0FBTyxDQUFDLE1BQU0sQ0FBb0M7SUFDbEQsT0FBTyxDQUFDLE1BQU0sQ0FBa0M7SUFDaEQsT0FBTyxDQUFDLGNBQWMsQ0FBa0M7SUFDeEQsT0FBTyxDQUFDLGFBQWEsQ0FBYTtJQUNsQyxPQUFPLENBQUMsV0FBVyxDQUFPO0lBQzFCLGFBQWEsRUFBRTtTQUFHLEdBQUcsSUFBSSxpQkFBaUIsR0FBRyxNQUFNO0tBQUUsQ0FBQztJQUV0RCxPQUFPLENBQUMsZ0JBQWdCLENBQWdCO0lBRXhDLFlBQVksTUFBTSxFQUFFLFNBQVMsRUFBRSxTQUFTLEdBQUUsZUFBc0MsRUFpQi9FO0lBRU0sWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLGlCQUFpQixVQU03RDtJQUVELFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQWlCdEQ7SUFFRCxjQUFjLElBQUksSUFBSSxDQVlyQjtJQUVELFFBQVEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FFL0I7SUFFTSxhQUFhLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxjQUFjLENBVW5EO0lBRUQsUUFBUSxJQUFJO1FBQUUsV0FBVyxFQUFFLE1BQU0sQ0FBQztRQUFDLFlBQVksRUFBRSxNQUFNLENBQUM7UUFBQyxlQUFlLEVBQUUsTUFBTSxDQUFDO1FBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQTtLQUFFLENBNEJ0RztDQUNGIn0=

package/dest/services/peer-manager/peer_scoring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peer_scoring.d.ts","sourceRoot":"","sources":["../../../src/services/peer-manager/peer_scoring.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQjD,oBAAY,cAAc;IACxB,MAAM,IAAA;IACN,UAAU,IAAA;IACV,OAAO,IAAA;CACR;AAMD,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAoC;IAClD,OAAO,CAAC,MAAM,CAAkC;IAChD,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,aAAa,CAAa;IAClC,OAAO,CAAC,WAAW,CAAO;IAC1B,aAAa,EAAE;SAAG,GAAG,IAAI,iBAAiB,GAAG,MAAM;KAAE,CAAC;gBAE1C,MAAM,EAAE,SAAS;IAYtB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB;IAQ9D,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAmBvD,cAAc,IAAI,IAAI;IActB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIzB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;IAYpD,QAAQ,IAAI;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE;CAGpC"}
+{"version":3,"file":"peer_scoring.d.ts","sourceRoot":"","sources":["../../../src/services/peer-manager/peer_scoring.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAGL,KAAK,eAAe,EAIrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQjD,oBAAY,cAAc;IACxB,MAAM,IAAA;IACN,UAAU,IAAA;IACV,OAAO,IAAA;CACR;AAMD,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAoC;IAClD,OAAO,CAAC,MAAM,CAAkC;IAChD,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,aAAa,CAAa;IAClC,OAAO,CAAC,WAAW,CAAO;IAC1B,aAAa,EAAE;SAAG,GAAG,IAAI,iBAAiB,GAAG,MAAM;KAAE,CAAC;IAEtD,OAAO,CAAC,gBAAgB,CAAgB;IAExC,YAAY,MAAM,EAAE,SAAS,EAAE,SAAS,GAAE,eAAsC,EAiB/E;IAEM,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,UAM7D;IAED,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAiBtD;IAED,cAAc,IAAI,IAAI,CAYrB;IAED,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE/B;IAEM,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAUnD;IAED,QAAQ,IAAI;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CA4BtG;CACF"}

package/dest/services/peer-manager/peer_scoring.js

@@ -1,6 +1,7 @@
 import { median } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
+import { Attributes, Metrics, ValueType, getTelemetryClient } from '@aztec/telemetry-client';
 const DefaultPeerPenalties = {
     [PeerErrorSeverity.LowToleranceError]: 50,
     [PeerErrorSeverity.MidToleranceError]: 10,
@@ -22,13 +23,19 @@ export class PeerScoring {
     decayInterval = 1000 * 60;
     decayFactor = 0.9;
     peerPenalties;
-    constructor(config){
+    peerStateCounter;
+    constructor(config, telemetry = getTelemetryClient()){
         const orderedValues = config.peerPenaltyValues?.sort((a, b)=>a - b);
         this.peerPenalties = {
             [PeerErrorSeverity.HighToleranceError]: orderedValues?.[0] ?? DefaultPeerPenalties[PeerErrorSeverity.HighToleranceError],
             [PeerErrorSeverity.MidToleranceError]: orderedValues?.[1] ?? DefaultPeerPenalties[PeerErrorSeverity.MidToleranceError],
             [PeerErrorSeverity.LowToleranceError]: orderedValues?.[2] ?? DefaultPeerPenalties[PeerErrorSeverity.LowToleranceError]
         };
+        const meter = telemetry.getMeter('PeerScoring');
+        this.peerStateCounter = meter.createUpDownCounter(Metrics.P2P_PEER_STATE_COUNT, {
+            description: 'Count of peers by state (Healthy, Disconnect, Banned)',
+            valueType: ValueType.INT
+        });
     }
     penalizePeer(peerId, penalty) {
         const id = peerId.toString();
@@ -79,8 +86,39 @@ export class PeerScoring {
         return 2;
     }
     getStats() {
+        const stateCounts = {
+            healthy: 0,
+            disconnect: 0,
+            banned: 0
+        };
+        for (const peerId of this.scores.keys()){
+            const state = this.getScoreState(peerId);
+            switch(state){
+                case 2:
+                    stateCounts.healthy++;
+                    break;
+                case 1:
+                    stateCounts.disconnect++;
+                    break;
+                case 0:
+                    stateCounts.banned++;
+                    break;
+            }
+        }
+        this.peerStateCounter.add(stateCounts.healthy, {
+            [Attributes.P2P_PEER_SCORE_STATE]: 'Healthy'
+        });
+        this.peerStateCounter.add(stateCounts.disconnect, {
+            [Attributes.P2P_PEER_SCORE_STATE]: 'Disconnect'
+        });
+        this.peerStateCounter.add(stateCounts.banned, {
+            [Attributes.P2P_PEER_SCORE_STATE]: 'Banned'
+        });
         return {
-            medianScore: median(Array.from(this.scores.values())) ?? 0
+            medianScore: median(Array.from(this.scores.values())) ?? 0,
+            healthyCount: stateCounts.healthy,
+            disconnectCount: stateCounts.disconnect,
+            bannedCount: stateCounts.banned
         };
     }
 }

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;
+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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEyQyxNQUFNLDBCQUEwQixDQUFDO0FBRXZHLGVBQU8sTUFBTSxxQ0FBcUMsUUFBUyxDQUFDO0FBQzVELGVBQU8sTUFBTSxrQ0FBa0MsUUFBUyxDQUFDO0FBQ3pELGVBQU8sTUFBTSwrQkFBK0IsT0FBUSxDQUFDO0FBQ3JELGVBQU8sTUFBTSw4QkFBOEIsUUFBUSxDQUFDO0FBR3BELGVBQU8sTUFBTSwwQkFBMEIsRUFBRSxnQkFLeEMsQ0FBQztBQUVGLE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsNERBQTREO0lBQzVELHVCQUF1QixFQUFFLE1BQU0sQ0FBQztJQUVoQyx1RUFBdUU7SUFDdkUsMEJBQTBCLEVBQUUsTUFBTSxDQUFDO0lBRW5DLGtIQUFrSDtJQUNsSCx3QkFBd0IsRUFBRSxPQUFPLENBQUM7SUFFbEMsdUVBQXVFO0lBQ3ZFLGFBQWEsRUFBRSxNQUFNLENBQUM7Q0FDdkI7QUFFRCxlQUFPLE1BQU0sd0JBQXdCLEVBQUUsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEVBQUUsYUFBYSxDQXNCbEYsQ0FBQyJ9

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,aAAa,EAA2C,MAAM,0BAA0B,CAAC;AAEvG,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,MAAM,CAAC,MAAM,gBAAgB,EAAE,aAAa,CAsBlF,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/batch_connection_sampler.d.ts

@@ -18,7 +18,7 @@ export declare class BatchConnectionSampler {
     private readonly logger;
     private readonly batch;
     private readonly requestsPerPeer;
-    constructor(connectionSampler: ConnectionSampler, batchSize: number, maxPeers: number);
+    constructor(connectionSampler: ConnectionSampler, batchSize: number, maxPeers: number, exclude?: PeerId[], logger?: import("@aztec/foundation/log").Logger);
     /**
      * Gets the peer responsible for handling a specific request index
      *
@@ -42,4 +42,4 @@ export declare class BatchConnectionSampler {
      */
     get requestsPerBucket(): number;
 }
-//# sourceMappingURL=batch_connection_sampler.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmF0Y2hfY29ubmVjdGlvbl9zYW1wbGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9jb25uZWN0aW9uLXNhbXBsZXIvYmF0Y2hfY29ubmVjdGlvbl9zYW1wbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakU7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gscUJBQWEsc0JBQXNCO0lBSy9CLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCO0lBSWxDLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQVJ6QixPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBZ0I7SUFDdEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQVM7SUFFekMsWUFDbUIsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQ3JELFNBQVMsRUFBRSxNQUFNLEVBQ2pCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLE9BQU8sQ0FBQyxFQUFFLE1BQU0sRUFBRSxFQUNELE1BQU0seUNBQXVELEVBZS9FO0lBRUQ7Ozs7O09BS0c7SUFDSCxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxTQUFTLENBUW5EO0lBRUQ7Ozs7O09BS0c7SUFDSCxvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FpQnpDO0lBRUQ7O09BRUc7SUFDSCxJQUFJLGVBQWUsSUFBSSxNQUFNLENBRTVCO0lBRUQ7O09BRUc7SUFDSCxJQUFJLGlCQUFpQixJQUFJLE1BQU0sQ0FFOUI7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"batch_connection_sampler.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/connection-sampler/batch_connection_sampler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;;;;;;;;;;GAYG;AACH,qBAAa,sBAAsB;IAKrB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAJ9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwD;IAC/E,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;gBAEZ,iBAAiB,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAetG;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUpD;;;;;OAKG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAmB1C;;OAEG;IACH,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,MAAM,CAE9B;CACF"}
+{"version":3,"file":"batch_connection_sampler.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/connection-sampler/batch_connection_sampler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;;;;;;;;;;GAYG;AACH,qBAAa,sBAAsB;IAK/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAIlC,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IAEzC,YACmB,iBAAiB,EAAE,iBAAiB,EACrD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAAE,EACD,MAAM,yCAAuD,EAe/E;IAED;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQnD;IAED;;;;;OAKG;IACH,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAiBzC;IAED;;OAEG;IACH,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,MAAM,CAE9B;CACF"}

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

@@ -16,9 +16,9 @@ import { createLogger } from '@aztec/foundation/log';
     logger;
     batch;
     requestsPerPeer;
-    constructor(connectionSampler, batchSize, maxPeers){
+    constructor(connectionSampler, batchSize, maxPeers, exclude, logger = createLogger('p2p:reqresp:batch-connection-sampler')){
         this.connectionSampler = connectionSampler;
-        this.logger = createLogger('p2p:reqresp:batch-connection-sampler');
+        this.logger = logger;
         this.batch = [];
         if (maxPeers <= 0) {
             throw new Error('Max peers cannot be 0');
@@ -29,7 +29,11 @@ import { createLogger } from '@aztec/foundation/log';
         // Calculate how many requests each peer should handle, cannot be 0
         this.requestsPerPeer = Math.max(1, Math.floor(batchSize / maxPeers));
         // Sample initial peers
-        this.batch = this.connectionSampler.samplePeersBatch(maxPeers);
+        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
@@ -60,17 +64,17 @@ import { createLogger } from '@aztec/foundation/log';
                 true
             ]
         ]);
-        const newPeer = this.connectionSampler.getPeer(excluding);
+        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} with ${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}`, {
+            this.logger.trace('Removed peer', {
                 peerId
             });
         }

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,43 @@ 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[];
+    };
     /**
      * 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbl9zYW1wbGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9jb25uZWN0aW9uLXNhbXBsZXIvY29ubmVjdGlvbl9zYW1wbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJaEUscUJBQWEsYUFBYTtJQUN4QixNQUFNLENBQUMsR0FBRyxFQUFFLE1BQU0sVUFFakI7Q0FDRjtBQUVEOzs7Ozs7R0FNRztBQUNILHFCQUFhLGlCQUFpQjtJQVkxQixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPO0lBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFkdkIsT0FBTyxDQUFDLGVBQWUsQ0FBaUI7SUFHeEMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxzQkFBc0IsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFhO0lBRzNFLFNBQVMsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBYTtJQUVwRCxPQUFPLENBQUMsV0FBVyxDQUEwQztJQUU3RCxZQUNtQixNQUFNLEVBQUUsTUFBTSxFQUNkLE9BQU8sRUFBRSxhQUFhLEVBQ3RCLE1BQU0seUNBQWlELEVBQ3ZELElBQUksR0FBRTtRQUFFLGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQUMsd0JBQXdCLENBQUMsRUFBRSxPQUFPLENBQUE7S0FBTyxFQU0vRjtJQUVEOztPQUVHO0lBQ0csSUFBSSxrQkFTVDtJQUVEOzs7OztPQUtHO0lBQ0gsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLEdBQUcsTUFBTSxHQUFHLFNBQVMsQ0FLNUQ7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNILGVBQWUsQ0FDYixLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQ2YsU0FBUyxDQUFDLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsR0FDL0I7UUFDRCxJQUFJLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztRQUN6QixZQUFZLEVBQUUsTUFBTSxFQUFFLENBQUM7S0FDeEIsQ0FxQ0E7SUFFRDs7Ozs7O09BTUc7SUFDSCxnQkFBZ0IsQ0FBQyxjQUFjLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLEdBQUcsTUFBTSxFQUFFLENBc0NuRjtJQUlEOzs7Ozs7O09BT0c7SUFDRyxZQUFZLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBcUJ0RjtJQUVEOztPQUVHO0lBQ0csS0FBSyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWlDekM7WUFLYSx1QkFBdUI7Q0FxQnRDIn0=

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;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;CAqBtC"}