@aztec/p2p 0.0.1-commit.e558bd1c → 0.0.1-commit.e588bc7e5

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 (431) hide show
  1. package/README.md +129 -3
  2. package/dest/client/factory.d.ts +9 -9
  3. package/dest/client/factory.d.ts.map +1 -1
  4. package/dest/client/factory.js +52 -14
  5. package/dest/client/interface.d.ts +47 -34
  6. package/dest/client/interface.d.ts.map +1 -1
  7. package/dest/client/p2p_client.d.ts +39 -51
  8. package/dest/client/p2p_client.d.ts.map +1 -1
  9. package/dest/client/p2p_client.js +164 -224
  10. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +20 -10
  11. package/dest/config.d.ts +54 -17
  12. package/dest/config.d.ts.map +1 -1
  13. package/dest/config.js +102 -38
  14. package/dest/errors/p2p-service.error.d.ts +9 -0
  15. package/dest/errors/p2p-service.error.d.ts.map +1 -0
  16. package/dest/errors/p2p-service.error.js +10 -0
  17. package/dest/errors/tx-pool.error.d.ts +8 -0
  18. package/dest/errors/tx-pool.error.d.ts.map +1 -0
  19. package/dest/errors/tx-pool.error.js +9 -0
  20. package/dest/index.d.ts +2 -2
  21. package/dest/index.d.ts.map +1 -1
  22. package/dest/index.js +1 -1
  23. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +21 -12
  24. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  25. package/dest/mem_pools/attestation_pool/attestation_pool.js +75 -40
  26. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
  27. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  28. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +57 -57
  29. package/dest/mem_pools/attestation_pool/index.d.ts +2 -2
  30. package/dest/mem_pools/attestation_pool/index.d.ts.map +1 -1
  31. package/dest/mem_pools/attestation_pool/index.js +1 -1
  32. package/dest/mem_pools/attestation_pool/mocks.d.ts +2 -2
  33. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  34. package/dest/mem_pools/attestation_pool/mocks.js +2 -2
  35. package/dest/mem_pools/index.d.ts +2 -2
  36. package/dest/mem_pools/index.d.ts.map +1 -1
  37. package/dest/mem_pools/instrumentation.d.ts +4 -2
  38. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  39. package/dest/mem_pools/instrumentation.js +16 -14
  40. package/dest/mem_pools/interface.d.ts +3 -3
  41. package/dest/mem_pools/interface.d.ts.map +1 -1
  42. package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts +104 -0
  43. package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts.map +1 -0
  44. package/dest/mem_pools/tx_pool_v2/deleted_pool.js +251 -0
  45. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts +3 -3
  46. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts.map +1 -1
  47. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.js +18 -9
  48. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts +1 -1
  49. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -1
  50. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +7 -3
  51. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +3 -3
  52. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -1
  53. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +12 -4
  54. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +2 -2
  55. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -1
  56. package/dest/mem_pools/tx_pool_v2/eviction/index.js +1 -1
  57. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts +54 -5
  58. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts.map +1 -1
  59. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.js +8 -0
  60. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.js +7 -5
  61. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +7 -5
  62. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts +2 -2
  63. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts.map +1 -1
  64. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.js +14 -6
  65. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts +4 -4
  66. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts.map +1 -1
  67. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.js +16 -4
  68. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts +3 -3
  69. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts.map +1 -1
  70. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.js +3 -3
  71. package/dest/mem_pools/tx_pool_v2/index.d.ts +3 -2
  72. package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
  73. package/dest/mem_pools/tx_pool_v2/index.js +2 -1
  74. package/dest/mem_pools/tx_pool_v2/instrumentation.d.ts +15 -0
  75. package/dest/mem_pools/tx_pool_v2/instrumentation.d.ts.map +1 -0
  76. package/dest/mem_pools/tx_pool_v2/instrumentation.js +43 -0
  77. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +30 -12
  78. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
  79. package/dest/mem_pools/tx_pool_v2/interfaces.js +5 -1
  80. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +78 -15
  81. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
  82. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +144 -19
  83. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +12 -3
  84. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
  85. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +50 -45
  86. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +12 -5
  87. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
  88. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +17 -6
  89. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +14 -5
  90. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
  91. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +364 -189
  92. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +1 -1
  93. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  94. package/dest/msg_validators/attestation_validator/attestation_validator.js +5 -4
  95. package/dest/msg_validators/clock_tolerance.d.ts +1 -1
  96. package/dest/msg_validators/clock_tolerance.d.ts.map +1 -1
  97. package/dest/msg_validators/clock_tolerance.js +4 -3
  98. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +6 -4
  99. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
  100. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +10 -2
  101. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +6 -4
  102. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
  103. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +16 -2
  104. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +13 -8
  105. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
  106. package/dest/msg_validators/proposal_validator/proposal_validator.js +53 -41
  107. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +4 -4
  108. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  109. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +3 -3
  110. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts +2 -1
  111. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map +1 -1
  112. package/dest/msg_validators/tx_validator/allowed_public_setup.js +24 -20
  113. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts +17 -0
  114. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts.map +1 -0
  115. package/dest/msg_validators/tx_validator/allowed_setup_helpers.js +24 -0
  116. package/dest/msg_validators/tx_validator/block_header_validator.d.ts +16 -3
  117. package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -1
  118. package/dest/msg_validators/tx_validator/block_header_validator.js +1 -1
  119. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts +9 -0
  120. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts.map +1 -0
  121. package/dest/msg_validators/tx_validator/contract_instance_validator.js +48 -0
  122. package/dest/msg_validators/tx_validator/data_validator.d.ts +1 -1
  123. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  124. package/dest/msg_validators/tx_validator/data_validator.js +35 -2
  125. package/dest/msg_validators/tx_validator/double_spend_validator.d.ts +13 -3
  126. package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map +1 -1
  127. package/dest/msg_validators/tx_validator/double_spend_validator.js +4 -4
  128. package/dest/msg_validators/tx_validator/factory.d.ts +133 -6
  129. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  130. package/dest/msg_validators/tx_validator/factory.js +247 -60
  131. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +1 -1
  132. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -1
  133. package/dest/msg_validators/tx_validator/fee_payer_balance.js +6 -2
  134. package/dest/msg_validators/tx_validator/gas_validator.d.ts +67 -3
  135. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  136. package/dest/msg_validators/tx_validator/gas_validator.js +104 -37
  137. package/dest/msg_validators/tx_validator/index.d.ts +3 -1
  138. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  139. package/dest/msg_validators/tx_validator/index.js +2 -0
  140. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
  141. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  142. package/dest/msg_validators/tx_validator/metadata_validator.js +4 -4
  143. package/dest/msg_validators/tx_validator/nullifier_cache.d.ts +14 -0
  144. package/dest/msg_validators/tx_validator/nullifier_cache.d.ts.map +1 -0
  145. package/dest/msg_validators/tx_validator/nullifier_cache.js +24 -0
  146. package/dest/msg_validators/tx_validator/phases_validator.d.ts +22 -2
  147. package/dest/msg_validators/tx_validator/phases_validator.d.ts.map +1 -1
  148. package/dest/msg_validators/tx_validator/phases_validator.js +72 -24
  149. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts +20 -4
  150. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts.map +1 -1
  151. package/dest/msg_validators/tx_validator/timestamp_validator.js +6 -6
  152. package/dest/services/dummy_service.d.ts +12 -6
  153. package/dest/services/dummy_service.d.ts.map +1 -1
  154. package/dest/services/dummy_service.js +12 -5
  155. package/dest/services/encoding.d.ts +7 -3
  156. package/dest/services/encoding.d.ts.map +1 -1
  157. package/dest/services/encoding.js +18 -11
  158. package/dest/services/gossipsub/index.d.ts +3 -0
  159. package/dest/services/gossipsub/index.d.ts.map +1 -0
  160. package/dest/services/gossipsub/index.js +2 -0
  161. package/dest/services/gossipsub/scoring.d.ts +21 -3
  162. package/dest/services/gossipsub/scoring.d.ts.map +1 -1
  163. package/dest/services/gossipsub/scoring.js +24 -7
  164. package/dest/services/gossipsub/topic_score_params.d.ts +173 -0
  165. package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -0
  166. package/dest/services/gossipsub/topic_score_params.js +346 -0
  167. package/dest/services/libp2p/libp2p_service.d.ts +37 -23
  168. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  169. package/dest/services/libp2p/libp2p_service.js +291 -202
  170. package/dest/services/peer-manager/metrics.d.ts +3 -1
  171. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  172. package/dest/services/peer-manager/metrics.js +6 -0
  173. package/dest/services/peer-manager/peer_manager.d.ts +6 -2
  174. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  175. package/dest/services/peer-manager/peer_manager.js +24 -9
  176. package/dest/services/peer-manager/peer_scoring.d.ts +5 -2
  177. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  178. package/dest/services/peer-manager/peer_scoring.js +53 -12
  179. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +12 -8
  180. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  181. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +83 -106
  182. package/dest/services/reqresp/batch-tx-requester/interface.d.ts +4 -7
  183. package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map +1 -1
  184. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts +11 -13
  185. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts.map +1 -1
  186. package/dest/services/reqresp/batch-tx-requester/missing_txs.js +31 -46
  187. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts +19 -11
  188. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts.map +1 -1
  189. package/dest/services/reqresp/batch-tx-requester/peer_collection.js +52 -15
  190. package/dest/services/reqresp/batch-tx-requester/tx_validator.js +2 -2
  191. package/dest/services/reqresp/interface.d.ts +10 -1
  192. package/dest/services/reqresp/interface.d.ts.map +1 -1
  193. package/dest/services/reqresp/interface.js +15 -1
  194. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +3 -3
  195. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
  196. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts +7 -1
  197. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts.map +1 -1
  198. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.js +15 -0
  199. package/dest/services/reqresp/protocols/tx.d.ts +7 -1
  200. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  201. package/dest/services/reqresp/protocols/tx.js +20 -0
  202. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +5 -4
  203. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -1
  204. package/dest/services/reqresp/rate-limiter/rate_limiter.js +10 -8
  205. package/dest/services/reqresp/reqresp.d.ts +1 -1
  206. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  207. package/dest/services/reqresp/reqresp.js +30 -14
  208. package/dest/services/service.d.ts +26 -4
  209. package/dest/services/service.d.ts.map +1 -1
  210. package/dest/services/tx_collection/config.d.ts +19 -1
  211. package/dest/services/tx_collection/config.d.ts.map +1 -1
  212. package/dest/services/tx_collection/config.js +46 -0
  213. package/dest/services/tx_collection/fast_tx_collection.d.ts +3 -4
  214. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +1 -1
  215. package/dest/services/tx_collection/fast_tx_collection.js +80 -76
  216. package/dest/services/tx_collection/file_store_tx_collection.d.ts +53 -0
  217. package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -0
  218. package/dest/services/tx_collection/file_store_tx_collection.js +167 -0
  219. package/dest/services/tx_collection/file_store_tx_source.d.ts +38 -0
  220. package/dest/services/tx_collection/file_store_tx_source.d.ts.map +1 -0
  221. package/dest/services/tx_collection/file_store_tx_source.js +100 -0
  222. package/dest/services/tx_collection/index.d.ts +2 -1
  223. package/dest/services/tx_collection/index.d.ts.map +1 -1
  224. package/dest/services/tx_collection/index.js +1 -0
  225. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  226. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  227. package/dest/services/tx_collection/instrumentation.js +2 -1
  228. package/dest/services/tx_collection/proposal_tx_collector.d.ts +7 -7
  229. package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +1 -1
  230. package/dest/services/tx_collection/proposal_tx_collector.js +5 -4
  231. package/dest/services/tx_collection/request_tracker.d.ts +53 -0
  232. package/dest/services/tx_collection/request_tracker.d.ts.map +1 -0
  233. package/dest/services/tx_collection/request_tracker.js +84 -0
  234. package/dest/services/tx_collection/slow_tx_collection.d.ts +7 -3
  235. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +1 -1
  236. package/dest/services/tx_collection/slow_tx_collection.js +60 -26
  237. package/dest/services/tx_collection/tx_collection.d.ts +23 -13
  238. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  239. package/dest/services/tx_collection/tx_collection.js +75 -3
  240. package/dest/services/tx_collection/tx_collection_sink.d.ts +18 -8
  241. package/dest/services/tx_collection/tx_collection_sink.d.ts.map +1 -1
  242. package/dest/services/tx_collection/tx_collection_sink.js +26 -29
  243. package/dest/services/tx_collection/tx_source.d.ts +13 -7
  244. package/dest/services/tx_collection/tx_source.d.ts.map +1 -1
  245. package/dest/services/tx_collection/tx_source.js +26 -7
  246. package/dest/services/tx_file_store/config.d.ts +1 -3
  247. package/dest/services/tx_file_store/config.d.ts.map +1 -1
  248. package/dest/services/tx_file_store/config.js +0 -4
  249. package/dest/services/tx_file_store/tx_file_store.d.ts +4 -3
  250. package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
  251. package/dest/services/tx_file_store/tx_file_store.js +9 -6
  252. package/dest/services/tx_provider.d.ts +4 -4
  253. package/dest/services/tx_provider.d.ts.map +1 -1
  254. package/dest/services/tx_provider.js +9 -8
  255. package/dest/test-helpers/make-test-p2p-clients.d.ts +7 -8
  256. package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
  257. package/dest/test-helpers/make-test-p2p-clients.js +1 -2
  258. package/dest/test-helpers/mock-pubsub.d.ts +30 -4
  259. package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
  260. package/dest/test-helpers/mock-pubsub.js +105 -4
  261. package/dest/test-helpers/reqresp-nodes.d.ts +2 -3
  262. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  263. package/dest/test-helpers/reqresp-nodes.js +4 -3
  264. package/dest/test-helpers/testbench-utils.d.ts +35 -24
  265. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  266. package/dest/test-helpers/testbench-utils.js +124 -38
  267. package/dest/testbench/p2p_client_testbench_worker.d.ts +2 -2
  268. package/dest/testbench/p2p_client_testbench_worker.d.ts.map +1 -1
  269. package/dest/testbench/p2p_client_testbench_worker.js +57 -27
  270. package/dest/testbench/worker_client_manager.d.ts +3 -1
  271. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  272. package/dest/testbench/worker_client_manager.js +6 -3
  273. package/dest/util.d.ts +3 -3
  274. package/dest/util.d.ts.map +1 -1
  275. package/package.json +14 -14
  276. package/src/client/factory.ts +102 -25
  277. package/src/client/interface.ts +52 -34
  278. package/src/client/p2p_client.ts +190 -266
  279. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +33 -14
  280. package/src/config.ts +158 -44
  281. package/src/errors/p2p-service.error.ts +11 -0
  282. package/src/errors/tx-pool.error.ts +12 -0
  283. package/src/index.ts +1 -1
  284. package/src/mem_pools/attestation_pool/attestation_pool.ts +104 -50
  285. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +61 -57
  286. package/src/mem_pools/attestation_pool/index.ts +3 -3
  287. package/src/mem_pools/attestation_pool/mocks.ts +2 -1
  288. package/src/mem_pools/index.ts +1 -1
  289. package/src/mem_pools/instrumentation.ts +17 -13
  290. package/src/mem_pools/interface.ts +2 -2
  291. package/src/mem_pools/tx_pool_v2/README.md +85 -11
  292. package/src/mem_pools/tx_pool_v2/deleted_pool.ts +321 -0
  293. package/src/mem_pools/tx_pool_v2/eviction/eviction_manager.ts +21 -8
  294. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +7 -3
  295. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +18 -4
  296. package/src/mem_pools/tx_pool_v2/eviction/index.ts +4 -0
  297. package/src/mem_pools/tx_pool_v2/eviction/interfaces.ts +59 -4
  298. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.ts +5 -5
  299. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +5 -5
  300. package/src/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.ts +14 -9
  301. package/src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts +33 -6
  302. package/src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts +4 -3
  303. package/src/mem_pools/tx_pool_v2/index.ts +2 -1
  304. package/src/mem_pools/tx_pool_v2/instrumentation.ts +69 -0
  305. package/src/mem_pools/tx_pool_v2/interfaces.ts +32 -12
  306. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +209 -27
  307. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +58 -45
  308. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +34 -8
  309. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +410 -187
  310. package/src/msg_validators/attestation_validator/README.md +49 -0
  311. package/src/msg_validators/attestation_validator/attestation_validator.ts +5 -4
  312. package/src/msg_validators/clock_tolerance.ts +4 -3
  313. package/src/msg_validators/proposal_validator/README.md +123 -0
  314. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +14 -4
  315. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +20 -7
  316. package/src/msg_validators/proposal_validator/proposal_validator.ts +69 -45
  317. package/src/msg_validators/tx_validator/README.md +119 -0
  318. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +5 -5
  319. package/src/msg_validators/tx_validator/allowed_public_setup.ts +22 -27
  320. package/src/msg_validators/tx_validator/allowed_setup_helpers.ts +31 -0
  321. package/src/msg_validators/tx_validator/block_header_validator.ts +15 -3
  322. package/src/msg_validators/tx_validator/contract_instance_validator.ts +56 -0
  323. package/src/msg_validators/tx_validator/data_validator.ts +42 -1
  324. package/src/msg_validators/tx_validator/double_spend_validator.ts +11 -6
  325. package/src/msg_validators/tx_validator/factory.ts +394 -78
  326. package/src/msg_validators/tx_validator/fee_payer_balance.ts +6 -2
  327. package/src/msg_validators/tx_validator/gas_validator.ts +123 -27
  328. package/src/msg_validators/tx_validator/index.ts +2 -0
  329. package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
  330. package/src/msg_validators/tx_validator/nullifier_cache.ts +30 -0
  331. package/src/msg_validators/tx_validator/phases_validator.ts +82 -27
  332. package/src/msg_validators/tx_validator/timestamp_validator.ts +23 -18
  333. package/src/services/dummy_service.ts +18 -7
  334. package/src/services/encoding.ts +18 -10
  335. package/src/services/gossipsub/README.md +641 -0
  336. package/src/services/gossipsub/index.ts +2 -0
  337. package/src/services/gossipsub/scoring.ts +29 -5
  338. package/src/services/gossipsub/topic_score_params.ts +487 -0
  339. package/src/services/libp2p/libp2p_service.ts +307 -229
  340. package/src/services/peer-manager/metrics.ts +7 -0
  341. package/src/services/peer-manager/peer_manager.ts +28 -9
  342. package/src/services/peer-manager/peer_scoring.ts +46 -5
  343. package/src/services/reqresp/README.md +229 -0
  344. package/src/services/reqresp/batch-tx-requester/README.md +46 -7
  345. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +79 -112
  346. package/src/services/reqresp/batch-tx-requester/interface.ts +3 -6
  347. package/src/services/reqresp/batch-tx-requester/missing_txs.ts +30 -71
  348. package/src/services/reqresp/batch-tx-requester/peer_collection.ts +68 -24
  349. package/src/services/reqresp/batch-tx-requester/tx_validator.ts +2 -2
  350. package/src/services/reqresp/interface.ts +26 -1
  351. package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +2 -2
  352. package/src/services/reqresp/protocols/block_txs/block_txs_reqresp.ts +17 -0
  353. package/src/services/reqresp/protocols/tx.ts +22 -0
  354. package/src/services/reqresp/rate-limiter/rate_limiter.ts +13 -9
  355. package/src/services/reqresp/reqresp.ts +35 -15
  356. package/src/services/service.ts +37 -3
  357. package/src/services/tx_collection/config.ts +68 -0
  358. package/src/services/tx_collection/fast_tx_collection.ts +83 -76
  359. package/src/services/tx_collection/file_store_tx_collection.ts +202 -0
  360. package/src/services/tx_collection/file_store_tx_source.ts +129 -0
  361. package/src/services/tx_collection/index.ts +1 -0
  362. package/src/services/tx_collection/instrumentation.ts +7 -1
  363. package/src/services/tx_collection/proposal_tx_collector.ts +9 -13
  364. package/src/services/tx_collection/request_tracker.ts +127 -0
  365. package/src/services/tx_collection/slow_tx_collection.ts +66 -33
  366. package/src/services/tx_collection/tx_collection.ts +114 -19
  367. package/src/services/tx_collection/tx_collection_sink.ts +30 -34
  368. package/src/services/tx_collection/tx_source.ts +28 -8
  369. package/src/services/tx_file_store/config.ts +0 -6
  370. package/src/services/tx_file_store/tx_file_store.ts +10 -8
  371. package/src/services/tx_provider.ts +10 -9
  372. package/src/test-helpers/make-test-p2p-clients.ts +4 -6
  373. package/src/test-helpers/mock-pubsub.ts +146 -9
  374. package/src/test-helpers/reqresp-nodes.ts +5 -7
  375. package/src/test-helpers/testbench-utils.ts +146 -43
  376. package/src/testbench/p2p_client_testbench_worker.ts +63 -30
  377. package/src/testbench/worker_client_manager.ts +13 -6
  378. package/src/util.ts +8 -2
  379. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +0 -125
  380. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +0 -1
  381. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +0 -596
  382. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +0 -32
  383. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +0 -1
  384. package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +0 -112
  385. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +0 -157
  386. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +0 -1
  387. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +0 -52
  388. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +0 -16
  389. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +0 -1
  390. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +0 -122
  391. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +0 -17
  392. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +0 -1
  393. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +0 -84
  394. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +0 -19
  395. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +0 -1
  396. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +0 -78
  397. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +0 -26
  398. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +0 -1
  399. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +0 -84
  400. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +0 -25
  401. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +0 -1
  402. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +0 -57
  403. package/dest/mem_pools/tx_pool/index.d.ts +0 -3
  404. package/dest/mem_pools/tx_pool/index.d.ts.map +0 -1
  405. package/dest/mem_pools/tx_pool/index.js +0 -2
  406. package/dest/mem_pools/tx_pool/priority.d.ts +0 -12
  407. package/dest/mem_pools/tx_pool/priority.d.ts.map +0 -1
  408. package/dest/mem_pools/tx_pool/priority.js +0 -15
  409. package/dest/mem_pools/tx_pool/tx_pool.d.ts +0 -127
  410. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +0 -1
  411. package/dest/mem_pools/tx_pool/tx_pool.js +0 -3
  412. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +0 -7
  413. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +0 -1
  414. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +0 -400
  415. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +0 -23
  416. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +0 -1
  417. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +0 -212
  418. package/src/mem_pools/tx_pool/README.md +0 -270
  419. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +0 -746
  420. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +0 -132
  421. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +0 -208
  422. package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +0 -162
  423. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +0 -104
  424. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +0 -93
  425. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +0 -106
  426. package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +0 -75
  427. package/src/mem_pools/tx_pool/index.ts +0 -2
  428. package/src/mem_pools/tx_pool/priority.ts +0 -20
  429. package/src/mem_pools/tx_pool/tx_pool.ts +0 -141
  430. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +0 -319
  431. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +0 -230
@@ -1,6 +1,29 @@
1
- import type { L2BlockId } from '@aztec/stdlib/block';
2
- import type { Tx } from '@aztec/stdlib/tx';
3
- import type { PreAddResult } from './eviction/interfaces.js';
1
+ import { BlockNumber } from '@aztec/foundation/branded-types';
2
+ import { Fr } from '@aztec/foundation/curves/bn254';
3
+ import { BlockHash, type L2BlockId } from '@aztec/stdlib/block';
4
+ import { Gas } from '@aztec/stdlib/gas';
5
+ import { type Tx } from '@aztec/stdlib/tx';
6
+ import { type PreAddResult } from './eviction/interfaces.js';
7
+ /** Validator-compatible data interface, mirroring the subset of PrivateKernelTailCircuitPublicInputs used by validators. */
8
+ export type TxMetaValidationData = {
9
+ getNonEmptyNullifiers(): Fr[];
10
+ expirationTimestamp: bigint;
11
+ /** Whether the tx has public calls. Used to select the correct L2 gas minimum. */
12
+ forPublic?: unknown;
13
+ constants: {
14
+ anchorBlockHeader: {
15
+ hash(): Promise<BlockHash>;
16
+ globalVariables: {
17
+ blockNumber: BlockNumber;
18
+ };
19
+ };
20
+ txContext: {
21
+ gasSettings: {
22
+ gasLimits: Gas;
23
+ };
24
+ };
25
+ };
26
+ };
4
27
  /**
5
28
  * Lightweight in-memory representation of a transaction.
6
29
  * Stored for every tx in the pool to enable efficient queries and challenges
@@ -12,6 +35,8 @@ import type { PreAddResult } from './eviction/interfaces.js';
12
35
  export type TxMetaData = {
13
36
  /** The transaction hash as hex string */
14
37
  readonly txHash: string;
38
+ /** The transaction hash as bigint (for efficient Fr conversion in comparisons) */
39
+ readonly txHashBigInt: bigint;
15
40
  /** Block ID (number and hash) in which the transaction was mined (undefined if not mined) */
16
41
  minedL2BlockId?: L2BlockId;
17
42
  /** Hash of the block header the transaction uses as its anchor (hex string) */
@@ -27,45 +52,83 @@ export type TxMetaData = {
27
52
  /** Non-empty nullifiers emitted by the transaction (hex strings) */
28
53
  readonly nullifiers: readonly string[];
29
54
  /** Timestamp by which the transaction must be included (for expiration checks) */
30
- readonly includeByTimestamp: bigint;
55
+ readonly expirationTimestamp: bigint;
56
+ /** Whether the tx's setup-phase calls pass the allow list check. Computed at receipt time. */
57
+ readonly allowedSetupCalls: boolean;
58
+ /** Validator-compatible data, providing the same access patterns as Tx.data */
59
+ readonly data: TxMetaValidationData;
60
+ /** Timestamp (ms) when the tx was received into the pool. 0 for hydrated txs (always eligible). */
61
+ receivedAt: number;
62
+ /** Estimated memory footprint of this metadata object in bytes */
63
+ readonly estimatedSizeBytes: number;
31
64
  };
32
65
  /** Transaction state derived from TxMetaData fields and pool protection status */
33
- export type TxState = 'pending' | 'protected' | 'mined';
66
+ export type TxState = 'pending' | 'protected' | 'mined' | 'deleted';
34
67
  /**
35
68
  * Builds TxMetaData from a full Tx object.
36
69
  * Extracts all relevant fields for efficient in-memory storage and querying.
70
+ * Fr values are captured in closures for zero-cost re-validation.
71
+ *
72
+ * @param allowedSetupCalls - Whether the tx's setup-phase calls pass the allow list.
73
+ * For gossip/RPC txs this is always `true` (already validated by PhasesTxValidator).
74
+ * For req/resp txs this should be computed by the caller using the phases validator.
37
75
  */
38
- export declare function buildTxMetaData(tx: Tx): Promise<TxMetaData>;
76
+ export declare function buildTxMetaData(tx: Tx, allowedSetupCalls?: boolean): Promise<TxMetaData>;
77
+ /** Converts a txHash bigint back to the canonical 0x-prefixed 64-char hex string. */
78
+ export declare function txHashFromBigInt(value: bigint): string;
39
79
  /** Minimal fields required for priority comparison. */
40
- type PriorityComparable = Pick<TxMetaData, 'txHash' | 'priorityFee'>;
80
+ export type PriorityComparable = Pick<TxMetaData, 'txHash' | 'txHashBigInt' | 'priorityFee'>;
41
81
  /**
42
82
  * Compares two priority fees in ascending order.
43
83
  * Returns negative if a < b, positive if a > b, 0 if equal.
44
84
  */
45
- export declare function compareFee(a: bigint, b: bigint): number;
85
+ export declare function compareFee(a: bigint, b: bigint): -1 | 0 | 1;
46
86
  /**
47
87
  * Compares two tx hashes in ascending order.
48
88
  * Uses field element comparison for deterministic ordering.
49
89
  * Returns negative if a < b, positive if a > b, 0 if equal.
50
90
  */
51
- export declare function compareTxHash(a: string, b: string): number;
91
+ export declare function compareTxHash(a: bigint, b: bigint): -1 | 0 | 1;
52
92
  /**
53
93
  * Compares two transactions by priority fee, with txHash as tiebreaker.
54
94
  * Returns negative if a < b, positive if a > b, 0 if equal.
55
95
  * Use with sort() for ascending order, or negate/reverse for descending.
56
96
  */
57
- export declare function comparePriority(a: PriorityComparable, b: PriorityComparable): number;
97
+ export declare function comparePriority(a: PriorityComparable, b: PriorityComparable): -1 | 0 | 1;
98
+ /**
99
+ * Returns the minimum fee required to replace an existing tx with the given price bump percentage.
100
+ * Uses integer arithmetic: `existingFee + existingFee * priceBumpPercentage / 100`.
101
+ */
102
+ export declare function getMinimumPriceBumpFee(existingFee: bigint, priceBumpPercentage: bigint): bigint;
58
103
  /**
59
104
  * Checks for nullifier conflicts between an incoming transaction and existing pool state.
60
105
  *
61
106
  * When the incoming tx shares nullifiers with existing pending txs:
62
- * - If the incoming tx has strictly higher priority, mark conflicting txs for eviction
63
- * - If any conflicting tx has equal or higher priority, ignore the incoming tx
107
+ * - If the incoming tx meets or exceeds the required priority, mark conflicting txs for eviction
108
+ * - Otherwise, ignore the incoming tx
109
+ *
110
+ * When `priceBumpPercentage` is provided (RPC path), uses fee-only comparison with the
111
+ * percentage bump instead of `comparePriority`.
64
112
  *
65
113
  * @param incomingMeta - Metadata for the incoming transaction
66
114
  * @param getTxHashByNullifier - Accessor to find which tx uses a nullifier
67
115
  * @param getMetadata - Accessor to get metadata for a tx hash
116
+ * @param priceBumpPercentage - Optional percentage bump required for fee-based replacement
68
117
  */
69
- export declare function checkNullifierConflict(incomingMeta: TxMetaData, getTxHashByNullifier: (nullifier: string) => string | undefined, getMetadata: (txHash: string) => TxMetaData | undefined): PreAddResult;
70
- export {};
71
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfbWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbF92Mi90eF9tZXRhZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUkzQyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RDs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxNQUFNLFVBQVUsR0FBRztJQUN2Qix5Q0FBeUM7SUFDekMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFeEIsNkZBQTZGO0lBQzdGLGNBQWMsQ0FBQyxFQUFFLFNBQVMsQ0FBQztJQUUzQiwrRUFBK0U7SUFDL0UsUUFBUSxDQUFDLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUV2QyxnRUFBZ0U7SUFDaEUsUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLENBQUM7SUFFN0IsMENBQTBDO0lBQzFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO0lBRTFCLHlDQUF5QztJQUN6QyxRQUFRLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUU3QixvQkFBb0I7SUFDcEIsUUFBUSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFFMUIsb0VBQW9FO0lBQ3BFLFFBQVEsQ0FBQyxVQUFVLEVBQUUsU0FBUyxNQUFNLEVBQUUsQ0FBQztJQUV2QyxrRkFBa0Y7SUFDbEYsUUFBUSxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztDQUNyQyxDQUFDO0FBRUYsa0ZBQWtGO0FBQ2xGLE1BQU0sTUFBTSxPQUFPLEdBQUcsU0FBUyxHQUFHLFdBQVcsR0FBRyxPQUFPLENBQUM7QUFFeEQ7OztHQUdHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FvQmpFO0FBRUQsdURBQXVEO0FBQ3ZELEtBQUssa0JBQWtCLEdBQUcsSUFBSSxDQUFDLFVBQVUsRUFBRSxRQUFRLEdBQUcsYUFBYSxDQUFDLENBQUM7QUFFckU7OztHQUdHO0FBQ0gsd0JBQWdCLFVBQVUsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUV2RDtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBZ0IsYUFBYSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBSTFEO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQixlQUFlLENBQUMsQ0FBQyxFQUFFLGtCQUFrQixFQUFFLENBQUMsRUFBRSxrQkFBa0IsR0FBRyxNQUFNLENBTXBGO0FBRUQ7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQixzQkFBc0IsQ0FDcEMsWUFBWSxFQUFFLFVBQVUsRUFDeEIsb0JBQW9CLEVBQUUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxLQUFLLE1BQU0sR0FBRyxTQUFTLEVBQy9ELFdBQVcsRUFBRSxDQUFDLE1BQU0sRUFBRSxNQUFNLEtBQUssVUFBVSxHQUFHLFNBQVMsR0FDdEQsWUFBWSxDQW1DZCJ9
118
+ export declare function checkNullifierConflict(incomingMeta: TxMetaData, getTxHashByNullifier: (nullifier: string) => string | undefined, getMetadata: (txHash: string) => TxMetaData | undefined, priceBumpPercentage?: bigint): PreAddResult;
119
+ /** Creates a stub TxMetaValidationData for tests that don't exercise validators. */
120
+ export declare function stubTxMetaValidationData(overrides?: {
121
+ expirationTimestamp?: bigint;
122
+ }): TxMetaValidationData;
123
+ /** Creates a stub TxMetaData for tests. All fields have sensible defaults and can be overridden. */
124
+ export declare function stubTxMetaData(txHash: string, overrides?: {
125
+ priorityFee?: bigint;
126
+ feePayer?: string;
127
+ claimAmount?: bigint;
128
+ feeLimit?: bigint;
129
+ nullifiers?: string[];
130
+ expirationTimestamp?: bigint;
131
+ anchorBlockHeaderHash?: string;
132
+ allowedSetupCalls?: boolean;
133
+ }): TxMetaData;
134
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfbWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbF92Mi90eF9tZXRhZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEMsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFVLE1BQU0sa0JBQWtCLENBQUM7QUFHbkQsT0FBTyxFQUFFLEtBQUssWUFBWSxFQUF1QixNQUFNLDBCQUEwQixDQUFDO0FBRWxGLDRIQUE0SDtBQUM1SCxNQUFNLE1BQU0sb0JBQW9CLEdBQUc7SUFDakMscUJBQXFCLElBQUksRUFBRSxFQUFFLENBQUM7SUFDOUIsbUJBQW1CLEVBQUUsTUFBTSxDQUFDO0lBQzVCLGtGQUFrRjtJQUNsRixTQUFTLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDcEIsU0FBUyxFQUFFO1FBQ1QsaUJBQWlCLEVBQUU7WUFDakIsSUFBSSxJQUFJLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUMzQixlQUFlLEVBQUU7Z0JBQ2YsV0FBVyxFQUFFLFdBQVcsQ0FBQzthQUMxQixDQUFDO1NBQ0gsQ0FBQztRQUNGLFNBQVMsRUFBRTtZQUNULFdBQVcsRUFBRTtnQkFBRSxTQUFTLEVBQUUsR0FBRyxDQUFBO2FBQUUsQ0FBQztTQUNqQyxDQUFDO0tBQ0gsQ0FBQztDQUNILENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxNQUFNLFVBQVUsR0FBRztJQUN2Qix5Q0FBeUM7SUFDekMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFeEIs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
@@ -1 +1 @@
1
- {"version":3,"file":"tx_metadata.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/tx_metadata.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAI3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,yCAAyC;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,6FAA6F;IAC7F,cAAc,CAAC,EAAE,SAAS,CAAC;IAE3B,+EAA+E;IAC/E,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAEvC,gEAAgE;IAChE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,yCAAyC;IACzC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,oBAAoB;IACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,oEAAoE;IACpE,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAEvC,kFAAkF;IAClF,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACrC,CAAC;AAEF,kFAAkF;AAClF,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;AAExD;;;GAGG;AACH,wBAAsB,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAoBjE;AAED,uDAAuD;AACvD,KAAK,kBAAkB,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,aAAa,CAAC,CAAC;AAErE;;;GAGG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAI1D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAMpF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,UAAU,EACxB,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,EAC/D,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,UAAU,GAAG,SAAS,GACtD,YAAY,CAmCd"}
1
+ {"version":3,"file":"tx_metadata.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/tx_metadata.ts"],"names":[],"mappings":"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"}
@@ -1,29 +1,87 @@
1
+ import { minBigint } from '@aztec/foundation/bigint';
2
+ import { BlockNumber } from '@aztec/foundation/branded-types';
1
3
  import { Fr } from '@aztec/foundation/curves/bn254';
2
4
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
5
+ import { BlockHash } from '@aztec/stdlib/block';
6
+ import { Gas } from '@aztec/stdlib/gas';
7
+ import { TxHash } from '@aztec/stdlib/tx';
3
8
  import { getFeePayerBalanceDelta } from '../../msg_validators/tx_validator/fee_payer_balance.js';
4
- import { getTxPriorityFee } from '../tx_pool/priority.js';
9
+ import { TxPoolRejectionCode } from './eviction/interfaces.js';
5
10
  /**
6
11
  * Builds TxMetaData from a full Tx object.
7
12
  * Extracts all relevant fields for efficient in-memory storage and querying.
8
- */ export async function buildTxMetaData(tx) {
9
- const txHash = tx.getTxHash().toString();
10
- const anchorBlockHeaderHash = (await tx.data.constants.anchorBlockHeader.hash()).toString();
13
+ * Fr values are captured in closures for zero-cost re-validation.
14
+ *
15
+ * @param allowedSetupCalls - Whether the tx's setup-phase calls pass the allow list.
16
+ * For gossip/RPC txs this is always `true` (already validated by PhasesTxValidator).
17
+ * For req/resp txs this should be computed by the caller using the phases validator.
18
+ */ export async function buildTxMetaData(tx, allowedSetupCalls = true) {
19
+ const txHashObj = tx.getTxHash();
20
+ const txHash = txHashObj.toString();
21
+ const txHashBigInt = txHashObj.toBigInt();
22
+ const nullifierFrs = tx.data.getNonEmptyNullifiers();
23
+ const nullifiers = nullifierFrs.map((n)=>n.toString());
24
+ const anchorBlockHeaderHashFr = await tx.data.constants.anchorBlockHeader.hash();
25
+ const anchorBlockHeaderHash = anchorBlockHeaderHashFr.toString();
26
+ const expirationTimestamp = tx.data.expirationTimestamp;
27
+ const anchorBlockNumber = tx.data.constants.anchorBlockHeader.globalVariables.blockNumber;
11
28
  const priorityFee = getTxPriorityFee(tx);
12
29
  const feePayer = tx.data.feePayer.toString();
13
- const nullifiers = tx.data.getNonEmptyNullifiers().map((n)=>n.toString());
14
- const includeByTimestamp = tx.data.includeByTimestamp;
15
30
  const { feeLimit, claimAmount } = await getFeePayerBalanceDelta(tx, ProtocolContractAddress.FeeJuice);
31
+ const estimatedSizeBytes = estimateTxMetaDataSize(nullifiers.length);
16
32
  return {
17
33
  txHash,
34
+ txHashBigInt,
18
35
  anchorBlockHeaderHash,
19
36
  priorityFee,
20
37
  feePayer,
21
38
  claimAmount,
22
39
  feeLimit,
23
40
  nullifiers,
24
- includeByTimestamp
41
+ expirationTimestamp,
42
+ allowedSetupCalls,
43
+ receivedAt: 0,
44
+ estimatedSizeBytes,
45
+ data: {
46
+ getNonEmptyNullifiers: ()=>nullifierFrs,
47
+ expirationTimestamp,
48
+ forPublic: !!tx.data.forPublic,
49
+ constants: {
50
+ anchorBlockHeader: {
51
+ hash: ()=>Promise.resolve(anchorBlockHeaderHashFr),
52
+ globalVariables: {
53
+ blockNumber: anchorBlockNumber
54
+ }
55
+ },
56
+ txContext: {
57
+ gasSettings: {
58
+ gasLimits: tx.data.constants.txContext.gasSettings.gasLimits
59
+ }
60
+ }
61
+ }
62
+ }
25
63
  };
26
64
  }
65
+ // V8 JS object overhead (~64 bytes for a plain object with hidden class).
66
+ // String overhead: ~32 bytes header + 1 byte per ASCII char (V8 one-byte strings).
67
+ // Hex string (0x + 64 hex chars = 66 chars): ~98 bytes per string.
68
+ // bigint: ~32 bytes. number: 8 bytes. Fr: ~80 bytes (32 data + object overhead).
69
+ const OBJECT_OVERHEAD = 64;
70
+ const HEX_STRING_BYTES = 98;
71
+ const BIGINT_BYTES = 32;
72
+ const FR_BYTES = 80;
73
+ // Fixed cost: object shell + txHash + anchorBlockHeaderHash + feePayer (3 hex strings)
74
+ // + txHashBigInt + priorityFee + claimAmount + feeLimit + includeByTimestamp (5 bigints)
75
+ // + receivedAt (number, 8 bytes) + estimatedSizeBytes (number, 8 bytes)
76
+ // + data closure object (~OBJECT_OVERHEAD + anchorBlockHeaderHashFr Fr + anchorBlockNumber number)
77
+ const FIXED_METADATA_BYTES = OBJECT_OVERHEAD + 3 * HEX_STRING_BYTES + 5 * BIGINT_BYTES + 8 + 8 + OBJECT_OVERHEAD + FR_BYTES + 8;
78
+ /** Estimates the in-memory size of a TxMetaData object based on the number of nullifiers. */ function estimateTxMetaDataSize(nullifierCount) {
79
+ // Per nullifier: one hex string in nullifiers[] + one Fr in the captured nullifierFrs[]
80
+ return FIXED_METADATA_BYTES + nullifierCount * (HEX_STRING_BYTES + FR_BYTES);
81
+ }
82
+ /** Converts a txHash bigint back to the canonical 0x-prefixed 64-char hex string. */ export function txHashFromBigInt(value) {
83
+ return TxHash.fromBigInt(value).toString();
84
+ }
27
85
  /**
28
86
  * Compares two priority fees in ascending order.
29
87
  * Returns negative if a < b, positive if a > b, 0 if equal.
@@ -35,9 +93,7 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
35
93
  * Uses field element comparison for deterministic ordering.
36
94
  * Returns negative if a < b, positive if a > b, 0 if equal.
37
95
  */ export function compareTxHash(a, b) {
38
- const fieldA = Fr.fromHexString(a);
39
- const fieldB = Fr.fromHexString(b);
40
- return fieldA.cmp(fieldB);
96
+ return Fr.cmpAsBigInt(a, b);
41
97
  }
42
98
  /**
43
99
  * Compares two transactions by priority fee, with txHash as tiebreaker.
@@ -48,19 +104,33 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
48
104
  if (feeComparison !== 0) {
49
105
  return feeComparison;
50
106
  }
51
- return compareTxHash(a.txHash, b.txHash);
107
+ return compareTxHash(a.txHashBigInt, b.txHashBigInt);
108
+ }
109
+ /**
110
+ * Returns the minimum fee required to replace an existing tx with the given price bump percentage.
111
+ * Uses integer arithmetic: `existingFee + existingFee * priceBumpPercentage / 100`.
112
+ */ export function getMinimumPriceBumpFee(existingFee, priceBumpPercentage) {
113
+ const bump = existingFee * priceBumpPercentage / 100n;
114
+ // Ensure the minimum bump is at least 1, so that replacement always requires
115
+ // paying strictly more — even with 0% bump or zero existing fee.
116
+ const effectiveBump = bump > 0n ? bump : 1n;
117
+ return existingFee + effectiveBump;
52
118
  }
53
119
  /**
54
120
  * Checks for nullifier conflicts between an incoming transaction and existing pool state.
55
121
  *
56
122
  * When the incoming tx shares nullifiers with existing pending txs:
57
- * - If the incoming tx has strictly higher priority, mark conflicting txs for eviction
58
- * - If any conflicting tx has equal or higher priority, ignore the incoming tx
123
+ * - If the incoming tx meets or exceeds the required priority, mark conflicting txs for eviction
124
+ * - Otherwise, ignore the incoming tx
125
+ *
126
+ * When `priceBumpPercentage` is provided (RPC path), uses fee-only comparison with the
127
+ * percentage bump instead of `comparePriority`.
59
128
  *
60
129
  * @param incomingMeta - Metadata for the incoming transaction
61
130
  * @param getTxHashByNullifier - Accessor to find which tx uses a nullifier
62
131
  * @param getMetadata - Accessor to get metadata for a tx hash
63
- */ export function checkNullifierConflict(incomingMeta, getTxHashByNullifier, getMetadata) {
132
+ * @param priceBumpPercentage - Optional percentage bump required for fee-based replacement
133
+ */ export function checkNullifierConflict(incomingMeta, getTxHashByNullifier, getMetadata, priceBumpPercentage) {
64
134
  const txHashesToEvict = [];
65
135
  for (const nullifier of incomingMeta.nullifiers){
66
136
  const conflictingHashStr = getTxHashByNullifier(nullifier);
@@ -75,16 +145,23 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
75
145
  if (!conflictingMeta) {
76
146
  continue;
77
147
  }
78
- // If incoming tx has strictly higher priority, mark for eviction
79
- // Otherwise, ignore incoming tx (ties go to existing tx)
80
- // Use comparePriority for deterministic ordering (includes txHash as tiebreaker)
81
- if (comparePriority(incomingMeta, conflictingMeta) > 0) {
148
+ // When price bump is set (RPC path), require the incoming fee to meet the bumped threshold.
149
+ // Otherwise (P2P path), use full comparePriority with tx hash tiebreaker.
150
+ const isHigherPriority = priceBumpPercentage !== undefined ? incomingMeta.priorityFee >= getMinimumPriceBumpFee(conflictingMeta.priorityFee, priceBumpPercentage) : comparePriority(incomingMeta, conflictingMeta) > 0;
151
+ if (isHigherPriority) {
82
152
  txHashesToEvict.push(conflictingHashStr);
83
153
  } else {
154
+ const minimumFee = priceBumpPercentage !== undefined ? getMinimumPriceBumpFee(conflictingMeta.priorityFee, priceBumpPercentage) : undefined;
84
155
  return {
85
156
  shouldIgnore: true,
86
157
  txHashesToEvict: [],
87
- reason: `nullifier conflict with ${conflictingHashStr}`
158
+ reason: {
159
+ code: TxPoolRejectionCode.NULLIFIER_CONFLICT,
160
+ message: minimumFee !== undefined ? `Nullifier conflict with existing tx ${conflictingHashStr}. Minimum required fee: ${minimumFee}, got: ${incomingMeta.priorityFee}` : `Nullifier conflict with existing tx ${conflictingHashStr}`,
161
+ conflictingTxHash: conflictingHashStr,
162
+ minimumPriceBumpFee: minimumFee,
163
+ txPriorityFee: minimumFee !== undefined ? incomingMeta.priorityFee : undefined
164
+ }
88
165
  };
89
166
  }
90
167
  }
@@ -93,3 +170,51 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
93
170
  txHashesToEvict
94
171
  };
95
172
  }
173
+ /** Creates a stub TxMetaValidationData for tests that don't exercise validators. */ export function stubTxMetaValidationData(overrides = {}) {
174
+ return {
175
+ getNonEmptyNullifiers: ()=>[],
176
+ expirationTimestamp: overrides.expirationTimestamp ?? 0n,
177
+ constants: {
178
+ anchorBlockHeader: {
179
+ hash: ()=>Promise.resolve(new BlockHash(Fr.ZERO)),
180
+ globalVariables: {
181
+ blockNumber: BlockNumber(0)
182
+ }
183
+ },
184
+ txContext: {
185
+ gasSettings: {
186
+ gasLimits: Gas.empty()
187
+ }
188
+ }
189
+ }
190
+ };
191
+ }
192
+ /** Creates a stub TxMetaData for tests. All fields have sensible defaults and can be overridden. */ export function stubTxMetaData(txHash, overrides = {}) {
193
+ const txHashBigInt = Fr.fromHexString(txHash).toBigInt();
194
+ // Normalize to canonical zero-padded hex so txHashFromBigInt(txHashBigInt) === normalizedTxHash
195
+ const normalizedTxHash = txHashFromBigInt(txHashBigInt);
196
+ const expirationTimestamp = overrides.expirationTimestamp ?? 0n;
197
+ return {
198
+ txHash: normalizedTxHash,
199
+ txHashBigInt,
200
+ anchorBlockHeaderHash: overrides.anchorBlockHeaderHash ?? '0x1234',
201
+ priorityFee: overrides.priorityFee ?? 100n,
202
+ feePayer: overrides.feePayer ?? '0xfeepayer',
203
+ claimAmount: overrides.claimAmount ?? 0n,
204
+ feeLimit: overrides.feeLimit ?? 100n,
205
+ nullifiers: overrides.nullifiers ?? [
206
+ `0x${normalizedTxHash.slice(2)}null1`
207
+ ],
208
+ expirationTimestamp,
209
+ allowedSetupCalls: overrides.allowedSetupCalls ?? true,
210
+ receivedAt: 0,
211
+ estimatedSizeBytes: 0,
212
+ data: stubTxMetaValidationData({
213
+ expirationTimestamp
214
+ })
215
+ };
216
+ }
217
+ /** Returns the priority fee for a tx, based on the L2 priority fee capped by the max fee per gas. */ function getTxPriorityFee(tx) {
218
+ const { maxPriorityFeesPerGas: priorityFees, maxFeesPerGas } = tx.getGasSettings();
219
+ return minBigint(maxFeesPerGas.feePerL2Gas, priorityFees.feePerL2Gas);
220
+ }
@@ -31,7 +31,13 @@ export declare class TxPoolIndices {
31
31
  * Iterates pending transaction hashes in priority order.
32
32
  * @param order - 'desc' for highest priority first, 'asc' for lowest priority first
33
33
  */
34
- iteratePendingByPriority(order: 'asc' | 'desc'): Generator<string>;
34
+ iteratePendingByPriority(order: 'asc' | 'desc', filter?: (hash: string) => boolean): Generator<string>;
35
+ /**
36
+ * Iterates pending transaction hashes in priority order, skipping txs received after maxReceivedAt.
37
+ * @param order - 'desc' for highest priority first, 'asc' for lowest priority first
38
+ * @param maxReceivedAt - Only yield txs with receivedAt <= this value
39
+ */
40
+ iterateEligiblePendingByPriority(order: 'asc' | 'desc', maxReceivedAt: number): Generator<string>;
35
41
  /** Iterates all metadata entries */
36
42
  iterateMetadata(): Generator<[string, TxMetaData]>;
37
43
  /** Adds a new pending transaction to all indices */
@@ -87,13 +93,16 @@ export declare class TxPoolIndices {
87
93
  filterUnprotected(txs: TxMetaData[]): TxMetaData[];
88
94
  /** Filters to transactions that have metadata and are not mined */
89
95
  filterRestorable(txHashes: string[]): TxMetaData[];
90
- /** Counts transactions by state */
96
+ /** Counts transactions by state and estimates total metadata memory usage */
91
97
  countTxs(): {
92
98
  pending: number;
93
99
  protected: number;
94
100
  mined: number;
101
+ totalMetadataBytes: number;
95
102
  };
103
+ /** Returns the estimated total memory consumed by all metadata objects */
104
+ getTotalMetadataBytes(): number;
96
105
  /** Gets all mined transactions with their block IDs */
97
106
  getMinedTxs(): [string, L2BlockId][];
98
107
  }
99
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbF9pbmRpY2VzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL3R4X3Bvb2xfdjIvdHhfcG9vbF9pbmRpY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQUUsS0FBSyxPQUFPLEVBQTZCLE1BQU0sa0JBQWtCLENBQUM7QUFFNUY7Ozs7Ozs7Ozs7O0dBV0c7QUFDSCxxQkFBYSxhQUFhOztJQWdCeEI7Ozs7OztPQU1HO0lBQ0gsVUFBVSxDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsT0FBTyxDQVFwQztJQUVELFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFVBQVUsR0FBRyxTQUFTLENBRWxEO0lBRUQsR0FBRyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUUzQjtJQUVELE9BQU8sSUFBSSxPQUFPLENBRWpCO0lBRUQsVUFBVSxJQUFJLE1BQU0sQ0FFbkI7SUFNRDs7O09BR0c7SUFDRix3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxHQUFHLE1BQU0sR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDLENBZWxFO0lBRUQsb0NBQW9DO0lBQ25DLGVBQWUsSUFBSSxTQUFTLENBQUMsQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FFbEQ7SUFNRCxvREFBb0Q7SUFDcEQsVUFBVSxDQUFDLElBQUksRUFBRSxVQUFVLEdBQUcsSUFBSSxDQUdqQztJQUVELHNFQUFzRTtJQUN0RSxZQUFZLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FHckQ7SUFFRCxrRUFBa0U7SUFDbEUsUUFBUSxDQUFDLElBQUksRUFBRSxVQUFVLEdB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
108
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbF9pbmRpY2VzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL3R4X3Bvb2xfdjIvdHhfcG9vbF9pbmRpY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVyRCxPQUFPLEVBQTJCLEtBQUssVUFBVSxFQUFFLEtBQUssT0FBTyxFQUFtQixNQUFNLGtCQUFrQixDQUFDO0FBRTNHOzs7Ozs7Ozs7OztHQVdHO0FBQ0gscUJBQWEsYUFBYTs7SUFnQnhCOzs7Ozs7T0FNRztJQUNILFVBQVUsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FRcEM7SUFFRCxXQUFXLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxVQUFVLEdBQUcsU0FBUyxDQUVsRDtJQUVELEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FFM0I7SUFFRCxPQUFPLElBQUksT0FBTyxDQUVqQjtJQUVELFVBQVUsSUFBSSxNQUFNLENBRW5CO0lBTUQ7OztPQUdHO0lBQ0Ysd0JBQXdCLENBQUMsS0FBSyxFQUFFLEtBQUssR0FBRyxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxLQUFLLE9BQU8sR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDLENBV3RHO0lBRUQ7Ozs7T0FJRztJQUNGLGdDQUFnQyxDQUFDLEtBQUssRUFBRSxLQUFLLEdBQUcsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQU9qRztJQUVELG9DQUFvQztJQUNuQyxlQUFlLElBQUksU0FBUyxDQUFDLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBRWxEO0lBTUQsb0RBQW9EO0lBQ3BELFVBQVUsQ0FB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
@@ -1 +1 @@
1
- {"version":3,"file":"tx_pool_indices.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/tx_pool_indices.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tx_pool_indices.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/tx_pool_indices.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
- import { compareFee, compareTxHash } from './tx_metadata.js';
1
+ import { insertIntoSortedArray, removeFromSortedArray } from '@aztec/foundation/array';
2
+ import { comparePriority } from './tx_metadata.js';
2
3
  /**
3
4
  * Manages in-memory indices for the transaction pool.
4
5
  *
@@ -14,7 +15,7 @@ import { compareFee, compareTxHash } from './tx_metadata.js';
14
15
  /** Primary metadata store: txHash -> TxMetaData */ #metadata = new Map();
15
16
  /** Nullifier to txHash index (pending txs only) */ #nullifierToTxHash = new Map();
16
17
  /** Fee payer to txHashes index (pending txs only) */ #feePayerToTxHashes = new Map();
17
- /** Pending txHashes grouped by priority fee */ #pendingByPriority = new Map();
18
+ /** Pending transactions sorted ascending by priority fee, ties broken by txHash */ #pendingByPriority = [];
18
19
  /** Protected transactions: txHash -> slotNumber */ #protectedTransactions = new Map();
19
20
  // ============================================================================
20
21
  // STATE QUERIES
@@ -52,24 +53,28 @@ import { compareFee, compareTxHash } from './tx_metadata.js';
52
53
  /**
53
54
  * Iterates pending transaction hashes in priority order.
54
55
  * @param order - 'desc' for highest priority first, 'asc' for lowest priority first
55
- */ *iteratePendingByPriority(order) {
56
- // Use compareFee from tx_metadata, swap args for descending order
57
- const feeCompareFn = order === 'desc' ? (a, b)=>compareFee(b, a) : compareFee;
58
- const hashCompareFn = order === 'desc' ? (a, b)=>compareTxHash(b, a) : compareTxHash;
59
- const sortedFees = [
60
- ...this.#pendingByPriority.keys()
61
- ].sort(feeCompareFn);
62
- for (const fee of sortedFees){
63
- const hashesAtFee = this.#pendingByPriority.get(fee);
64
- // Use compareTxHash from tx_metadata, swap args for descending order
65
- const sortedHashes = [
66
- ...hashesAtFee
67
- ].sort(hashCompareFn);
68
- for (const hash of sortedHashes){
69
- yield hash;
56
+ */ *iteratePendingByPriority(order, filter) {
57
+ const arr = this.#pendingByPriority;
58
+ const start = order === 'asc' ? 0 : arr.length - 1;
59
+ const step = order === 'asc' ? 1 : -1;
60
+ const inBounds = order === 'asc' ? (i)=>i < arr.length : (i)=>i >= 0;
61
+ for(let i = start; inBounds(i); i += step){
62
+ if (filter === undefined || filter(arr[i].txHash)) {
63
+ yield arr[i].txHash;
70
64
  }
71
65
  }
72
66
  }
67
+ /**
68
+ * Iterates pending transaction hashes in priority order, skipping txs received after maxReceivedAt.
69
+ * @param order - 'desc' for highest priority first, 'asc' for lowest priority first
70
+ * @param maxReceivedAt - Only yield txs with receivedAt <= this value
71
+ */ *iterateEligiblePendingByPriority(order, maxReceivedAt) {
72
+ const filter = (hash)=>{
73
+ const meta = this.#metadata.get(hash);
74
+ return meta !== undefined && meta.receivedAt <= maxReceivedAt;
75
+ };
76
+ yield* this.iteratePendingByPriority(order, filter);
77
+ }
73
78
  /** Iterates all metadata entries */ *iterateMetadata() {
74
79
  yield* this.#metadata;
75
80
  }
@@ -157,11 +162,7 @@ import { compareFee, compareTxHash } from './tx_metadata.js';
157
162
  return result;
158
163
  }
159
164
  /** Gets the count of pending transactions */ getPendingTxCount() {
160
- let count = 0;
161
- for (const hashes of this.#pendingByPriority.values()){
162
- count += hashes.size;
163
- }
164
- return count;
165
+ return this.#pendingByPriority.length;
165
166
  }
166
167
  /** Gets the lowest priority pending transaction hashes (up to limit) */ getLowestPriorityPending(limit) {
167
168
  if (limit <= 0) {
@@ -187,12 +188,10 @@ import { compareFee, compareTxHash } from './tx_metadata.js';
187
188
  }
188
189
  /** Gets all pending transactions */ getPendingTxs() {
189
190
  const result = [];
190
- for (const hashSet of this.#pendingByPriority.values()){
191
- for (const txHash of hashSet){
192
- const meta = this.#metadata.get(txHash);
193
- if (meta) {
194
- result.push(meta);
195
- }
191
+ for (const entry of this.#pendingByPriority){
192
+ const meta = this.#metadata.get(entry.txHash);
193
+ if (meta) {
194
+ result.push(meta);
196
195
  }
197
196
  }
198
197
  return result;
@@ -252,11 +251,13 @@ import { compareFee, compareTxHash } from './tx_metadata.js';
252
251
  // ============================================================================
253
252
  // METRICS
254
253
  // ============================================================================
255
- /** Counts transactions by state */ countTxs() {
254
+ /** Counts transactions by state and estimates total metadata memory usage */ countTxs() {
256
255
  let pending = 0;
257
256
  let protected_ = 0;
258
257
  let mined = 0;
258
+ let totalMetadataBytes = 0;
259
259
  for (const meta of this.#metadata.values()){
260
+ totalMetadataBytes += meta.estimatedSizeBytes;
260
261
  const state = this.getTxState(meta);
261
262
  if (state === 'pending') {
262
263
  pending++;
@@ -269,9 +270,17 @@ import { compareFee, compareTxHash } from './tx_metadata.js';
269
270
  return {
270
271
  pending,
271
272
  protected: protected_,
272
- mined
273
+ mined,
274
+ totalMetadataBytes
273
275
  };
274
276
  }
277
+ /** Returns the estimated total memory consumed by all metadata objects */ getTotalMetadataBytes() {
278
+ let total = 0;
279
+ for (const meta of this.#metadata.values()){
280
+ total += meta.estimatedSizeBytes;
281
+ }
282
+ return total;
283
+ }
275
284
  /** Gets all mined transactions with their block IDs */ getMinedTxs() {
276
285
  const result = [];
277
286
  for (const [txHash, meta] of this.#metadata){
@@ -299,13 +308,11 @@ import { compareFee, compareTxHash } from './tx_metadata.js';
299
308
  this.#feePayerToTxHashes.set(meta.feePayer, feePayerSet);
300
309
  }
301
310
  feePayerSet.add(meta.txHash);
302
- // Add to priority bucket
303
- let prioritySet = this.#pendingByPriority.get(meta.priorityFee);
304
- if (!prioritySet) {
305
- prioritySet = new Set();
306
- this.#pendingByPriority.set(meta.priorityFee, prioritySet);
307
- }
308
- prioritySet.add(meta.txHash);
311
+ insertIntoSortedArray(this.#pendingByPriority, {
312
+ txHash: meta.txHash,
313
+ priorityFee: meta.priorityFee,
314
+ txHashBigInt: meta.txHashBigInt
315
+ }, comparePriority, false);
309
316
  }
310
317
  #removeFromPendingIndices(meta) {
311
318
  // Remove from nullifier index
@@ -320,13 +327,11 @@ import { compareFee, compareTxHash } from './tx_metadata.js';
320
327
  this.#feePayerToTxHashes.delete(meta.feePayer);
321
328
  }
322
329
  }
323
- // Remove from priority map
324
- const hashSet = this.#pendingByPriority.get(meta.priorityFee);
325
- if (hashSet) {
326
- hashSet.delete(meta.txHash);
327
- if (hashSet.size === 0) {
328
- this.#pendingByPriority.delete(meta.priorityFee);
329
- }
330
- }
330
+ // Remove from priority array
331
+ removeFromSortedArray(this.#pendingByPriority, {
332
+ txHash: meta.txHash,
333
+ priorityFee: meta.priorityFee,
334
+ txHashBigInt: meta.txHashBigInt
335
+ }, comparePriority);
331
336
  }
332
337
  }