@aztec/p2p 0.71.0 → 0.73.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (153) hide show
  1. package/dest/bootstrap/bootstrap.d.ts +2 -2
  2. package/dest/bootstrap/bootstrap.d.ts.map +1 -1
  3. package/dest/bootstrap/bootstrap.js +1 -1
  4. package/dest/client/factory.js +4 -4
  5. package/dest/client/p2p_client.d.ts +13 -16
  6. package/dest/client/p2p_client.d.ts.map +1 -1
  7. package/dest/client/p2p_client.js +55 -67
  8. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  9. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +11 -19
  10. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +6 -13
  11. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +1 -1
  12. package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +74 -80
  13. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +1 -1
  14. package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +5 -5
  15. package/dest/mem_pools/attestation_pool/mocks.d.ts +3 -2
  16. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  17. package/dest/mem_pools/attestation_pool/mocks.js +3 -3
  18. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +9 -9
  19. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +1 -1
  20. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +60 -54
  21. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts +7 -7
  22. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +1 -1
  23. package/dest/mem_pools/tx_pool/memory_tx_pool.js +17 -18
  24. package/dest/mem_pools/tx_pool/tx_pool.d.ts +7 -7
  25. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +1 -1
  26. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +1 -1
  27. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +48 -47
  28. package/dest/mocks/index.d.ts +3 -3
  29. package/dest/mocks/index.d.ts.map +1 -1
  30. package/dest/mocks/index.js +19 -18
  31. package/dest/msg_validators/attestation_validator/attestation_validator.js +2 -2
  32. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js +2 -2
  33. package/dest/msg_validators/tx_validator/block_header_validator.js +3 -3
  34. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  35. package/dest/msg_validators/tx_validator/data_validator.js +7 -7
  36. package/dest/msg_validators/tx_validator/double_spend_validator.js +3 -3
  37. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  38. package/dest/msg_validators/tx_validator/metadata_validator.js +9 -9
  39. package/dest/services/data_store.d.ts +4 -4
  40. package/dest/services/data_store.d.ts.map +1 -1
  41. package/dest/services/data_store.js +7 -7
  42. package/dest/services/dummy_service.d.ts +7 -0
  43. package/dest/services/dummy_service.d.ts.map +1 -1
  44. package/dest/services/dummy_service.js +10 -1
  45. package/dest/services/libp2p/libp2p_service.d.ts +19 -15
  46. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  47. package/dest/services/libp2p/libp2p_service.js +163 -134
  48. package/dest/services/peer-manager/metrics.d.ts +12 -0
  49. package/dest/services/peer-manager/metrics.d.ts.map +1 -0
  50. package/dest/services/peer-manager/metrics.js +26 -0
  51. package/dest/services/{peer_manager.d.ts → peer-manager/peer_manager.d.ts} +24 -8
  52. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -0
  53. package/dest/services/peer-manager/peer_manager.js +395 -0
  54. package/dest/services/{peer-scoring → peer-manager}/peer_scoring.d.ts +3 -0
  55. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -0
  56. package/dest/services/peer-manager/peer_scoring.js +84 -0
  57. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +45 -0
  58. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +1 -0
  59. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +81 -0
  60. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts +61 -0
  61. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map +1 -0
  62. package/dest/services/reqresp/connection-sampler/connection_sampler.js +175 -0
  63. package/dest/services/reqresp/interface.d.ts +17 -4
  64. package/dest/services/reqresp/interface.d.ts.map +1 -1
  65. package/dest/services/reqresp/interface.js +34 -11
  66. package/dest/services/reqresp/metrics.d.ts +15 -0
  67. package/dest/services/reqresp/metrics.d.ts.map +1 -0
  68. package/dest/services/reqresp/metrics.js +42 -0
  69. package/dest/services/reqresp/protocols/block.d.ts +4 -0
  70. package/dest/services/reqresp/protocols/block.d.ts.map +1 -0
  71. package/dest/services/reqresp/protocols/block.js +9 -0
  72. package/dest/services/reqresp/protocols/goodbye.d.ts +51 -0
  73. package/dest/services/reqresp/protocols/goodbye.d.ts.map +1 -0
  74. package/dest/services/reqresp/protocols/goodbye.js +92 -0
  75. package/dest/services/reqresp/protocols/index.d.ts +9 -0
  76. package/dest/services/reqresp/protocols/index.d.ts.map +1 -0
  77. package/dest/services/reqresp/protocols/index.js +9 -0
  78. package/dest/services/reqresp/protocols/ping.d.ts +9 -0
  79. package/dest/services/reqresp/protocols/ping.d.ts.map +1 -0
  80. package/dest/services/reqresp/protocols/ping.js +9 -0
  81. package/dest/services/reqresp/{handlers.d.ts → protocols/status.d.ts} +1 -7
  82. package/dest/services/reqresp/protocols/status.d.ts.map +1 -0
  83. package/dest/services/reqresp/protocols/status.js +9 -0
  84. package/dest/services/reqresp/protocols/tx.d.ts +13 -0
  85. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -0
  86. package/dest/services/reqresp/protocols/tx.js +23 -0
  87. package/dest/services/reqresp/rate-limiter/index.d.ts.map +1 -0
  88. package/dest/services/reqresp/{rate_limiter → rate-limiter}/index.js +1 -1
  89. package/dest/services/reqresp/{rate_limiter → rate-limiter}/rate_limiter.d.ts +3 -3
  90. package/dest/services/reqresp/{rate_limiter → rate-limiter}/rate_limiter.d.ts.map +1 -1
  91. package/dest/services/reqresp/{rate_limiter → rate-limiter}/rate_limiter.js +4 -4
  92. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -0
  93. package/dest/services/reqresp/rate-limiter/rate_limits.js +55 -0
  94. package/dest/services/reqresp/reqresp.d.ts +33 -6
  95. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  96. package/dest/services/reqresp/reqresp.js +414 -249
  97. package/dest/services/service.d.ts +8 -0
  98. package/dest/services/service.d.ts.map +1 -1
  99. package/dest/util.d.ts +6 -2
  100. package/dest/util.d.ts.map +1 -1
  101. package/dest/util.js +2 -2
  102. package/package.json +8 -8
  103. package/src/bootstrap/bootstrap.ts +2 -2
  104. package/src/client/factory.ts +3 -3
  105. package/src/client/p2p_client.ts +68 -80
  106. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +14 -22
  107. package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +100 -94
  108. package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +4 -4
  109. package/src/mem_pools/attestation_pool/mocks.ts +5 -5
  110. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +84 -73
  111. package/src/mem_pools/tx_pool/memory_tx_pool.ts +26 -23
  112. package/src/mem_pools/tx_pool/tx_pool.ts +7 -7
  113. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +50 -47
  114. package/src/mocks/index.ts +19 -20
  115. package/src/msg_validators/attestation_validator/attestation_validator.ts +1 -1
  116. package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts +1 -1
  117. package/src/msg_validators/tx_validator/block_header_validator.ts +2 -2
  118. package/src/msg_validators/tx_validator/data_validator.ts +12 -9
  119. package/src/msg_validators/tx_validator/double_spend_validator.ts +2 -2
  120. package/src/msg_validators/tx_validator/metadata_validator.ts +8 -8
  121. package/src/services/data_store.ts +9 -9
  122. package/src/services/dummy_service.ts +13 -0
  123. package/src/services/libp2p/libp2p_service.ts +212 -163
  124. package/src/services/peer-manager/metrics.ts +41 -0
  125. package/src/services/{peer_manager.ts → peer-manager/peer_manager.ts} +73 -23
  126. package/src/services/{peer-scoring → peer-manager}/peer_scoring.ts +16 -3
  127. package/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +94 -0
  128. package/src/services/reqresp/connection-sampler/connection_sampler.ts +211 -0
  129. package/src/services/reqresp/interface.ts +39 -16
  130. package/src/services/reqresp/metrics.ts +57 -0
  131. package/src/services/reqresp/protocols/block.ts +15 -0
  132. package/src/services/reqresp/protocols/goodbye.ts +101 -0
  133. package/src/services/reqresp/protocols/index.ts +8 -0
  134. package/src/services/reqresp/protocols/ping.ts +8 -0
  135. package/src/services/reqresp/{handlers.ts → protocols/status.ts} +0 -9
  136. package/src/services/reqresp/protocols/tx.ts +29 -0
  137. package/src/services/reqresp/{rate_limiter → rate-limiter}/rate_limiter.ts +3 -3
  138. package/src/services/reqresp/{rate_limiter → rate-limiter}/rate_limits.ts +24 -4
  139. package/src/services/reqresp/reqresp.ts +231 -26
  140. package/src/services/service.ts +12 -0
  141. package/src/util.ts +11 -4
  142. package/dest/services/peer-scoring/peer_scoring.d.ts.map +0 -1
  143. package/dest/services/peer-scoring/peer_scoring.js +0 -75
  144. package/dest/services/peer_manager.d.ts.map +0 -1
  145. package/dest/services/peer_manager.js +0 -358
  146. package/dest/services/reqresp/handlers.d.ts.map +0 -1
  147. package/dest/services/reqresp/handlers.js +0 -17
  148. package/dest/services/reqresp/rate_limiter/index.d.ts.map +0 -1
  149. package/dest/services/reqresp/rate_limiter/rate_limits.d.ts.map +0 -1
  150. package/dest/services/reqresp/rate_limiter/rate_limits.js +0 -35
  151. /package/dest/services/reqresp/{rate_limiter → rate-limiter}/index.d.ts +0 -0
  152. /package/dest/services/reqresp/{rate_limiter → rate-limiter}/rate_limits.d.ts +0 -0
  153. /package/src/services/reqresp/{rate_limiter → rate-limiter}/index.ts +0 -0
@@ -0,0 +1,26 @@
1
+ import { Attributes, Metrics, ValueType, } from '@aztec/telemetry-client';
2
+ import { prettyGoodbyeReason } from '../reqresp/protocols/index.js';
3
+ export class PeerManagerMetrics {
4
+ constructor(telemetryClient, name = 'PeerManager') {
5
+ this.telemetryClient = telemetryClient;
6
+ this.tracer = telemetryClient.getTracer(name);
7
+ const meter = telemetryClient.getMeter(name);
8
+ this.sentGoodbyes = meter.createUpDownCounter(Metrics.PEER_MANAGER_GOODBYES_SENT, {
9
+ description: 'Number of goodbyes sent to peers',
10
+ unit: 'peers',
11
+ valueType: ValueType.INT,
12
+ });
13
+ this.receivedGoodbyes = meter.createUpDownCounter(Metrics.PEER_MANAGER_GOODBYES_RECEIVED, {
14
+ description: 'Number of goodbyes received from peers',
15
+ unit: 'peers',
16
+ valueType: ValueType.INT,
17
+ });
18
+ }
19
+ recordGoodbyeSent(reason) {
20
+ this.sentGoodbyes.add(1, { [Attributes.P2P_GOODBYE_REASON]: prettyGoodbyeReason(reason) });
21
+ }
22
+ recordGoodbyeReceived(reason) {
23
+ this.receivedGoodbyes.add(1, { [Attributes.P2P_GOODBYE_REASON]: prettyGoodbyeReason(reason) });
24
+ }
25
+ }
26
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9wZWVyLW1hbmFnZXIvbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLE9BQU8sRUFJUCxTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEVBQXNCLG1CQUFtQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFeEYsTUFBTSxPQUFPLGtCQUFrQjtJQU03QixZQUE0QixlQUFnQyxFQUFFLElBQUksR0FBRyxhQUFhO1FBQXRELG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUMxRCxJQUFJLENBQUMsTUFBTSxHQUFHLGVBQWUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFOUMsTUFBTSxLQUFLLEdBQUcsZUFBZSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxJQUFJLENBQUMsWUFBWSxHQUFHLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsMEJBQTBCLEVBQUU7WUFDaEYsV0FBVyxFQUFFLGtDQUFrQztZQUMvQyxJQUFJLEVBQUUsT0FBTztZQUNiLFNBQVMsRUFBRSxTQUFTLENBQUMsR0FBRztTQUN6QixDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsS0FBSyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyw4QkFBOEIsRUFBRTtZQUN4RixXQUFXLEVBQUUsd0NBQXdDO1lBQ3JELElBQUksRUFBRSxPQUFPO1lBQ2IsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTSxpQkFBaUIsQ0FBQyxNQUFxQjtRQUM1QyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUM3RixDQUFDO0lBRU0scUJBQXFCLENBQUMsTUFBcUI7UUFDaEQsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUNqRyxDQUFDO0NBQ0YifQ==
@@ -1,20 +1,27 @@
1
1
  import { type PeerErrorSeverity, type PeerInfo } from '@aztec/circuit-types';
2
- import { type TelemetryClient, WithTracer } from '@aztec/telemetry-client';
2
+ import { type TelemetryClient } from '@aztec/telemetry-client';
3
3
  import { type PeerId } from '@libp2p/interface';
4
- import { type P2PConfig } from '../config.js';
5
- import { type PubSubLibp2p } from '../util.js';
6
- import { type PeerDiscoveryService } from './service.js';
7
- export declare class PeerManager extends WithTracer {
4
+ import { type P2PConfig } from '../../config.js';
5
+ import { type PubSubLibp2p } from '../../util.js';
6
+ import { GoodByeReason } from '../reqresp/protocols/goodbye.js';
7
+ import { type ReqResp } from '../reqresp/reqresp.js';
8
+ import { type PeerDiscoveryService } from '../service.js';
9
+ import { type PeerScoring } from './peer_scoring.js';
10
+ export declare class PeerManager {
8
11
  private libP2PNode;
9
12
  private peerDiscoveryService;
10
13
  private config;
11
14
  private logger;
12
- private cachedPeers;
13
15
  private peerScoring;
16
+ private reqresp;
17
+ private cachedPeers;
14
18
  private heartbeatCounter;
15
19
  private displayPeerCountsPeerHeartbeat;
16
20
  private timedOutPeers;
17
- constructor(libP2PNode: PubSubLibp2p, peerDiscoveryService: PeerDiscoveryService, config: P2PConfig, telemetryClient: TelemetryClient, logger?: import("@aztec/foundation/log").Logger);
21
+ private metrics;
22
+ private discoveredPeerHandler;
23
+ constructor(libP2PNode: PubSubLibp2p, peerDiscoveryService: PeerDiscoveryService, config: P2PConfig, telemetryClient: TelemetryClient, logger: import("@aztec/foundation/log").Logger, peerScoring: PeerScoring, reqresp: ReqResp);
24
+ get tracer(): import("@aztec/telemetry-client").Tracer;
18
25
  heartbeat(): void;
19
26
  /**
20
27
  * Cleans up expired timeouts.
@@ -34,6 +41,14 @@ export declare class PeerManager extends WithTracer {
34
41
  * @param e - The disconnected peer event.
35
42
  */
36
43
  private handleDisconnectedPeerEvent;
44
+ /**
45
+ * Handles a goodbye received from a peer.
46
+ *
47
+ * Used as the reqresp handler when a peer sends us goodbye message.
48
+ * @param peerId - The peer ID.
49
+ * @param reason - The reason for the goodbye.
50
+ */
51
+ goodbyeReceived(peerId: PeerId, reason: GoodByeReason): void;
37
52
  penalizePeer(peerId: PeerId, penalty: PeerErrorSeverity): void;
38
53
  getPeerScore(peerId: string): number;
39
54
  getPeers(includePending?: boolean): PeerInfo[];
@@ -42,6 +57,7 @@ export declare class PeerManager extends WithTracer {
42
57
  */
43
58
  private discover;
44
59
  private pruneUnhealthyPeers;
60
+ private goodbyeAndDisconnectPeer;
45
61
  private disconnectPeer;
46
62
  /**
47
63
  * Handles a discovered peer.
@@ -55,6 +71,6 @@ export declare class PeerManager extends WithTracer {
55
71
  * Stops the peer manager.
56
72
  * Removing all event listeners.
57
73
  */
58
- stop(): void;
74
+ stop(): Promise<void>;
59
75
  }
60
76
  //# sourceMappingURL=peer_manager.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"peer_manager.d.ts","sourceRoot":"","sources":["../../../src/services/peer-manager/peer_manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAAE,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAG1E,OAAO,EAAmB,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIjE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,aAAa,EAAuB,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAoBrE,qBAAa,WAAW;IAUpB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,OAAO;IAfjB,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,gBAAgB,CAAa;IACrC,OAAO,CAAC,8BAA8B,CAAa;IACnD,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,qBAAqB,CAAC;gBAGpB,UAAU,EAAE,YAAY,EACxB,oBAAoB,EAAE,oBAAoB,EAC1C,MAAM,EAAE,SAAS,EACzB,eAAe,EAAE,eAAe,EACxB,MAAM,wCAAmC,EACzC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO;IAmB1B,IAAI,MAAM,6CAET;IAGM,SAAS;IAShB;;;;;;OAMG;IACH,OAAO,CAAC,sBAAsB;IAU9B;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAShC;;;OAGG;IACH,OAAO,CAAC,2BAA2B;IASnC;;;;;;OAMG;IACI,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa;IAQrD,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB;IAIvD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIpC,QAAQ,CAAC,cAAc,UAAQ,GAAG,QAAQ,EAAE;IAiCnD;;OAEG;IACH,OAAO,CAAC,QAAQ;IA6DhB,OAAO,CAAC,mBAAmB;YAoBb,wBAAwB;YAcxB,cAAc;IAQ5B;;;OAGG;YACW,oBAAoB;YA8DpB,QAAQ;IA2BtB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,gBAAgB;IAiBxB;;;OAGG;IACU,IAAI;CAYlB"}
@@ -0,0 +1,395 @@
1
+ import { __esDecorate, __runInitializers } from "tslib";
2
+ import { createLogger } from '@aztec/foundation/log';
3
+ import { trackSpan } from '@aztec/telemetry-client';
4
+ import { inspect } from 'util';
5
+ import { ReqRespSubProtocol } from '../reqresp/interface.js';
6
+ import { GoodByeReason, prettyGoodbyeReason } from '../reqresp/protocols/goodbye.js';
7
+ import { PeerEvent } from '../types.js';
8
+ import { PeerManagerMetrics } from './metrics.js';
9
+ import { PeerScoreState } from './peer_scoring.js';
10
+ const MAX_DIAL_ATTEMPTS = 3;
11
+ const MAX_CACHED_PEERS = 100;
12
+ const MAX_CACHED_PEER_AGE_MS = 5 * 60 * 1000; // 5 minutes
13
+ const FAILED_PEER_BAN_TIME_MS = 5 * 60 * 1000; // 5 minutes timeout after failing MAX_DIAL_ATTEMPTS
14
+ let PeerManager = (() => {
15
+ var _a;
16
+ let _instanceExtraInitializers = [];
17
+ let _heartbeat_decorators;
18
+ return _a = class PeerManager {
19
+ constructor(libP2PNode, peerDiscoveryService, config, telemetryClient, logger = createLogger('p2p:peer-manager'), peerScoring, reqresp) {
20
+ this.libP2PNode = (__runInitializers(this, _instanceExtraInitializers), libP2PNode);
21
+ this.peerDiscoveryService = peerDiscoveryService;
22
+ this.config = config;
23
+ this.logger = logger;
24
+ this.peerScoring = peerScoring;
25
+ this.reqresp = reqresp;
26
+ this.cachedPeers = new Map();
27
+ this.heartbeatCounter = 0;
28
+ this.displayPeerCountsPeerHeartbeat = 0;
29
+ this.timedOutPeers = new Map();
30
+ this.metrics = new PeerManagerMetrics(telemetryClient, 'PeerManager');
31
+ // Handle new established connections
32
+ this.libP2PNode.addEventListener(PeerEvent.CONNECTED, this.handleConnectedPeerEvent.bind(this));
33
+ // Handle lost connections
34
+ this.libP2PNode.addEventListener(PeerEvent.DISCONNECTED, this.handleDisconnectedPeerEvent.bind(this));
35
+ // Handle Discovered peers
36
+ this.discoveredPeerHandler = (enr) => this.handleDiscoveredPeer(enr).catch(e => this.logger.error('Error handling discovered peer', e));
37
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
38
+ this.peerDiscoveryService.on(PeerEvent.DISCOVERED, this.discoveredPeerHandler);
39
+ // Display peer counts every 60 seconds
40
+ this.displayPeerCountsPeerHeartbeat = Math.floor(60000 / this.config.peerCheckIntervalMS);
41
+ }
42
+ get tracer() {
43
+ return this.metrics.tracer;
44
+ }
45
+ heartbeat() {
46
+ this.heartbeatCounter++;
47
+ this.peerScoring.decayAllScores();
48
+ this.cleanupExpiredTimeouts();
49
+ this.discover();
50
+ }
51
+ /**
52
+ * Cleans up expired timeouts.
53
+ *
54
+ * When peers fail to dial after a number of retries, they are temporarily timed out.
55
+ * This function removes any peers that have been in the timed out state for too long.
56
+ * To give them a chance to reconnect.
57
+ */
58
+ cleanupExpiredTimeouts() {
59
+ // Clean up expired timeouts
60
+ const now = Date.now();
61
+ for (const [peerId, timedOutPeer] of this.timedOutPeers.entries()) {
62
+ if (now >= timedOutPeer.timeoutUntilMs) {
63
+ this.timedOutPeers.delete(peerId);
64
+ }
65
+ }
66
+ }
67
+ /**
68
+ * Simply logs the type of connected peer.
69
+ * @param e - The connected peer event.
70
+ */
71
+ handleConnectedPeerEvent(e) {
72
+ const peerId = e.detail;
73
+ if (this.peerDiscoveryService.isBootstrapPeer(peerId)) {
74
+ this.logger.verbose(`Connected to bootstrap peer ${peerId.toString()}`);
75
+ }
76
+ else {
77
+ this.logger.verbose(`Connected to transaction peer ${peerId.toString()}`);
78
+ }
79
+ }
80
+ /**
81
+ * Simply logs the type of disconnected peer.
82
+ * @param e - The disconnected peer event.
83
+ */
84
+ handleDisconnectedPeerEvent(e) {
85
+ const peerId = e.detail;
86
+ if (this.peerDiscoveryService.isBootstrapPeer(peerId)) {
87
+ this.logger.verbose(`Disconnected from bootstrap peer ${peerId.toString()}`);
88
+ }
89
+ else {
90
+ this.logger.verbose(`Disconnected from transaction peer ${peerId.toString()}`);
91
+ }
92
+ }
93
+ /**
94
+ * Handles a goodbye received from a peer.
95
+ *
96
+ * Used as the reqresp handler when a peer sends us goodbye message.
97
+ * @param peerId - The peer ID.
98
+ * @param reason - The reason for the goodbye.
99
+ */
100
+ goodbyeReceived(peerId, reason) {
101
+ this.logger.debug(`Goodbye received from peer ${peerId.toString()} with reason ${prettyGoodbyeReason(reason)}`);
102
+ this.metrics.recordGoodbyeReceived(reason);
103
+ void this.disconnectPeer(peerId);
104
+ }
105
+ penalizePeer(peerId, penalty) {
106
+ this.peerScoring.penalizePeer(peerId, penalty);
107
+ }
108
+ getPeerScore(peerId) {
109
+ return this.peerScoring.getScore(peerId);
110
+ }
111
+ getPeers(includePending = false) {
112
+ const connected = this.libP2PNode
113
+ .getPeers()
114
+ .map(peer => ({ id: peer.toString(), score: this.getPeerScore(peer.toString()), status: 'connected' }));
115
+ if (!includePending) {
116
+ return connected;
117
+ }
118
+ const dialQueue = this.libP2PNode
119
+ .getDialQueue()
120
+ .filter(peer => !!peer.peerId)
121
+ .map(peer => ({
122
+ id: peer.peerId.toString(),
123
+ status: 'dialing',
124
+ dialStatus: peer.status,
125
+ addresses: peer.multiaddrs.map(m => m.toString()),
126
+ }));
127
+ const cachedPeers = Array.from(this.cachedPeers.values())
128
+ .filter(peer => !dialQueue.some(dialPeer => dialPeer.id && peer.peerId.toString() === dialPeer.id.toString()))
129
+ .filter(peer => !connected.some(connPeer => connPeer.id.toString() === peer.peerId.toString()))
130
+ .map(peer => ({
131
+ status: 'cached',
132
+ id: peer.peerId.toString(),
133
+ addresses: [peer.multiaddrTcp.toString()],
134
+ dialAttempts: peer.dialAttempts,
135
+ enr: peer.enr.encodeTxt(),
136
+ }));
137
+ return [...connected, ...dialQueue, ...cachedPeers];
138
+ }
139
+ /**
140
+ * Discovers peers.
141
+ */
142
+ discover() {
143
+ const connections = this.libP2PNode.getConnections();
144
+ const healthyConnections = this.pruneUnhealthyPeers(connections);
145
+ // Calculate how many connections we're looking to make
146
+ const peersToConnect = this.config.maxPeerCount - healthyConnections.length;
147
+ const logLevel = this.heartbeatCounter % this.displayPeerCountsPeerHeartbeat === 0 ? 'info' : 'debug';
148
+ this.logger[logLevel](`Connected to ${connections.length} peers`, {
149
+ connections: connections.length,
150
+ maxPeerCount: this.config.maxPeerCount,
151
+ cachedPeers: this.cachedPeers.size,
152
+ ...this.peerScoring.getStats(),
153
+ });
154
+ // Exit if no peers to connect
155
+ if (peersToConnect <= 0) {
156
+ return;
157
+ }
158
+ const cachedPeersToDial = [];
159
+ const pendingDials = new Set(this.libP2PNode
160
+ .getDialQueue()
161
+ .map(pendingDial => pendingDial.peerId?.toString())
162
+ .filter(Boolean));
163
+ for (const [id, peerData] of this.cachedPeers.entries()) {
164
+ // if already dialling or connected to, remove from cache
165
+ if (pendingDials.has(id) ||
166
+ healthyConnections.some(conn => conn.remotePeer.equals(peerData.peerId)) ||
167
+ // if peer has been in cache for the max cache age, remove from cache
168
+ Date.now() - peerData.addedUnixMs > MAX_CACHED_PEER_AGE_MS) {
169
+ this.cachedPeers.delete(id);
170
+ }
171
+ else {
172
+ // cachedPeersToDial.set(id, enr);
173
+ cachedPeersToDial.push(peerData);
174
+ }
175
+ }
176
+ // reverse to dial older entries first
177
+ cachedPeersToDial.reverse();
178
+ for (const peer of cachedPeersToDial) {
179
+ // We remove from the cache before, as dialling will add it back if it fails
180
+ this.cachedPeers.delete(peer.peerId.toString());
181
+ void this.dialPeer(peer);
182
+ }
183
+ // if we need more peers, start randomNodesQuery
184
+ if (peersToConnect > 0) {
185
+ this.logger.trace(`Running random nodes query to connect to ${peersToConnect} peers`);
186
+ void this.peerDiscoveryService.runRandomNodesQuery();
187
+ }
188
+ }
189
+ pruneUnhealthyPeers(connections) {
190
+ const connectedHealthyPeers = [];
191
+ for (const peer of connections) {
192
+ const score = this.peerScoring.getScoreState(peer.remotePeer.toString());
193
+ switch (score) {
194
+ case PeerScoreState.Banned:
195
+ void this.goodbyeAndDisconnectPeer(peer.remotePeer, GoodByeReason.BANNED);
196
+ break;
197
+ case PeerScoreState.Disconnect:
198
+ void this.goodbyeAndDisconnectPeer(peer.remotePeer, GoodByeReason.DISCONNECTED);
199
+ break;
200
+ case PeerScoreState.Healthy:
201
+ connectedHealthyPeers.push(peer);
202
+ }
203
+ }
204
+ return connectedHealthyPeers;
205
+ }
206
+ async goodbyeAndDisconnectPeer(peer, reason) {
207
+ this.logger.debug(`Disconnecting peer ${peer.toString()} with reason ${prettyGoodbyeReason(reason)}`);
208
+ this.metrics.recordGoodbyeSent(reason);
209
+ try {
210
+ await this.reqresp.sendRequestToPeer(peer, ReqRespSubProtocol.GOODBYE, Buffer.from([reason]));
211
+ }
212
+ catch (error) {
213
+ this.logger.debug(`Failed to send goodbye to peer ${peer.toString()}: ${error}`);
214
+ }
215
+ finally {
216
+ await this.disconnectPeer(peer);
217
+ }
218
+ }
219
+ async disconnectPeer(peer) {
220
+ try {
221
+ await this.libP2PNode.hangUp(peer);
222
+ }
223
+ catch (error) {
224
+ this.logger.debug(`Failed to disconnect peer ${peer.toString()}`, { error: inspect(error) });
225
+ }
226
+ }
227
+ /**
228
+ * Handles a discovered peer.
229
+ * @param enr - The discovered peer's ENR.
230
+ */
231
+ async handleDiscoveredPeer(enr) {
232
+ // Check that the peer has not already been banned
233
+ const peerId = await enr.peerId();
234
+ const peerIdString = peerId.toString();
235
+ // Check if peer is temporarily timed out
236
+ const timedOutPeer = this.timedOutPeers.get(peerIdString);
237
+ if (timedOutPeer) {
238
+ if (Date.now() < timedOutPeer.timeoutUntilMs) {
239
+ this.logger.trace(`Skipping timed out peer ${peerId}`);
240
+ return;
241
+ }
242
+ // Timeout period expired, remove from timed out peers
243
+ this.timedOutPeers.delete(peerIdString);
244
+ }
245
+ if (this.peerScoring.getScoreState(peerIdString) != PeerScoreState.Healthy) {
246
+ return;
247
+ }
248
+ const [multiaddrTcp] = await Promise.all([enr.getFullMultiaddr('tcp')]);
249
+ this.logger.trace(`Handling discovered peer ${peerId} at ${multiaddrTcp?.toString() ?? 'undefined address'}`);
250
+ // stop if no tcp addr in multiaddr
251
+ if (!multiaddrTcp) {
252
+ this.logger.debug(`No TCP address in discovered node's multiaddr ${enr.encodeTxt()}`);
253
+ return;
254
+ }
255
+ // check if peer is already connected
256
+ const connections = this.libP2PNode.getConnections();
257
+ if (connections.some((conn) => conn.remotePeer.equals(peerId))) {
258
+ this.logger.trace(`Already connected to peer ${peerId}`);
259
+ return;
260
+ }
261
+ // check if peer is already in cache
262
+ if (this.cachedPeers.has(peerIdString)) {
263
+ this.logger.trace(`Peer already in cache ${peerIdString}`);
264
+ return;
265
+ }
266
+ // create cached peer object
267
+ const cachedPeer = {
268
+ peerId,
269
+ enr,
270
+ multiaddrTcp,
271
+ dialAttempts: 0,
272
+ addedUnixMs: Date.now(),
273
+ };
274
+ // Determine if we should dial immediately or not
275
+ if (this.shouldDialPeer()) {
276
+ void this.dialPeer(cachedPeer);
277
+ }
278
+ else {
279
+ this.logger.trace(`Caching peer ${peerIdString}`);
280
+ this.cachedPeers.set(peerIdString, cachedPeer);
281
+ // Prune set of cached peers
282
+ this.pruneCachedPeers();
283
+ }
284
+ }
285
+ async dialPeer(peer) {
286
+ const id = peer.peerId.toString();
287
+ // Add to the address book before dialing
288
+ await this.libP2PNode.peerStore.merge(peer.peerId, { multiaddrs: [peer.multiaddrTcp] });
289
+ this.logger.trace(`Dialing peer ${id}`);
290
+ try {
291
+ await this.libP2PNode.dial(peer.multiaddrTcp);
292
+ }
293
+ catch (error) {
294
+ peer.dialAttempts++;
295
+ if (peer.dialAttempts < MAX_DIAL_ATTEMPTS) {
296
+ this.logger.trace(`Failed to dial peer ${id} (attempt ${peer.dialAttempts})`, { error: inspect(error) });
297
+ this.cachedPeers.set(id, peer);
298
+ }
299
+ else {
300
+ formatLibp2pDialError(error);
301
+ this.logger.debug(`Failed to dial peer ${id} (dropping)`, { error: inspect(error) });
302
+ this.cachedPeers.delete(id);
303
+ // Add to timed out peers
304
+ this.timedOutPeers.set(id, {
305
+ peerId: id,
306
+ timeoutUntilMs: Date.now() + FAILED_PEER_BAN_TIME_MS,
307
+ });
308
+ }
309
+ }
310
+ }
311
+ shouldDialPeer() {
312
+ const connections = this.libP2PNode.getConnections().length;
313
+ if (connections >= this.config.maxPeerCount) {
314
+ this.logger.trace(`Not dialing peer due to max peer count of ${this.config.maxPeerCount} reached (${connections} current connections)`);
315
+ return false;
316
+ }
317
+ return true;
318
+ }
319
+ pruneCachedPeers() {
320
+ let peersToDelete = this.cachedPeers.size - MAX_CACHED_PEERS;
321
+ if (peersToDelete <= 0) {
322
+ return;
323
+ }
324
+ // Remove the oldest peers
325
+ for (const key of this.cachedPeers.keys()) {
326
+ this.cachedPeers.delete(key);
327
+ this.logger.trace(`Pruning peer ${key} from cache`);
328
+ peersToDelete--;
329
+ if (peersToDelete <= 0) {
330
+ break;
331
+ }
332
+ }
333
+ }
334
+ /**
335
+ * Stops the peer manager.
336
+ * Removing all event listeners.
337
+ */
338
+ async stop() {
339
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
340
+ this.peerDiscoveryService.off(PeerEvent.DISCOVERED, this.discoveredPeerHandler);
341
+ // Send goodbyes to all peers
342
+ await Promise.all(this.libP2PNode.getPeers().map(peer => this.goodbyeAndDisconnectPeer(peer, GoodByeReason.SHUTDOWN)));
343
+ this.libP2PNode.removeEventListener(PeerEvent.CONNECTED, this.handleConnectedPeerEvent);
344
+ this.libP2PNode.removeEventListener(PeerEvent.DISCONNECTED, this.handleDisconnectedPeerEvent);
345
+ }
346
+ },
347
+ (() => {
348
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
349
+ _heartbeat_decorators = [trackSpan('PeerManager.heartbeat')];
350
+ __esDecorate(_a, null, _heartbeat_decorators, { kind: "method", name: "heartbeat", static: false, private: false, access: { has: obj => "heartbeat" in obj, get: obj => obj.heartbeat }, metadata: _metadata }, null, _instanceExtraInitializers);
351
+ if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
352
+ })(),
353
+ _a;
354
+ })();
355
+ export { PeerManager };
356
+ /**
357
+ * copied from github.com/ChainSafe/lodestar
358
+ * libp2p errors with extremely noisy errors here, which are deeply nested taking 30-50 lines.
359
+ * Some known errors:
360
+ * ```
361
+ * Error: The operation was aborted
362
+ * Error: stream ended before 1 bytes became available
363
+ * Error: Error occurred during XX handshake: Error occurred while verifying signed payload: Peer ID doesn't match libp2p public key
364
+ * ```
365
+ *
366
+ * Also the error's message is not properly formatted, where the error message is indented and includes the full stack
367
+ * ```
368
+ * {
369
+ * emessage: '\n' +
370
+ * ' Error: stream ended before 1 bytes became available\n' +
371
+ * ' at /home/lion/Code/eth2.0/lodestar/node_modules/it-reader/index.js:37:9\n' +
372
+ * ' at runMicrotasks (<anonymous>)\n' +
373
+ * ' at decoder (/home/lion/Code/eth2.0/lodestar/node_modules/it-length-prefixed/src/decode.js:113:22)\n' +
374
+ * ' at first (/home/lion/Code/eth2.0/lodestar/node_modules/it-first/index.js:11:20)\n' +
375
+ * ' at Object.exports.read (/home/lion/Code/eth2.0/lodestar/node_modules/multistream-select/src/multistream.js:31:15)\n' +
376
+ * ' at module.exports (/home/lion/Code/eth2.0/lodestar/node_modules/multistream-select/src/select.js:21:19)\n' +
377
+ * ' at Upgrader._encryptOutbound (/home/lion/Code/eth2.0/lodestar/node_modules/libp2p/src/upgrader.js:397:36)\n' +
378
+ * ' at Upgrader.upgradeOutbound (/home/lion/Code/eth2.0/lodestar/node_modules/libp2p/src/upgrader.js:176:11)\n' +
379
+ * ' at ClassIsWrapper.dial (/home/lion/Code/eth2.0/lodestar/node_modules/libp2p-tcp/src/index.js:49:18)'
380
+ * }
381
+ * ```
382
+ *
383
+ * Tracking issue https://github.com/libp2p/js-libp2p/issues/996
384
+ */
385
+ function formatLibp2pDialError(e) {
386
+ const errorMessage = e.message.trim();
387
+ const newlineIndex = errorMessage.indexOf('\n');
388
+ e.message = newlineIndex !== -1 ? errorMessage.slice(0, newlineIndex) : errorMessage;
389
+ if (e.message.includes('The operation was aborted') ||
390
+ e.message.includes('stream ended before 1 bytes became available') ||
391
+ e.message.includes('The operation was aborted')) {
392
+ e.stack = undefined;
393
+ }
394
+ }
395
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"peer_manager.js","sourceRoot":"","sources":["../../../src/services/peer-manager/peer_manager.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { PeerErrorSeverity } from '@aztec/circuit-types';
2
+ import { type PeerId } from '@libp2p/interface';
2
3
  import { type P2PConfig } from '../../config.js';
3
4
  export declare enum PeerScoreState {
4
5
  Banned = 0,
@@ -6,6 +7,7 @@ export declare enum PeerScoreState {
6
7
  Healthy = 2
7
8
  }
8
9
  export declare class PeerScoring {
10
+ private logger;
9
11
  private scores;
10
12
  private lastUpdateTime;
11
13
  private decayInterval;
@@ -14,6 +16,7 @@ export declare class PeerScoring {
14
16
  [key in PeerErrorSeverity]: number;
15
17
  };
16
18
  constructor(config: P2PConfig);
19
+ penalizePeer(peerId: PeerId, penalty: PeerErrorSeverity): number;
17
20
  updateScore(peerId: string, scoreDelta: number): number;
18
21
  decayAllScores(): void;
19
22
  getScore(peerId: string): number;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"peer_scoring.d.ts","sourceRoot":"","sources":["../../../src/services/peer-manager/peer_scoring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,KAAK,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"}
@@ -0,0 +1,84 @@
1
+ import { PeerErrorSeverity } from '@aztec/circuit-types';
2
+ import { median } from '@aztec/foundation/collection';
3
+ import { createLogger } from '@aztec/foundation/log';
4
+ const DefaultPeerPenalties = {
5
+ [PeerErrorSeverity.LowToleranceError]: 50,
6
+ [PeerErrorSeverity.MidToleranceError]: 10,
7
+ [PeerErrorSeverity.HighToleranceError]: 2,
8
+ };
9
+ export var PeerScoreState;
10
+ (function (PeerScoreState) {
11
+ PeerScoreState[PeerScoreState["Banned"] = 0] = "Banned";
12
+ PeerScoreState[PeerScoreState["Disconnect"] = 1] = "Disconnect";
13
+ PeerScoreState[PeerScoreState["Healthy"] = 2] = "Healthy";
14
+ })(PeerScoreState || (PeerScoreState = {}));
15
+ // TODO: move into config / constants
16
+ const MIN_SCORE_BEFORE_BAN = -100;
17
+ const MIN_SCORE_BEFORE_DISCONNECT = -50;
18
+ export class PeerScoring {
19
+ constructor(config) {
20
+ this.logger = createLogger('p2p:peer-scoring');
21
+ this.scores = new Map();
22
+ this.lastUpdateTime = new Map();
23
+ this.decayInterval = 1000 * 60; // 1 minute
24
+ this.decayFactor = 0.9;
25
+ const orderedValues = config.peerPenaltyValues?.sort((a, b) => a - b);
26
+ this.peerPenalties = {
27
+ [PeerErrorSeverity.HighToleranceError]: orderedValues?.[0] ?? DefaultPeerPenalties[PeerErrorSeverity.HighToleranceError],
28
+ [PeerErrorSeverity.MidToleranceError]: orderedValues?.[1] ?? DefaultPeerPenalties[PeerErrorSeverity.MidToleranceError],
29
+ [PeerErrorSeverity.LowToleranceError]: orderedValues?.[2] ?? DefaultPeerPenalties[PeerErrorSeverity.LowToleranceError],
30
+ };
31
+ }
32
+ penalizePeer(peerId, penalty) {
33
+ const id = peerId.toString();
34
+ const penaltyValue = this.peerPenalties[penalty];
35
+ const newScore = this.updateScore(id, -penaltyValue);
36
+ this.logger.verbose(`Penalizing peer ${id} with ${penalty} (new score is ${newScore})`);
37
+ return newScore;
38
+ }
39
+ updateScore(peerId, scoreDelta) {
40
+ const currentTime = Date.now();
41
+ const lastUpdate = this.lastUpdateTime.get(peerId) || currentTime;
42
+ const timePassed = currentTime - lastUpdate;
43
+ const decayPeriods = Math.floor(timePassed / this.decayInterval);
44
+ let currentScore = this.scores.get(peerId) || 0;
45
+ // Apply decay
46
+ currentScore *= Math.pow(this.decayFactor, decayPeriods);
47
+ // Apply new score delta
48
+ currentScore += scoreDelta;
49
+ this.scores.set(peerId, currentScore);
50
+ this.lastUpdateTime.set(peerId, currentTime);
51
+ return currentScore;
52
+ }
53
+ decayAllScores() {
54
+ const currentTime = Date.now();
55
+ for (const [peerId, lastUpdate] of this.lastUpdateTime.entries()) {
56
+ const timePassed = currentTime - lastUpdate;
57
+ const decayPeriods = Math.floor(timePassed / this.decayInterval);
58
+ if (decayPeriods > 0) {
59
+ let score = this.scores.get(peerId) || 0;
60
+ score *= Math.pow(this.decayFactor, decayPeriods);
61
+ this.scores.set(peerId, score);
62
+ this.lastUpdateTime.set(peerId, currentTime);
63
+ }
64
+ }
65
+ }
66
+ getScore(peerId) {
67
+ return this.scores.get(peerId) || 0;
68
+ }
69
+ getScoreState(peerId) {
70
+ // TODO(#11329): permanently store banned peers?
71
+ const score = this.getScore(peerId);
72
+ if (score < MIN_SCORE_BEFORE_BAN) {
73
+ return PeerScoreState.Banned;
74
+ }
75
+ if (score < MIN_SCORE_BEFORE_DISCONNECT) {
76
+ return PeerScoreState.Disconnect;
77
+ }
78
+ return PeerScoreState.Healthy;
79
+ }
80
+ getStats() {
81
+ return { medianScore: median(Array.from(this.scores.values())) ?? 0 };
82
+ }
83
+ }
84
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVlcl9zY29yaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3BlZXItbWFuYWdlci9wZWVyX3Njb3JpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU1yRCxNQUFNLG9CQUFvQixHQUFHO0lBQzNCLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUMsRUFBRSxFQUFFO0lBQ3pDLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUMsRUFBRSxFQUFFO0lBQ3pDLENBQUMsaUJBQWlCLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDO0NBQzFDLENBQUM7QUFFRixNQUFNLENBQU4sSUFBWSxjQUlYO0FBSkQsV0FBWSxjQUFjO0lBQ3hCLHVEQUFNLENBQUE7SUFDTiwrREFBVSxDQUFBO0lBQ1YseURBQU8sQ0FBQTtBQUNULENBQUMsRUFKVyxjQUFjLEtBQWQsY0FBYyxRQUl6QjtBQUVELHFDQUFxQztBQUNyQyxNQUFNLG9CQUFvQixHQUFHLENBQUMsR0FBRyxDQUFDO0FBQ2xDLE1BQU0sMkJBQTJCLEdBQUcsQ0FBQyxFQUFFLENBQUM7QUFFeEMsTUFBTSxPQUFPLFdBQVc7SUFRdEIsWUFBWSxNQUFpQjtRQVByQixXQUFNLEdBQUcsWUFBWSxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDMUMsV0FBTSxHQUF3QixJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQ3hDLG1CQUFjLEdBQXdCLElBQUksR0FBRyxFQUFFLENBQUM7UUFDaEQsa0JBQWEsR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUMsV0FBVztRQUN0QyxnQkFBVyxHQUFHLEdBQUcsQ0FBQztRQUl4QixNQUFNLGFBQWEs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