@aztec/p2p 0.76.4 → 0.77.0-testnet-ignition.21

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 (241) 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 +55 -41
  4. package/dest/client/factory.d.ts +8 -6
  5. package/dest/client/factory.d.ts.map +1 -1
  6. package/dest/client/factory.js +8 -10
  7. package/dest/client/index.js +0 -1
  8. package/dest/client/p2p_client.d.ts +7 -4
  9. package/dest/client/p2p_client.d.ts.map +1 -1
  10. package/dest/client/p2p_client.js +492 -514
  11. package/dest/config.d.ts +8 -10
  12. package/dest/config.d.ts.map +1 -1
  13. package/dest/config.js +54 -47
  14. package/dest/enr/generate-enr.d.ts +9 -0
  15. package/dest/enr/generate-enr.d.ts.map +1 -0
  16. package/dest/enr/generate-enr.js +30 -0
  17. package/dest/enr/index.d.ts +2 -0
  18. package/dest/enr/index.d.ts.map +1 -0
  19. package/dest/enr/index.js +1 -0
  20. package/dest/errors/reqresp.error.js +6 -10
  21. package/dest/index.js +0 -1
  22. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +1 -1
  23. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  24. package/dest/mem_pools/attestation_pool/attestation_pool.js +6 -2
  25. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
  26. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  27. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +65 -33
  28. package/dest/mem_pools/attestation_pool/index.js +0 -1
  29. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +3 -3
  30. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +1 -1
  31. package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +23 -20
  32. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +2 -2
  33. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +1 -1
  34. package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +22 -26
  35. package/dest/mem_pools/attestation_pool/mocks.d.ts +3 -2
  36. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  37. package/dest/mem_pools/attestation_pool/mocks.js +12 -7
  38. package/dest/mem_pools/index.d.ts +2 -2
  39. package/dest/mem_pools/index.d.ts.map +1 -1
  40. package/dest/mem_pools/index.js +1 -2
  41. package/dest/mem_pools/instrumentation.d.ts +1 -1
  42. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  43. package/dest/mem_pools/instrumentation.js +35 -39
  44. package/dest/mem_pools/interface.d.ts +3 -3
  45. package/dest/mem_pools/interface.d.ts.map +1 -1
  46. package/dest/mem_pools/interface.js +3 -2
  47. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +2 -2
  48. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +1 -1
  49. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +129 -136
  50. package/dest/mem_pools/tx_pool/index.js +0 -1
  51. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts +2 -2
  52. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +1 -1
  53. package/dest/mem_pools/tx_pool/memory_tx_pool.js +46 -44
  54. package/dest/mem_pools/tx_pool/priority.d.ts +1 -1
  55. package/dest/mem_pools/tx_pool/priority.d.ts.map +1 -1
  56. package/dest/mem_pools/tx_pool/priority.js +1 -3
  57. package/dest/mem_pools/tx_pool/tx_pool.d.ts +1 -1
  58. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +1 -1
  59. package/dest/mem_pools/tx_pool/tx_pool.js +3 -2
  60. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +1 -1
  61. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +1 -1
  62. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +109 -39
  63. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +2 -2
  64. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  65. package/dest/msg_validators/attestation_validator/attestation_validator.js +4 -4
  66. package/dest/msg_validators/attestation_validator/index.js +0 -1
  67. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts +2 -2
  68. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts.map +1 -1
  69. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js +3 -3
  70. package/dest/msg_validators/block_proposal_validator/index.js +0 -1
  71. package/dest/msg_validators/index.js +0 -1
  72. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +1 -1
  73. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  74. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +9 -11
  75. package/dest/msg_validators/tx_validator/block_header_validator.d.ts +2 -2
  76. package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -1
  77. package/dest/msg_validators/tx_validator/block_header_validator.js +18 -13
  78. package/dest/msg_validators/tx_validator/data_validator.d.ts +1 -1
  79. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  80. package/dest/msg_validators/tx_validator/data_validator.js +102 -33
  81. package/dest/msg_validators/tx_validator/double_spend_validator.d.ts +1 -1
  82. package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map +1 -1
  83. package/dest/msg_validators/tx_validator/double_spend_validator.js +34 -20
  84. package/dest/msg_validators/tx_validator/index.js +0 -1
  85. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +2 -2
  86. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  87. package/dest/msg_validators/tx_validator/metadata_validator.js +30 -27
  88. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +2 -1
  89. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -1
  90. package/dest/msg_validators/tx_validator/tx_proof_validator.js +17 -12
  91. package/dest/services/data_store.js +57 -57
  92. package/dest/services/discv5/discV5_service.d.ts +2 -0
  93. package/dest/services/discv5/discV5_service.d.ts.map +1 -1
  94. package/dest/services/discv5/discV5_service.js +64 -36
  95. package/dest/services/dummy_service.d.ts +4 -2
  96. package/dest/services/dummy_service.d.ts.map +1 -1
  97. package/dest/services/dummy_service.js +41 -59
  98. package/dest/services/encoding.d.ts +3 -3
  99. package/dest/services/encoding.d.ts.map +1 -1
  100. package/dest/services/encoding.js +10 -9
  101. package/dest/services/gossipsub/scoring.d.ts +7 -0
  102. package/dest/services/gossipsub/scoring.d.ts.map +1 -0
  103. package/dest/services/gossipsub/scoring.js +10 -0
  104. package/dest/services/index.js +0 -1
  105. package/dest/services/libp2p/libp2p_service.d.ts +10 -33
  106. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  107. package/dest/services/libp2p/libp2p_service.js +682 -673
  108. package/dest/services/peer-manager/metrics.js +14 -7
  109. package/dest/services/peer-manager/peer_manager.d.ts +24 -6
  110. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  111. package/dest/services/peer-manager/peer_manager.js +390 -340
  112. package/dest/services/peer-manager/peer_scoring.d.ts +3 -3
  113. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  114. package/dest/services/peer-manager/peer_scoring.js +21 -19
  115. package/dest/services/reqresp/config.js +4 -5
  116. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +2 -2
  117. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +1 -1
  118. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +35 -28
  119. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts +1 -1
  120. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map +1 -1
  121. package/dest/services/reqresp/connection-sampler/connection_sampler.js +67 -61
  122. package/dest/services/reqresp/index.js +1 -3
  123. package/dest/services/reqresp/interface.d.ts +2 -2
  124. package/dest/services/reqresp/interface.d.ts.map +1 -1
  125. package/dest/services/reqresp/interface.js +27 -31
  126. package/dest/services/reqresp/metrics.d.ts +1 -1
  127. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  128. package/dest/services/reqresp/metrics.js +23 -10
  129. package/dest/services/reqresp/protocols/block.d.ts +2 -2
  130. package/dest/services/reqresp/protocols/block.d.ts.map +1 -1
  131. package/dest/services/reqresp/protocols/block.js +1 -2
  132. package/dest/services/reqresp/protocols/goodbye.d.ts +5 -5
  133. package/dest/services/reqresp/protocols/goodbye.d.ts.map +1 -1
  134. package/dest/services/reqresp/protocols/goodbye.js +36 -41
  135. package/dest/services/reqresp/protocols/index.js +1 -3
  136. package/dest/services/reqresp/protocols/ping.js +1 -3
  137. package/dest/services/reqresp/protocols/status.js +1 -3
  138. package/dest/services/reqresp/protocols/tx.d.ts +3 -3
  139. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  140. package/dest/services/reqresp/protocols/tx.js +6 -9
  141. package/dest/services/reqresp/rate-limiter/index.js +0 -1
  142. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +9 -9
  143. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -1
  144. package/dest/services/reqresp/rate-limiter/rate_limiter.js +53 -46
  145. package/dest/services/reqresp/rate-limiter/rate_limits.js +16 -17
  146. package/dest/services/reqresp/reqresp.d.ts +4 -4
  147. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  148. package/dest/services/reqresp/reqresp.js +467 -464
  149. package/dest/services/reqresp/status.js +16 -17
  150. package/dest/services/service.d.ts +3 -2
  151. package/dest/services/service.d.ts.map +1 -1
  152. package/dest/services/service.js +3 -4
  153. package/dest/test-helpers/generate-peer-id-private-keys.js +2 -4
  154. package/dest/test-helpers/get-ports.js +3 -3
  155. package/dest/test-helpers/index.js +0 -1
  156. package/dest/test-helpers/make-enrs.d.ts +1 -1
  157. package/dest/test-helpers/make-enrs.d.ts.map +1 -1
  158. package/dest/test-helpers/make-enrs.js +3 -6
  159. package/dest/test-helpers/make-test-p2p-clients.d.ts +7 -6
  160. package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
  161. package/dest/test-helpers/make-test-p2p-clients.js +10 -12
  162. package/dest/test-helpers/reqresp-nodes.d.ts +18 -7
  163. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  164. package/dest/test-helpers/reqresp-nodes.js +64 -40
  165. package/dest/testbench/p2p_client_testbench_worker.js +61 -45
  166. package/dest/testbench/parse_log_file.d.ts +2 -0
  167. package/dest/testbench/parse_log_file.d.ts.map +1 -0
  168. package/dest/testbench/parse_log_file.js +131 -0
  169. package/dest/testbench/testbench.d.ts +2 -0
  170. package/dest/testbench/testbench.d.ts.map +1 -0
  171. package/dest/testbench/testbench.js +141 -0
  172. package/dest/{services/types.d.ts → types/index.d.ts} +1 -1
  173. package/dest/types/index.d.ts.map +1 -0
  174. package/dest/types/index.js +28 -0
  175. package/dest/util.d.ts +5 -5
  176. package/dest/util.d.ts.map +1 -1
  177. package/dest/util.js +23 -34
  178. package/dest/versioning.d.ts +3 -3
  179. package/dest/versioning.d.ts.map +1 -1
  180. package/dest/versioning.js +7 -12
  181. package/package.json +15 -13
  182. package/src/bootstrap/bootstrap.ts +30 -17
  183. package/src/client/factory.ts +9 -12
  184. package/src/client/p2p_client.ts +13 -24
  185. package/src/config.ts +14 -15
  186. package/src/enr/generate-enr.ts +39 -0
  187. package/src/enr/index.ts +1 -0
  188. package/src/mem_pools/attestation_pool/attestation_pool.ts +1 -1
  189. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +4 -3
  190. package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +3 -3
  191. package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +2 -2
  192. package/src/mem_pools/attestation_pool/mocks.ts +5 -5
  193. package/src/mem_pools/index.ts +2 -2
  194. package/src/mem_pools/instrumentation.ts +4 -3
  195. package/src/mem_pools/interface.ts +3 -3
  196. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +4 -4
  197. package/src/mem_pools/tx_pool/memory_tx_pool.ts +3 -3
  198. package/src/mem_pools/tx_pool/priority.ts +1 -1
  199. package/src/mem_pools/tx_pool/tx_pool.ts +1 -1
  200. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +4 -3
  201. package/src/msg_validators/attestation_validator/attestation_validator.ts +2 -2
  202. package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts +2 -2
  203. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +1 -1
  204. package/src/msg_validators/tx_validator/block_header_validator.ts +2 -2
  205. package/src/msg_validators/tx_validator/data_validator.ts +57 -4
  206. package/src/msg_validators/tx_validator/double_spend_validator.ts +17 -12
  207. package/src/msg_validators/tx_validator/metadata_validator.ts +2 -2
  208. package/src/msg_validators/tx_validator/tx_proof_validator.ts +2 -6
  209. package/src/services/discv5/discV5_service.ts +33 -8
  210. package/src/services/dummy_service.ts +4 -2
  211. package/src/services/encoding.ts +3 -3
  212. package/src/services/gossipsub/scoring.ts +13 -0
  213. package/src/services/libp2p/libp2p_service.ts +124 -146
  214. package/src/services/peer-manager/peer_manager.ts +71 -13
  215. package/src/services/peer-manager/peer_scoring.ts +3 -3
  216. package/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +2 -2
  217. package/src/services/reqresp/connection-sampler/connection_sampler.ts +9 -3
  218. package/src/services/reqresp/interface.ts +4 -3
  219. package/src/services/reqresp/metrics.ts +1 -1
  220. package/src/services/reqresp/protocols/block.ts +3 -3
  221. package/src/services/reqresp/protocols/goodbye.ts +7 -7
  222. package/src/services/reqresp/protocols/tx.ts +5 -5
  223. package/src/services/reqresp/rate-limiter/rate_limiter.ts +22 -18
  224. package/src/services/reqresp/reqresp.ts +18 -11
  225. package/src/services/service.ts +3 -2
  226. package/src/test-helpers/make-enrs.ts +1 -1
  227. package/src/test-helpers/make-test-p2p-clients.ts +9 -7
  228. package/src/test-helpers/reqresp-nodes.ts +32 -18
  229. package/src/testbench/p2p_client_testbench_worker.ts +16 -9
  230. package/src/testbench/parse_log_file.ts +175 -0
  231. package/src/testbench/testbench.ts +157 -0
  232. package/src/util.ts +5 -5
  233. package/src/versioning.ts +7 -7
  234. package/dest/services/libp2p/libp2p_logger.d.ts +0 -7
  235. package/dest/services/libp2p/libp2p_logger.d.ts.map +0 -1
  236. package/dest/services/libp2p/libp2p_logger.js +0 -67
  237. package/dest/services/types.d.ts.map +0 -1
  238. package/dest/services/types.js +0 -35
  239. package/src/services/libp2p/libp2p_logger.ts +0 -78
  240. package/src/testbench/scripts/run_testbench.sh +0 -7
  241. /package/src/{services/types.ts → types/index.ts} +0 -0
@@ -1,358 +1,412 @@
1
- import { __esDecorate, __runInitializers } from "tslib";
1
+ function _ts_decorate(decorators, target, key, desc) {
2
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
3
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
4
+ else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
6
+ }
2
7
  import { createLogger } from '@aztec/foundation/log';
3
8
  import { trackSpan } from '@aztec/telemetry-client';
4
9
  import { inspect } from 'util';
10
+ import { PeerEvent } from '../../types/index.js';
5
11
  import { ReqRespSubProtocol } from '../reqresp/interface.js';
6
12
  import { GoodByeReason, prettyGoodbyeReason } from '../reqresp/protocols/goodbye.js';
7
- import { PeerEvent } from '../types.js';
8
13
  import { PeerManagerMetrics } from './metrics.js';
9
14
  import { PeerScoreState } from './peer_scoring.js';
10
15
  const MAX_DIAL_ATTEMPTS = 3;
11
16
  const MAX_CACHED_PEERS = 100;
12
17
  const MAX_CACHED_PEER_AGE_MS = 5 * 60 * 1000; // 5 minutes
13
18
  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;
19
+ export class PeerManager {
20
+ libP2PNode;
21
+ peerDiscoveryService;
22
+ config;
23
+ logger;
24
+ peerScoring;
25
+ reqresp;
26
+ cachedPeers;
27
+ heartbeatCounter;
28
+ displayPeerCountsPeerHeartbeat;
29
+ timedOutPeers;
30
+ metrics;
31
+ discoveredPeerHandler;
32
+ constructor(libP2PNode, peerDiscoveryService, config, telemetryClient, logger = createLogger('p2p:peer-manager'), peerScoring, reqresp){
33
+ this.libP2PNode = libP2PNode;
34
+ this.peerDiscoveryService = peerDiscoveryService;
35
+ this.config = config;
36
+ this.logger = logger;
37
+ this.peerScoring = peerScoring;
38
+ this.reqresp = reqresp;
39
+ this.cachedPeers = new Map();
40
+ this.heartbeatCounter = 0;
41
+ this.displayPeerCountsPeerHeartbeat = 0;
42
+ this.timedOutPeers = new Map();
43
+ this.metrics = new PeerManagerMetrics(telemetryClient, 'PeerManager');
44
+ // Handle new established connections
45
+ this.libP2PNode.addEventListener(PeerEvent.CONNECTED, this.handleConnectedPeerEvent.bind(this));
46
+ // Handle lost connections
47
+ this.libP2PNode.addEventListener(PeerEvent.DISCONNECTED, this.handleDisconnectedPeerEvent.bind(this));
48
+ // Handle Discovered peers
49
+ this.discoveredPeerHandler = (enr)=>this.handleDiscoveredPeer(enr).catch((e)=>this.logger.error('Error handling discovered peer', e));
50
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
51
+ this.peerDiscoveryService.on(PeerEvent.DISCOVERED, this.discoveredPeerHandler);
52
+ // Display peer counts every 60 seconds
53
+ this.displayPeerCountsPeerHeartbeat = Math.floor(60_000 / this.config.peerCheckIntervalMS);
54
+ }
55
+ get tracer() {
56
+ return this.metrics.tracer;
57
+ }
58
+ heartbeat() {
59
+ this.heartbeatCounter++;
60
+ this.peerScoring.decayAllScores();
61
+ this.cleanupExpiredTimeouts();
62
+ this.discover();
63
+ }
64
+ /**
65
+ * Cleans up expired timeouts.
66
+ *
67
+ * When peers fail to dial after a number of retries, they are temporarily timed out.
68
+ * This function removes any peers that have been in the timed out state for too long.
69
+ * To give them a chance to reconnect.
70
+ */ cleanupExpiredTimeouts() {
71
+ // Clean up expired timeouts
72
+ const now = Date.now();
73
+ for (const [peerId, timedOutPeer] of this.timedOutPeers.entries()){
74
+ if (now >= timedOutPeer.timeoutUntilMs) {
75
+ this.timedOutPeers.delete(peerId);
44
76
  }
45
- heartbeat() {
46
- this.heartbeatCounter++;
47
- this.peerScoring.decayAllScores();
48
- this.cleanupExpiredTimeouts();
49
- this.discover();
77
+ }
78
+ }
79
+ /**
80
+ * Simply logs the type of connected peer.
81
+ * @param e - The connected peer event.
82
+ */ handleConnectedPeerEvent(e) {
83
+ const peerId = e.detail;
84
+ if (this.peerDiscoveryService.isBootstrapPeer(peerId)) {
85
+ this.logger.verbose(`Connected to bootstrap peer ${peerId.toString()}`);
86
+ } else {
87
+ this.logger.verbose(`Connected to transaction peer ${peerId.toString()}`);
88
+ }
89
+ }
90
+ /**
91
+ * Simply logs the type of disconnected peer.
92
+ * @param e - The disconnected peer event.
93
+ */ handleDisconnectedPeerEvent(e) {
94
+ const peerId = e.detail;
95
+ if (this.peerDiscoveryService.isBootstrapPeer(peerId)) {
96
+ this.logger.verbose(`Disconnected from bootstrap peer ${peerId.toString()}`);
97
+ } else {
98
+ this.logger.verbose(`Disconnected from transaction peer ${peerId.toString()}`);
99
+ }
100
+ }
101
+ /**
102
+ * Handles a goodbye received from a peer.
103
+ *
104
+ * Used as the reqresp handler when a peer sends us goodbye message.
105
+ * @param peerId - The peer ID.
106
+ * @param reason - The reason for the goodbye.
107
+ */ goodbyeReceived(peerId, reason) {
108
+ this.logger.debug(`Goodbye received from peer ${peerId.toString()} with reason ${prettyGoodbyeReason(reason)}`);
109
+ this.metrics.recordGoodbyeReceived(reason);
110
+ void this.disconnectPeer(peerId);
111
+ }
112
+ penalizePeer(peerId, penalty) {
113
+ this.peerScoring.penalizePeer(peerId, penalty);
114
+ }
115
+ getPeerScore(peerId) {
116
+ return this.peerScoring.getScore(peerId);
117
+ }
118
+ getPeers(includePending = false) {
119
+ const connected = this.libP2PNode.getPeers().map((peer)=>({
120
+ id: peer.toString(),
121
+ score: this.getPeerScore(peer.toString()),
122
+ status: 'connected'
123
+ }));
124
+ if (!includePending) {
125
+ return connected;
126
+ }
127
+ const dialQueue = this.libP2PNode.getDialQueue().filter((peer)=>!!peer.peerId).map((peer)=>({
128
+ id: peer.peerId.toString(),
129
+ status: 'dialing',
130
+ dialStatus: peer.status,
131
+ addresses: peer.multiaddrs.map((m)=>m.toString())
132
+ }));
133
+ const cachedPeers = Array.from(this.cachedPeers.values()).filter((peer)=>!dialQueue.some((dialPeer)=>dialPeer.id && peer.peerId.toString() === dialPeer.id.toString())).filter((peer)=>!connected.some((connPeer)=>connPeer.id.toString() === peer.peerId.toString())).map((peer)=>({
134
+ status: 'cached',
135
+ id: peer.peerId.toString(),
136
+ addresses: [
137
+ peer.multiaddrTcp.toString()
138
+ ],
139
+ dialAttempts: peer.dialAttempts,
140
+ enr: peer.enr.encodeTxt()
141
+ }));
142
+ return [
143
+ ...connected,
144
+ ...dialQueue,
145
+ ...cachedPeers
146
+ ];
147
+ }
148
+ /**
149
+ * Discovers peers.
150
+ */ discover() {
151
+ const connections = this.libP2PNode.getConnections();
152
+ const healthyConnections = this.prioritizePeers(this.pruneUnhealthyPeers(this.pruneDuplicatePeers(connections)));
153
+ // Calculate how many connections we're looking to make
154
+ const peersToConnect = this.config.maxPeerCount - healthyConnections.length;
155
+ const logLevel = this.heartbeatCounter % this.displayPeerCountsPeerHeartbeat === 0 ? 'info' : 'debug';
156
+ this.logger[logLevel](`Connected to ${healthyConnections.length} peers`, {
157
+ connections: healthyConnections.length,
158
+ maxPeerCount: this.config.maxPeerCount,
159
+ cachedPeers: this.cachedPeers.size,
160
+ ...this.peerScoring.getStats()
161
+ });
162
+ // Exit if no peers to connect
163
+ if (peersToConnect <= 0) {
164
+ return;
165
+ }
166
+ const cachedPeersToDial = [];
167
+ const pendingDials = new Set(this.libP2PNode.getDialQueue().map((pendingDial)=>pendingDial.peerId?.toString()).filter(Boolean));
168
+ for (const [id, peerData] of this.cachedPeers.entries()){
169
+ // if already dialling or connected to, remove from cache
170
+ if (pendingDials.has(id) || healthyConnections.some((conn)=>conn.remotePeer.equals(peerData.peerId)) || // if peer has been in cache for the max cache age, remove from cache
171
+ Date.now() - peerData.addedUnixMs > MAX_CACHED_PEER_AGE_MS) {
172
+ this.cachedPeers.delete(id);
173
+ } else {
174
+ // cachedPeersToDial.set(id, enr);
175
+ cachedPeersToDial.push(peerData);
50
176
  }
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
- }
177
+ }
178
+ // reverse to dial older entries first
179
+ cachedPeersToDial.reverse();
180
+ for (const peer of cachedPeersToDial){
181
+ // We remove from the cache before, as dialling will add it back if it fails
182
+ this.cachedPeers.delete(peer.peerId.toString());
183
+ void this.dialPeer(peer);
184
+ }
185
+ // if we need more peers, start randomNodesQuery
186
+ if (peersToConnect > 0) {
187
+ this.logger.trace(`Running random nodes query to connect to ${peersToConnect} peers`);
188
+ void this.peerDiscoveryService.runRandomNodesQuery();
189
+ }
190
+ }
191
+ pruneUnhealthyPeers(connections) {
192
+ const connectedHealthyPeers = [];
193
+ for (const peer of connections){
194
+ const score = this.peerScoring.getScoreState(peer.remotePeer.toString());
195
+ switch(score){
196
+ case PeerScoreState.Banned:
197
+ void this.goodbyeAndDisconnectPeer(peer.remotePeer, GoodByeReason.BANNED);
198
+ break;
199
+ case PeerScoreState.Disconnect:
200
+ void this.goodbyeAndDisconnectPeer(peer.remotePeer, GoodByeReason.LOW_SCORE);
201
+ break;
202
+ case PeerScoreState.Healthy:
203
+ connectedHealthyPeers.push(peer);
66
204
  }
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
- }
205
+ }
206
+ return connectedHealthyPeers;
207
+ }
208
+ /**
209
+ * If the max peer count is reached, the lowest scoring peers will be pruned to satisfy the max peer count.
210
+ *
211
+ * @param connections - The list of connections to prune low scoring peers above the max peer count from.
212
+ * @returns The pruned list of connections.
213
+ */ prioritizePeers(connections) {
214
+ if (connections.length > this.config.maxPeerCount) {
215
+ // Sort the peer scores from lowest to highest
216
+ const prioritizedConnections = connections.sort((connectionA, connectionB)=>{
217
+ const connectionScoreA = this.peerScoring.getScore(connectionA.remotePeer.toString());
218
+ const connectionScoreB = this.peerScoring.getScore(connectionB.remotePeer.toString());
219
+ return connectionScoreB - connectionScoreA;
220
+ });
221
+ // Disconnect from the lowest scoring connections.
222
+ for (const conn of prioritizedConnections.slice(this.config.maxPeerCount)){
223
+ void this.goodbyeAndDisconnectPeer(conn.remotePeer, GoodByeReason.MAX_PEERS);
79
224
  }
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()}`);
225
+ return prioritizedConnections.slice(0, this.config.maxPeerCount);
226
+ } else {
227
+ return connections;
228
+ }
229
+ }
230
+ /**
231
+ * If multiple connections to the same peer are found, the oldest connection is kept and the duplicates are pruned.
232
+ *
233
+ * This is necessary to resolve a race condition where multiple connections to the same peer are established if
234
+ * they are discovered at the same time.
235
+ *
236
+ * @param connections - The list of connections to prune duplicate peers from.
237
+ * @returns The pruned list of connections.
238
+ */ pruneDuplicatePeers(connections) {
239
+ const peerConnections = new Map();
240
+ for (const conn of connections){
241
+ const peerId = conn.remotePeer.toString();
242
+ const existingConnection = peerConnections.get(peerId);
243
+ if (!existingConnection) {
244
+ peerConnections.set(peerId, conn);
245
+ } else {
246
+ // Keep the oldest connection for each peer
247
+ this.logger.debug(`Found duplicate connection to peer ${peerId}, keeping oldest connection`);
248
+ if (conn.timeline.open < existingConnection.timeline.open) {
249
+ peerConnections.set(peerId, conn);
250
+ void existingConnection.close();
251
+ } else {
252
+ void conn.close();
91
253
  }
92
254
  }
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];
255
+ }
256
+ return [
257
+ ...peerConnections.values()
258
+ ];
259
+ }
260
+ async goodbyeAndDisconnectPeer(peer, reason) {
261
+ this.logger.debug(`Disconnecting peer ${peer.toString()} with reason ${prettyGoodbyeReason(reason)}`);
262
+ this.metrics.recordGoodbyeSent(reason);
263
+ try {
264
+ await this.reqresp.sendRequestToPeer(peer, ReqRespSubProtocol.GOODBYE, Buffer.from([
265
+ reason
266
+ ]));
267
+ } catch (error) {
268
+ this.logger.debug(`Failed to send goodbye to peer ${peer.toString()}: ${error}`);
269
+ } finally{
270
+ await this.disconnectPeer(peer);
271
+ }
272
+ }
273
+ async disconnectPeer(peer) {
274
+ try {
275
+ await this.libP2PNode.hangUp(peer);
276
+ } catch (error) {
277
+ this.logger.debug(`Failed to disconnect peer ${peer.toString()}`, {
278
+ error: inspect(error)
279
+ });
280
+ }
281
+ }
282
+ /**
283
+ * Handles a discovered peer.
284
+ * @param enr - The discovered peer's ENR.
285
+ */ async handleDiscoveredPeer(enr) {
286
+ // Check that the peer has not already been banned
287
+ const peerId = await enr.peerId();
288
+ const peerIdString = peerId.toString();
289
+ // Check if peer is temporarily timed out
290
+ const timedOutPeer = this.timedOutPeers.get(peerIdString);
291
+ if (timedOutPeer) {
292
+ if (Date.now() < timedOutPeer.timeoutUntilMs) {
293
+ this.logger.trace(`Skipping timed out peer ${peerId}`);
294
+ return;
138
295
  }
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(),
296
+ // Timeout period expired, remove from timed out peers
297
+ this.timedOutPeers.delete(peerIdString);
298
+ }
299
+ if (this.peerScoring.getScoreState(peerIdString) != PeerScoreState.Healthy) {
300
+ return;
301
+ }
302
+ const [multiaddrTcp] = await Promise.all([
303
+ enr.getFullMultiaddr('tcp')
304
+ ]);
305
+ this.logger.trace(`Handling discovered peer ${peerId} at ${multiaddrTcp?.toString() ?? 'undefined address'}`);
306
+ // stop if no tcp addr in multiaddr
307
+ if (!multiaddrTcp) {
308
+ this.logger.debug(`No TCP address in discovered node's multiaddr ${enr.encodeTxt()}`);
309
+ return;
310
+ }
311
+ // check if peer is already connected
312
+ const connections = this.libP2PNode.getConnections();
313
+ if (connections.some((conn)=>conn.remotePeer.equals(peerId))) {
314
+ this.logger.trace(`Already connected to peer ${peerId}`);
315
+ return;
316
+ }
317
+ // check if peer is already in cache
318
+ if (this.cachedPeers.has(peerIdString)) {
319
+ this.logger.trace(`Peer already in cache ${peerIdString}`);
320
+ return;
321
+ }
322
+ // create cached peer object
323
+ const cachedPeer = {
324
+ peerId,
325
+ enr,
326
+ multiaddrTcp,
327
+ dialAttempts: 0,
328
+ addedUnixMs: Date.now()
329
+ };
330
+ // Determine if we should dial immediately or not
331
+ if (this.shouldDialPeer()) {
332
+ void this.dialPeer(cachedPeer);
333
+ } else {
334
+ this.logger.trace(`Caching peer ${peerIdString}`);
335
+ this.cachedPeers.set(peerIdString, cachedPeer);
336
+ // Prune set of cached peers
337
+ this.pruneCachedPeers();
338
+ }
339
+ }
340
+ async dialPeer(peer) {
341
+ const id = peer.peerId.toString();
342
+ // Add to the address book before dialing
343
+ await this.libP2PNode.peerStore.merge(peer.peerId, {
344
+ multiaddrs: [
345
+ peer.multiaddrTcp
346
+ ]
347
+ });
348
+ this.logger.trace(`Dialing peer ${id}`);
349
+ try {
350
+ await this.libP2PNode.dial(peer.multiaddrTcp);
351
+ } catch (error) {
352
+ peer.dialAttempts++;
353
+ if (peer.dialAttempts < MAX_DIAL_ATTEMPTS) {
354
+ this.logger.trace(`Failed to dial peer ${id} (attempt ${peer.dialAttempts})`, {
355
+ error: inspect(error)
356
+ });
357
+ this.cachedPeers.set(id, peer);
358
+ } else {
359
+ formatLibp2pDialError(error);
360
+ this.logger.debug(`Failed to dial peer ${id} (dropping)`, {
361
+ error: inspect(error)
362
+ });
363
+ this.cachedPeers.delete(id);
364
+ // Add to timed out peers
365
+ this.timedOutPeers.set(id, {
366
+ peerId: id,
367
+ timeoutUntilMs: Date.now() + FAILED_PEER_BAN_TIME_MS
153
368
  });
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
369
  }
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);
370
+ }
371
+ }
372
+ shouldDialPeer() {
373
+ const connections = this.libP2PNode.getConnections().length;
374
+ if (connections >= this.config.maxPeerCount) {
375
+ this.logger.trace(`Not dialing peer due to max peer count of ${this.config.maxPeerCount} reached (${connections} current connections)`);
376
+ return false;
377
+ }
378
+ return true;
379
+ }
380
+ pruneCachedPeers() {
381
+ let peersToDelete = this.cachedPeers.size - MAX_CACHED_PEERS;
382
+ if (peersToDelete <= 0) {
383
+ return;
384
+ }
385
+ // Remove the oldest peers
386
+ for (const key of this.cachedPeers.keys()){
387
+ this.cachedPeers.delete(key);
388
+ this.logger.trace(`Pruning peer ${key} from cache`);
389
+ peersToDelete--;
390
+ if (peersToDelete <= 0) {
391
+ break;
345
392
  }
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 };
393
+ }
394
+ }
395
+ /**
396
+ * Stops the peer manager.
397
+ * Removing all event listeners.
398
+ */ async stop() {
399
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
400
+ this.peerDiscoveryService.off(PeerEvent.DISCOVERED, this.discoveredPeerHandler);
401
+ // Send goodbyes to all peers
402
+ await Promise.all(this.libP2PNode.getPeers().map((peer)=>this.goodbyeAndDisconnectPeer(peer, GoodByeReason.SHUTDOWN)));
403
+ this.libP2PNode.removeEventListener(PeerEvent.CONNECTED, this.handleConnectedPeerEvent);
404
+ this.libP2PNode.removeEventListener(PeerEvent.DISCONNECTED, this.handleDisconnectedPeerEvent);
405
+ }
406
+ }
407
+ _ts_decorate([
408
+ trackSpan('PeerManager.heartbeat')
409
+ ], PeerManager.prototype, "heartbeat", null);
356
410
  /**
357
411
  * copied from github.com/ChainSafe/lodestar
358
412
  * libp2p errors with extremely noisy errors here, which are deeply nested taking 30-50 lines.
@@ -381,15 +435,11 @@ export { PeerManager };
381
435
  * ```
382
436
  *
383
437
  * Tracking issue https://github.com/libp2p/js-libp2p/issues/996
384
- */
385
- function formatLibp2pDialError(e) {
438
+ */ function formatLibp2pDialError(e) {
386
439
  const errorMessage = e.message.trim();
387
440
  const newlineIndex = errorMessage.indexOf('\n');
388
441
  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')) {
442
+ if (e.message.includes('The operation was aborted') || e.message.includes('stream ended before 1 bytes became available') || e.message.includes('The operation was aborted')) {
392
443
  e.stack = undefined;
393
444
  }
394
445
  }
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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"}