@aztec/p2p 0.0.1-commit.96dac018d → 0.0.1-commit.993d240

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 (455) hide show
  1. package/README.md +129 -3
  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 +9 -1
  5. package/dest/client/factory.d.ts +7 -7
  6. package/dest/client/factory.d.ts.map +1 -1
  7. package/dest/client/factory.js +34 -16
  8. package/dest/client/interface.d.ts +17 -8
  9. package/dest/client/interface.d.ts.map +1 -1
  10. package/dest/client/p2p_client.d.ts +15 -11
  11. package/dest/client/p2p_client.d.ts.map +1 -1
  12. package/dest/client/p2p_client.js +93 -49
  13. package/dest/config.d.ts +153 -102
  14. package/dest/config.d.ts.map +1 -1
  15. package/dest/config.js +134 -35
  16. package/dest/errors/p2p-service.error.d.ts +9 -0
  17. package/dest/errors/p2p-service.error.d.ts.map +1 -0
  18. package/dest/errors/p2p-service.error.js +10 -0
  19. package/dest/errors/reqresp.error.d.ts +1 -20
  20. package/dest/errors/reqresp.error.d.ts.map +1 -1
  21. package/dest/errors/reqresp.error.js +0 -21
  22. package/dest/index.d.ts +1 -2
  23. package/dest/index.d.ts.map +1 -1
  24. package/dest/index.js +0 -1
  25. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +99 -59
  26. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  27. package/dest/mem_pools/attestation_pool/attestation_pool.js +267 -197
  28. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
  29. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  30. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +181 -65
  31. package/dest/mem_pools/attestation_pool/mocks.d.ts +1 -1
  32. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  33. package/dest/mem_pools/attestation_pool/mocks.js +6 -4
  34. package/dest/mem_pools/index.d.ts +1 -2
  35. package/dest/mem_pools/index.d.ts.map +1 -1
  36. package/dest/mem_pools/instrumentation.d.ts +4 -2
  37. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  38. package/dest/mem_pools/instrumentation.js +33 -15
  39. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts +1 -1
  40. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -1
  41. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +2 -1
  42. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +1 -1
  43. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -1
  44. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +2 -0
  45. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +2 -1
  46. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -1
  47. package/dest/mem_pools/tx_pool_v2/eviction/index.js +1 -0
  48. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts +16 -0
  49. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts.map +1 -0
  50. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.js +62 -0
  51. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts +7 -1
  52. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts.map +1 -1
  53. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +2 -2
  54. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts +1 -1
  55. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts.map +1 -1
  56. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.js +8 -6
  57. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts +2 -2
  58. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts.map +1 -1
  59. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.js +2 -2
  60. package/dest/mem_pools/tx_pool_v2/index.d.ts +2 -2
  61. package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
  62. package/dest/mem_pools/tx_pool_v2/index.js +1 -1
  63. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +12 -5
  64. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
  65. package/dest/mem_pools/tx_pool_v2/interfaces.js +2 -1
  66. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +44 -12
  67. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
  68. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +81 -22
  69. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +1 -1
  70. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
  71. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +26 -44
  72. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +4 -2
  73. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
  74. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +6 -0
  75. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +2 -1
  76. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
  77. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +133 -110
  78. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +9 -3
  79. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  80. package/dest/msg_validators/attestation_validator/attestation_validator.js +37 -12
  81. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +7 -3
  82. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  83. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +4 -5
  84. package/dest/msg_validators/clock_tolerance.d.ts +12 -1
  85. package/dest/msg_validators/clock_tolerance.d.ts.map +1 -1
  86. package/dest/msg_validators/clock_tolerance.js +61 -3
  87. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +10 -4
  88. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
  89. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +10 -2
  90. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +10 -4
  91. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
  92. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +16 -2
  93. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +21 -8
  94. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
  95. package/dest/msg_validators/proposal_validator/proposal_validator.js +90 -44
  96. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +1 -1
  97. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  98. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +8 -15
  99. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts +2 -1
  100. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map +1 -1
  101. package/dest/msg_validators/tx_validator/allowed_public_setup.js +25 -21
  102. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts +17 -0
  103. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts.map +1 -0
  104. package/dest/msg_validators/tx_validator/allowed_setup_helpers.js +24 -0
  105. package/dest/msg_validators/tx_validator/archive_cache.js +1 -1
  106. package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts +15 -0
  107. package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts.map +1 -0
  108. package/dest/msg_validators/tx_validator/cached_tx_validator.js +19 -0
  109. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts +9 -0
  110. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts.map +1 -0
  111. package/dest/msg_validators/tx_validator/contract_instance_validator.js +48 -0
  112. package/dest/msg_validators/tx_validator/data_validator.d.ts +2 -1
  113. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  114. package/dest/msg_validators/tx_validator/data_validator.js +36 -2
  115. package/dest/msg_validators/tx_validator/factory.d.ts +27 -7
  116. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  117. package/dest/msg_validators/tx_validator/factory.js +47 -17
  118. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +1 -1
  119. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -1
  120. package/dest/msg_validators/tx_validator/fee_payer_balance.js +6 -2
  121. package/dest/msg_validators/tx_validator/gas_validator.d.ts +48 -7
  122. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  123. package/dest/msg_validators/tx_validator/gas_validator.js +88 -41
  124. package/dest/msg_validators/tx_validator/index.d.ts +4 -1
  125. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  126. package/dest/msg_validators/tx_validator/index.js +3 -0
  127. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
  128. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  129. package/dest/msg_validators/tx_validator/metadata_validator.js +4 -4
  130. package/dest/msg_validators/tx_validator/phases_validator.d.ts +22 -2
  131. package/dest/msg_validators/tx_validator/phases_validator.d.ts.map +1 -1
  132. package/dest/msg_validators/tx_validator/phases_validator.js +72 -24
  133. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +2 -1
  134. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -1
  135. package/dest/msg_validators/tx_validator/tx_proof_validator.js +2 -0
  136. package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts +48 -0
  137. package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts.map +1 -0
  138. package/dest/msg_validators/tx_validator/tx_validation_cache.js +69 -0
  139. package/dest/services/data_store.d.ts +1 -1
  140. package/dest/services/data_store.d.ts.map +1 -1
  141. package/dest/services/data_store.js +5 -5
  142. package/dest/services/discv5/discV5_service.d.ts +2 -1
  143. package/dest/services/discv5/discV5_service.d.ts.map +1 -1
  144. package/dest/services/discv5/discV5_service.js +35 -8
  145. package/dest/services/dummy_service.d.ts +11 -15
  146. package/dest/services/dummy_service.d.ts.map +1 -1
  147. package/dest/services/dummy_service.js +12 -16
  148. package/dest/services/encoding.d.ts +6 -2
  149. package/dest/services/encoding.d.ts.map +1 -1
  150. package/dest/services/encoding.js +14 -8
  151. package/dest/services/gossipsub/topic_score_params.d.ts +13 -2
  152. package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -1
  153. package/dest/services/gossipsub/topic_score_params.js +21 -4
  154. package/dest/services/libp2p/instrumentation.d.ts +3 -1
  155. package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
  156. package/dest/services/libp2p/instrumentation.js +14 -0
  157. package/dest/services/libp2p/libp2p_service.d.ts +39 -50
  158. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  159. package/dest/services/libp2p/libp2p_service.js +299 -250
  160. package/dest/services/peer-manager/metrics.d.ts +3 -1
  161. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  162. package/dest/services/peer-manager/metrics.js +6 -0
  163. package/dest/services/peer-manager/peer_manager.d.ts +6 -2
  164. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  165. package/dest/services/peer-manager/peer_manager.js +40 -11
  166. package/dest/services/peer-manager/peer_scoring.d.ts +7 -2
  167. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  168. package/dest/services/peer-manager/peer_scoring.js +32 -10
  169. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +11 -8
  170. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  171. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +84 -71
  172. package/dest/services/reqresp/batch-tx-requester/interface.d.ts +10 -6
  173. package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map +1 -1
  174. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts +5 -4
  175. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts.map +1 -1
  176. package/dest/services/reqresp/batch-tx-requester/missing_txs.js +13 -7
  177. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts +3 -1
  178. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts.map +1 -1
  179. package/dest/services/reqresp/batch-tx-requester/peer_collection.js +3 -0
  180. package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts +5 -14
  181. package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts.map +1 -1
  182. package/dest/services/reqresp/batch-tx-requester/tx_validator.js +6 -20
  183. package/dest/services/reqresp/config.d.ts +3 -3
  184. package/dest/services/reqresp/config.d.ts.map +1 -1
  185. package/dest/services/reqresp/interface.d.ts +16 -18
  186. package/dest/services/reqresp/interface.d.ts.map +1 -1
  187. package/dest/services/reqresp/interface.js +10 -20
  188. package/dest/services/reqresp/metrics.d.ts +1 -1
  189. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  190. package/dest/services/reqresp/metrics.js +0 -1
  191. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +1 -1
  192. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
  193. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js +4 -2
  194. package/dest/services/reqresp/protocols/index.d.ts +1 -2
  195. package/dest/services/reqresp/protocols/index.d.ts.map +1 -1
  196. package/dest/services/reqresp/protocols/index.js +0 -1
  197. package/dest/services/reqresp/protocols/tx.d.ts +1 -1
  198. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  199. package/dest/services/reqresp/protocols/tx.js +1 -3
  200. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +5 -4
  201. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -1
  202. package/dest/services/reqresp/rate-limiter/rate_limiter.js +10 -8
  203. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts +1 -1
  204. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -1
  205. package/dest/services/reqresp/rate-limiter/rate_limits.js +0 -10
  206. package/dest/services/reqresp/reqresp.d.ts +7 -29
  207. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  208. package/dest/services/reqresp/reqresp.js +43 -215
  209. package/dest/services/service.d.ts +9 -12
  210. package/dest/services/service.d.ts.map +1 -1
  211. package/dest/services/tx_collection/config.d.ts +2 -23
  212. package/dest/services/tx_collection/config.d.ts.map +1 -1
  213. package/dest/services/tx_collection/config.js +2 -55
  214. package/dest/services/tx_collection/file_store_tx_collection.d.ts +12 -28
  215. package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -1
  216. package/dest/services/tx_collection/file_store_tx_collection.js +43 -83
  217. package/dest/services/tx_collection/file_store_tx_source.d.ts +5 -4
  218. package/dest/services/tx_collection/file_store_tx_source.d.ts.map +1 -1
  219. package/dest/services/tx_collection/file_store_tx_source.js +39 -29
  220. package/dest/services/tx_collection/index.d.ts +2 -3
  221. package/dest/services/tx_collection/index.d.ts.map +1 -1
  222. package/dest/services/tx_collection/index.js +0 -1
  223. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  224. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  225. package/dest/services/tx_collection/instrumentation.js +0 -2
  226. package/dest/services/tx_collection/request_tracker.d.ts +53 -0
  227. package/dest/services/tx_collection/request_tracker.d.ts.map +1 -0
  228. package/dest/services/tx_collection/request_tracker.js +84 -0
  229. package/dest/services/tx_collection/tx_collection.d.ts +36 -55
  230. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  231. package/dest/services/tx_collection/tx_collection.js +275 -119
  232. package/dest/services/tx_collection/tx_collection_sink.d.ts +1 -1
  233. package/dest/services/tx_collection/tx_collection_sink.js +2 -2
  234. package/dest/services/tx_collection/tx_source.d.ts +6 -5
  235. package/dest/services/tx_collection/tx_source.d.ts.map +1 -1
  236. package/dest/services/tx_collection/tx_source.js +9 -7
  237. package/dest/services/tx_file_store/tx_file_store.d.ts +1 -3
  238. package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
  239. package/dest/services/tx_file_store/tx_file_store.js +4 -14
  240. package/dest/services/tx_provider.d.ts +3 -1
  241. package/dest/services/tx_provider.d.ts.map +1 -1
  242. package/dest/services/tx_provider.js +3 -0
  243. package/dest/test-helpers/make-test-p2p-clients.d.ts +5 -6
  244. package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
  245. package/dest/test-helpers/make-test-p2p-clients.js +5 -3
  246. package/dest/test-helpers/mock-pubsub.d.ts +24 -11
  247. package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
  248. package/dest/test-helpers/mock-pubsub.js +45 -45
  249. package/dest/test-helpers/reqresp-nodes.d.ts +5 -7
  250. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  251. package/dest/test-helpers/reqresp-nodes.js +17 -19
  252. package/dest/test-helpers/test_tx_provider.d.ts +3 -1
  253. package/dest/test-helpers/test_tx_provider.d.ts.map +1 -1
  254. package/dest/test-helpers/test_tx_provider.js +3 -0
  255. package/dest/test-helpers/testbench-utils.d.ts +12 -14
  256. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  257. package/dest/test-helpers/testbench-utils.js +42 -15
  258. package/dest/testbench/p2p_client_testbench_worker.d.ts +3 -5
  259. package/dest/testbench/p2p_client_testbench_worker.d.ts.map +1 -1
  260. package/dest/testbench/p2p_client_testbench_worker.js +88 -42
  261. package/dest/testbench/worker_client_manager.d.ts +12 -6
  262. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  263. package/dest/testbench/worker_client_manager.js +57 -11
  264. package/dest/util.d.ts +12 -7
  265. package/dest/util.d.ts.map +1 -1
  266. package/dest/util.js +35 -14
  267. package/dest/versioning.d.ts +3 -6
  268. package/dest/versioning.d.ts.map +1 -1
  269. package/dest/versioning.js +3 -24
  270. package/package.json +15 -14
  271. package/src/bootstrap/bootstrap.ts +9 -1
  272. package/src/client/factory.ts +65 -21
  273. package/src/client/interface.ts +18 -20
  274. package/src/client/p2p_client.ts +108 -82
  275. package/src/client/test/{tx_proposal_collector/README.md → p2p_client.batch_tx_requester.bench.README.md} +23 -53
  276. package/src/config.ts +226 -36
  277. package/src/errors/p2p-service.error.ts +11 -0
  278. package/src/errors/reqresp.error.ts +0 -25
  279. package/src/index.ts +0 -1
  280. package/src/mem_pools/attestation_pool/attestation_pool.ts +318 -242
  281. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +204 -68
  282. package/src/mem_pools/attestation_pool/mocks.ts +13 -8
  283. package/src/mem_pools/index.ts +0 -3
  284. package/src/mem_pools/instrumentation.ts +22 -14
  285. package/src/mem_pools/tx_pool_v2/README.md +9 -1
  286. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +2 -1
  287. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +3 -0
  288. package/src/mem_pools/tx_pool_v2/eviction/index.ts +1 -0
  289. package/src/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.ts +65 -0
  290. package/src/mem_pools/tx_pool_v2/eviction/interfaces.ts +11 -1
  291. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +3 -3
  292. package/src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts +15 -6
  293. package/src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts +2 -1
  294. package/src/mem_pools/tx_pool_v2/index.ts +1 -1
  295. package/src/mem_pools/tx_pool_v2/interfaces.ts +12 -4
  296. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +121 -27
  297. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +29 -43
  298. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +16 -1
  299. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +141 -114
  300. package/src/msg_validators/attestation_validator/README.md +49 -0
  301. package/src/msg_validators/attestation_validator/attestation_validator.ts +41 -9
  302. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +14 -7
  303. package/src/msg_validators/clock_tolerance.ts +79 -3
  304. package/src/msg_validators/proposal_validator/README.md +123 -0
  305. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +24 -4
  306. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +35 -7
  307. package/src/msg_validators/proposal_validator/proposal_validator.ts +114 -47
  308. package/src/msg_validators/tx_validator/README.md +15 -3
  309. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +3 -12
  310. package/src/msg_validators/tx_validator/allowed_public_setup.ts +22 -27
  311. package/src/msg_validators/tx_validator/allowed_setup_helpers.ts +31 -0
  312. package/src/msg_validators/tx_validator/archive_cache.ts +1 -1
  313. package/src/msg_validators/tx_validator/cached_tx_validator.ts +31 -0
  314. package/src/msg_validators/tx_validator/contract_instance_validator.ts +56 -0
  315. package/src/msg_validators/tx_validator/data_validator.ts +44 -1
  316. package/src/msg_validators/tx_validator/factory.ts +61 -10
  317. package/src/msg_validators/tx_validator/fee_payer_balance.ts +6 -2
  318. package/src/msg_validators/tx_validator/gas_validator.ts +121 -39
  319. package/src/msg_validators/tx_validator/index.ts +3 -0
  320. package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
  321. package/src/msg_validators/tx_validator/phases_validator.ts +82 -27
  322. package/src/msg_validators/tx_validator/tx_proof_validator.ts +2 -0
  323. package/src/msg_validators/tx_validator/tx_validation_cache.ts +102 -0
  324. package/src/services/data_store.ts +5 -13
  325. package/src/services/discv5/discV5_service.ts +38 -5
  326. package/src/services/dummy_service.ts +14 -39
  327. package/src/services/encoding.ts +14 -7
  328. package/src/services/gossipsub/topic_score_params.ts +36 -4
  329. package/src/services/libp2p/instrumentation.ts +14 -0
  330. package/src/services/libp2p/libp2p_service.ts +326 -287
  331. package/src/services/peer-manager/metrics.ts +7 -0
  332. package/src/services/peer-manager/peer_manager.ts +46 -11
  333. package/src/services/peer-manager/peer_scoring.ts +27 -5
  334. package/src/services/reqresp/README.md +215 -0
  335. package/src/services/reqresp/batch-tx-requester/README.md +46 -7
  336. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +83 -77
  337. package/src/services/reqresp/batch-tx-requester/interface.ts +13 -5
  338. package/src/services/reqresp/batch-tx-requester/missing_txs.ts +13 -6
  339. package/src/services/reqresp/batch-tx-requester/peer_collection.ts +5 -0
  340. package/src/services/reqresp/batch-tx-requester/tx_validator.ts +12 -25
  341. package/src/services/reqresp/config.ts +2 -2
  342. package/src/services/reqresp/interface.ts +21 -47
  343. package/src/services/reqresp/metrics.ts +0 -1
  344. package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +4 -2
  345. package/src/services/reqresp/protocols/index.ts +0 -1
  346. package/src/services/reqresp/protocols/tx.ts +1 -3
  347. package/src/services/reqresp/rate-limiter/rate_limiter.ts +13 -9
  348. package/src/services/reqresp/rate-limiter/rate_limits.ts +0 -10
  349. package/src/services/reqresp/reqresp.ts +48 -261
  350. package/src/services/service.ts +12 -28
  351. package/src/services/tx_collection/config.ts +3 -80
  352. package/src/services/tx_collection/file_store_tx_collection.ts +54 -103
  353. package/src/services/tx_collection/file_store_tx_source.ts +43 -31
  354. package/src/services/tx_collection/index.ts +1 -6
  355. package/src/services/tx_collection/instrumentation.ts +1 -7
  356. package/src/services/tx_collection/request_tracker.ts +127 -0
  357. package/src/services/tx_collection/tx_collection.ts +331 -176
  358. package/src/services/tx_collection/tx_collection_sink.ts +2 -2
  359. package/src/services/tx_collection/tx_source.ts +8 -7
  360. package/src/services/tx_file_store/tx_file_store.ts +5 -17
  361. package/src/services/tx_provider.ts +5 -0
  362. package/src/test-helpers/make-test-p2p-clients.ts +4 -3
  363. package/src/test-helpers/mock-pubsub.ts +49 -66
  364. package/src/test-helpers/reqresp-nodes.ts +15 -28
  365. package/src/test-helpers/test_tx_provider.ts +5 -0
  366. package/src/test-helpers/testbench-utils.ts +53 -28
  367. package/src/testbench/p2p_client_testbench_worker.ts +91 -61
  368. package/src/testbench/worker_client_manager.ts +72 -25
  369. package/src/util.ts +33 -18
  370. package/src/versioning.ts +3 -33
  371. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts +0 -2
  372. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts.map +0 -1
  373. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +0 -305
  374. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts +0 -73
  375. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts.map +0 -1
  376. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.js +0 -8
  377. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +0 -125
  378. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +0 -1
  379. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +0 -596
  380. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +0 -32
  381. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +0 -1
  382. package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +0 -112
  383. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +0 -157
  384. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +0 -1
  385. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +0 -52
  386. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +0 -16
  387. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +0 -1
  388. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +0 -122
  389. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +0 -17
  390. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +0 -1
  391. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +0 -84
  392. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +0 -19
  393. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +0 -1
  394. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +0 -78
  395. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +0 -26
  396. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +0 -1
  397. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +0 -84
  398. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +0 -25
  399. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +0 -1
  400. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +0 -57
  401. package/dest/mem_pools/tx_pool/index.d.ts +0 -3
  402. package/dest/mem_pools/tx_pool/index.d.ts.map +0 -1
  403. package/dest/mem_pools/tx_pool/index.js +0 -2
  404. package/dest/mem_pools/tx_pool/priority.d.ts +0 -12
  405. package/dest/mem_pools/tx_pool/priority.d.ts.map +0 -1
  406. package/dest/mem_pools/tx_pool/priority.js +0 -15
  407. package/dest/mem_pools/tx_pool/tx_pool.d.ts +0 -127
  408. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +0 -1
  409. package/dest/mem_pools/tx_pool/tx_pool.js +0 -3
  410. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +0 -7
  411. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +0 -1
  412. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +0 -400
  413. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +0 -23
  414. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +0 -1
  415. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +0 -212
  416. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +0 -64
  417. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +0 -1
  418. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +0 -151
  419. package/dest/services/reqresp/protocols/block.d.ts +0 -9
  420. package/dest/services/reqresp/protocols/block.d.ts.map +0 -1
  421. package/dest/services/reqresp/protocols/block.js +0 -32
  422. package/dest/services/tx_collection/fast_tx_collection.d.ts +0 -54
  423. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +0 -1
  424. package/dest/services/tx_collection/fast_tx_collection.js +0 -327
  425. package/dest/services/tx_collection/missing_txs_tracker.d.ts +0 -32
  426. package/dest/services/tx_collection/missing_txs_tracker.d.ts.map +0 -1
  427. package/dest/services/tx_collection/missing_txs_tracker.js +0 -27
  428. package/dest/services/tx_collection/proposal_tx_collector.d.ts +0 -49
  429. package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +0 -1
  430. package/dest/services/tx_collection/proposal_tx_collector.js +0 -50
  431. package/dest/services/tx_collection/slow_tx_collection.d.ts +0 -57
  432. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +0 -1
  433. package/dest/services/tx_collection/slow_tx_collection.js +0 -211
  434. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +0 -346
  435. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.ts +0 -43
  436. package/src/mem_pools/tx_pool/README.md +0 -270
  437. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +0 -746
  438. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +0 -132
  439. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +0 -208
  440. package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +0 -162
  441. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +0 -104
  442. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +0 -93
  443. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +0 -106
  444. package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +0 -75
  445. package/src/mem_pools/tx_pool/index.ts +0 -2
  446. package/src/mem_pools/tx_pool/priority.ts +0 -20
  447. package/src/mem_pools/tx_pool/tx_pool.ts +0 -141
  448. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +0 -319
  449. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +0 -230
  450. package/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +0 -161
  451. package/src/services/reqresp/protocols/block.ts +0 -37
  452. package/src/services/tx_collection/fast_tx_collection.ts +0 -387
  453. package/src/services/tx_collection/missing_txs_tracker.ts +0 -52
  454. package/src/services/tx_collection/proposal_tx_collector.ts +0 -113
  455. package/src/services/tx_collection/slow_tx_collection.ts +0 -266
@@ -1,24 +1,21 @@
1
- import { compactArray } from '@aztec/foundation/collection';
1
+ import { times } from '@aztec/foundation/collection';
2
2
  import { createLogger } from '@aztec/foundation/log';
3
- import { RunningPromise } from '@aztec/foundation/promise';
4
3
  import { sleep } from '@aztec/foundation/sleep';
5
- import { DateProvider } from '@aztec/foundation/timer';
4
+ import { DateProvider, elapsed } from '@aztec/foundation/timer';
6
5
  import { TxHash } from '@aztec/stdlib/tx';
7
6
  import { getTelemetryClient } from '@aztec/telemetry-client';
8
- import { FastTxCollection } from './fast_tx_collection.js';
7
+ import { BatchTxRequester } from '../reqresp/batch-tx-requester/batch_tx_requester.js';
9
8
  import { FileStoreTxCollection } from './file_store_tx_collection.js';
10
- import { SlowTxCollection, getProofDeadlineForSlot } from './slow_tx_collection.js';
9
+ import { RequestTracker } from './request_tracker.js';
11
10
  import { TxCollectionSink } from './tx_collection_sink.js';
12
11
  /**
13
- * Coordinates tx collection from remote RPC nodes and reqresp.
12
+ * Coordinates tx collection from remote RPC nodes, reqresp, and file store.
14
13
  *
15
- * The slow collection loops are used for periodically collecting missing txs from mined blocks,
16
- * from remote RPC nodes and via reqresp. The fast collection methods are used to quickly gather
17
- * txs, usually for attesting to block proposals or preparing to prove an epoch. The slow and fast
18
- * collection instances both send their txs to the collection sink, which handles metrics and adds
19
- * them to the tx pool. Whenever a tx is added to either the sink or the pool, this service is notified
20
- * via events and notifies the slow and fast collection loops to stop collecting that tx, so that we don't
21
- * collect the same tx multiple times.
14
+ * Runs a sequential pipeline: node RPC reqresp file store. Node collection starts immediately,
15
+ * reqresp starts after a configured delay, and file store (if configured) starts after a further
16
+ * delay. All paths send txs to the collection sink, which handles metrics and adds them to the
17
+ * tx pool. Whenever a tx is added to the sink or the pool, this service is notified and stops
18
+ * collecting that tx across all in-flight requests.
22
19
  */ export class TxCollection {
23
20
  p2pService;
24
21
  nodes;
@@ -27,16 +24,13 @@ import { TxCollectionSink } from './tx_collection_sink.js';
27
24
  config;
28
25
  dateProvider;
29
26
  log;
30
- /** Slow collection background loops */ slowCollection;
31
- /** Fast collection methods */ fastCollection;
32
- /** File store collection for slow (mined block) path */ fileStoreSlowCollection;
33
- /** File store collection for fast (proposal/proving) path */ fileStoreFastCollection;
34
- /** Loop for periodically reconciling found transactions from the tx pool in case we missed some */ reconcileFoundTxsLoop;
35
- /** Handles txs found by the slow and fast collection loops */ txCollectionSink;
27
+ // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
28
+ requests;
29
+ /** The collector for txs via reqresp */ reqRespTxsCollector;
30
+ /** File store collection for the fast (proposal/proving) path */ fileStoreFastCollection;
31
+ /** Handles txs found by collection paths before adding to the pool */ txCollectionSink;
36
32
  /** Handler for the txs-added event from the tx pool */ handleTxsAddedToPool;
37
33
  /** Handler for the txs-added event from the tx collection sink */ handleTxsFound;
38
- /** Whether the service has been started. */ started;
39
- /** Whether file store sources are configured. */ hasFileStoreSources;
40
34
  constructor(p2pService, nodes, constants, txPool, config, fileStoreSources = [], dateProvider = new DateProvider(), telemetryClient = getTelemetryClient(), log = createLogger('p2p:tx_collection_service')){
41
35
  this.p2pService = p2pService;
42
36
  this.nodes = nodes;
@@ -45,22 +39,14 @@ import { TxCollectionSink } from './tx_collection_sink.js';
45
39
  this.config = config;
46
40
  this.dateProvider = dateProvider;
47
41
  this.log = log;
48
- this.started = false;
42
+ this.requests = new Set();
49
43
  this.txCollectionSink = new TxCollectionSink(this.txPool, telemetryClient, this.log);
50
- this.fastCollection = new FastTxCollection(this.p2pService, this.nodes, this.txCollectionSink, this.config, this.dateProvider, this.log);
51
- this.slowCollection = new SlowTxCollection(this.p2pService.reqResp, this.nodes, this.txCollectionSink, this.fastCollection, constants, this.config, this.dateProvider, this.log);
52
- this.hasFileStoreSources = fileStoreSources.length > 0;
53
- this.fileStoreSlowCollection = new FileStoreTxCollection(fileStoreSources, this.txCollectionSink, {
54
- workerCount: config.txCollectionFileStoreSlowWorkerCount,
55
- backoffBaseMs: config.txCollectionFileStoreSlowBackoffBaseMs,
56
- backoffMaxMs: config.txCollectionFileStoreSlowBackoffMaxMs
57
- }, this.dateProvider, this.log);
44
+ this.reqRespTxsCollector = (requestTracker, blockTxsSource, pinnedPeer)=>BatchTxRequester.collectAllTxs(new BatchTxRequester(requestTracker, blockTxsSource, pinnedPeer, this.p2pService, this.log, this.dateProvider).run());
58
45
  this.fileStoreFastCollection = new FileStoreTxCollection(fileStoreSources, this.txCollectionSink, {
59
46
  workerCount: config.txCollectionFileStoreFastWorkerCount,
60
47
  backoffBaseMs: config.txCollectionFileStoreFastBackoffBaseMs,
61
48
  backoffMaxMs: config.txCollectionFileStoreFastBackoffMaxMs
62
49
  }, this.dateProvider, this.log);
63
- this.reconcileFoundTxsLoop = new RunningPromise(()=>this.reconcileFoundTxsWithPool(), this.log, this.config.txCollectionReconcileIntervalMs);
64
50
  this.handleTxsFound = (args)=>{
65
51
  this.foundTxs(args.txs);
66
52
  };
@@ -73,128 +59,298 @@ import { TxCollectionSink } from './tx_collection_sink.js';
73
59
  };
74
60
  this.txPool.on('txs-added', this.handleTxsAddedToPool);
75
61
  }
76
- /** Starts all collection loops. */ start() {
77
- this.started = true;
78
- this.slowCollection.start();
79
- this.fileStoreSlowCollection.start();
80
- this.fileStoreFastCollection.start();
81
- this.reconcileFoundTxsLoop.start();
82
- // TODO(palla/txs): Collect mined unproven tx hashes for txs we dont have in the pool and populate missingTxs on startup
83
- return Promise.resolve();
84
- }
85
- /** Stops all activity. */ async stop() {
86
- this.started = false;
87
- await Promise.all([
88
- this.slowCollection.stop(),
89
- this.fastCollection.stop(),
90
- this.fileStoreSlowCollection.stop(),
91
- this.fileStoreFastCollection.stop(),
92
- this.reconcileFoundTxsLoop.stop()
93
- ]);
62
+ /** Stops all activity. Cancels in-flight requests; file store workers self-terminate. */ stop() {
63
+ this.requests.forEach((request)=>{
64
+ request.requestTracker.cancel();
65
+ });
94
66
  this.txPool.removeListener('txs-added', this.handleTxsAddedToPool);
95
67
  this.txCollectionSink.removeListener('txs-added', this.handleTxsFound);
96
68
  }
97
- /** Force trigger the slow collection and reconciliation loops */ async trigger() {
98
- await Promise.all([
99
- this.reconcileFoundTxsLoop.trigger(),
100
- this.slowCollection.trigger()
101
- ]);
102
- }
103
69
  /** Returns L1 rollup constants. */ getConstants() {
104
70
  return this.constants;
105
71
  }
106
- /** Starts collecting the given tx hashes for the given L2Block in the slow loop */ startCollecting(block, txHashes) {
107
- this.slowCollection.startCollecting(block, txHashes);
108
- // Delay file store collection to give P2P methods time to find txs first
109
- if (this.hasFileStoreSources) {
110
- const context = {
111
- type: 'mined',
112
- block
113
- };
114
- const deadline = getProofDeadlineForSlot(block.header.getSlot(), this.constants);
115
- sleep(this.config.txCollectionFileStoreSlowDelayMs).then(()=>{
116
- if (this.started) {
117
- // Only queue txs that are still missing after the delay
118
- const stillMissing = new Set(this.slowCollection.getMissingTxHashes().map((h)=>h.toString()));
119
- const remaining = txHashes.filter((h)=>stillMissing.has(h.toString()));
120
- if (remaining.length > 0) {
121
- this.fileStoreSlowCollection.startCollecting(remaining, context, deadline);
122
- }
123
- }
124
- }).catch((err)=>this.log.error('Error in file store slow delay', err));
125
- }
126
- }
127
- /** Collects the set of txs for the given block proposal as fast as possible */ collectFastForProposal(blockProposal, blockNumber, txHashes, opts) {
128
- return this.collectFastFor({
129
- type: 'proposal',
130
- blockProposal,
131
- blockNumber
132
- }, txHashes, opts);
133
- }
134
72
  /** Collects the set of txs for the given mined block as fast as possible */ collectFastForBlock(block, txHashes, opts) {
135
73
  return this.collectFastFor({
136
74
  type: 'block',
137
75
  block
138
76
  }, txHashes, opts);
139
77
  }
140
- /** Collects the set of txs for the given proposal or block as fast as possible */ collectFastFor(input, txHashes, opts) {
78
+ /** Collects the set of txs for the given proposal or block as fast as possible */ async collectFastFor(input, txHashes, opts) {
79
+ const timeout = opts.deadline.getTime() - this.dateProvider.now();
80
+ if (timeout <= 0) {
81
+ this.log.warn(`Deadline for fast tx collection is in the past (${timeout}ms)`, {
82
+ deadline: opts.deadline.getTime(),
83
+ now: this.dateProvider.now()
84
+ });
85
+ return [];
86
+ }
141
87
  const hashes = txHashes.map((h)=>typeof h === 'string' ? TxHash.fromString(h) : h);
142
- // Delay file store collection to give P2P methods time to find txs first
143
- if (this.hasFileStoreSources) {
144
- const context = this.getAddContextForInput(input);
145
- sleep(this.config.txCollectionFileStoreFastDelayMs).then(()=>{
146
- if (this.started) {
147
- this.fileStoreFastCollection.startCollecting(hashes, context, opts.deadline);
88
+ const blockInfo = input.type === 'proposal' ? {
89
+ ...input.blockProposal.toBlockInfo(),
90
+ blockNumber: input.blockNumber
91
+ } : {
92
+ ...input.block.toBlockInfo()
93
+ };
94
+ const request = {
95
+ ...input,
96
+ blockInfo,
97
+ requestTracker: RequestTracker.create(hashes, opts.deadline, this.dateProvider)
98
+ };
99
+ const [duration] = await elapsed(()=>this.collectFast(request, {
100
+ pinnedPeer: opts.pinnedPeer
101
+ }));
102
+ this.log.verbose(`Collected ${request.requestTracker.collectedTxs.length} txs out of ${hashes.length} for ${input.type} at slot ${blockInfo.slotNumber}`, {
103
+ ...blockInfo,
104
+ duration,
105
+ requestType: input.type,
106
+ missingTxs: [
107
+ ...request.requestTracker.missingTxHashes
108
+ ]
109
+ });
110
+ return request.requestTracker.collectedTxs;
111
+ }
112
+ async collectFast(request, opts) {
113
+ this.requests.add(request);
114
+ const { blockInfo } = request;
115
+ this.log.debug(`Starting fast collection of ${request.requestTracker.numberOfMissingTxs} txs for ${request.type} at slot ${blockInfo.slotNumber}`, {
116
+ ...blockInfo,
117
+ requestType: request.type,
118
+ deadline: request.requestTracker.deadline
119
+ });
120
+ try {
121
+ // 1. Start node collection in the background.
122
+ // Note: this will be a noop if no nodes are configured.
123
+ const nodeCollectionPromise = this.collectFastFromNodes(request);
124
+ // 2. Wait before starting reqresp, interruptible by cancellation or node exhaustion.
125
+ await Promise.race([
126
+ request.requestTracker.cancellationToken,
127
+ sleep(this.config.txCollectionFastNodesTimeoutBeforeReqRespMs),
128
+ nodeCollectionPromise
129
+ ]);
130
+ // 3. Start reqresp in the background (runs in parallel with node collection).
131
+ // Note: this will be a noop if all TXs were already found.
132
+ const reqRespPromise = this.collectFastViaReqResp(request, opts);
133
+ // 4. Wait before starting file store, interruptible by cancellation.
134
+ await Promise.race([
135
+ request.requestTracker.cancellationToken,
136
+ sleep(this.config.txCollectionFileStoreFastDelayMs),
137
+ reqRespPromise
138
+ ]);
139
+ // 5. Start file store collection in the background. Self-terminates on tracker cancel / all-found.
140
+ // Note: this will be a noop if all TXs were already found.
141
+ const fileStorePromise = this.fileStoreFastCollection.startCollecting(request.requestTracker, this.getAddContext(request));
142
+ // 6. Wait for all paths to settle.
143
+ // NOTE: The request will automatically be cancelled after `opt.deadline` is reached.
144
+ await Promise.allSettled([
145
+ reqRespPromise,
146
+ nodeCollectionPromise,
147
+ fileStorePromise
148
+ ]);
149
+ } catch (err) {
150
+ this.log.error(`Error collecting txs for ${request.type} for slot ${blockInfo.slotNumber}`, err, {
151
+ ...blockInfo,
152
+ missingTxs: request.requestTracker.missingTxHashes.values().map((txHash)=>txHash.toString())
153
+ });
154
+ } finally{
155
+ request.requestTracker.cancel();
156
+ this.requests.delete(request);
157
+ }
158
+ }
159
+ /**
160
+ * Starts collecting txs from all configured nodes. We send `txCollectionFastMaxParallelRequestsPerNode` requests
161
+ * in parallel to each node. We keep track of the number of attempts made to collect each tx, so we can prioritize
162
+ * the txs that have been requested less often whenever we need to send a new batch of requests. We ensure that no
163
+ * tx is requested more than once at the same time to the same node.
164
+ */ async collectFastFromNodes(request) {
165
+ if (this.nodes.length === 0) {
166
+ return;
167
+ }
168
+ // Keep a shared priority queue of all txs pending to be requested, sorted by the number of attempts made to collect them.
169
+ const attemptsPerTx = [
170
+ ...request.requestTracker.missingTxHashes
171
+ ].map((txHash)=>({
172
+ txHash,
173
+ attempts: 0,
174
+ found: false
175
+ }));
176
+ // Returns once we have finished all node loops. Each loop finishes when the deadline is hit, or all txs have been collected.
177
+ await Promise.allSettled(this.nodes.map((node)=>this.collectFastFromNode(request, node, attemptsPerTx)));
178
+ }
179
+ async collectFastFromNode(request, node, attemptsPerTx) {
180
+ const notFinished = ()=>!request.requestTracker.checkCancelled();
181
+ const maxParallelRequests = this.config.txCollectionFastMaxParallelRequestsPerNode;
182
+ const maxBatchSize = this.config.txCollectionNodeRpcMaxBatchSize;
183
+ const activeRequestsToThisNode = new Set(); // Track the txs being actively requested to this node
184
+ const processBatch = async ()=>{
185
+ while(notFinished()){
186
+ // Pull tx hashes from the attemptsPerTx array, which is sorted by attempts,
187
+ // so we prioritize txs that have been requested less often.
188
+ const batch = [];
189
+ let index = 0;
190
+ while(batch.length < maxBatchSize){
191
+ const txToRequest = attemptsPerTx[index++];
192
+ if (!txToRequest) {
193
+ break;
194
+ } else if (!request.requestTracker.isMissing(txToRequest.txHash)) {
195
+ // Mark as found if it was found somewhere else, we'll then remove it from the array.
196
+ // We don't delete it now since 'array.splice' is pretty expensive, so we do it after sorting.
197
+ txToRequest.found = true;
198
+ } else if (!activeRequestsToThisNode.has(txToRequest.txHash)) {
199
+ // If the tx is not already being requested to this node, add it to the current batch and increase attempts.
200
+ // Note that we increase the attempts *before* making the request, so the next `collectFastFromNode` that
201
+ // needs to grab txs to send, will pick txs that have been requested less often, instead of all requesting
202
+ // the same txs at the same time.
203
+ batch.push(txToRequest);
204
+ activeRequestsToThisNode.add(txToRequest.txHash);
205
+ txToRequest.attempts++;
206
+ }
148
207
  }
149
- }).catch((err)=>this.log.error('Error in file store fast delay', err));
208
+ // After modifying the array by removing txs or updating attempts, re-sort it and trim the found txs from the end.
209
+ attemptsPerTx.sort((a, b)=>a.found === b.found ? a.attempts - b.attempts : Number(a.found) - Number(b.found));
210
+ const firstFoundTxIndex = attemptsPerTx.findIndex((tx)=>tx.found);
211
+ if (firstFoundTxIndex !== -1) {
212
+ attemptsPerTx.length = firstFoundTxIndex;
213
+ }
214
+ // If we see no more txs to request, we can stop this "process" loop
215
+ if (batch.length === 0) {
216
+ return;
217
+ }
218
+ const txHashes = batch.map(({ txHash })=>txHash);
219
+ // Collect this batch from the node
220
+ await this.txCollectionSink.collect(async ()=>{
221
+ const result = await node.getTxsByHash(txHashes.map(TxHash.fromString));
222
+ for (const tx of result.validTxs){
223
+ request.requestTracker.markFetched(tx);
224
+ }
225
+ return result;
226
+ }, txHashes, {
227
+ description: `fast ${node.getInfo()}`,
228
+ node: node.getInfo(),
229
+ method: 'fast-node-rpc',
230
+ ...request.blockInfo
231
+ }, this.getAddContext(request));
232
+ // Clear from the active requests the txs we just requested
233
+ for (const requestedTx of batch){
234
+ activeRequestsToThisNode.delete(requestedTx.txHash);
235
+ }
236
+ // Sleep a bit until hitting the node again, but wake up immediately on cancellation
237
+ if (notFinished()) {
238
+ await Promise.race([
239
+ sleep(this.config.txCollectionFastNodeIntervalMs),
240
+ request.requestTracker.cancellationToken
241
+ ]);
242
+ }
243
+ }
244
+ };
245
+ // Kick off N parallel requests to the node, up to the maxParallelRequests limit
246
+ await Promise.all(times(maxParallelRequests, processBatch));
247
+ }
248
+ async collectFastViaReqResp(request, opts) {
249
+ const pinnedPeer = opts.pinnedPeer;
250
+ const blockInfo = request.blockInfo;
251
+ const slotNumber = blockInfo.slotNumber;
252
+ if (request.requestTracker.timeoutMs < 100) {
253
+ this.log.warn(`Not initiating fast reqresp for txs for ${request.type} at slot ${blockInfo.slotNumber} due to timeout`, {
254
+ timeoutMs: request.requestTracker.timeoutMs,
255
+ ...blockInfo
256
+ });
257
+ return;
258
+ }
259
+ if (request.requestTracker.checkCancelled()) {
260
+ this.log.debug(`No txs to collect via reqresp for ${request.type} at slot ${blockInfo.slotNumber}`, {
261
+ ...blockInfo
262
+ });
263
+ return;
264
+ }
265
+ this.log.debug(`Starting fast reqresp for ${request.requestTracker.numberOfMissingTxs} txs for ${request.type} at slot ${blockInfo.slotNumber}`, {
266
+ ...blockInfo,
267
+ timeoutMs: request.requestTracker.timeoutMs,
268
+ pinnedPeer
269
+ });
270
+ try {
271
+ await this.txCollectionSink.collect(async ()=>{
272
+ let blockTxsSource;
273
+ if (request.type === 'proposal') {
274
+ blockTxsSource = request.blockProposal;
275
+ } else if (request.type === 'block') {
276
+ blockTxsSource = {
277
+ txHashes: request.block.body.txEffects.map((e)=>e.txHash),
278
+ archive: request.block.archive.root
279
+ };
280
+ } else {
281
+ throw new Error(`Unknown request type: ${request.type}`);
282
+ }
283
+ const result = await this.reqRespTxsCollector(request.requestTracker, blockTxsSource, pinnedPeer);
284
+ return {
285
+ validTxs: result,
286
+ invalidTxHashes: []
287
+ };
288
+ }, Array.from(request.requestTracker.missingTxHashes), {
289
+ description: `reqresp for slot ${slotNumber}`,
290
+ method: 'fast-req-resp',
291
+ ...opts,
292
+ ...request.blockInfo
293
+ }, this.getAddContext(request));
294
+ } catch (err) {
295
+ this.log.error(`Error sending fast reqresp request for txs`, err, {
296
+ txs: [
297
+ ...request.requestTracker.missingTxHashes
298
+ ],
299
+ ...blockInfo
300
+ });
150
301
  }
151
- return this.fastCollection.collectFastFor(input, txHashes, opts);
152
302
  }
153
- /** Returns the TxAddContext for the given fast collection request input */ getAddContextForInput(input) {
154
- if (input.type === 'proposal') {
303
+ /** Returns the TxAddContext for the given request, used by the sink to add txs to the pool correctly. */ getAddContext(request) {
304
+ if (request.type === 'proposal') {
155
305
  return {
156
306
  type: 'proposal',
157
- blockHeader: input.blockProposal.blockHeader
307
+ blockHeader: request.blockProposal.blockHeader
158
308
  };
159
309
  } else {
160
310
  return {
161
311
  type: 'mined',
162
- block: input.block
312
+ block: request.block
163
313
  };
164
314
  }
165
315
  }
166
- /** Mark the given txs as found. Stops collecting them. */ foundTxs(txs) {
167
- this.slowCollection.foundTxs(txs);
168
- this.fastCollection.foundTxs(txs);
169
- this.fileStoreSlowCollection.foundTxs(txs);
170
- this.fileStoreFastCollection.foundTxs(txs);
316
+ /** Mark the given txs as found. Stops collecting them across all in-flight requests. */ foundTxs(txs) {
317
+ for (const request of this.requests){
318
+ for (const tx of txs){
319
+ if (request.requestTracker.markFetched(tx)) {
320
+ this.log.trace(`Found tx ${tx.txHash.toString()} for fast collection request`, {
321
+ ...request.blockInfo,
322
+ txHash: tx.txHash.toString(),
323
+ type: request.type
324
+ });
325
+ if (request.requestTracker.allFetched()) {
326
+ this.log.trace(`All txs found for fast collection request`, {
327
+ ...request.blockInfo,
328
+ type: request.type
329
+ });
330
+ break;
331
+ }
332
+ }
333
+ }
334
+ }
171
335
  }
172
336
  /**
173
- * Stop collecting all txs for blocks less than or requal to the block number specified.
337
+ * Stop collecting all txs for blocks less than or equal to the block number specified.
174
338
  * To be called when we no longer care about gathering txs up to a certain block, eg when they become proven or finalized.
175
339
  */ stopCollectingForBlocksUpTo(blockNumber) {
176
- this.slowCollection.stopCollectingForBlocksUpTo(blockNumber);
177
- this.fastCollection.stopCollectingForBlocksUpTo(blockNumber);
178
- this.fileStoreSlowCollection.clearPending();
179
- this.fileStoreFastCollection.clearPending();
340
+ for (const request of this.requests){
341
+ if (request.blockInfo.blockNumber <= blockNumber) {
342
+ request.requestTracker.cancel();
343
+ }
344
+ }
180
345
  }
181
346
  /**
182
347
  * Stop collecting all txs for blocks greater than the block number specified.
183
348
  * To be called when there is a chain prune and previously mined txs are no longer relevant.
184
349
  */ stopCollectingForBlocksAfter(blockNumber) {
185
- this.slowCollection.stopCollectingForBlocksAfter(blockNumber);
186
- this.fastCollection.stopCollectingForBlocksAfter(blockNumber);
187
- this.fileStoreSlowCollection.clearPending();
188
- this.fileStoreFastCollection.clearPending();
189
- }
190
- /** Every now and then, check if the pool has received one of the txs we are looking for, just to catch any race conditions */ async reconcileFoundTxsWithPool() {
191
- const missingTxHashes = this.slowCollection.getMissingTxHashes();
192
- const foundTxs = compactArray(await this.txPool.getTxsByHash(missingTxHashes));
193
- if (foundTxs.length > 0) {
194
- this.log.verbose(`Found ${foundTxs.length} txs in the pool during reconciliation`, {
195
- foundTxs: foundTxs.map((t)=>t.getTxHash().toString())
196
- });
197
- this.foundTxs(foundTxs);
350
+ for (const request of this.requests){
351
+ if (request.blockInfo.blockNumber > blockNumber) {
352
+ request.requestTracker.cancel();
353
+ }
198
354
  }
199
355
  }
200
356
  }
@@ -16,7 +16,7 @@ export type TxAddContext = {
16
16
  };
17
17
  declare const TxCollectionSink_base: new () => TypedEventEmitter<TxPoolV2Events>;
18
18
  /**
19
- * Executes collection requests from the fast and slow collection loops, and handles collected txs
19
+ * Executes collection requests from fast collection paths, and handles collected txs
20
20
  * by adding them to the tx pool and emitting events, as well as handling logging and metrics.
21
21
  */
22
22
  export declare class TxCollectionSink extends TxCollectionSink_base {
@@ -2,7 +2,7 @@ import { elapsed } from '@aztec/foundation/timer';
2
2
  import EventEmitter from 'node:events';
3
3
  import { TxCollectionInstrumentation } from './instrumentation.js';
4
4
  /**
5
- * Executes collection requests from the fast and slow collection loops, and handles collected txs
5
+ * Executes collection requests from fast collection paths, and handles collected txs
6
6
  * by adding them to the tx pool and emitting events, as well as handling logging and metrics.
7
7
  */ export class TxCollectionSink extends EventEmitter {
8
8
  txPool;
@@ -76,7 +76,7 @@ import { TxCollectionInstrumentation } from './instrumentation.js';
76
76
  async foundTxs(txs, info, context) {
77
77
  // Report metrics for the collection
78
78
  this.instrumentation.increaseTxsFor(info.method, txs.length, info.duration);
79
- // Mark txs as found in the slow missing txs set and all fast requests
79
+ // Mark txs as found in all in-flight collection requests
80
80
  this.emit('txs-added', {
81
81
  txs
82
82
  });
@@ -1,6 +1,6 @@
1
1
  import type { ChainConfig } from '@aztec/stdlib/config';
2
2
  import { type AztecNode } from '@aztec/stdlib/interfaces/client';
3
- import type { Tx, TxHash } from '@aztec/stdlib/tx';
3
+ import type { Tx, TxHash, TxValidator } from '@aztec/stdlib/tx';
4
4
  import { type ComponentsVersions } from '@aztec/stdlib/versioning';
5
5
  export type TxSourceCollectionResult = {
6
6
  validTxs: Tx[];
@@ -12,12 +12,13 @@ export interface TxSource {
12
12
  }
13
13
  export declare class NodeRpcTxSource implements TxSource {
14
14
  private readonly client;
15
+ private readonly txValidator;
15
16
  private readonly info;
16
- constructor(client: Pick<AztecNode, 'getTxsByHash'>, info: string);
17
- static fromUrl(nodeUrl: string, versions: ComponentsVersions): NodeRpcTxSource;
17
+ constructor(client: Pick<AztecNode, 'getTxsByHash'>, txValidator: TxValidator, info: string);
18
+ static fromUrl(nodeUrl: string, txValidator: TxValidator, versions: ComponentsVersions): NodeRpcTxSource;
18
19
  getInfo(): string;
19
20
  getTxsByHash(txHashes: TxHash[]): Promise<TxSourceCollectionResult>;
20
21
  private verifyTxs;
21
22
  }
22
- export declare function createNodeRpcTxSources(urls: string[], chainConfig: ChainConfig): NodeRpcTxSource[];
23
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc291cmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi90eF9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3hGLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBbUMsTUFBTSwwQkFBMEIsQ0FBQztBQUdwRyxNQUFNLE1BQU0sd0JBQXdCLEdBQUc7SUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFBQyxlQUFlLEVBQUUsTUFBTSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBRXJGLE1BQU0sV0FBVyxRQUFRO0lBQ3ZCLE9BQU8sSUFBSSxNQUFNLENBQUM7SUFDbEIsWUFBWSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0FBQztDQUNyRTtBQUVELHFCQUFhLGVBQWdCLFlBQVcsUUFBUTtJQUU1QyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJO0lBRnZCLFlBQ21CLE1BQU0sRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxFQUN2QyxJQUFJLEVBQUUsTUFBTSxFQUMzQjtJQUVKLE9BQWMsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLGtCQUFrQixHQUFHLGVBQWUsQ0FHcEY7SUFFTSxPQUFPLFdBRWI7SUFFWSxZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBQyxDQUUvRTtZQUVhLFNBQVM7Q0FnQnhCO0FBRUQsd0JBQWdCLHNCQUFzQixDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsRUFBRSxXQUFXLEVBQUUsV0FBVyxxQkFHOUUifQ==
23
+ export declare function createNodeRpcTxSources(urls: string[], txValidator: TxValidator, chainConfig: ChainConfig): NodeRpcTxSource[];
24
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfc291cmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi90eF9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3hGLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDaEUsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQW1DLE1BQU0sMEJBQTBCLENBQUM7QUFHcEcsTUFBTSxNQUFNLHdCQUF3QixHQUFHO0lBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQUMsZUFBZSxFQUFFLE1BQU0sRUFBRSxDQUFBO0NBQUUsQ0FBQztBQUVyRixNQUFNLFdBQVcsUUFBUTtJQUN2QixPQUFPLElBQUksTUFBTSxDQUFDO0lBQ2xCLFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLHdCQUF3QixDQUFDLENBQUM7Q0FDckU7QUFFRCxxQkFBYSxlQUFnQixZQUFXLFFBQVE7SUFFNUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVztJQUM1QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFIdkIsWUFDbUIsTUFBTSxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQ3ZDLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLElBQUksRUFBRSxNQUFNLEVBQzNCO0lBRUosT0FBYyxPQUFPLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFFLFFBQVEsRUFBRSxrQkFBa0IsR0FBRyxlQUFlLENBRzlHO0lBRU0sT0FBTyxXQUViO0lBRVksWUFBWSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0FFL0U7WUFFYSxTQUFTO0NBZ0J4QjtBQUVELHdCQUFnQixzQkFBc0IsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLEVBQUUsV0FBVyxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsV0FBVyxxQkFHeEcifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"tx_source.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,KAAK,kBAAkB,EAAmC,MAAM,0BAA0B,CAAC;AAGpG,MAAM,MAAM,wBAAwB,GAAG;IAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAAC,eAAe,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAErF,MAAM,WAAW,QAAQ;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CACrE;AAED,qBAAa,eAAgB,YAAW,QAAQ;IAE5C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFvB,YACmB,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EACvC,IAAI,EAAE,MAAM,EAC3B;IAEJ,OAAc,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,eAAe,CAGpF;IAEM,OAAO,WAEb;IAEY,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAE/E;YAEa,SAAS;CAgBxB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,qBAG9E"}
1
+ {"version":3,"file":"tx_source.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,KAAK,kBAAkB,EAAmC,MAAM,0BAA0B,CAAC;AAGpG,MAAM,MAAM,wBAAwB,GAAG;IAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAAC,eAAe,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAErF,MAAM,WAAW,QAAQ;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CACrE;AAED,qBAAa,eAAgB,YAAW,QAAQ;IAE5C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHvB,YACmB,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EACvC,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,MAAM,EAC3B;IAEJ,OAAc,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,kBAAkB,GAAG,eAAe,CAG9G;IAEM,OAAO,WAEb;IAEY,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAE/E;YAEa,SAAS;CAgBxB;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,qBAGxG"}
@@ -5,18 +5,20 @@ import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
5
5
  import { makeTracedFetch } from '@aztec/telemetry-client';
6
6
  export class NodeRpcTxSource {
7
7
  client;
8
+ txValidator;
8
9
  info;
9
- constructor(client, info){
10
+ constructor(client, txValidator, info){
10
11
  this.client = client;
12
+ this.txValidator = txValidator;
11
13
  this.info = info;
12
14
  }
13
- static fromUrl(nodeUrl, versions) {
15
+ static fromUrl(nodeUrl, txValidator, versions) {
14
16
  const client = createAztecNodeClient(nodeUrl, versions, makeTracedFetch([
15
17
  1,
16
18
  2,
17
19
  3
18
20
  ], false));
19
- return new NodeRpcTxSource(client, nodeUrl);
21
+ return new NodeRpcTxSource(client, txValidator, nodeUrl);
20
22
  }
21
23
  getInfo() {
22
24
  return this.info;
@@ -29,8 +31,8 @@ export class NodeRpcTxSource {
29
31
  const validTxs = [];
30
32
  const invalidTxHashes = [];
31
33
  await Promise.all(txs.map(async (tx)=>{
32
- const isValid = await tx.validateTxHash();
33
- if (isValid) {
34
+ const validation = await this.txValidator.validateTx(tx);
35
+ if (validation.result === 'valid') {
34
36
  validTxs.push(tx);
35
37
  } else {
36
38
  invalidTxHashes.push(tx.getTxHash().toString());
@@ -42,7 +44,7 @@ export class NodeRpcTxSource {
42
44
  };
43
45
  }
44
46
  }
45
- export function createNodeRpcTxSources(urls, chainConfig) {
47
+ export function createNodeRpcTxSources(urls, txValidator, chainConfig) {
46
48
  const versions = getComponentsVersionsFromConfig(chainConfig, protocolContractsHash, getVKTreeRoot());
47
- return urls.map((url)=>NodeRpcTxSource.fromUrl(url, versions));
49
+ return urls.map((url)=>NodeRpcTxSource.fromUrl(url, txValidator, versions));
48
50
  }
@@ -20,8 +20,6 @@ export declare class TxFileStore {
20
20
  private readonly handleTxsAdded;
21
21
  /** Recently uploaded tx hashes for deduplication. */
22
22
  private recentUploads;
23
- private recentUploadsOrder;
24
- private readonly maxRecentUploads;
25
23
  private constructor();
26
24
  /**
27
25
  * Creates and initializes the file store.
@@ -45,4 +43,4 @@ export declare class TxFileStore {
45
43
  /** Returns the number of pending uploads (queued + in-flight). */
46
44
  getPendingUploadCount(): number;
47
45
  }
48
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZmlsZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3R4X2ZpbGVfc3RvcmUvdHhfZmlsZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFJbEUsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFtQixNQUFNLDBCQUEwQixDQUFDO0FBRTNFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUdyRDs7O0dBR0c7QUFDSCxxQkFBYSxXQUFXO0lBWXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZUFBZTtJQUNoQyxPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFDcEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRO0lBaEIzQixPQUFPLENBQUMsV0FBVyxDQUFZO0lBQy9CLE9BQU8sQ0FBQyxhQUFhLENBQUs7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlCO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFpRDtJQUVoRixxREFBcUQ7SUFDckQsT0FBTyxDQUFDLGFBQWEsQ0FBMEI7SUFDL0MsT0FBTyxDQUFDLGtCQUFrQixDQUFnQjtJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFRO0lBRXpDLE9BQU8sZUFZTjtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBYSxNQUFNLENBQ2pCLE1BQU0sRUFBRSxRQUFRLEVBQ2hCLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsR0FBRyxHQUFFLE1BQTBDLEVBQy9DLFNBQVMsR0FBRSxlQUFzQyxFQUNqRCxpQkFBaUIsQ0FBQyxFQUFFLFNBQVMsR0FDNUIsT0FBTyxDQUFDLFdBQVcsR0FBRyxTQUFTLENBQUMsQ0FvQmxDO0lBRUQsMkRBQTJEO0lBQ3BELEtBQUssSUFBSSxJQUFJLENBT25CO0lBRUQsaUVBQWlFO0lBQ3BELElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWpDO0lBRUQsT0FBTyxDQUFDLFVBQVU7WUFnQkosaUJBQWlCO1lBWWpCLFFBQVE7SUF1Q3RCLDJFQUEyRTtJQUM5RCxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlsQztJQUVELGtFQUFrRTtJQUMzRCxxQkFBcUIsSUFBSSxNQUFNLENBRXJDO0NBQ0YifQ==
46
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZmlsZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3R4X2ZpbGVfc3RvcmUvdHhfZmlsZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFJbEUsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFtQixNQUFNLDBCQUEwQixDQUFDO0FBRTNFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUtyRDs7O0dBR0c7QUFDSCxxQkFBYSxXQUFXO0lBVXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZUFBZTtJQUNoQyxPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFDcEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRO0lBZDNCLE9BQU8sQ0FBQyxXQUFXLENBQVk7SUFDL0IsT0FBTyxDQUFDLGFBQWEsQ0FBSztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBaUI7SUFDaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlEO0lBRWhGLHFEQUFxRDtJQUNyRCxPQUFPLENBQUMsYUFBYSxDQUFpRDtJQUV0RSxPQUFPLGVBWU47SUFFRDs7Ozs7Ozs7T0FRRztJQUNILE9BQWEsTUFBTSxDQUNqQixNQUFNLEVBQUUsUUFBUSxFQUNoQixNQUFNLEVBQUUsaUJBQWlCLEVBQ3pCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLEdBQUcsR0FBRSxNQUEwQyxFQUMvQyxTQUFTLEdBQUUsZUFBc0MsRUFDakQsaUJBQWlCLENBQUMsRUFBRSxTQUFTLEdBQzVCLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBb0JsQztJQUVELDJEQUEyRDtJQUNwRCxLQUFLLElBQUksSUFBSSxDQU9uQjtJQUVELGlFQUFpRTtJQUNwRCxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlqQztJQUVELE9BQU8sQ0FBQyxVQUFVO1lBZ0JKLGlCQUFpQjtZQVlqQixRQUFRO0lBMEJ0QiwyRUFBMkU7SUFDOUQsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJbEM7SUFFRCxrRUFBa0U7SUFDM0QscUJBQXFCLElBQUksTUFBTSxDQUVyQztDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"tx_file_store.d.ts","sourceRoot":"","sources":["../../../src/services/tx_file_store/tx_file_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD;;;GAGG;AACH,qBAAa,WAAW;IAYpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhB3B,OAAO,CAAC,WAAW,CAAY;IAC/B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiD;IAEhF,qDAAqD;IACrD,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;IAEzC,OAAO,eAYN;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,iBAAiB,EACzB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,MAA0C,EAC/C,SAAS,GAAE,eAAsC,EACjD,iBAAiB,CAAC,EAAE,SAAS,GAC5B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAoBlC;IAED,2DAA2D;IACpD,KAAK,IAAI,IAAI,CAOnB;IAED,iEAAiE;IACpD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAIjC;IAED,OAAO,CAAC,UAAU;YAgBJ,iBAAiB;YAYjB,QAAQ;IAuCtB,2EAA2E;IAC9D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAIlC;IAED,kEAAkE;IAC3D,qBAAqB,IAAI,MAAM,CAErC;CACF"}
1
+ {"version":3,"file":"tx_file_store.d.ts","sourceRoot":"","sources":["../../../src/services/tx_file_store/tx_file_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EAAE,KAAK,SAAS,EAAmB,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKrD;;;GAGG;AACH,qBAAa,WAAW;IAUpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAd3B,OAAO,CAAC,WAAW,CAAY;IAC/B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiD;IAEhF,qDAAqD;IACrD,OAAO,CAAC,aAAa,CAAiD;IAEtE,OAAO,eAYN;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,iBAAiB,EACzB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,MAA0C,EAC/C,SAAS,GAAE,eAAsC,EACjD,iBAAiB,CAAC,EAAE,SAAS,GAC5B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAoBlC;IAED,2DAA2D;IACpD,KAAK,IAAI,IAAI,CAOnB;IAED,iEAAiE;IACpD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAIjC;IAED,OAAO,CAAC,UAAU;YAgBJ,iBAAiB;YAYjB,QAAQ;IA0BtB,2EAA2E;IAC9D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAIlC;IAED,kEAAkE;IAC3D,qBAAqB,IAAI,MAAM,CAErC;CACF"}