@aztec/p2p 0.0.1-commit.4d3c002 → 0.0.1-commit.4d9804df

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 (340) hide show
  1. package/README.md +7 -6
  2. package/dest/bootstrap/bootstrap.d.ts +1 -1
  3. package/dest/bootstrap/bootstrap.d.ts.map +1 -1
  4. package/dest/bootstrap/bootstrap.js +22 -6
  5. package/dest/client/factory.d.ts +4 -3
  6. package/dest/client/factory.d.ts.map +1 -1
  7. package/dest/client/factory.js +33 -24
  8. package/dest/client/interface.d.ts +40 -10
  9. package/dest/client/interface.d.ts.map +1 -1
  10. package/dest/client/p2p_client.d.ts +32 -18
  11. package/dest/client/p2p_client.d.ts.map +1 -1
  12. package/dest/client/p2p_client.js +97 -51
  13. package/dest/config.d.ts +143 -107
  14. package/dest/config.d.ts.map +1 -1
  15. package/dest/config.js +72 -26
  16. package/dest/errors/reqresp.error.d.ts +9 -16
  17. package/dest/errors/reqresp.error.d.ts.map +1 -1
  18. package/dest/errors/reqresp.error.js +10 -17
  19. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +98 -56
  20. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  21. package/dest/mem_pools/attestation_pool/attestation_pool.js +270 -198
  22. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
  23. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  24. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +218 -59
  25. package/dest/mem_pools/attestation_pool/mocks.d.ts +1 -1
  26. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  27. package/dest/mem_pools/attestation_pool/mocks.js +6 -4
  28. package/dest/mem_pools/instrumentation.d.ts +9 -4
  29. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  30. package/dest/mem_pools/instrumentation.js +28 -9
  31. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.d.ts +1 -5
  32. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.d.ts.map +1 -1
  33. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.js +1 -7
  34. package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts +3 -3
  35. package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts.map +1 -1
  36. package/dest/mem_pools/tx_pool_v2/deleted_pool.js +6 -6
  37. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +1 -1
  38. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +2 -1
  39. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -1
  40. package/dest/mem_pools/tx_pool_v2/eviction/index.js +1 -0
  41. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts +16 -0
  42. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts.map +1 -0
  43. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.js +62 -0
  44. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +2 -2
  45. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +33 -5
  46. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
  47. package/dest/mem_pools/tx_pool_v2/interfaces.js +2 -1
  48. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +5 -2
  49. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
  50. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +8 -5
  51. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +15 -1
  52. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
  53. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +31 -0
  54. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +9 -3
  55. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
  56. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +19 -8
  57. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +17 -4
  58. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
  59. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +208 -118
  60. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +10 -3
  61. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  62. package/dest/msg_validators/attestation_validator/attestation_validator.js +38 -16
  63. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +7 -3
  64. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  65. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +4 -5
  66. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +8 -3
  67. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
  68. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +2 -2
  69. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +8 -3
  70. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
  71. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +8 -2
  72. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +25 -3
  73. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
  74. package/dest/msg_validators/proposal_validator/proposal_validator.js +85 -15
  75. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +1 -1
  76. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  77. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +8 -15
  78. package/dest/msg_validators/tx_validator/allowed_public_setup.js +3 -3
  79. package/dest/msg_validators/tx_validator/archive_cache.js +1 -1
  80. package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts +15 -0
  81. package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts.map +1 -0
  82. package/dest/msg_validators/tx_validator/cached_tx_validator.js +19 -0
  83. package/dest/msg_validators/tx_validator/data_validator.d.ts +2 -1
  84. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  85. package/dest/msg_validators/tx_validator/data_validator.js +1 -0
  86. package/dest/msg_validators/tx_validator/factory.d.ts +14 -15
  87. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  88. package/dest/msg_validators/tx_validator/factory.js +29 -16
  89. package/dest/msg_validators/tx_validator/gas_validator.d.ts +47 -10
  90. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  91. package/dest/msg_validators/tx_validator/gas_validator.js +65 -48
  92. package/dest/msg_validators/tx_validator/index.d.ts +3 -1
  93. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  94. package/dest/msg_validators/tx_validator/index.js +2 -0
  95. package/dest/msg_validators/tx_validator/phases_validator.js +2 -2
  96. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +2 -1
  97. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -1
  98. package/dest/msg_validators/tx_validator/tx_proof_validator.js +2 -0
  99. package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts +48 -0
  100. package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts.map +1 -0
  101. package/dest/msg_validators/tx_validator/tx_validation_cache.js +68 -0
  102. package/dest/services/data_store.d.ts +1 -1
  103. package/dest/services/data_store.d.ts.map +1 -1
  104. package/dest/services/data_store.js +5 -5
  105. package/dest/services/discv5/discV5_service.d.ts +13 -2
  106. package/dest/services/discv5/discV5_service.d.ts.map +1 -1
  107. package/dest/services/discv5/discV5_service.js +117 -24
  108. package/dest/services/discv5/persisted_enr_store.d.ts +38 -0
  109. package/dest/services/discv5/persisted_enr_store.d.ts.map +1 -0
  110. package/dest/services/discv5/persisted_enr_store.js +145 -0
  111. package/dest/services/dummy_service.d.ts +15 -17
  112. package/dest/services/dummy_service.d.ts.map +1 -1
  113. package/dest/services/dummy_service.js +13 -18
  114. package/dest/services/encoding.d.ts +19 -6
  115. package/dest/services/encoding.d.ts.map +1 -1
  116. package/dest/services/encoding.js +25 -15
  117. package/dest/services/gossipsub/topic_score_params.d.ts +6 -12
  118. package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -1
  119. package/dest/services/gossipsub/topic_score_params.js +4 -14
  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 +31 -38
  124. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  125. package/dest/services/libp2p/libp2p_service.js +268 -248
  126. package/dest/services/peer-manager/peer_manager.d.ts +15 -2
  127. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  128. package/dest/services/peer-manager/peer_manager.js +59 -17
  129. package/dest/services/peer-manager/peer_scoring.d.ts +30 -1
  130. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  131. package/dest/services/peer-manager/peer_scoring.js +74 -3
  132. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +1 -8
  133. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  134. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +35 -44
  135. package/dest/services/reqresp/batch-tx-requester/interface.d.ts +8 -5
  136. package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map +1 -1
  137. package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts +5 -14
  138. package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts.map +1 -1
  139. package/dest/services/reqresp/batch-tx-requester/tx_validator.js +6 -20
  140. package/dest/services/reqresp/config.d.ts +15 -3
  141. package/dest/services/reqresp/config.d.ts.map +1 -1
  142. package/dest/services/reqresp/config.js +11 -0
  143. package/dest/services/reqresp/interface.d.ts +16 -18
  144. package/dest/services/reqresp/interface.d.ts.map +1 -1
  145. package/dest/services/reqresp/interface.js +10 -20
  146. package/dest/services/reqresp/metrics.d.ts +1 -1
  147. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  148. package/dest/services/reqresp/metrics.js +0 -1
  149. package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts +4 -3
  150. package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts.map +1 -1
  151. package/dest/services/reqresp/protocols/block_txs/bitvector.js +3 -2
  152. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +1 -1
  153. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
  154. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js +31 -28
  155. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts +12 -7
  156. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts.map +1 -1
  157. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.js +42 -24
  158. package/dest/services/reqresp/protocols/index.d.ts +1 -2
  159. package/dest/services/reqresp/protocols/index.d.ts.map +1 -1
  160. package/dest/services/reqresp/protocols/index.js +0 -1
  161. package/dest/services/reqresp/protocols/tx.d.ts +1 -1
  162. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  163. package/dest/services/reqresp/protocols/tx.js +1 -3
  164. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts +1 -1
  165. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -1
  166. package/dest/services/reqresp/rate-limiter/rate_limits.js +3 -13
  167. package/dest/services/reqresp/reqresp.d.ts +7 -29
  168. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  169. package/dest/services/reqresp/reqresp.js +59 -209
  170. package/dest/services/service.d.ts +21 -13
  171. package/dest/services/service.d.ts.map +1 -1
  172. package/dest/services/tx_collection/config.d.ts +2 -23
  173. package/dest/services/tx_collection/config.d.ts.map +1 -1
  174. package/dest/services/tx_collection/config.js +2 -55
  175. package/dest/services/tx_collection/file_store_tx_collection.d.ts +12 -28
  176. package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -1
  177. package/dest/services/tx_collection/file_store_tx_collection.js +43 -83
  178. package/dest/services/tx_collection/index.d.ts +2 -3
  179. package/dest/services/tx_collection/index.d.ts.map +1 -1
  180. package/dest/services/tx_collection/index.js +0 -1
  181. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  182. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  183. package/dest/services/tx_collection/instrumentation.js +0 -2
  184. package/dest/services/tx_collection/tx_collection.d.ts +35 -51
  185. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  186. package/dest/services/tx_collection/tx_collection.js +275 -119
  187. package/dest/services/tx_collection/tx_collection_sink.d.ts +1 -1
  188. package/dest/services/tx_collection/tx_collection_sink.js +2 -2
  189. package/dest/services/tx_collection/tx_source.d.ts +1 -1
  190. package/dest/services/tx_collection/tx_source.d.ts.map +1 -1
  191. package/dest/services/tx_collection/tx_source.js +4 -1
  192. package/dest/services/tx_file_store/tx_file_store.d.ts +1 -3
  193. package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
  194. package/dest/services/tx_file_store/tx_file_store.js +4 -14
  195. package/dest/services/tx_provider.d.ts +3 -1
  196. package/dest/services/tx_provider.d.ts.map +1 -1
  197. package/dest/services/tx_provider.js +3 -0
  198. package/dest/test-helpers/make-test-p2p-clients.d.ts +1 -1
  199. package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
  200. package/dest/test-helpers/make-test-p2p-clients.js +5 -2
  201. package/dest/test-helpers/mock-pubsub.d.ts +16 -9
  202. package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
  203. package/dest/test-helpers/mock-pubsub.js +36 -43
  204. package/dest/test-helpers/reqresp-nodes.d.ts +4 -5
  205. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  206. package/dest/test-helpers/reqresp-nodes.js +11 -17
  207. package/dest/test-helpers/test_tx_provider.d.ts +3 -1
  208. package/dest/test-helpers/test_tx_provider.d.ts.map +1 -1
  209. package/dest/test-helpers/test_tx_provider.js +3 -0
  210. package/dest/test-helpers/testbench-utils.d.ts +15 -14
  211. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  212. package/dest/test-helpers/testbench-utils.js +28 -13
  213. package/dest/testbench/p2p_client_testbench_worker.d.ts +3 -5
  214. package/dest/testbench/p2p_client_testbench_worker.d.ts.map +1 -1
  215. package/dest/testbench/p2p_client_testbench_worker.js +60 -27
  216. package/dest/testbench/worker_client_manager.d.ts +10 -6
  217. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  218. package/dest/testbench/worker_client_manager.js +51 -8
  219. package/dest/util.d.ts +7 -6
  220. package/dest/util.d.ts.map +1 -1
  221. package/dest/util.js +39 -10
  222. package/dest/versioning.d.ts +3 -6
  223. package/dest/versioning.d.ts.map +1 -1
  224. package/dest/versioning.js +3 -24
  225. package/package.json +16 -16
  226. package/src/bootstrap/bootstrap.ts +17 -3
  227. package/src/client/factory.ts +49 -25
  228. package/src/client/interface.ts +35 -16
  229. package/src/client/p2p_client.ts +116 -85
  230. package/src/client/test/{tx_proposal_collector/README.md → p2p_client.batch_tx_requester.bench.README.md} +23 -53
  231. package/src/config.ts +146 -34
  232. package/src/errors/reqresp.error.ts +13 -19
  233. package/src/mem_pools/attestation_pool/attestation_pool.ts +325 -242
  234. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +238 -63
  235. package/src/mem_pools/attestation_pool/mocks.ts +13 -8
  236. package/src/mem_pools/instrumentation.ts +18 -12
  237. package/src/mem_pools/tx_pool_v2/archive/tx_archive.ts +1 -9
  238. package/src/mem_pools/tx_pool_v2/deleted_pool.ts +7 -7
  239. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +1 -1
  240. package/src/mem_pools/tx_pool_v2/eviction/index.ts +1 -0
  241. package/src/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.ts +65 -0
  242. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +3 -3
  243. package/src/mem_pools/tx_pool_v2/interfaces.ts +31 -4
  244. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +13 -7
  245. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +35 -0
  246. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +22 -8
  247. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +233 -123
  248. package/src/msg_validators/attestation_validator/attestation_validator.ts +46 -15
  249. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +15 -7
  250. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +15 -3
  251. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +26 -3
  252. package/src/msg_validators/proposal_validator/proposal_validator.ts +94 -12
  253. package/src/msg_validators/tx_validator/README.md +13 -3
  254. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +3 -12
  255. package/src/msg_validators/tx_validator/allowed_public_setup.ts +3 -3
  256. package/src/msg_validators/tx_validator/archive_cache.ts +1 -1
  257. package/src/msg_validators/tx_validator/cached_tx_validator.ts +31 -0
  258. package/src/msg_validators/tx_validator/data_validator.ts +2 -0
  259. package/src/msg_validators/tx_validator/factory.ts +37 -20
  260. package/src/msg_validators/tx_validator/gas_validator.ts +99 -54
  261. package/src/msg_validators/tx_validator/index.ts +2 -0
  262. package/src/msg_validators/tx_validator/phases_validator.ts +2 -2
  263. package/src/msg_validators/tx_validator/tx_proof_validator.ts +2 -0
  264. package/src/msg_validators/tx_validator/tx_validation_cache.ts +101 -0
  265. package/src/services/data_store.ts +5 -13
  266. package/src/services/discv5/discV5_service.ts +124 -15
  267. package/src/services/discv5/persisted_enr_store.ts +158 -0
  268. package/src/services/dummy_service.ts +19 -43
  269. package/src/services/encoding.ts +28 -20
  270. package/src/services/gossipsub/README.md +33 -11
  271. package/src/services/gossipsub/topic_score_params.ts +9 -18
  272. package/src/services/libp2p/instrumentation.ts +14 -0
  273. package/src/services/libp2p/libp2p_service.ts +311 -271
  274. package/src/services/peer-manager/peer_manager.ts +63 -16
  275. package/src/services/peer-manager/peer_scoring.ts +81 -3
  276. package/src/services/reqresp/README.md +2 -37
  277. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +39 -52
  278. package/src/services/reqresp/batch-tx-requester/interface.ts +11 -4
  279. package/src/services/reqresp/batch-tx-requester/tx_validator.ts +12 -25
  280. package/src/services/reqresp/config.ts +19 -2
  281. package/src/services/reqresp/interface.ts +21 -47
  282. package/src/services/reqresp/metrics.ts +0 -1
  283. package/src/services/reqresp/protocols/block_txs/bitvector.ts +3 -2
  284. package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +34 -30
  285. package/src/services/reqresp/protocols/block_txs/block_txs_reqresp.ts +47 -20
  286. package/src/services/reqresp/protocols/index.ts +0 -1
  287. package/src/services/reqresp/protocols/tx.ts +1 -3
  288. package/src/services/reqresp/rate-limiter/rate_limits.ts +3 -13
  289. package/src/services/reqresp/reqresp.ts +69 -252
  290. package/src/services/service.ts +25 -30
  291. package/src/services/tx_collection/config.ts +3 -80
  292. package/src/services/tx_collection/file_store_tx_collection.ts +54 -103
  293. package/src/services/tx_collection/index.ts +1 -6
  294. package/src/services/tx_collection/instrumentation.ts +1 -7
  295. package/src/services/tx_collection/tx_collection.ts +330 -173
  296. package/src/services/tx_collection/tx_collection_sink.ts +2 -2
  297. package/src/services/tx_collection/tx_source.ts +2 -1
  298. package/src/services/tx_file_store/tx_file_store.ts +5 -17
  299. package/src/services/tx_provider.ts +5 -0
  300. package/src/test-helpers/make-test-p2p-clients.ts +3 -0
  301. package/src/test-helpers/mock-pubsub.ts +39 -60
  302. package/src/test-helpers/reqresp-nodes.ts +8 -22
  303. package/src/test-helpers/test_tx_provider.ts +5 -0
  304. package/src/test-helpers/testbench-utils.ts +35 -26
  305. package/src/testbench/p2p_client_testbench_worker.ts +68 -44
  306. package/src/testbench/worker_client_manager.ts +59 -19
  307. package/src/util.ts +34 -12
  308. package/src/versioning.ts +3 -33
  309. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts +0 -2
  310. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts.map +0 -1
  311. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +0 -315
  312. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts +0 -73
  313. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts.map +0 -1
  314. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.js +0 -8
  315. package/dest/msg_validators/clock_tolerance.d.ts +0 -21
  316. package/dest/msg_validators/clock_tolerance.d.ts.map +0 -1
  317. package/dest/msg_validators/clock_tolerance.js +0 -38
  318. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +0 -64
  319. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +0 -1
  320. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +0 -151
  321. package/dest/services/reqresp/protocols/block.d.ts +0 -9
  322. package/dest/services/reqresp/protocols/block.d.ts.map +0 -1
  323. package/dest/services/reqresp/protocols/block.js +0 -32
  324. package/dest/services/tx_collection/fast_tx_collection.d.ts +0 -51
  325. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +0 -1
  326. package/dest/services/tx_collection/fast_tx_collection.js +0 -311
  327. package/dest/services/tx_collection/proposal_tx_collector.d.ts +0 -48
  328. package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +0 -1
  329. package/dest/services/tx_collection/proposal_tx_collector.js +0 -50
  330. package/dest/services/tx_collection/slow_tx_collection.d.ts +0 -57
  331. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +0 -1
  332. package/dest/services/tx_collection/slow_tx_collection.js +0 -211
  333. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +0 -355
  334. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.ts +0 -43
  335. package/src/msg_validators/clock_tolerance.ts +0 -52
  336. package/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +0 -161
  337. package/src/services/reqresp/protocols/block.ts +0 -37
  338. package/src/services/tx_collection/fast_tx_collection.ts +0 -361
  339. package/src/services/tx_collection/proposal_tx_collector.ts +0 -108
  340. package/src/services/tx_collection/slow_tx_collection.ts +0 -266
@@ -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
  };
@@ -1,7 +1,7 @@
1
1
  import { type Logger } from '@aztec/foundation/log';
2
2
  import { DateProvider } from '@aztec/foundation/timer';
3
- import { Tx, TxHash } from '@aztec/stdlib/tx';
4
3
  import type { FileStoreTxSource } from './file_store_tx_source.js';
4
+ import type { IRequestTracker } from './request_tracker.js';
5
5
  import type { TxAddContext, TxCollectionSink } from './tx_collection_sink.js';
6
6
  /** Configuration for a FileStoreTxCollection instance. */
7
7
  export type FileStoreCollectionConfig = {
@@ -11,9 +11,10 @@ export type FileStoreCollectionConfig = {
11
11
  };
12
12
  /**
13
13
  * Collects txs from file stores as a fallback after P2P methods have been tried.
14
- * Uses a shared worker pool that pulls entries with priority (fewest attempts first),
15
- * retries with round-robin across sources, and applies exponential backoff between
16
- * full cycles through all sources.
14
+ * Each call to startCollecting spins up its own worker pool which pulls entries with priority
15
+ * (fewest attempts first), retries with round-robin across sources, and applies exponential
16
+ * backoff between full cycles through all sources. Workers self-terminate when the request
17
+ * tracker is cancelled (deadline / all-fetched / external) or when there is nothing left to do.
17
18
  */
18
19
  export declare class FileStoreTxCollection {
19
20
  private readonly sources;
@@ -21,33 +22,16 @@ export declare class FileStoreTxCollection {
21
22
  private readonly config;
22
23
  private readonly dateProvider;
23
24
  private readonly log;
24
- /** Map from tx hash string to entry for all pending downloads. */
25
- private entries;
26
- /** Worker promises for the shared worker pool. */
27
- private workers;
28
- /** Whether the worker pool is running. */
29
- private running;
30
- /** Signal used to wake sleeping workers when new entries arrive or stop is called. */
31
- private wakeSignal;
32
25
  constructor(sources: FileStoreTxSource[], txCollectionSink: TxCollectionSink, config: FileStoreCollectionConfig, dateProvider?: DateProvider, log?: Logger);
33
- /** Starts the shared worker pool. */
34
- start(): void;
35
- /** Stops all workers and clears state. */
36
- stop(): Promise<void>;
37
- /** Adds entries to the shared map and wakes workers. */
38
- startCollecting(txHashes: TxHash[], context: TxAddContext, deadline: Date): void;
39
- /** Removes entries for txs that have been found elsewhere. */
40
- foundTxs(txs: Tx[]): void;
41
- /** Clears all pending entries. */
42
- clearPending(): void;
26
+ /**
27
+ * Spins up workers to download all txs still missing from the tracker, racing across the
28
+ * configured file store sources. Resolves once all workers settle.
29
+ */
30
+ startCollecting(requestTracker: IRequestTracker, context: TxAddContext): Promise<void>;
43
31
  private workerLoop;
44
- /** Single-pass scan: removes expired entries, finds the best ready entry, or computes sleep time. */
32
+ /** Single-pass scan: removes stale entries, finds the best ready entry, or computes sleep time. */
45
33
  private getNextAction;
46
34
  /** Computes backoff for an entry. Backoff applies after a full cycle through all sources. */
47
35
  private getBackoffMs;
48
- /** Resolves the current wake signal and creates a new one. */
49
- private wake;
50
- private waitForWake;
51
- private sleepOrWake;
52
36
  }
53
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZV9zdG9yZV90eF9jb2xsZWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9maWxlX3N0b3JlX3R4X2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBR2xFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFOUUsMERBQTBEO0FBQzFELE1BQU0sTUFBTSx5QkFBeUIsR0FBRztJQUN0QyxXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsWUFBWSxFQUFFLE1BQU0sQ0FBQztDQUN0QixDQUFDO0FBV0Y7Ozs7O0dBS0c7QUFDSCxxQkFBYSxxQkFBcUI7SUFjOUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPO0lBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZ0JBQWdCO0lBQ2pDLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHO0lBakJ0QixrRUFBa0U7SUFDbEUsT0FBTyxDQUFDLE9BQU8sQ0FBdUM7SUFFdEQsa0RBQWtEO0lBQ2xELE9BQU8sQ0FBQyxPQUFPLENBQXVCO0lBRXRDLDBDQUEwQztJQUMxQyxPQUFPLENBQUMsT0FBTyxDQUFTO0lBRXhCLHNGQUFzRjtJQUN0RixPQUFPLENBQUMsVUFBVSxDQUE2QjtJQUUvQyxZQUNtQixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsRUFDNUIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLE1BQU0sRUFBRSx5QkFBeUIsRUFDakMsWUFBWSxHQUFFLFlBQWlDLEVBQy9DLEdBQUcsR0FBRSxNQUFxRCxFQUc1RTtJQUVELHFDQUFxQztJQUM5QixLQUFLLElBQUksSUFBSSxDQVNuQjtJQUVELDBDQUEwQztJQUM3QixJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1qQztJQUVELHdEQUF3RDtJQUNqRCxlQUFlLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLElBQUksR0FBRyxJQUFJLENBc0J0RjtJQUVELDhEQUE4RDtJQUN2RCxRQUFRLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FJL0I7SUFFRCxrQ0FBa0M7SUFDM0IsWUFBWSxJQUFJLElBQUksQ0FFMUI7WUFFYSxVQUFVO0lBa0N4QixxR0FBcUc7SUFDckcsT0FBTyxDQUFDLGFBQWE7SUE4QnJCLDZGQUE2RjtJQUM3RixPQUFPLENBQUMsWUFBWTtJQVFwQiw4REFBOEQ7SUFDOUQsT0FBTyxDQUFDLElBQUk7WUFNRSxXQUFXO1lBS1gsV0FBVztDQUcxQiJ9
37
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZV9zdG9yZV90eF9jb2xsZWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9maWxlX3N0b3JlX3R4X2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRWxFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUd2RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTlFLDBEQUEwRDtBQUMxRCxNQUFNLE1BQU0seUJBQXlCLEdBQUc7SUFDdEMsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLFlBQVksRUFBRSxNQUFNLENBQUM7Q0FDdEIsQ0FBQztBQVNGOzs7Ozs7R0FNRztBQUNILHFCQUFhLHFCQUFxQjtJQUU5QixPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU87SUFDeEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0I7SUFDakMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWTtJQUM3QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFMdEIsWUFDbUIsT0FBTyxFQUFFLGlCQUFpQixFQUFFLEVBQzVCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxNQUFNLEVBQUUseUJBQXlCLEVBQ2pDLFlBQVksR0FBRSxZQUFpQyxFQUMvQyxHQUFHLEdBQUUsTUFBcUQsRUFDekU7SUFFSjs7O09BR0c7SUFDVSxlQUFlLENBQUMsY0FBYyxFQUFFLGVBQWUsRUFBRSxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0F3QmxHO1lBRWEsVUFBVTtJQXVDeEIsbUdBQW1HO0lBQ25HLE9BQU8sQ0FBQyxhQUFhO0lBa0NyQiw2RkFBNkY7SUFDN0YsT0FBTyxDQUFDLFlBQVk7Q0FPckIifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"file_store_tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/file_store_tx_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE9E,0DAA0D;AAC1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAWF;;;;;GAKG;AACH,qBAAa,qBAAqB;IAc9B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAjBtB,kEAAkE;IAClE,OAAO,CAAC,OAAO,CAAuC;IAEtD,kDAAkD;IAClD,OAAO,CAAC,OAAO,CAAuB;IAEtC,0CAA0C;IAC1C,OAAO,CAAC,OAAO,CAAS;IAExB,sFAAsF;IACtF,OAAO,CAAC,UAAU,CAA6B;IAE/C,YACmB,OAAO,EAAE,iBAAiB,EAAE,EAC5B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,yBAAyB,EACjC,YAAY,GAAE,YAAiC,EAC/C,GAAG,GAAE,MAAqD,EAG5E;IAED,qCAAqC;IAC9B,KAAK,IAAI,IAAI,CASnB;IAED,0CAA0C;IAC7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAMjC;IAED,wDAAwD;IACjD,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI,CAsBtF;IAED,8DAA8D;IACvD,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAI/B;IAED,kCAAkC;IAC3B,YAAY,IAAI,IAAI,CAE1B;YAEa,UAAU;IAkCxB,qGAAqG;IACrG,OAAO,CAAC,aAAa;IA8BrB,6FAA6F;IAC7F,OAAO,CAAC,YAAY;IAQpB,8DAA8D;IAC9D,OAAO,CAAC,IAAI;YAME,WAAW;YAKX,WAAW;CAG1B"}
1
+ {"version":3,"file":"file_store_tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/file_store_tx_collection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE9E,0DAA0D;AAC1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AASF;;;;;;GAMG;AACH,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,YACmB,OAAO,EAAE,iBAAiB,EAAE,EAC5B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,yBAAyB,EACjC,YAAY,GAAE,YAAiC,EAC/C,GAAG,GAAE,MAAqD,EACzE;IAEJ;;;OAGG;IACU,eAAe,CAAC,cAAc,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBlG;YAEa,UAAU;IAuCxB,mGAAmG;IACnG,OAAO,CAAC,aAAa;IAkCrB,6FAA6F;IAC7F,OAAO,CAAC,YAAY;CAOrB"}
@@ -1,86 +1,61 @@
1
+ import { times } from '@aztec/foundation/collection';
1
2
  import { createLogger } from '@aztec/foundation/log';
2
- import { promiseWithResolvers } from '@aztec/foundation/promise';
3
3
  import { sleep } from '@aztec/foundation/sleep';
4
4
  import { DateProvider } from '@aztec/foundation/timer';
5
5
  import { TxHash } from '@aztec/stdlib/tx';
6
6
  /**
7
7
  * Collects txs from file stores as a fallback after P2P methods have been tried.
8
- * Uses a shared worker pool that pulls entries with priority (fewest attempts first),
9
- * retries with round-robin across sources, and applies exponential backoff between
10
- * full cycles through all sources.
8
+ * Each call to startCollecting spins up its own worker pool which pulls entries with priority
9
+ * (fewest attempts first), retries with round-robin across sources, and applies exponential
10
+ * backoff between full cycles through all sources. Workers self-terminate when the request
11
+ * tracker is cancelled (deadline / all-fetched / external) or when there is nothing left to do.
11
12
  */ export class FileStoreTxCollection {
12
13
  sources;
13
14
  txCollectionSink;
14
15
  config;
15
16
  dateProvider;
16
17
  log;
17
- /** Map from tx hash string to entry for all pending downloads. */ entries;
18
- /** Worker promises for the shared worker pool. */ workers;
19
- /** Whether the worker pool is running. */ running;
20
- /** Signal used to wake sleeping workers when new entries arrive or stop is called. */ wakeSignal;
21
18
  constructor(sources, txCollectionSink, config, dateProvider = new DateProvider(), log = createLogger('p2p:file_store_tx_collection')){
22
19
  this.sources = sources;
23
20
  this.txCollectionSink = txCollectionSink;
24
21
  this.config = config;
25
22
  this.dateProvider = dateProvider;
26
23
  this.log = log;
27
- this.entries = new Map();
28
- this.workers = [];
29
- this.running = false;
30
- this.wakeSignal = promiseWithResolvers();
31
24
  }
32
- /** Starts the shared worker pool. */ start() {
33
- if (this.sources.length === 0) {
34
- this.log.debug('No file store sources configured');
25
+ /**
26
+ * Spins up workers to download all txs still missing from the tracker, racing across the
27
+ * configured file store sources. Resolves once all workers settle.
28
+ */ async startCollecting(requestTracker, context) {
29
+ if (this.sources.length === 0 || requestTracker.checkCancelled()) {
35
30
  return;
36
31
  }
37
- this.running = true;
38
- for(let i = 0; i < this.config.workerCount; i++){
39
- this.workers.push(this.workerLoop());
32
+ // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
33
+ const entries = new Set();
34
+ for (const hashStr of requestTracker.missingTxHashes){
35
+ entries.add({
36
+ txHash: hashStr,
37
+ attempts: 0,
38
+ lastAttemptTime: 0,
39
+ nextSourceIndex: Math.floor(Math.random() * this.sources.length)
40
+ });
40
41
  }
41
- }
42
- /** Stops all workers and clears state. */ async stop() {
43
- this.running = false;
44
- this.wake();
45
- await Promise.all(this.workers);
46
- this.workers = [];
47
- this.entries.clear();
48
- }
49
- /** Adds entries to the shared map and wakes workers. */ startCollecting(txHashes, context, deadline) {
50
- if (this.sources.length === 0 || txHashes.length === 0) {
51
- return;
52
- }
53
- if (+deadline <= this.dateProvider.now()) {
42
+ // Yield before spawning so the synchronous caller can finish any follow-up (eg. marking a tx
43
+ // as fetched on the tracker, or cancelling it) before workers begin scanning entries.
44
+ await Promise.resolve();
45
+ if (requestTracker.checkCancelled()) {
54
46
  return;
55
47
  }
56
- for (const txHash of txHashes){
57
- const hashStr = txHash.toString();
58
- if (!this.entries.has(hashStr)) {
59
- this.entries.set(hashStr, {
60
- txHash: hashStr,
61
- context,
62
- deadline,
63
- attempts: 0,
64
- lastAttemptTime: 0,
65
- nextSourceIndex: Math.floor(Math.random() * this.sources.length)
66
- });
67
- }
68
- }
69
- this.wake();
70
- }
71
- /** Removes entries for txs that have been found elsewhere. */ foundTxs(txs) {
72
- for (const tx of txs){
73
- this.entries.delete(tx.getTxHash().toString());
74
- }
75
- }
76
- /** Clears all pending entries. */ clearPending() {
77
- this.entries.clear();
48
+ await Promise.allSettled(times(this.config.workerCount, ()=>this.workerLoop(entries, requestTracker, context)));
78
49
  }
79
- async workerLoop() {
80
- while(this.running){
81
- const action = this.getNextAction();
50
+ async workerLoop(// eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
51
+ entries, requestTracker, context) {
52
+ while(!requestTracker.checkCancelled() && entries.size > 0){
53
+ const action = this.getNextAction(entries, requestTracker);
82
54
  if (action.type === 'sleep') {
83
- await action.promise;
55
+ await Promise.race([
56
+ sleep(action.ms),
57
+ requestTracker.cancellationToken
58
+ ]);
84
59
  continue;
85
60
  }
86
61
  const entry = action.entry;
@@ -97,9 +72,9 @@ import { TxHash } from '@aztec/stdlib/tx';
97
72
  description: `file-store ${source.getInfo()}`,
98
73
  method: 'file-store',
99
74
  fileStore: source.getInfo()
100
- }, entry.context);
75
+ }, context);
101
76
  if (result.txs.length > 0) {
102
- this.entries.delete(entry.txHash);
77
+ entries.delete(entry);
103
78
  }
104
79
  } catch (err) {
105
80
  this.log.trace(`Error downloading tx ${entry.txHash} from ${source.getInfo()}`, {
@@ -108,13 +83,15 @@ import { TxHash } from '@aztec/stdlib/tx';
108
83
  }
109
84
  }
110
85
  }
111
- /** Single-pass scan: removes expired entries, finds the best ready entry, or computes sleep time. */ getNextAction() {
86
+ /** Single-pass scan: removes stale entries, finds the best ready entry, or computes sleep time. */ getNextAction(// eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
87
+ entries, requestTracker) {
112
88
  const now = this.dateProvider.now();
113
89
  let best;
114
90
  let earliestReadyAt = Infinity;
115
- for (const [key, entry] of this.entries){
116
- if (+entry.deadline <= now) {
117
- this.entries.delete(key);
91
+ for (const entry of entries){
92
+ // Drop entries whose tx was already found via another collection path.
93
+ if (!requestTracker.isMissing(entry.txHash)) {
94
+ entries.delete(entry);
118
95
  continue;
119
96
  }
120
97
  const backoffMs = this.getBackoffMs(entry);
@@ -133,15 +110,11 @@ import { TxHash } from '@aztec/stdlib/tx';
133
110
  entry: best
134
111
  };
135
112
  }
136
- if (earliestReadyAt < Infinity) {
137
- return {
138
- type: 'sleep',
139
- promise: this.sleepOrWake(earliestReadyAt - now)
140
- };
141
- }
113
+ // earliestReadyAt is finite whenever there are surviving entries; if entries became empty,
114
+ // the outer worker loop will exit on its next iteration via entries.size === 0.
142
115
  return {
143
116
  type: 'sleep',
144
- promise: this.waitForWake()
117
+ ms: earliestReadyAt === Infinity ? 0 : earliestReadyAt - now
145
118
  };
146
119
  }
147
120
  /** Computes backoff for an entry. Backoff applies after a full cycle through all sources. */ getBackoffMs(entry) {
@@ -151,17 +124,4 @@ import { TxHash } from '@aztec/stdlib/tx';
151
124
  }
152
125
  return Math.min(this.config.backoffBaseMs * Math.pow(2, fullCycles - 1), this.config.backoffMaxMs);
153
126
  }
154
- /** Resolves the current wake signal and creates a new one. */ wake() {
155
- this.wakeSignal.resolve();
156
- this.wakeSignal = promiseWithResolvers();
157
- }
158
- /** Waits until the wake signal is resolved. */ async waitForWake() {
159
- await this.wakeSignal.promise;
160
- }
161
- /** Sleeps for the given duration or until the wake signal is resolved. */ async sleepOrWake(ms) {
162
- await Promise.race([
163
- sleep(ms),
164
- this.wakeSignal.promise
165
- ]);
166
- }
167
127
  }
@@ -1,5 +1,4 @@
1
- export { TxCollection, type FastCollectionRequestInput } from './tx_collection.js';
1
+ export { TxCollection, type FastCollectionRequestInput, type IReqRespTxsCollector } from './tx_collection.js';
2
2
  export { type TxSource, createNodeRpcTxSources, NodeRpcTxSource } from './tx_source.js';
3
- export { type MissingTxsCollector, BatchTxRequesterCollector, SendBatchRequestCollector, } from './proposal_tx_collector.js';
4
3
  export { FileStoreTxSource, createFileStoreTxSources } from './file_store_tx_source.js';
5
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy90eF9jb2xsZWN0aW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsS0FBSywwQkFBMEIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ25GLE9BQU8sRUFBRSxLQUFLLFFBQVEsRUFBRSxzQkFBc0IsRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxtQkFBbUIsRUFDeEIseUJBQXlCLEVBQ3pCLHlCQUF5QixHQUMxQixNQUFNLDRCQUE0QixDQUFDO0FBQ3BDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDIn0=
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy90eF9jb2xsZWN0aW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsS0FBSywwQkFBMEIsRUFBRSxLQUFLLG9CQUFvQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUcsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLHNCQUFzQixFQUFFLGVBQWUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,KAAK,QAAQ,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EACL,KAAK,mBAAmB,EACxB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,0BAA0B,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC9G,OAAO,EAAE,KAAK,QAAQ,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC"}
@@ -1,4 +1,3 @@
1
1
  export { TxCollection } from './tx_collection.js';
2
2
  export { createNodeRpcTxSources, NodeRpcTxSource } from './tx_source.js';
3
- export { BatchTxRequesterCollector, SendBatchRequestCollector } from './proposal_tx_collector.js';
4
3
  export { FileStoreTxSource, createFileStoreTxSources } from './file_store_tx_source.js';
@@ -7,4 +7,4 @@ export declare class TxCollectionInstrumentation {
7
7
  constructor(client: TelemetryClient, name: string);
8
8
  increaseTxsFor(what: CollectionMethod, count: number, duration: number): void;
9
9
  }
10
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUlMLEtBQUssZUFBZSxFQUdyQixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFM0QscUJBQWEsMkJBQTJCO0lBQ3RDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBWTtJQUMzQyxPQUFPLENBQUMsNEJBQTRCLENBQVk7SUFFaEQsWUFBWSxNQUFNLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxNQUFNLEVBZ0JoRDtJQUVELGNBQWMsQ0FBQyxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxRQUtyRTtDQUNGIn0=
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUlMLEtBQUssZUFBZSxFQUdyQixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFM0QscUJBQWEsMkJBQTJCO0lBQ3RDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBWTtJQUMzQyxPQUFPLENBQUMsNEJBQTRCLENBQVk7SUFFaEQsWUFBWSxNQUFNLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxNQUFNLEVBVWhEO0lBRUQsY0FBYyxDQUFDLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLFFBS3JFO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,qBAAa,2BAA2B;IACtC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,4BAA4B,CAAY;IAEhD,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAgBhD;IAED,cAAc,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAKrE;CACF"}
1
+ {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,qBAAa,2BAA2B;IACtC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,4BAA4B,CAAY;IAEhD,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAUhD;IAED,cAAc,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAKrE;CACF"}
@@ -9,8 +9,6 @@ export class TxCollectionInstrumentation {
9
9
  [Attributes.TX_COLLECTION_METHOD]: [
10
10
  'fast-req-resp',
11
11
  'fast-node-rpc',
12
- 'slow-req-resp',
13
- 'slow-node-rpc',
14
12
  'file-store'
15
13
  ]
16
14
  });
@@ -10,20 +10,13 @@ import { type TelemetryClient } from '@aztec/telemetry-client';
10
10
  import type { PeerId } from '@libp2p/interface';
11
11
  import type { TxPoolV2, TxPoolV2Events } from '../../mem_pools/tx_pool_v2/interfaces.js';
12
12
  import type { BatchTxRequesterLibP2PService } from '../reqresp/batch-tx-requester/interface.js';
13
+ import type { BlockTxsSource } from '../reqresp/index.js';
13
14
  import type { TxCollectionConfig } from './config.js';
14
- import { FastTxCollection } from './fast_tx_collection.js';
15
15
  import { FileStoreTxCollection } from './file_store_tx_collection.js';
16
16
  import type { FileStoreTxSource } from './file_store_tx_source.js';
17
- import type { IRequestTracker } from './request_tracker.js';
18
- import { SlowTxCollection } from './slow_tx_collection.js';
17
+ import { type IRequestTracker } from './request_tracker.js';
19
18
  import type { TxSource } from './tx_source.js';
20
- export type CollectionMethod = 'fast-req-resp' | 'fast-node-rpc' | 'slow-req-resp' | 'slow-node-rpc' | 'file-store';
21
- export type MissingTxInfo = {
22
- block: L2Block;
23
- blockNumber: BlockNumber;
24
- deadline: Date;
25
- readyForReqResp: boolean;
26
- };
19
+ export type CollectionMethod = 'fast-req-resp' | 'fast-node-rpc' | 'file-store';
27
20
  export type FastCollectionRequestInput = {
28
21
  type: 'block';
29
22
  block: L2Block;
@@ -37,15 +30,21 @@ export type FastCollectionRequest = FastCollectionRequestInput & {
37
30
  blockInfo: L2BlockInfo;
38
31
  };
39
32
  /**
40
- * Coordinates tx collection from remote RPC nodes and reqresp.
33
+ * Collect missing transactions for a block or proposal via reqresp.
34
+ * @param requestTracker - The missing transactions tracker
35
+ * @param blockTxsSource - The block or proposal containing the transactions
36
+ * @param pinnedPeer - Optional peer expected to have the transactions
37
+ * @returns The collected transactions
38
+ */
39
+ export type IReqRespTxsCollector = (requestTracker: IRequestTracker, blockTxsSource: BlockTxsSource, pinnedPeer: PeerId | undefined) => Promise<Tx[]>;
40
+ /**
41
+ * Coordinates tx collection from remote RPC nodes, reqresp, and file store.
41
42
  *
42
- * The slow collection loops are used for periodically collecting missing txs from mined blocks,
43
- * from remote RPC nodes and via reqresp. The fast collection methods are used to quickly gather
44
- * txs, usually for attesting to block proposals or preparing to prove an epoch. The slow and fast
45
- * collection instances both send their txs to the collection sink, which handles metrics and adds
46
- * them to the tx pool. Whenever a tx is added to either the sink or the pool, this service is notified
47
- * via events and notifies the slow and fast collection loops to stop collecting that tx, so that we don't
48
- * collect the same tx multiple times.
43
+ * Runs a sequential pipeline: node RPC → reqresp → file store. Node collection starts immediately,
44
+ * reqresp starts after a configured delay, and file store (if configured) starts after a further
45
+ * delay. All paths send txs to the collection sink, which handles metrics and adds them to the
46
+ * tx pool. Whenever a tx is added to the sink or the pool, this service is notified and stops
47
+ * collecting that tx across all in-flight requests.
49
48
  */
50
49
  export declare class TxCollection {
51
50
  private readonly p2pService;
@@ -55,42 +54,22 @@ export declare class TxCollection {
55
54
  private readonly config;
56
55
  private readonly dateProvider;
57
56
  private readonly log;
58
- /** Slow collection background loops */
59
- protected readonly slowCollection: SlowTxCollection;
60
- /** Fast collection methods */
61
- protected readonly fastCollection: FastTxCollection;
62
- /** File store collection for slow (mined block) path */
63
- protected readonly fileStoreSlowCollection: FileStoreTxCollection;
64
- /** File store collection for fast (proposal/proving) path */
57
+ protected requests: Set<FastCollectionRequest>;
58
+ /** The collector for txs via reqresp */
59
+ protected reqRespTxsCollector?: IReqRespTxsCollector;
60
+ /** File store collection for the fast (proposal/proving) path */
65
61
  protected readonly fileStoreFastCollection: FileStoreTxCollection;
66
- /** Loop for periodically reconciling found transactions from the tx pool in case we missed some */
67
- private readonly reconcileFoundTxsLoop;
68
- /** Handles txs found by the slow and fast collection loops */
62
+ /** Handles txs found by collection paths before adding to the pool */
69
63
  private readonly txCollectionSink;
70
64
  /** Handler for the txs-added event from the tx pool */
71
65
  protected readonly handleTxsAddedToPool: TxPoolV2Events['txs-added'];
72
66
  /** Handler for the txs-added event from the tx collection sink */
73
67
  protected readonly handleTxsFound: TxPoolV2Events['txs-added'];
74
- /** Whether the service has been started. */
75
- private started;
76
- /** Whether file store sources are configured. */
77
- private readonly hasFileStoreSources;
78
68
  constructor(p2pService: BatchTxRequesterLibP2PService, nodes: TxSource[], constants: L1RollupConstants, txPool: TxPoolV2, config: TxCollectionConfig, fileStoreSources?: FileStoreTxSource[], dateProvider?: DateProvider, telemetryClient?: TelemetryClient, log?: Logger);
79
- /** Starts all collection loops. */
80
- start(): Promise<void>;
81
- /** Stops all activity. */
82
- stop(): Promise<void>;
83
- /** Force trigger the slow collection and reconciliation loops */
84
- trigger(): Promise<void>;
69
+ /** Stops all activity. Cancels in-flight requests; file store workers self-terminate. */
70
+ stop(): void;
85
71
  /** Returns L1 rollup constants. */
86
72
  getConstants(): L1RollupConstants;
87
- /** Starts collecting the given tx hashes for the given L2Block in the slow loop */
88
- startCollecting(block: L2Block, txHashes: TxHash[]): void;
89
- /** Collects the set of txs for the given block proposal as fast as possible */
90
- collectFastForProposal(blockProposal: BlockProposal, blockNumber: BlockNumber, txHashes: TxHash[] | string[], opts: {
91
- deadline: Date;
92
- pinnedPeer?: PeerId;
93
- }): Promise<Tx[]>;
94
73
  /** Collects the set of txs for the given mined block as fast as possible */
95
74
  collectFastForBlock(block: L2Block, txHashes: TxHash[] | string[], opts: {
96
75
  deadline: Date;
@@ -101,12 +80,18 @@ export declare class TxCollection {
101
80
  deadline: Date;
102
81
  pinnedPeer?: PeerId;
103
82
  }): Promise<Tx[]>;
104
- /** Returns the TxAddContext for the given fast collection request input */
105
- private getAddContextForInput;
106
- /** Mark the given txs as found. Stops collecting them. */
83
+ protected collectFast(request: FastCollectionRequest, opts: {
84
+ pinnedPeer?: PeerId;
85
+ }): Promise<void>;
86
+ private collectFastFromNodes;
87
+ private collectFastFromNode;
88
+ private collectFastViaReqResp;
89
+ /** Returns the TxAddContext for the given request, used by the sink to add txs to the pool correctly. */
90
+ private getAddContext;
91
+ /** Mark the given txs as found. Stops collecting them across all in-flight requests. */
107
92
  private foundTxs;
108
93
  /**
109
- * Stop collecting all txs for blocks less than or requal to the block number specified.
94
+ * Stop collecting all txs for blocks less than or equal to the block number specified.
110
95
  * To be called when we no longer care about gathering txs up to a certain block, eg when they become proven or finalized.
111
96
  */
112
97
  stopCollectingForBlocksUpTo(blockNumber: BlockNumber): void;
@@ -115,6 +100,5 @@ export declare class TxCollection {
115
100
  * To be called when there is a chain prune and previously mined txs are no longer relevant.
116
101
  */
117
102
  stopCollectingForBlocksAfter(blockNumber: BlockNumber): void;
118
- private reconcileFoundTxsWithPool;
119
103
  }
120
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfY29sbGVjdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3R4X2NvbGxlY3Rpb24vdHhfY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBR2xFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDMUMsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBRW5GLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxjQUFjLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUN6RixPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQ2hHLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixF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
104
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfY29sbGVjdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3R4X2NvbGxlY3Rpb24vdHhfY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRWxFLE9BQU8sRUFBRSxZQUFZLEVBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDMUMsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBRW5GLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxjQUFjLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUV6RixPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQ2hHLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLGlCQUFp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
@@ -1 +1 @@
1
- {"version":3,"file":"tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAA2B,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe,GAAG,YAAY,CAAC;AAEpH,MAAM,MAAM,aAAa,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CAAC;AAEnH,MAAM,MAAM,0BAA0B,GAClC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,CAAC;AAEjF,MAAM,MAAM,qBAAqB,GAAG,0BAA0B,GAAG;IAC/D,cAAc,EAAE,eAAe,CAAC;IAChC,SAAS,EAAE,WAAW,CAAC;CACxB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,qBAAa,YAAY;IAgCrB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAvCtB,uCAAuC;IACvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,gBAAgB,CAAC;IAEpD,8BAA8B;IAC9B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,gBAAgB,CAAC;IAEpD,wDAAwD;IACxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,qBAAqB,CAAC;IAElE,6DAA6D;IAC7D,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,qBAAqB,CAAC;IAElE,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAiB;IAEvD,8DAA8D;IAC9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IAEpD,uDAAuD;IACvD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IAErE,kEAAkE;IAClE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IAE/D,4CAA4C;IAC5C,OAAO,CAAC,OAAO,CAAS;IAExB,iDAAiD;IACjD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;IAE9C,YACmB,UAAU,EAAE,6BAA6B,EACzC,KAAK,EAAE,QAAQ,EAAE,EACjB,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,kBAAkB,EAC3C,gBAAgB,GAAE,iBAAiB,EAAO,EACzB,YAAY,GAAE,YAAiC,EAChE,eAAe,GAAE,eAAsC,EACtC,GAAG,GAAE,MAAkD,EAkEzE;IAED,mCAAmC;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAS5B;IAED,0BAA0B;IACb,IAAI,kBAYhB;IAED,iEAAiE;IACpD,OAAO,kBAEnB;IAED,mCAAmC;IAC5B,YAAY,IAAI,iBAAiB,CAEvC;IAED,mFAAmF;IAC5E,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAoBxD;IAED,+EAA+E;IACxE,sBAAsB,CAC3B,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAC7B,IAAI,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,iBAG9C;IAED,4EAA4E;IACrE,mBAAmB,CACxB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAC7B,IAAI,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,iBAG9C;IAED,kFAAkF;IAC3E,cAAc,CACnB,KAAK,EAAE,0BAA0B,EACjC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAC7B,IAAI,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,iBAiB9C;IAED,2EAA2E;IAC3E,OAAO,CAAC,qBAAqB;IAQ7B,0DAA0D;IAC1D,OAAO,CAAC,QAAQ;IAOhB;;;OAGG;IACI,2BAA2B,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAKjE;IAED;;;OAGG;IACI,4BAA4B,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAKlE;YAGa,yBAAyB;CAUxC"}
1
+ {"version":3,"file":"tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_collection.ts"],"names":[],"mappings":"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"}