@aztec/p2p 0.0.1-commit.2448fdb → 0.0.1-commit.2606882

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 (402) hide show
  1. package/dest/bootstrap/bootstrap.d.ts +1 -1
  2. package/dest/bootstrap/bootstrap.d.ts.map +1 -1
  3. package/dest/bootstrap/bootstrap.js +9 -1
  4. package/dest/client/factory.d.ts +5 -4
  5. package/dest/client/factory.d.ts.map +1 -1
  6. package/dest/client/factory.js +26 -21
  7. package/dest/client/interface.d.ts +14 -5
  8. package/dest/client/interface.d.ts.map +1 -1
  9. package/dest/client/p2p_client.d.ts +13 -9
  10. package/dest/client/p2p_client.d.ts.map +1 -1
  11. package/dest/client/p2p_client.js +78 -20
  12. package/dest/config.d.ts +135 -105
  13. package/dest/config.d.ts.map +1 -1
  14. package/dest/config.js +59 -14
  15. package/dest/errors/p2p-service.error.d.ts +9 -0
  16. package/dest/errors/p2p-service.error.d.ts.map +1 -0
  17. package/dest/errors/p2p-service.error.js +10 -0
  18. package/dest/errors/reqresp.error.d.ts +1 -20
  19. package/dest/errors/reqresp.error.d.ts.map +1 -1
  20. package/dest/errors/reqresp.error.js +0 -21
  21. package/dest/index.d.ts +1 -2
  22. package/dest/index.d.ts.map +1 -1
  23. package/dest/index.js +0 -1
  24. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +99 -59
  25. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  26. package/dest/mem_pools/attestation_pool/attestation_pool.js +267 -197
  27. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
  28. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  29. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +181 -65
  30. package/dest/mem_pools/attestation_pool/mocks.d.ts +1 -1
  31. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  32. package/dest/mem_pools/attestation_pool/mocks.js +6 -4
  33. package/dest/mem_pools/index.d.ts +1 -2
  34. package/dest/mem_pools/index.d.ts.map +1 -1
  35. package/dest/mem_pools/instrumentation.d.ts +4 -2
  36. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  37. package/dest/mem_pools/instrumentation.js +33 -15
  38. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.d.ts +1 -5
  39. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.d.ts.map +1 -1
  40. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.js +1 -7
  41. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +2 -1
  42. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -1
  43. package/dest/mem_pools/tx_pool_v2/eviction/index.js +1 -0
  44. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts +16 -0
  45. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts.map +1 -0
  46. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.js +62 -0
  47. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +2 -2
  48. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +10 -5
  49. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
  50. package/dest/mem_pools/tx_pool_v2/interfaces.js +1 -0
  51. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +9 -7
  52. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
  53. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +13 -6
  54. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +1 -1
  55. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
  56. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +26 -43
  57. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +1 -1
  58. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
  59. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +3 -0
  60. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +2 -1
  61. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
  62. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +93 -85
  63. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +9 -3
  64. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  65. package/dest/msg_validators/attestation_validator/attestation_validator.js +37 -12
  66. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +7 -3
  67. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  68. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +4 -5
  69. package/dest/msg_validators/clock_tolerance.d.ts +12 -1
  70. package/dest/msg_validators/clock_tolerance.d.ts.map +1 -1
  71. package/dest/msg_validators/clock_tolerance.js +56 -3
  72. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +6 -2
  73. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
  74. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +6 -2
  75. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
  76. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +10 -2
  77. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
  78. package/dest/msg_validators/proposal_validator/proposal_validator.js +46 -12
  79. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +1 -1
  80. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  81. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +8 -15
  82. package/dest/msg_validators/tx_validator/allowed_public_setup.js +3 -3
  83. package/dest/msg_validators/tx_validator/archive_cache.js +1 -1
  84. package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts +15 -0
  85. package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts.map +1 -0
  86. package/dest/msg_validators/tx_validator/cached_tx_validator.js +19 -0
  87. package/dest/msg_validators/tx_validator/data_validator.d.ts +2 -1
  88. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  89. package/dest/msg_validators/tx_validator/data_validator.js +1 -0
  90. package/dest/msg_validators/tx_validator/factory.d.ts +6 -5
  91. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  92. package/dest/msg_validators/tx_validator/factory.js +14 -10
  93. package/dest/msg_validators/tx_validator/gas_validator.d.ts +36 -4
  94. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  95. package/dest/msg_validators/tx_validator/gas_validator.js +50 -33
  96. package/dest/msg_validators/tx_validator/index.d.ts +3 -1
  97. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  98. package/dest/msg_validators/tx_validator/index.js +2 -0
  99. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
  100. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  101. package/dest/msg_validators/tx_validator/metadata_validator.js +4 -4
  102. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +2 -1
  103. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -1
  104. package/dest/msg_validators/tx_validator/tx_proof_validator.js +2 -0
  105. package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts +48 -0
  106. package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts.map +1 -0
  107. package/dest/msg_validators/tx_validator/tx_validation_cache.js +68 -0
  108. package/dest/services/data_store.d.ts +1 -1
  109. package/dest/services/data_store.d.ts.map +1 -1
  110. package/dest/services/data_store.js +5 -5
  111. package/dest/services/discv5/discV5_service.d.ts +2 -1
  112. package/dest/services/discv5/discV5_service.d.ts.map +1 -1
  113. package/dest/services/discv5/discV5_service.js +35 -8
  114. package/dest/services/dummy_service.d.ts +11 -15
  115. package/dest/services/dummy_service.d.ts.map +1 -1
  116. package/dest/services/dummy_service.js +12 -16
  117. package/dest/services/gossipsub/topic_score_params.d.ts +13 -2
  118. package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -1
  119. package/dest/services/gossipsub/topic_score_params.js +21 -4
  120. package/dest/services/libp2p/instrumentation.d.ts +3 -1
  121. package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
  122. package/dest/services/libp2p/instrumentation.js +14 -0
  123. package/dest/services/libp2p/libp2p_service.d.ts +36 -46
  124. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  125. package/dest/services/libp2p/libp2p_service.js +289 -265
  126. package/dest/services/peer-manager/metrics.d.ts +3 -1
  127. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  128. package/dest/services/peer-manager/metrics.js +6 -0
  129. package/dest/services/peer-manager/peer_manager.d.ts +6 -2
  130. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  131. package/dest/services/peer-manager/peer_manager.js +40 -11
  132. package/dest/services/peer-manager/peer_scoring.d.ts +7 -2
  133. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  134. package/dest/services/peer-manager/peer_scoring.js +32 -10
  135. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +4 -8
  136. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  137. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +94 -122
  138. package/dest/services/reqresp/batch-tx-requester/interface.d.ts +10 -6
  139. package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map +1 -1
  140. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts +5 -4
  141. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts.map +1 -1
  142. package/dest/services/reqresp/batch-tx-requester/missing_txs.js +13 -7
  143. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts +19 -11
  144. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts.map +1 -1
  145. package/dest/services/reqresp/batch-tx-requester/peer_collection.js +52 -15
  146. package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts +5 -14
  147. package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts.map +1 -1
  148. package/dest/services/reqresp/batch-tx-requester/tx_validator.js +6 -20
  149. package/dest/services/reqresp/config.d.ts +3 -3
  150. package/dest/services/reqresp/config.d.ts.map +1 -1
  151. package/dest/services/reqresp/interface.d.ts +16 -18
  152. package/dest/services/reqresp/interface.d.ts.map +1 -1
  153. package/dest/services/reqresp/interface.js +10 -20
  154. package/dest/services/reqresp/metrics.d.ts +1 -1
  155. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  156. package/dest/services/reqresp/metrics.js +0 -1
  157. package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts +4 -3
  158. package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts.map +1 -1
  159. package/dest/services/reqresp/protocols/block_txs/bitvector.js +3 -2
  160. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +1 -1
  161. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
  162. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js +31 -28
  163. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts +12 -7
  164. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts.map +1 -1
  165. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.js +42 -24
  166. package/dest/services/reqresp/protocols/index.d.ts +1 -2
  167. package/dest/services/reqresp/protocols/index.d.ts.map +1 -1
  168. package/dest/services/reqresp/protocols/index.js +0 -1
  169. package/dest/services/reqresp/protocols/tx.d.ts +1 -1
  170. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  171. package/dest/services/reqresp/protocols/tx.js +1 -3
  172. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts +1 -1
  173. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -1
  174. package/dest/services/reqresp/rate-limiter/rate_limits.js +0 -10
  175. package/dest/services/reqresp/reqresp.d.ts +7 -29
  176. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  177. package/dest/services/reqresp/reqresp.js +27 -207
  178. package/dest/services/service.d.ts +9 -12
  179. package/dest/services/service.d.ts.map +1 -1
  180. package/dest/services/tx_collection/config.d.ts +2 -23
  181. package/dest/services/tx_collection/config.d.ts.map +1 -1
  182. package/dest/services/tx_collection/config.js +2 -55
  183. package/dest/services/tx_collection/file_store_tx_collection.d.ts +12 -28
  184. package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -1
  185. package/dest/services/tx_collection/file_store_tx_collection.js +43 -83
  186. package/dest/services/tx_collection/index.d.ts +2 -3
  187. package/dest/services/tx_collection/index.d.ts.map +1 -1
  188. package/dest/services/tx_collection/index.js +0 -1
  189. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  190. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  191. package/dest/services/tx_collection/instrumentation.js +0 -2
  192. package/dest/services/tx_collection/request_tracker.d.ts +53 -0
  193. package/dest/services/tx_collection/request_tracker.d.ts.map +1 -0
  194. package/dest/services/tx_collection/request_tracker.js +84 -0
  195. package/dest/services/tx_collection/tx_collection.d.ts +36 -55
  196. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  197. package/dest/services/tx_collection/tx_collection.js +275 -119
  198. package/dest/services/tx_collection/tx_collection_sink.d.ts +1 -1
  199. package/dest/services/tx_collection/tx_collection_sink.js +2 -2
  200. package/dest/services/tx_file_store/tx_file_store.d.ts +1 -3
  201. package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
  202. package/dest/services/tx_file_store/tx_file_store.js +4 -14
  203. package/dest/services/tx_provider.d.ts +3 -1
  204. package/dest/services/tx_provider.d.ts.map +1 -1
  205. package/dest/services/tx_provider.js +3 -0
  206. package/dest/test-helpers/make-test-p2p-clients.d.ts +1 -1
  207. package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
  208. package/dest/test-helpers/make-test-p2p-clients.js +5 -2
  209. package/dest/test-helpers/mock-pubsub.d.ts +23 -9
  210. package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
  211. package/dest/test-helpers/mock-pubsub.js +44 -44
  212. package/dest/test-helpers/reqresp-nodes.d.ts +4 -5
  213. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  214. package/dest/test-helpers/reqresp-nodes.js +16 -18
  215. package/dest/test-helpers/test_tx_provider.d.ts +3 -1
  216. package/dest/test-helpers/test_tx_provider.d.ts.map +1 -1
  217. package/dest/test-helpers/test_tx_provider.js +3 -0
  218. package/dest/test-helpers/testbench-utils.d.ts +12 -14
  219. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  220. package/dest/test-helpers/testbench-utils.js +38 -14
  221. package/dest/testbench/p2p_client_testbench_worker.d.ts +3 -5
  222. package/dest/testbench/p2p_client_testbench_worker.d.ts.map +1 -1
  223. package/dest/testbench/p2p_client_testbench_worker.js +83 -38
  224. package/dest/testbench/worker_client_manager.d.ts +10 -6
  225. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  226. package/dest/testbench/worker_client_manager.js +53 -10
  227. package/dest/util.d.ts +12 -7
  228. package/dest/util.d.ts.map +1 -1
  229. package/dest/util.js +35 -14
  230. package/dest/versioning.d.ts +3 -6
  231. package/dest/versioning.d.ts.map +1 -1
  232. package/dest/versioning.js +3 -24
  233. package/package.json +15 -14
  234. package/src/bootstrap/bootstrap.ts +9 -1
  235. package/src/client/factory.ts +45 -24
  236. package/src/client/interface.ts +15 -11
  237. package/src/client/p2p_client.ts +91 -41
  238. package/src/client/test/{tx_proposal_collector/README.md → p2p_client.batch_tx_requester.bench.README.md} +23 -53
  239. package/src/config.ts +117 -17
  240. package/src/errors/p2p-service.error.ts +11 -0
  241. package/src/errors/reqresp.error.ts +0 -25
  242. package/src/index.ts +0 -1
  243. package/src/mem_pools/attestation_pool/attestation_pool.ts +318 -242
  244. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +204 -68
  245. package/src/mem_pools/attestation_pool/mocks.ts +13 -8
  246. package/src/mem_pools/index.ts +0 -3
  247. package/src/mem_pools/instrumentation.ts +22 -14
  248. package/src/mem_pools/tx_pool_v2/archive/tx_archive.ts +1 -9
  249. package/src/mem_pools/tx_pool_v2/eviction/index.ts +1 -0
  250. package/src/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.ts +65 -0
  251. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +3 -3
  252. package/src/mem_pools/tx_pool_v2/interfaces.ts +10 -4
  253. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +24 -12
  254. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +29 -43
  255. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +3 -0
  256. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +94 -91
  257. package/src/msg_validators/attestation_validator/README.md +1 -1
  258. package/src/msg_validators/attestation_validator/attestation_validator.ts +41 -9
  259. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +14 -7
  260. package/src/msg_validators/clock_tolerance.ts +73 -3
  261. package/src/msg_validators/proposal_validator/README.md +4 -4
  262. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +12 -2
  263. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +17 -2
  264. package/src/msg_validators/proposal_validator/proposal_validator.ts +54 -10
  265. package/src/msg_validators/tx_validator/README.md +11 -3
  266. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +3 -12
  267. package/src/msg_validators/tx_validator/allowed_public_setup.ts +3 -3
  268. package/src/msg_validators/tx_validator/archive_cache.ts +1 -1
  269. package/src/msg_validators/tx_validator/cached_tx_validator.ts +31 -0
  270. package/src/msg_validators/tx_validator/data_validator.ts +2 -0
  271. package/src/msg_validators/tx_validator/factory.ts +18 -7
  272. package/src/msg_validators/tx_validator/gas_validator.ts +82 -33
  273. package/src/msg_validators/tx_validator/index.ts +2 -0
  274. package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
  275. package/src/msg_validators/tx_validator/tx_proof_validator.ts +2 -0
  276. package/src/msg_validators/tx_validator/tx_validation_cache.ts +101 -0
  277. package/src/services/data_store.ts +5 -13
  278. package/src/services/discv5/discV5_service.ts +38 -5
  279. package/src/services/dummy_service.ts +14 -39
  280. package/src/services/gossipsub/topic_score_params.ts +36 -4
  281. package/src/services/libp2p/instrumentation.ts +14 -0
  282. package/src/services/libp2p/libp2p_service.ts +315 -302
  283. package/src/services/peer-manager/metrics.ts +7 -0
  284. package/src/services/peer-manager/peer_manager.ts +46 -11
  285. package/src/services/peer-manager/peer_scoring.ts +27 -5
  286. package/src/services/reqresp/README.md +0 -14
  287. package/src/services/reqresp/batch-tx-requester/README.md +46 -7
  288. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +91 -137
  289. package/src/services/reqresp/batch-tx-requester/interface.ts +13 -5
  290. package/src/services/reqresp/batch-tx-requester/missing_txs.ts +13 -6
  291. package/src/services/reqresp/batch-tx-requester/peer_collection.ts +68 -24
  292. package/src/services/reqresp/batch-tx-requester/tx_validator.ts +12 -25
  293. package/src/services/reqresp/config.ts +2 -2
  294. package/src/services/reqresp/interface.ts +21 -47
  295. package/src/services/reqresp/metrics.ts +0 -1
  296. package/src/services/reqresp/protocols/block_txs/bitvector.ts +3 -2
  297. package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +34 -30
  298. package/src/services/reqresp/protocols/block_txs/block_txs_reqresp.ts +47 -20
  299. package/src/services/reqresp/protocols/index.ts +0 -1
  300. package/src/services/reqresp/protocols/tx.ts +1 -3
  301. package/src/services/reqresp/rate-limiter/rate_limits.ts +0 -10
  302. package/src/services/reqresp/reqresp.ts +31 -252
  303. package/src/services/service.ts +12 -28
  304. package/src/services/tx_collection/config.ts +3 -80
  305. package/src/services/tx_collection/file_store_tx_collection.ts +54 -103
  306. package/src/services/tx_collection/index.ts +1 -6
  307. package/src/services/tx_collection/instrumentation.ts +1 -7
  308. package/src/services/tx_collection/request_tracker.ts +127 -0
  309. package/src/services/tx_collection/tx_collection.ts +331 -176
  310. package/src/services/tx_collection/tx_collection_sink.ts +2 -2
  311. package/src/services/tx_file_store/tx_file_store.ts +5 -17
  312. package/src/services/tx_provider.ts +5 -0
  313. package/src/test-helpers/make-test-p2p-clients.ts +4 -1
  314. package/src/test-helpers/mock-pubsub.ts +46 -60
  315. package/src/test-helpers/reqresp-nodes.ts +13 -23
  316. package/src/test-helpers/test_tx_provider.ts +5 -0
  317. package/src/test-helpers/testbench-utils.ts +50 -28
  318. package/src/testbench/p2p_client_testbench_worker.ts +88 -55
  319. package/src/testbench/worker_client_manager.ts +61 -21
  320. package/src/util.ts +33 -18
  321. package/src/versioning.ts +3 -33
  322. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts +0 -2
  323. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts.map +0 -1
  324. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +0 -304
  325. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts +0 -73
  326. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts.map +0 -1
  327. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.js +0 -8
  328. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +0 -125
  329. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +0 -1
  330. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +0 -596
  331. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +0 -32
  332. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +0 -1
  333. package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +0 -112
  334. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +0 -157
  335. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +0 -1
  336. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +0 -52
  337. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +0 -16
  338. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +0 -1
  339. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +0 -123
  340. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +0 -17
  341. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +0 -1
  342. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +0 -84
  343. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +0 -19
  344. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +0 -1
  345. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +0 -78
  346. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +0 -26
  347. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +0 -1
  348. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +0 -84
  349. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +0 -25
  350. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +0 -1
  351. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +0 -57
  352. package/dest/mem_pools/tx_pool/index.d.ts +0 -3
  353. package/dest/mem_pools/tx_pool/index.d.ts.map +0 -1
  354. package/dest/mem_pools/tx_pool/index.js +0 -2
  355. package/dest/mem_pools/tx_pool/priority.d.ts +0 -12
  356. package/dest/mem_pools/tx_pool/priority.d.ts.map +0 -1
  357. package/dest/mem_pools/tx_pool/priority.js +0 -15
  358. package/dest/mem_pools/tx_pool/tx_pool.d.ts +0 -127
  359. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +0 -1
  360. package/dest/mem_pools/tx_pool/tx_pool.js +0 -3
  361. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +0 -7
  362. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +0 -1
  363. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +0 -402
  364. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +0 -64
  365. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +0 -1
  366. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +0 -151
  367. package/dest/services/reqresp/protocols/block.d.ts +0 -9
  368. package/dest/services/reqresp/protocols/block.d.ts.map +0 -1
  369. package/dest/services/reqresp/protocols/block.js +0 -32
  370. package/dest/services/tx_collection/fast_tx_collection.d.ts +0 -54
  371. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +0 -1
  372. package/dest/services/tx_collection/fast_tx_collection.js +0 -327
  373. package/dest/services/tx_collection/missing_txs_tracker.d.ts +0 -32
  374. package/dest/services/tx_collection/missing_txs_tracker.d.ts.map +0 -1
  375. package/dest/services/tx_collection/missing_txs_tracker.js +0 -27
  376. package/dest/services/tx_collection/proposal_tx_collector.d.ts +0 -49
  377. package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +0 -1
  378. package/dest/services/tx_collection/proposal_tx_collector.js +0 -50
  379. package/dest/services/tx_collection/slow_tx_collection.d.ts +0 -57
  380. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +0 -1
  381. package/dest/services/tx_collection/slow_tx_collection.js +0 -211
  382. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +0 -345
  383. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.ts +0 -43
  384. package/src/mem_pools/tx_pool/README.md +0 -270
  385. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +0 -746
  386. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +0 -132
  387. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +0 -208
  388. package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +0 -163
  389. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +0 -104
  390. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +0 -93
  391. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +0 -106
  392. package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +0 -75
  393. package/src/mem_pools/tx_pool/index.ts +0 -2
  394. package/src/mem_pools/tx_pool/priority.ts +0 -20
  395. package/src/mem_pools/tx_pool/tx_pool.ts +0 -141
  396. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +0 -321
  397. package/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +0 -161
  398. package/src/services/reqresp/protocols/block.ts +0 -37
  399. package/src/services/tx_collection/fast_tx_collection.ts +0 -387
  400. package/src/services/tx_collection/missing_txs_tracker.ts +0 -52
  401. package/src/services/tx_collection/proposal_tx_collector.ts +0 -113
  402. package/src/services/tx_collection/slow_tx_collection.ts +0 -266
@@ -371,30 +371,25 @@ function applyDecs2203RFactory() {
371
371
  function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
372
372
  return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
373
373
  }
374
- var _dec, _dec1, _dec2, _initProto;
375
- import { compactArray } from '@aztec/foundation/collection';
374
+ var _dec, _dec1, _initProto;
376
375
  import { AbortError, TimeoutError } from '@aztec/foundation/error';
377
376
  import { createLogger } from '@aztec/foundation/log';
378
377
  import { executeTimeout } from '@aztec/foundation/timer';
379
378
  import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
380
379
  import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
381
380
  import { pipeline } from 'node:stream/promises';
382
- import { CollectiveReqRespTimeoutError, IndividualReqRespTimeoutError, InvalidResponseError } from '../../errors/reqresp.error.js';
381
+ import { IndividualReqRespTimeoutError } from '../../errors/reqresp.error.js';
383
382
  import { OversizedSnappyResponseError, SnappyTransform } from '../encoding.js';
384
383
  import { DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS, DEFAULT_REQRESP_DIAL_TIMEOUT_MS } from './config.js';
385
- import { BatchConnectionSampler } from './connection-sampler/batch_connection_sampler.js';
386
384
  import { ConnectionSampler, RandomSampler } from './connection-sampler/connection_sampler.js';
387
- import { DEFAULT_SUB_PROTOCOL_VALIDATORS, ReqRespSubProtocol, responseFromBuffer, subProtocolSizeCalculators } from './interface.js';
385
+ import { ReqRespSubProtocol, UNAUTHENTICATED_ALLOWED_PROTOCOLS, subProtocolSizeCalculators } from './interface.js';
388
386
  import { ReqRespMetrics } from './metrics.js';
389
387
  import { RateLimitStatus, RequestResponseRateLimiter, prettyPrintRateLimitStatus } from './rate-limiter/rate_limiter.js';
390
- import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqRespStatus } from './status.js';
391
- _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
392
- [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol,
393
- [Attributes.P2P_REQ_RESP_BATCH_REQUESTS_COUNT]: requests.length
394
- })), _dec1 = trackSpan('ReqResp.sendRequestToPeer', (peerId, subProtocol, _)=>({
388
+ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk } from './status.js';
389
+ _dec = trackSpan('ReqResp.sendRequestToPeer', (peerId, subProtocol, _)=>({
395
390
  [Attributes.P2P_ID]: peerId.toString(),
396
391
  [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol
397
- })), _dec2 = trackSpan('ReqResp.streamHandler', (protocol, { connection })=>({
392
+ })), _dec1 = trackSpan('ReqResp.streamHandler', (protocol, { connection })=>({
398
393
  [Attributes.P2P_REQ_RESP_PROTOCOL]: protocol,
399
394
  [Attributes.P2P_ID]: connection.remotePeer.toString()
400
395
  }));
@@ -402,7 +397,7 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
402
397
  * The Request Response Service
403
398
  *
404
399
  * It allows nodes to request specific information from their peers, its use case covers recovering
405
- * information that was missed during a syncronisation or a gossip event.
400
+ * information that was missed during a synchronisation or a gossip event.
406
401
  *
407
402
  * This service implements the request response sub protocol, it is heavily inspired from
408
403
  * ethereum implementations of the same name.
@@ -420,15 +415,10 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
420
415
  [
421
416
  _dec,
422
417
  2,
423
- "sendBatchRequest"
424
- ],
425
- [
426
- _dec1,
427
- 2,
428
418
  "sendRequestToPeer"
429
419
  ],
430
420
  [
431
- _dec2,
421
+ _dec1,
432
422
  2,
433
423
  "streamHandler"
434
424
  ]
@@ -437,10 +427,10 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
437
427
  individualRequestTimeoutMs;
438
428
  dialTimeoutMs;
439
429
  subProtocolHandlers;
440
- subProtocolValidators;
441
430
  connectionSampler;
442
431
  rateLimiter;
443
432
  snappyTransform;
433
+ shouldRejectPeer;
444
434
  metrics;
445
435
  constructor(config, libp2p, peerScoring, logger = createLogger('p2p:reqresp'), rateLimits = {}, telemetryClient = getTelemetryClient()){
446
436
  this.libp2p = libp2p;
@@ -449,7 +439,6 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
449
439
  this.individualRequestTimeoutMs = (_initProto(this), DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS);
450
440
  this.dialTimeoutMs = DEFAULT_REQRESP_DIAL_TIMEOUT_MS;
451
441
  this.subProtocolHandlers = {};
452
- this.subProtocolValidators = {};
453
442
  this.updateConfig(config);
454
443
  this.rateLimiter = new RequestResponseRateLimiter(peerScoring, rateLimits);
455
444
  // Connection sampler is used to sample our connected peers
@@ -465,6 +454,9 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
465
454
  this.dialTimeoutMs = config.dialTimeoutMs;
466
455
  }
467
456
  }
457
+ setShouldRejectPeer(checker) {
458
+ this.shouldRejectPeer = checker;
459
+ }
468
460
  get tracer() {
469
461
  return this.metrics.tracer;
470
462
  }
@@ -475,19 +467,18 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
475
467
  }
476
468
  /**
477
469
  * Start the reqresp service
478
- */ async start(subProtocolHandlers, subProtocolValidators) {
470
+ */ async start(subProtocolHandlers) {
479
471
  Object.assign(this.subProtocolHandlers, subProtocolHandlers);
480
- Object.assign(this.subProtocolValidators, subProtocolValidators);
481
- // Register all protocol handlers
472
+ // Register streamHandler with libp2p.
473
+ // The streamHandler is responsible for reading the incoming stream, determining the protocol, then triggering the appropriate handler.
482
474
  for (const subProtocol of Object.keys(subProtocolHandlers)){
483
475
  this.logger.debug(`Registering handler for sub protocol ${subProtocol}`);
484
476
  await this.libp2p.handle(subProtocol, (data)=>void this.streamHandler(subProtocol, data).catch((err)=>this.logger.error(`Error on libp2p subprotocol ${subProtocol} handler`, err)));
485
477
  }
486
478
  this.rateLimiter.start();
487
479
  }
488
- async addSubProtocol(subProtocol, handler, validator = DEFAULT_SUB_PROTOCOL_VALIDATORS[subProtocol]) {
480
+ async addSubProtocol(subProtocol, handler) {
489
481
  this.subProtocolHandlers[subProtocol] = handler;
490
- this.subProtocolValidators[subProtocol] = validator;
491
482
  this.logger.debug(`Registering handler for sub protocol ${subProtocol}`);
492
483
  await this.libp2p.handle(subProtocol, (data)=>void this.streamHandler(subProtocol, data).catch((err)=>this.logger.error(`Error on libp2p subprotocol ${subProtocol} handler`, err)));
493
484
  }
@@ -509,179 +500,6 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
509
500
  // NOTE: We assume libp2p instance is managed by the caller
510
501
  }
511
502
  /**
512
- * Request multiple messages over the same sub protocol, balancing the requests across peers.
513
- *
514
- * @devnote
515
- * - The function prioritizes sending requests to free peers using a batch sampling strategy.
516
- * - If a peer fails to respond or returns an invalid response, it is removed from the sampling pool and replaced.
517
- * - The function stops retrying once all requests are processed, no active peers remain, or the maximum retry attempts are reached.
518
- * - Responses are validated using a custom validator for the sub-protocol.*
519
- *
520
- * Requests are sent in parallel to each peer, but multiple requests are sent to the same peer in series
521
- * - If a peer fails to respond or returns an invalid response, it is removed from the sampling pool and replaced.
522
- * - The function stops retrying once all requests are processed, no active peers remain, or the maximum retry attempts are reached.
523
- * - Responses are validated using a custom validator for the sub-protocol.*
524
- *
525
- * @param subProtocol
526
- * @param requests
527
- * @param timeoutMs
528
- * @param maxPeers
529
- * @returns
530
- *
531
- * @throws {CollectiveReqRespTimeoutError} - If the request batch exceeds the specified timeout (`timeoutMs`).
532
- */ async sendBatchRequest(subProtocol, requests, pinnedPeer, timeoutMs = 10000, maxPeers = Math.max(10, Math.ceil(requests.length / 3)), maxRetryAttempts = 3) {
533
- const responseValidator = this.subProtocolValidators[subProtocol] ?? DEFAULT_SUB_PROTOCOL_VALIDATORS[subProtocol];
534
- const responses = new Array(requests.length);
535
- const requestBuffers = requests.map((req)=>req.toBuffer());
536
- const isEmptyResponse = (value)=>{
537
- // Some responses serialize to a non-empty buffer even when they contain no items (e.g., empty TxArray).
538
- if (!value || typeof value !== 'object') {
539
- return false;
540
- }
541
- const length = value.length;
542
- return typeof length === 'number' && length === 0;
543
- };
544
- const requestFunction = async (signal)=>{
545
- // Track which requests still need to be processed
546
- const pendingRequestIndices = new Set(requestBuffers.map((_, i)=>i));
547
- // Create batch sampler with the total number of requests and max peers
548
- const batchSampler = new BatchConnectionSampler(this.connectionSampler, requests.length, maxPeers, compactArray([
549
- pinnedPeer
550
- ]), createLogger(`${this.logger.module}:batch-connection-sampler`));
551
- if (batchSampler.activePeerCount === 0 && !pinnedPeer) {
552
- this.logger.warn('No active peers to send requests to');
553
- return [];
554
- }
555
- // This is where it gets fun
556
- // The outer loop is the retry loop, we will continue to retry until we process all indices we have
557
- // not received a response for, or we have reached the max retry attempts
558
- // The inner loop is the batch loop, we will process all requests for each peer in parallel
559
- // We will then process the results of the requests, and resample any peers that failed to respond
560
- // We will continue to retry until we have processed all indices, or we have reached the max retry attempts
561
- let retryAttempts = 0;
562
- while(pendingRequestIndices.size > 0 && batchSampler.activePeerCount > 0 && retryAttempts < maxRetryAttempts){
563
- if (signal.aborted) {
564
- throw new AbortError('Batch request aborted');
565
- }
566
- const requestBatches = new Map();
567
- // Group requests by peer
568
- for (const requestIndex of pendingRequestIndices){
569
- const peer = batchSampler.getPeerForRequest(requestIndex);
570
- if (!peer) {
571
- continue;
572
- }
573
- const peerAsString = peer.toString();
574
- if (!requestBatches.has(peerAsString)) {
575
- requestBatches.set(peerAsString, {
576
- peerId: peer,
577
- indices: []
578
- });
579
- }
580
- requestBatches.get(peerAsString).indices.push(requestIndex);
581
- }
582
- // If there is a pinned peer, we will always send every request to that peer
583
- // We use the default limits for the subprotocol to avoid hitting the rate limiter
584
- if (pinnedPeer) {
585
- const limit = this.rateLimiter.getRateLimits(subProtocol).peerLimit.quotaCount;
586
- requestBatches.set(pinnedPeer.toString(), {
587
- peerId: pinnedPeer,
588
- indices: Array.from(pendingRequestIndices.values()).slice(0, limit)
589
- });
590
- }
591
- // If no requests could be assigned (all peers exhausted for all indices), exit early
592
- if (requestBatches.size === 0) {
593
- this.logger.warn('No peers available for any pending request indices, stopping batch request');
594
- break;
595
- }
596
- // Make parallel requests for each peer's batch
597
- // A batch entry will look something like this:
598
- // PeerId0: [0, 1, 2, 3]
599
- // PeerId1: [4, 5, 6, 7]
600
- // Peer Id 0 will send requests 0, 1, 2, 3 in serial
601
- // while simultaneously Peer Id 1 will send requests 4, 5, 6, 7 in serial
602
- const batchResults = await Promise.all(Array.from(requestBatches.entries()).map(async ([peerAsString, { peerId: peer, indices }])=>{
603
- try {
604
- const markIndexFailed = (index)=>batchSampler.markPeerFailedForIndex(peer, index);
605
- // Requests all going to the same peer are sent synchronously
606
- const peerResults = [];
607
- let shouldReplacePeer = false;
608
- const handleFailure = (status, index)=>{
609
- this.logger.warn(`Request to peer ${peerAsString} failed with status ${prettyPrintReqRespStatus(status)}`);
610
- markIndexFailed(index);
611
- return status === ReqRespStatus.RATE_LIMIT_EXCEEDED;
612
- };
613
- for (const index of indices){
614
- this.logger.info(`Sending request ${index} to peer ${peerAsString}`);
615
- const response = await this.sendRequestToPeer(peer, subProtocol, requestBuffers[index]);
616
- // Check the status of the response buffer
617
- if (response.status !== ReqRespStatus.SUCCESS) {
618
- shouldReplacePeer = handleFailure(response.status, index);
619
- if (shouldReplacePeer) {
620
- break;
621
- }
622
- continue;
623
- }
624
- if (response.data.length === 0) {
625
- markIndexFailed(index);
626
- continue;
627
- }
628
- const object = responseFromBuffer(subProtocol, response.data);
629
- if (isEmptyResponse(object)) {
630
- markIndexFailed(index);
631
- continue;
632
- }
633
- const isValid = await responseValidator(requests[index], object, peer);
634
- if (!isValid) {
635
- markIndexFailed(index);
636
- continue;
637
- }
638
- peerResults.push({
639
- index,
640
- response: object
641
- });
642
- }
643
- // If peer had a hard failure (rate limit), replace it for future iterations
644
- if (shouldReplacePeer) {
645
- this.logger.warn(`Peer ${peerAsString} hit a hard failure, removing from sampler`);
646
- batchSampler.removePeerAndReplace(peer);
647
- }
648
- return {
649
- peer,
650
- results: peerResults
651
- };
652
- } catch (error) {
653
- this.logger.warn(`Failed batch request to peer ${peerAsString}:`, error);
654
- batchSampler.removePeerAndReplace(peer);
655
- return {
656
- peer,
657
- results: []
658
- };
659
- }
660
- }));
661
- // Process results
662
- for (const { results } of batchResults){
663
- for (const { index, response } of results){
664
- if (response) {
665
- responses[index] = response;
666
- pendingRequestIndices.delete(index);
667
- }
668
- }
669
- }
670
- retryAttempts++;
671
- }
672
- if (retryAttempts >= maxRetryAttempts) {
673
- this.logger.warn(`Max retry attempts ${maxRetryAttempts} reached for batch request`);
674
- }
675
- return responses;
676
- };
677
- try {
678
- return await executeTimeout(requestFunction, timeoutMs, ()=>new CollectiveReqRespTimeoutError());
679
- } catch (e) {
680
- this.logger.warn(`${e.message} | subProtocol: ${subProtocol}`);
681
- return [];
682
- }
683
- }
684
- /**
685
503
  * Sends a request to a specific peer
686
504
  *
687
505
  * We first dial a particular protocol for the peer, this ensures that the peer knows
@@ -838,6 +656,11 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
838
656
  this.logger.verbose(`Rate limit exceeded ${prettyPrintRateLimitStatus(rateLimitStatus)} for ${protocol} from ${connection.remotePeer}`);
839
657
  throw new ReqRespStatusError(ReqRespStatus.RATE_LIMIT_EXCEEDED);
840
658
  }
659
+ // When p2pAllowOnlyValidators is enabled, reject unauthenticated peers on data protocols
660
+ if (!UNAUTHENTICATED_ALLOWED_PROTOCOLS.has(protocol) && (this.shouldRejectPeer?.(connection.remotePeer.toString()) ?? false)) {
661
+ this.logger.debug(`Rejecting unauthenticated peer ${connection.remotePeer} on gated protocol ${protocol}`);
662
+ throw new ReqRespStatusError(ReqRespStatus.FAILURE);
663
+ }
841
664
  await this.processStream(protocol, incomingStream);
842
665
  } catch (err) {
843
666
  this.metrics.recordResponseError(protocol);
@@ -858,7 +681,8 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
858
681
  // and that this stream should be dropped
859
682
  const isMessageToNotWarn = err instanceof Error && [
860
683
  'stream reset',
861
- 'Cannot push value onto an ended pushable'
684
+ 'Cannot push value onto an ended pushable',
685
+ 'read ECONNRESET'
862
686
  ].some((msg)=>err.message.includes(msg));
863
687
  const level = isMessageToNotWarn ? 'debug' : 'warn';
864
688
  this.logger[level]('Unknown stream error while handling the stream, aborting', {
@@ -946,12 +770,12 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
946
770
  peerId: peerId.toString(),
947
771
  subProtocol
948
772
  };
949
- //Punishable error - peer should never send badly formed request
773
+ // Punishable error - peer should never send badly formed request
950
774
  if (e instanceof ReqRespStatusError && e.status === ReqRespStatus.BADLY_FORMED_REQUEST) {
951
775
  this.logger.debug(`Punishable error in ${subProtocol}: ${e.cause}`, logTags);
952
776
  return PeerErrorSeverity.LowToleranceError;
953
777
  }
954
- //TODO: (mralj): think if we should penalize peer here based on connection errors
778
+ // TODO: (mralj): think if we should penalize peer here based on connection errors
955
779
  return undefined;
956
780
  }
957
781
  /**
@@ -968,11 +792,6 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
968
792
  this.logger.debug('Error encountered on goodbye sub protocol, no penalty', logTags);
969
793
  return undefined;
970
794
  }
971
- // We do not punish a collective timeout, as the node triggers this interupt, independent of the peer's behaviour
972
- if (e instanceof CollectiveReqRespTimeoutError || e instanceof InvalidResponseError) {
973
- this.logger.debug(`Non-punishable error in ${subProtocol}: ${e.message}`, logTags);
974
- return undefined;
975
- }
976
795
  // Invalid status byte: the peer sent a status byte that doesn't match any known status code.
977
796
  // This is a protocol violation, penalize harshly.
978
797
  if (e instanceof ReqRespStatusError) {
@@ -989,7 +808,8 @@ _dec = trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
989
808
  }
990
809
  /*
991
810
  * Errors specific to connection handling
992
- * These can happen both when sending request and response*/ categorizeConnectionErrors(e, peerId, subProtocol) {
811
+ * These can happen both when sending request and response.
812
+ */ categorizeConnectionErrors(e, peerId, subProtocol) {
993
813
  const logTags = {
994
814
  peerId: peerId.toString(),
995
815
  subProtocol
@@ -9,7 +9,7 @@ import type EventEmitter from 'events';
9
9
  import type { BatchTxRequesterLibP2PService } from './reqresp/batch-tx-requester/interface.js';
10
10
  import type { P2PReqRespConfig } from './reqresp/config.js';
11
11
  import type { StatusMessage } from './reqresp/index.js';
12
- import type { ReqRespSubProtocol, ReqRespSubProtocolHandler, ReqRespSubProtocolValidators, SubProtocolMap } from './reqresp/interface.js';
12
+ import type { ReqRespSubProtocol, ReqRespSubProtocolHandler } from './reqresp/interface.js';
13
13
  import type { AuthRequest, AuthResponse } from './reqresp/protocols/auth.js';
14
14
  export declare enum PeerDiscoveryState {
15
15
  RUNNING = "running",
@@ -51,6 +51,7 @@ export type DuplicateAttestationInfo = {
51
51
  * Invoked on the first duplicate (when count goes from 1 to 2).
52
52
  */
53
53
  export type P2PDuplicateAttestationCallback = (info: DuplicateAttestationInfo) => void;
54
+ export type P2PCheckpointAttestationCallback = (attestation: CheckpointAttestation) => void;
54
55
  /**
55
56
  * The interface for a P2P service implementation.
56
57
  */
@@ -70,16 +71,9 @@ export interface P2PService {
70
71
  * @param message - The message to be propagated.
71
72
  */
72
73
  propagate<T extends Gossipable>(message: T): Promise<void>;
73
- /**
74
- * Send a batch of requests to peers, and return the responses
75
- *
76
- * @param protocol - The request response protocol to use
77
- * @param requests - The requests to send to the peers
78
- * @returns The responses to the requests
79
- */
80
- sendBatchRequest<Protocol extends ReqRespSubProtocol>(protocol: Protocol, requests: InstanceType<SubProtocolMap[Protocol]['request']>[], pinnedPeerId?: PeerId, timeoutMs?: number, maxPeers?: number, maxRetryAttempts?: number): Promise<InstanceType<SubProtocolMap[Protocol]['response']>[]>;
81
74
  registerBlockReceivedCallback(callback: P2PBlockReceivedCallback): void;
82
- registerCheckpointReceivedCallback(callback: P2PCheckpointReceivedCallback): void;
75
+ registerValidatorCheckpointReceivedCallback(callback: P2PCheckpointReceivedCallback): void;
76
+ registerAllNodesCheckpointReceivedCallback(callback: P2PCheckpointReceivedCallback): void;
83
77
  /**
84
78
  * Registers a callback invoked when a duplicate proposal is detected (equivocation).
85
79
  * The callback is triggered on the first duplicate (when count goes from 1 to 2).
@@ -91,12 +85,13 @@ export interface P2PService {
91
85
  * The callback is triggered on the first duplicate (when count goes from 1 to 2).
92
86
  */
93
87
  registerDuplicateAttestationCallback(callback: P2PDuplicateAttestationCallback): void;
88
+ registerCheckpointAttestationCallback(callback: P2PCheckpointAttestationCallback): void;
94
89
  getEnr(): ENR | undefined;
95
90
  getPeers(includePending?: boolean): PeerInfo[];
96
91
  /** Returns the number of peers in the GossipSub mesh for a given topic type. */
97
92
  getGossipMeshPeerCount(topicType: TopicType): number;
98
93
  validateTxsReceivedInBlockProposal(txs: Tx[]): Promise<void>;
99
- addReqRespSubProtocol(subProtocol: ReqRespSubProtocol, handler: ReqRespSubProtocolHandler, validator?: ReqRespSubProtocolValidators[ReqRespSubProtocol]): Promise<void>;
94
+ addReqRespSubProtocol(subProtocol: ReqRespSubProtocol, handler: ReqRespSubProtocolHandler): Promise<void>;
100
95
  handleAuthRequestFromPeer(authRequest: AuthRequest, peerId: PeerId): Promise<StatusMessage>;
101
96
  updateConfig(config: Partial<P2PReqRespConfig>): void;
102
97
  /** If node running this P2P stack is validator, passes in validator address to P2P layer */
@@ -136,8 +131,10 @@ export interface PeerDiscoveryService extends EventEmitter {
136
131
  */
137
132
  on(event: 'peer:discovered', listener: (enr: ENR) => void): this;
138
133
  emit(event: 'peer:discovered', enr: ENR): boolean;
134
+ on(event: 'ip:changed', listener: (ip: string) => void): this;
135
+ emit(event: 'ip:changed', ip: string): boolean;
139
136
  getStatus(): PeerDiscoveryState;
140
137
  getEnr(): ENR | undefined;
141
138
  bootstrapNodeEnrs: ENR[];
142
139
  }
143
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQ1YsYUFBYSxFQUNiLHFCQUFxQixFQUNyQixzQkFBc0IsRUFDdEIsVUFBVSxFQUNWLFNBQVMsRUFDVixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTNDLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxZQUFZLE1BQU0sUUFBUSxDQUFDO0FBRXZDLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDL0YsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFDVixrQkFBa0IsRUFDbEIseUJBQXlCLEVBQ3pCLDRCQUE0QixFQUM1QixjQUFjLEVBQ2YsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFN0Usb0JBQVksa0JBQWtCO0lBQzVCLE9BQU8sWUFBWTtJQUNuQixPQUFPLFlBQVk7Q0FDcEI7QUFFRDs7OztHQUlHO0FB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
140
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQ1YsYUFBYSxFQUNiLHFCQUFxQixFQUNyQixzQkFBc0IsRUFDdEIsVUFBVSxFQUNWLFNBQVMsRUFDVixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTNDLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxZQUFZLE1BQU0sUUFBUSxDQUFDO0FBRXZDLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDL0YsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVGLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUU3RSxvQkFBWSxrQkFBa0I7SUFDNUIsT0FBTyxZQUFZO0lBQ25CLE9BQU8sWUFBWTtDQUNwQjtBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLE1BQU0sd0JBQXdCLEdBQUcs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
@@ -1 +1 @@
1
- {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/services/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EACV,aAAa,EACb,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACV,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC;AAC/F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EACV,kBAAkB,EAClB,yBAAyB,EACzB,4BAA4B,EAC5B,cAAc,EACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE7E,oBAAY,kBAAkB;IAC5B,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED;;;;GAIG;AACH,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAElG;;;;;GAKG;AACH,MAAM,MAAM,6BAA6B,GAAG,CAC1C,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,qBAAqB,EAAE,GAAG,SAAS,CAAC,CAAC;AAElD,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC;AAEnH,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG,CAAC,IAAI,EAAE,qBAAqB,KAAK,IAAI,CAAC;AAEjF,iEAAiE;AACjE,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,+BAA+B,GAAG,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;AAEvF;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;OAGG;IACH,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D;;;;;;OAMG;IACH,gBAAgB,CAAC,QAAQ,SAAS,kBAAkB,EAClD,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAC7D,YAAY,CAAC,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;IAGjE,6BAA6B,CAAC,QAAQ,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAExE,kCAAkC,CAAC,QAAQ,EAAE,6BAA6B,GAAG,IAAI,CAAC;IAElF;;;OAGG;IACH,iCAAiC,CAAC,QAAQ,EAAE,4BAA4B,GAAG,IAAI,CAAC;IAEhF;;;;OAIG;IACH,oCAAoC,CAAC,QAAQ,EAAE,+BAA+B,GAAG,IAAI,CAAC;IAEtF,MAAM,IAAI,GAAG,GAAG,SAAS,CAAC;IAE1B,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,QAAQ,EAAE,CAAC;IAE/C,gFAAgF;IAChF,sBAAsB,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAAC;IAErD,kCAAkC,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,qBAAqB,CACnB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,yBAAyB,EAClC,SAAS,CAAC,EAAE,4BAA4B,CAAC,kBAAkB,CAAC,GAC3D,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,yBAAyB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAE5F,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEtD,4FAA4F;IAC5F,8BAA8B,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAE5D,gDAAgD;IAChD,0BAA0B,IAAI,6BAA6B,CAAC;CAC7D;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD;;SAEK;IACL,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;SAEK;IACL,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;OAGG;IACH,YAAY,IAAI,GAAG,EAAE,CAAC;IAEtB;;OAEG;IACH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC;;;;OAIG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAEzC;;OAEG;IACH,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;IACjE,IAAI,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;IAElD,SAAS,IAAI,kBAAkB,CAAC;IAEhC,MAAM,IAAI,GAAG,GAAG,SAAS,CAAC;IAE1B,iBAAiB,EAAE,GAAG,EAAE,CAAC;CAC1B"}
1
+ {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/services/service.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,7 @@
1
1
  import { type ConfigMappingsType } from '@aztec/foundation/config';
2
- export type MissingTxsCollectorType = 'new' | 'old';
3
2
  export type TxCollectionConfig = {
4
3
  /** How long to wait before starting reqresp for fast collection */
5
4
  txCollectionFastNodesTimeoutBeforeReqRespMs: number;
6
- /** How often to collect from configured nodes */
7
- txCollectionSlowNodesIntervalMs: number;
8
- /** How ofter to collect from peers */
9
- txCollectionSlowReqRespIntervalMs: number;
10
- /** How long to wait for a reqresp response during slow collection */
11
- txCollectionSlowReqRespTimeoutMs: number;
12
- /** How often to reconcile found txs with the tx pool */
13
- txCollectionReconcileIntervalMs: number;
14
- /** Whether to disable the slow collection loop if we are dealing with any immediate requests */
15
- txCollectionDisableSlowDuringFastRequests: boolean;
16
5
  /** How many ms to wait between retried request to a node via RPC during fast collection */
17
6
  txCollectionFastNodeIntervalMs: number;
18
7
  /** A comma-separated list of Aztec node RPC URLs to use for tx collection */
@@ -21,26 +10,16 @@ export type TxCollectionConfig = {
21
10
  txCollectionFastMaxParallelRequestsPerNode: number;
22
11
  /** Maximum number of transactions to request from a node in a single batch */
23
12
  txCollectionNodeRpcMaxBatchSize: number;
24
- /** Which collector implementation to use for missing txs collection */
25
- txCollectionMissingTxsCollectorType: MissingTxsCollectorType;
26
13
  /** A comma-separated list of file store URLs (s3://, gs://, file://, http://) for tx collection */
27
14
  txCollectionFileStoreUrls: string[];
28
- /** Delay in ms before file store collection starts after slow collection is triggered */
29
- txCollectionFileStoreSlowDelayMs: number;
30
- /** Delay in ms before file store collection starts after fast collection is triggered */
15
+ /** Delay in ms from reqresp start before file store collection begins */
31
16
  txCollectionFileStoreFastDelayMs: number;
32
17
  /** Number of concurrent workers for fast file store collection */
33
18
  txCollectionFileStoreFastWorkerCount: number;
34
- /** Number of concurrent workers for slow file store collection */
35
- txCollectionFileStoreSlowWorkerCount: number;
36
19
  /** Base backoff time in ms for fast file store collection retries */
37
20
  txCollectionFileStoreFastBackoffBaseMs: number;
38
- /** Base backoff time in ms for slow file store collection retries */
39
- txCollectionFileStoreSlowBackoffBaseMs: number;
40
21
  /** Max backoff time in ms for fast file store collection retries */
41
22
  txCollectionFileStoreFastBackoffMaxMs: number;
42
- /** Max backoff time in ms for slow file store collection retries */
43
- txCollectionFileStoreSlowBackoffMaxMs: number;
44
23
  };
45
24
  export declare const txCollectionConfigMappings: ConfigMappingsType<TxCollectionConfig>;
46
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBSXhCLE1BQU0sMEJBQTBCLENBQUM7QUFHbEMsTUFBTSxNQUFNLHVCQUF1QixHQUFHLEtBQUssR0FBRyxLQUFLLENBQUM7QUFFcEQsTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLG9FQUFvRTtJQUNwRSwyQ0FBMkMsRUFBRSxNQUFNLENBQUM7SUFDcEQsaURBQWlEO0lBQ2pELCtCQUErQixFQUFFLE1BQU0sQ0FBQztJQUN4QyxzQ0FBc0M7SUFDdEMsaUNBQWlDLEVBQUUsTUFBTSxDQUFDO0lBQzFDLHFFQUFxRTtJQUNyRSxnQ0FBZ0MsRUFBRSxNQUFNLENBQUM7SUFDekMsd0RBQXdEO0lBQ3hELCtCQUErQixFQUFFLE1BQU0sQ0FBQztJQUN4QyxnR0FBZ0c7SUFDaEcseUNBQXlDLEVBQUUsT0FBTyxDQUFDO0lBQ25ELDJGQUEyRjtJQUMzRiw4QkFBOEIsRUFBRSxNQUFNLENBQUM7SUFDdkMsNkVBQTZFO0lBQzdFLHVCQUF1QixFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ2xDLG1GQUFtRjtJQUNuRiwwQ0FBMEMsRUFBRSxNQUFNLENBQUM7SUFDbkQsOEVBQThFO0lBQzlFLCtCQUErQixFQUFFLE1BQU0sQ0FBQztJQUN4Qyx1RUFBdUU7SUFDdkUsbUNBQW1DLEVBQUUsdUJBQXVCLENBQUM7SUFDN0QsbUdBQW1HO0lBQ25HLHlCQUF5QixFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BDLHlGQUF5RjtJQUN6RixnQ0FBZ0MsRUFBRSxNQUFNLENBQUM7SUFDekMseUZBQXlGO0lBQ3pGLGdDQUFnQyxFQUFFLE1BQU0sQ0FBQztJQUN6QyxrRUFBa0U7SUFDbEUsb0NBQW9DLEVBQUUsTUFBTSxDQUFDO0lBQzdDLGtFQUFrRTtJQUNsRSxvQ0FBb0MsRUFBRSxNQUFNLENBQUM7SUFDN0MscUVBQXFFO0lBQ3JFLHNDQUFzQyxFQUFFLE1BQU0sQ0FBQztJQUMvQyxxRUFBcUU7SUFDckUsc0NBQXNDLEVBQUUsTUFBTSxDQUFDO0lBQy9DLG9FQUFvRTtJQUNwRSxxQ0FBcUMsRUFBRSxNQUFNLENBQUM7SUFDOUMsb0VBQW9FO0lBQ3BFLHFDQUFxQyxFQUFFLE1BQU0sQ0FBQztDQUMvQyxDQUFDO0FBRUYsZUFBTyxNQUFNLDBCQUEwQixFQUFFLGtCQUFrQixDQUFDLGtCQUFrQixDQWdIN0UsQ0FBQyJ9
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXNCLE1BQU0sMEJBQTBCLENBQUM7QUFHdkYsTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLG9FQUFvRTtJQUNwRSwyQ0FBMkMsRUFBRSxNQUFNLENBQUM7SUFDcEQsMkZBQTJGO0lBQzNGLDhCQUE4QixFQUFFLE1BQU0sQ0FBQztJQUN2Qyw2RUFBNkU7SUFDN0UsdUJBQXVCLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbEMsbUZBQW1GO0lBQ25GLDBDQUEwQyxFQUFFLE1BQU0sQ0FBQztJQUNuRCw4RUFBOEU7SUFDOUUsK0JBQStCLEVBQUUsTUFBTSxDQUFDO0lBQ3hDLG1HQUFtRztJQUNuRyx5QkFBeUIsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQyx5RUFBeUU7SUFDekUsZ0NBQWdDLEVBQUUsTUFBTSxDQUFDO0lBQ3pDLGtFQUFrRTtJQUNsRSxvQ0FBb0MsRUFBRSxNQUFNLENBQUM7SUFDN0MscUVBQXFFO0lBQ3JFLHNDQUFzQyxFQUFFLE1BQU0sQ0FBQztJQUMvQyxvRUFBb0U7SUFDcEUscUNBQXFDLEVBQUUsTUFBTSxDQUFDO0NBQy9DLENBQUM7QUFFRixlQUFPLE1BQU0sMEJBQTBCLEVBQUUsa0JBQWtCLENBQUMsa0JBQWtCLENBOEQ3RSxDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAGlC,MAAM,MAAM,uBAAuB,GAAG,KAAK,GAAG,KAAK,CAAC;AAEpD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oEAAoE;IACpE,2CAA2C,EAAE,MAAM,CAAC;IACpD,iDAAiD;IACjD,+BAA+B,EAAE,MAAM,CAAC;IACxC,sCAAsC;IACtC,iCAAiC,EAAE,MAAM,CAAC;IAC1C,qEAAqE;IACrE,gCAAgC,EAAE,MAAM,CAAC;IACzC,wDAAwD;IACxD,+BAA+B,EAAE,MAAM,CAAC;IACxC,gGAAgG;IAChG,yCAAyC,EAAE,OAAO,CAAC;IACnD,2FAA2F;IAC3F,8BAA8B,EAAE,MAAM,CAAC;IACvC,6EAA6E;IAC7E,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAClC,mFAAmF;IACnF,0CAA0C,EAAE,MAAM,CAAC;IACnD,8EAA8E;IAC9E,+BAA+B,EAAE,MAAM,CAAC;IACxC,uEAAuE;IACvE,mCAAmC,EAAE,uBAAuB,CAAC;IAC7D,mGAAmG;IACnG,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,yFAAyF;IACzF,gCAAgC,EAAE,MAAM,CAAC;IACzC,yFAAyF;IACzF,gCAAgC,EAAE,MAAM,CAAC;IACzC,kEAAkE;IAClE,oCAAoC,EAAE,MAAM,CAAC;IAC7C,kEAAkE;IAClE,oCAAoC,EAAE,MAAM,CAAC;IAC7C,qEAAqE;IACrE,sCAAsC,EAAE,MAAM,CAAC;IAC/C,qEAAqE;IACrE,sCAAsC,EAAE,MAAM,CAAC;IAC/C,oEAAoE;IACpE,qCAAqC,EAAE,MAAM,CAAC;IAC9C,oEAAoE;IACpE,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAgH7E,CAAC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAsB,MAAM,0BAA0B,CAAC;AAGvF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oEAAoE;IACpE,2CAA2C,EAAE,MAAM,CAAC;IACpD,2FAA2F;IAC3F,8BAA8B,EAAE,MAAM,CAAC;IACvC,6EAA6E;IAC7E,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAClC,mFAAmF;IACnF,0CAA0C,EAAE,MAAM,CAAC;IACnD,8EAA8E;IAC9E,+BAA+B,EAAE,MAAM,CAAC;IACxC,mGAAmG;IACnG,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,yEAAyE;IACzE,gCAAgC,EAAE,MAAM,CAAC;IACzC,kEAAkE;IAClE,oCAAoC,EAAE,MAAM,CAAC;IAC7C,qEAAqE;IACrE,sCAAsC,EAAE,MAAM,CAAC;IAC/C,oEAAoE;IACpE,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CA8D7E,CAAC"}
@@ -1,4 +1,4 @@
1
- import { booleanConfigHelper, enumConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
1
+ import { numberConfigHelper } from '@aztec/foundation/config';
2
2
  import { MAX_RPC_TXS_LEN } from '@aztec/stdlib/interfaces/api-limit';
3
3
  export const txCollectionConfigMappings = {
4
4
  txCollectionFastNodesTimeoutBeforeReqRespMs: {
@@ -6,31 +6,6 @@ export const txCollectionConfigMappings = {
6
6
  description: 'How long to wait before starting reqresp for fast collection',
7
7
  ...numberConfigHelper(200)
8
8
  },
9
- txCollectionSlowNodesIntervalMs: {
10
- env: 'TX_COLLECTION_SLOW_NODES_INTERVAL_MS',
11
- description: 'How often to collect from configured nodes in the slow collection loop',
12
- ...numberConfigHelper(12_000)
13
- },
14
- txCollectionSlowReqRespIntervalMs: {
15
- env: 'TX_COLLECTION_SLOW_REQ_RESP_INTERVAL_MS',
16
- description: 'How often to collect from peers via reqresp in the slow collection loop',
17
- ...numberConfigHelper(12_000)
18
- },
19
- txCollectionSlowReqRespTimeoutMs: {
20
- env: 'TX_COLLECTION_SLOW_REQ_RESP_TIMEOUT_MS',
21
- description: 'How long to wait for a reqresp response during slow collection',
22
- ...numberConfigHelper(20_000)
23
- },
24
- txCollectionReconcileIntervalMs: {
25
- env: 'TX_COLLECTION_RECONCILE_INTERVAL_MS',
26
- description: 'How often to reconcile found txs from the tx pool',
27
- ...numberConfigHelper(60_000)
28
- },
29
- txCollectionDisableSlowDuringFastRequests: {
30
- env: 'TX_COLLECTION_DISABLE_SLOW_DURING_FAST_REQUESTS',
31
- description: 'Whether to disable the slow collection loop if we are dealing with any immediate requests',
32
- ...booleanConfigHelper(true)
33
- },
34
9
  txCollectionFastNodeIntervalMs: {
35
10
  env: 'TX_COLLECTION_FAST_NODE_INTERVAL_MS',
36
11
  description: 'How many ms to wait between retried request to a node via RPC during fast collection',
@@ -55,28 +30,15 @@ export const txCollectionConfigMappings = {
55
30
  description: 'Maximum number of transactions to request from a node in a single batch',
56
31
  ...numberConfigHelper(MAX_RPC_TXS_LEN)
57
32
  },
58
- txCollectionMissingTxsCollectorType: {
59
- env: 'TX_COLLECTION_MISSING_TXS_COLLECTOR_TYPE',
60
- description: 'Which collector implementation to use for missing txs collection (new or old)',
61
- ...enumConfigHelper([
62
- 'new',
63
- 'old'
64
- ], 'new')
65
- },
66
33
  txCollectionFileStoreUrls: {
67
34
  env: 'TX_COLLECTION_FILE_STORE_URLS',
68
35
  description: 'A comma-separated list of file store URLs (s3://, gs://, file://, http://) for tx collection',
69
36
  parseEnv: (val)=>val.split(',').map((url)=>url.trim()).filter((url)=>url.length > 0),
70
37
  defaultValue: []
71
38
  },
72
- txCollectionFileStoreSlowDelayMs: {
73
- env: 'TX_COLLECTION_FILE_STORE_SLOW_DELAY_MS',
74
- description: 'Delay before file store collection starts after slow collection',
75
- ...numberConfigHelper(24_000)
76
- },
77
39
  txCollectionFileStoreFastDelayMs: {
78
40
  env: 'TX_COLLECTION_FILE_STORE_FAST_DELAY_MS',
79
- description: 'Delay before file store collection starts after fast collection',
41
+ description: 'Delay in ms from reqresp start before file store collection begins',
80
42
  ...numberConfigHelper(2_000)
81
43
  },
82
44
  txCollectionFileStoreFastWorkerCount: {
@@ -84,29 +46,14 @@ export const txCollectionConfigMappings = {
84
46
  description: 'Number of concurrent workers for fast file store collection',
85
47
  ...numberConfigHelper(5)
86
48
  },
87
- txCollectionFileStoreSlowWorkerCount: {
88
- env: 'TX_COLLECTION_FILE_STORE_SLOW_WORKER_COUNT',
89
- description: 'Number of concurrent workers for slow file store collection',
90
- ...numberConfigHelper(2)
91
- },
92
49
  txCollectionFileStoreFastBackoffBaseMs: {
93
50
  env: 'TX_COLLECTION_FILE_STORE_FAST_BACKOFF_BASE_MS',
94
51
  description: 'Base backoff time in ms for fast file store collection retries',
95
52
  ...numberConfigHelper(1_000)
96
53
  },
97
- txCollectionFileStoreSlowBackoffBaseMs: {
98
- env: 'TX_COLLECTION_FILE_STORE_SLOW_BACKOFF_BASE_MS',
99
- description: 'Base backoff time in ms for slow file store collection retries',
100
- ...numberConfigHelper(5_000)
101
- },
102
54
  txCollectionFileStoreFastBackoffMaxMs: {
103
55
  env: 'TX_COLLECTION_FILE_STORE_FAST_BACKOFF_MAX_MS',
104
56
  description: 'Max backoff time in ms for fast file store collection retries',
105
57
  ...numberConfigHelper(5_000)
106
- },
107
- txCollectionFileStoreSlowBackoffMaxMs: {
108
- env: 'TX_COLLECTION_FILE_STORE_SLOW_BACKOFF_MAX_MS',
109
- description: 'Max backoff time in ms for slow file store collection retries',
110
- ...numberConfigHelper(30_000)
111
58
  }
112
59
  };