@aztec/p2p 0.0.1-commit.b655e406 → 0.0.1-commit.b8a057fa

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

@@ -1,7 +1,23 @@
 import { median } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
-const DefaultPeerPenalties = {
+import { Attributes, Metrics, createUpDownCounterWithDefault, getTelemetryClient } from '@aztec/telemetry-client';
+/**
+ * Application-level peer penalties.
+ *
+ * These scores are multiplied by appSpecificWeight (10) when contributing to gossipsub score.
+ * The values are designed to align with gossipsub thresholds:
+ *
+ * - LowToleranceError (50): 1 error → app score -50 → gossipsub -500 → gossipThreshold
+ * - MidToleranceError (10): 5 errors → app score -50 → gossipsub -500 → gossipThreshold
+ * - HighToleranceError (2): 25 errors → app score -50 → gossipsub -500 → gossipThreshold
+ *
+ * Examples of each severity:
+ * - LowToleranceError: Invalid messages, deserialization errors, manipulation attempts
+ * - MidToleranceError: Hash mismatches, protocol violations
+ * - HighToleranceError: Rate limit exceeded, failed responses, transient errors
+ */ const DefaultPeerPenalties = {
     [PeerErrorSeverity.LowToleranceError]: 50,
     [PeerErrorSeverity.MidToleranceError]: 10,
     [PeerErrorSeverity.HighToleranceError]: 2
@@ -12,23 +28,57 @@ export var PeerScoreState = /*#__PURE__*/ function(PeerScoreState) {
     PeerScoreState[PeerScoreState["Healthy"] = 2] = "Healthy";
     return PeerScoreState;
 }({});
-// TODO: move into config / constants
+/**
+ * Score thresholds for peer states.
+ *
+ * These values align with gossipsub thresholds when multiplied by appSpecificWeight (10):
+ * - MIN_SCORE_BEFORE_DISCONNECT (-50) × 10 = -500 = gossipThreshold
+ * - MIN_SCORE_BEFORE_BAN (-100) × 10 = -1000 = publishThreshold
+ *
+ * This ensures that when a peer is disconnected at the application level,
+ * they also stop receiving gossip, and when banned, they cannot publish.
+ */ // TODO: move into config / constants
 const MIN_SCORE_BEFORE_BAN = -100;
 const MIN_SCORE_BEFORE_DISCONNECT = -50;
+const SCORE_CLEANUP_THRESHOLD = 0.1;
 export class PeerScoring {
-    logger = createLogger('p2p:peer-scoring');
-    scores = new Map();
-    lastUpdateTime = new Map();
-    decayInterval = 1000 * 60;
-    decayFactor = 0.9;
+    dateProvider;
+    logger;
+    scores;
+    lastUpdateTime;
+    decayInterval;
+    decayFactor;
     peerPenalties;
-    constructor(config){
+    peerStateCounter;
+    /** Active bans, keyed by peer id. Held in memory only, so they are cleared on restart. */ bannedPeers;
+    /**
+   * How long a peer remains banned once its score crosses MIN_SCORE_BEFORE_BAN. While banned, the
+   * peer's ban score is returned by getScore regardless of decay, so it cannot recover its way out
+   * of the ban early. After the ban expires the live (decayed) score takes over again.
+   */ banDurationMs;
+    constructor(config, telemetry = getTelemetryClient(), dateProvider = new DateProvider()){
+        this.dateProvider = dateProvider;
+        this.logger = createLogger('p2p:peer-scoring');
+        this.scores = new Map();
+        this.lastUpdateTime = new Map();
+        this.decayInterval = 1000 * 60;
+        this.decayFactor = 0.9;
+        this.bannedPeers = new Map();
+        this.banDurationMs = config.peerBanDurationSeconds * 1000;
         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 = createUpDownCounterWithDefault(meter, Metrics.P2P_PEER_STATE_COUNT, {
+            [Attributes.P2P_PEER_SCORE_STATE]: [
+                'Healthy',
+                'Disconnect',
+                'Banned'
+            ]
+        });
     }
     penalizePeer(peerId, penalty) {
         const id = peerId.toString();
@@ -38,7 +88,7 @@ export class PeerScoring {
         return newScore;
     }
     updateScore(peerId, scoreDelta) {
-        const currentTime = Date.now();
+        const currentTime = this.dateProvider.now();
         const lastUpdate = this.lastUpdateTime.get(peerId) || currentTime;
         const timePassed = currentTime - lastUpdate;
         const decayPeriods = Math.floor(timePassed / this.decayInterval);
@@ -49,26 +99,93 @@ export class PeerScoring {
         currentScore += scoreDelta;
         this.scores.set(peerId, currentScore);
         this.lastUpdateTime.set(peerId, currentTime);
+        this.maybeBanPeer(peerId, currentScore);
         return currentScore;
     }
+    /**
+   * Records a ban for a peer whose score has crossed the ban threshold, with an expiry banDurationMs
+   * in the future. No-op if the score is above the threshold or the peer is already serving an active
+   * ban (an existing ban is not extended; the original window stands). A previously expired ban does
+   * not block a fresh one — getActiveBanScore prunes it first.
+   */ maybeBanPeer(peerId, score) {
+        if (score >= MIN_SCORE_BEFORE_BAN || this.getActiveBanScore(peerId) !== undefined) {
+            return;
+        }
+        const record = {
+            score,
+            expiry: this.dateProvider.now() + this.banDurationMs
+        };
+        this.bannedPeers.set(peerId, record);
+        this.logger.verbose(`Banning peer ${peerId} until ${new Date(record.expiry).toISOString()}`, {
+            peerId,
+            score,
+            expiry: record.expiry
+        });
+    }
     decayAllScores() {
-        const currentTime = Date.now();
+        const currentTime = this.dateProvider.now();
         for (const [peerId, lastUpdate] of this.lastUpdateTime.entries()){
             const timePassed = currentTime - lastUpdate;
             const decayPeriods = Math.floor(timePassed / this.decayInterval);
             if (decayPeriods > 0) {
                 let score = this.scores.get(peerId) || 0;
                 score *= Math.pow(this.decayFactor, decayPeriods);
-                this.scores.set(peerId, score);
-                this.lastUpdateTime.set(peerId, currentTime);
+                if (Math.abs(score) < SCORE_CLEANUP_THRESHOLD) {
+                    this.scores.delete(peerId);
+                    this.lastUpdateTime.delete(peerId);
+                } else {
+                    this.scores.set(peerId, score);
+                    this.lastUpdateTime.set(peerId, currentTime);
+                }
             }
         }
     }
+    /**
+   * Removes bans whose window has elapsed. Expired bans are otherwise only pruned lazily when their
+   * peer's score is next queried, so a banned peer that disconnects and is never queried again would
+   * linger in the map. Called periodically (per heartbeat) to bound the ban map's size.
+   */ pruneExpiredBans() {
+        const now = this.dateProvider.now();
+        const expired = [
+            ...this.bannedPeers.entries()
+        ].filter(([, ban])=>ban.expiry <= now).map(([peerId])=>peerId);
+        for (const peerId of expired){
+            this.bannedPeers.delete(peerId);
+        }
+    }
+    /** Resets all peer scores. Useful for benchmarks to prevent cross-case contamination. */ resetAllScores() {
+        this.scores.clear();
+        this.lastUpdateTime.clear();
+        this.bannedPeers.clear();
+    }
+    removePeer(peerId) {
+        this.scores.delete(peerId);
+        this.lastUpdateTime.delete(peerId);
+    }
+    /**
+   * The single source of truth for whether a peer is banned. Returns the ban score while the ban is
+   * active, or undefined if the peer is not banned. A ban that has expired is lazily lifted before
+   * returning undefined, so callers never see a stale ban.
+   */ getActiveBanScore(peerId) {
+        const ban = this.bannedPeers.get(peerId);
+        if (ban === undefined) {
+            return undefined;
+        }
+        if (ban.expiry > this.dateProvider.now()) {
+            return ban.score;
+        }
+        // Ban expired: lift it so the peer can recover.
+        this.bannedPeers.delete(peerId);
+        return undefined;
+    }
     getScore(peerId) {
-        return this.scores.get(peerId) || 0;
+        // While a ban is active its ban score is returned regardless of how the live score has decayed,
+        // so the peer stays banned for the full duration.
+        return this.getActiveBanScore(peerId) ?? this.scores.get(peerId) ?? 0;
     }
     getScoreState(peerId) {
-        // TODO(#11329): permanently store banned peers?
+        // A banned peer stays banned for the full ban duration regardless of score decay (see getScore /
+        // maybeBanPeer), rather than silently recovering once its decayed score is cleaned up.
         const score = this.getScore(peerId);
         if (score < MIN_SCORE_BEFORE_BAN) {
             return 0;
@@ -79,8 +196,44 @@ export class PeerScoring {
         return 2;
     }
     getStats() {
+        const stateCounts = {
+            healthy: 0,
+            disconnect: 0,
+            banned: 0
+        };
+        // Include banned peers whose live score may have been decayed away but whose ban is still active.
+        const peerIds = new Set([
+            ...this.scores.keys(),
+            ...this.bannedPeers.keys()
+        ]);
+        for (const peerId of peerIds){
+            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/batch-tx-requester/batch_tx_requester.d.ts

@@ -0,0 +1,44 @@
+import { type Logger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
+import { Tx } from '@aztec/stdlib/tx';
+import type { PeerId } from '@libp2p/interface';
+import type { IRequestTracker } from '../../tx_collection/request_tracker.js';
+import { type BlockTxsSource } from '.././protocols/index.js';
+import type { BatchTxRequesterLibP2PService, BatchTxRequesterOptions } from './interface.js';
+export declare class BatchTxRequester {
+    private readonly requestTracker;
+    private readonly blockTxsSource;
+    private readonly pinnedPeer;
+    private readonly p2pService;
+    private readonly logger;
+    private readonly opts;
+    private readonly peers;
+    private readonly txsMetadata;
+    private readonly smartRequesterSemaphore;
+    private readonly txQueue;
+    private readonly txValidator;
+    private readonly smartParallelWorkerCount;
+    private readonly dumbParallelWorkerCount;
+    private readonly txBatchSize;
+    constructor(requestTracker: IRequestTracker, blockTxsSource: BlockTxsSource, pinnedPeer: PeerId | undefined, p2pService: BatchTxRequesterLibP2PService, logger?: Logger, dateProvider?: DateProvider, opts?: BatchTxRequesterOptions);
+    run(): AsyncGenerator<Tx, Tx | undefined, unknown>;
+    static collectAllTxs(generator: AsyncGenerator<Tx, Tx | undefined, unknown>): Promise<Tx[]>;
+    private pinnedPeerRequester;
+    private dumbRequester;
+    private dumbWorkerLoop;
+    private smartRequester;
+    private smartWorkerLoop;
+    private requestTxBatch;
+    private handleFailResponseFromPeer;
+    private handleSuccessResponseFromPeer;
+    private handleReceivedTxs;
+    private decideIfPeerIsSmart;
+    private peerHasSomeTxsWeAreMissing;
+    private markTxsPeerHas;
+    private extractHashesPeerHasFromResponse;
+    private makeRoundRobinIndexer;
+    private shouldStop;
+    private unlockSmartRequesterSemaphores;
+    private sleepClampedToDeadline;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmF0Y2hfdHhfcmVxdWVzdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvcmVxcmVzcC9iYXRjaC10eC1yZXF1ZXN0ZXIvYmF0Y2hfdHhfcmVxdWVzdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUdsRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxFQUFFLEVBQUUsRUFBcUMsTUFBTSxrQkFBa0IsQ0FBQztBQUV6RSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUdoRCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUU5RSxPQUFPLEVBQXFDLEtBQUssY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFRakcsT0FBTyxLQUFLLEVBQUUsNkJBQTZCLEVBQUUsdUJBQXVCLEVBQXlCLE1BQU0sZ0JBQWdCLENBQUM7QUFzQnBILHFCQUFhLGdCQUFnQjtJQUMzQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBa0I7SUFDakQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlCO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFxQjtJQUNoRCxPQUFPLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBZ0M7SUFDM0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQVM7SUFDaEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQTBCO0lBQy9DLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFrQjtJQUN4QyxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBd0I7SUFDcEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyx1QkFBdUIsQ0FBYTtJQUNyRCxPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQWM7SUFDMUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyx3QkFBd0IsQ0FBUztJQUNsRCxPQUFPLENBQUMsUUFBUSxDQUFDLHVCQUF1QixDQUFTO0lBQ2pELE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFTO0lBRXJDLFlBQ0UsY0FBYyxFQUFFLGVBQWUsRUFDL0IsY0FBYyxFQUFFLGNBQWMsRUFDOUIsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQzlCLFVBQVUsRUFBRSw2QkFBNkIsRUFDekMsTUFBTSxDQUFDLEVBQUUsTUFBTSxFQUNmLFlBQVksQ0FBQyxFQUFFLFlBQVksRUFDM0IsSUFBSSxDQUFDLEVBQUUsdUJBQXVCLEVBK0IvQjtJQUthLEdBQUcsSUFBSSxjQUFjLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxTQUFTLEVBQUUsT0FBTyxDQUFDLENBbUMvRDtJQUtELE9BQW9CLGFBQWEsQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsU0FBUyxFQUFFLE9BQU8sQ0FBQyxHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQVN2RztZQVVhLG1CQUFtQjtZQWtEbkIsYUFBYTtZQWtEYixjQUFjO1lBZ0RkLGNBQWM7WUErQmQsZUFBZTtZQTRFZixjQUFjO0lBNkM1QixPQUFPLENBQUMsMEJBQTBCO1lBc0JwQiw2QkFBNkI7WUFZN0IsaUJBQWlCO0lBd0QvQixPQUFPLENBQUMsbUJBQW1CO0lBZ0MzQixPQUFPLENBQUMsMEJBQTBCO0lBUWxDLE9BQU8sQ0FBQyxjQUFjO0lBTXRCLE9BQU8sQ0FBQyxnQ0FBZ0M7SUFVeEMsT0FBTyxDQUFDLHFCQUFxQjtJQXdCN0IsT0FBTyxDQUFDLFVBQVU7SUFZbEIsT0FBTyxDQUFDLDhCQUE4QjtZQVV4QixzQkFBc0I7Q0FNckMifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"batch_tx_requester.d.ts","sourceRoot":"","sources":["../../../../src/services/reqresp/batch-tx-requester/batch_tx_requester.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,EAAE,EAAqC,MAAM,kBAAkB,CAAC;AAEzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,OAAO,EAAqC,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAQjG,OAAO,KAAK,EAAE,6BAA6B,EAAE,uBAAuB,EAAyB,MAAM,gBAAgB,CAAC;AAsBpH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IACjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgC;IAC3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA0B;IAC/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwB;IACpD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAa;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAS;IAClD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAErC,YACE,cAAc,EAAE,eAAe,EAC/B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,UAAU,EAAE,6BAA6B,EACzC,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,YAAY,EAC3B,IAAI,CAAC,EAAE,uBAAuB,EA+B/B;IAKa,GAAG,IAAI,cAAc,CAAC,EAAE,EAAE,EAAE,GAAG,SAAS,EAAE,OAAO,CAAC,CAmC/D;IAKD,OAAoB,aAAa,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,EAAE,EAAE,GAAG,SAAS,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CASvG;YAUa,mBAAmB;YAkDnB,aAAa;YAkDb,cAAc;YAgDd,cAAc;YA+Bd,eAAe;YA4Ef,cAAc;IA6C5B,OAAO,CAAC,0BAA0B;YAsBpB,6BAA6B;YAY7B,iBAAiB;IAwD/B,OAAO,CAAC,mBAAmB;IAgC3B,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,gCAAgC;IAUxC,OAAO,CAAC,qBAAqB;IAwB7B,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,8BAA8B;YAUxB,sBAAsB;CAMrC"}