@aztec/p2p 0.0.1-commit.0c875d939 → 0.0.1-commit.0ec55a70b

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 (421) hide show
  1. package/README.md +129 -3
  2. package/dest/client/factory.d.ts +8 -7
  3. package/dest/client/factory.d.ts.map +1 -1
  4. package/dest/client/factory.js +35 -30
  5. package/dest/client/interface.d.ts +18 -20
  6. package/dest/client/interface.d.ts.map +1 -1
  7. package/dest/client/p2p_client.d.ts +9 -19
  8. package/dest/client/p2p_client.d.ts.map +1 -1
  9. package/dest/client/p2p_client.js +81 -104
  10. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +23 -10
  11. package/dest/config.d.ts +130 -103
  12. package/dest/config.d.ts.map +1 -1
  13. package/dest/config.js +97 -39
  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 +1 -2
  21. package/dest/index.d.ts.map +1 -1
  22. package/dest/index.js +0 -1
  23. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +7 -5
  24. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  25. package/dest/mem_pools/attestation_pool/attestation_pool.js +16 -9
  26. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +6 -6
  27. package/dest/mem_pools/attestation_pool/mocks.d.ts +1 -1
  28. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  29. package/dest/mem_pools/attestation_pool/mocks.js +6 -4
  30. package/dest/mem_pools/index.d.ts +1 -2
  31. package/dest/mem_pools/index.d.ts.map +1 -1
  32. package/dest/mem_pools/instrumentation.d.ts +4 -2
  33. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  34. package/dest/mem_pools/instrumentation.js +33 -15
  35. package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts +3 -1
  36. package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts.map +1 -1
  37. package/dest/mem_pools/tx_pool_v2/deleted_pool.js +9 -0
  38. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts +3 -3
  39. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts.map +1 -1
  40. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.js +18 -9
  41. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts +1 -1
  42. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -1
  43. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +5 -4
  44. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +3 -3
  45. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -1
  46. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +12 -4
  47. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +3 -2
  48. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -1
  49. package/dest/mem_pools/tx_pool_v2/eviction/index.js +2 -1
  50. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts +16 -0
  51. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts.map +1 -0
  52. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.js +62 -0
  53. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts +54 -5
  54. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts.map +1 -1
  55. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.js +8 -0
  56. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.js +4 -4
  57. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +7 -7
  58. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts +2 -2
  59. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts.map +1 -1
  60. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.js +12 -6
  61. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts +4 -4
  62. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts.map +1 -1
  63. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.js +16 -4
  64. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts +3 -3
  65. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts.map +1 -1
  66. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.js +3 -3
  67. package/dest/mem_pools/tx_pool_v2/index.d.ts +2 -2
  68. package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
  69. package/dest/mem_pools/tx_pool_v2/index.js +1 -1
  70. package/dest/mem_pools/tx_pool_v2/instrumentation.d.ts +15 -0
  71. package/dest/mem_pools/tx_pool_v2/instrumentation.d.ts.map +1 -0
  72. package/dest/mem_pools/tx_pool_v2/instrumentation.js +43 -0
  73. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +27 -10
  74. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
  75. package/dest/mem_pools/tx_pool_v2/interfaces.js +4 -1
  76. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +57 -15
  77. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
  78. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +115 -20
  79. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +5 -2
  80. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
  81. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +38 -46
  82. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +9 -4
  83. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
  84. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +12 -5
  85. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +12 -5
  86. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
  87. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +297 -153
  88. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +9 -3
  89. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  90. package/dest/msg_validators/attestation_validator/attestation_validator.js +37 -12
  91. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +7 -3
  92. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  93. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +2 -2
  94. package/dest/msg_validators/clock_tolerance.d.ts +12 -1
  95. package/dest/msg_validators/clock_tolerance.d.ts.map +1 -1
  96. package/dest/msg_validators/clock_tolerance.js +61 -3
  97. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +9 -4
  98. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
  99. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +10 -2
  100. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +9 -4
  101. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
  102. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +16 -2
  103. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +19 -8
  104. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
  105. package/dest/msg_validators/proposal_validator/proposal_validator.js +88 -44
  106. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +2 -2
  107. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  108. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +3 -3
  109. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts +2 -1
  110. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map +1 -1
  111. package/dest/msg_validators/tx_validator/allowed_public_setup.js +24 -20
  112. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts +17 -0
  113. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts.map +1 -0
  114. package/dest/msg_validators/tx_validator/allowed_setup_helpers.js +24 -0
  115. package/dest/msg_validators/tx_validator/archive_cache.js +1 -1
  116. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts +9 -0
  117. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts.map +1 -0
  118. package/dest/msg_validators/tx_validator/contract_instance_validator.js +48 -0
  119. package/dest/msg_validators/tx_validator/data_validator.d.ts +1 -1
  120. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  121. package/dest/msg_validators/tx_validator/data_validator.js +35 -2
  122. package/dest/msg_validators/tx_validator/factory.d.ts +133 -6
  123. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  124. package/dest/msg_validators/tx_validator/factory.js +247 -60
  125. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +1 -1
  126. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -1
  127. package/dest/msg_validators/tx_validator/fee_payer_balance.js +6 -2
  128. package/dest/msg_validators/tx_validator/gas_validator.d.ts +99 -3
  129. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  130. package/dest/msg_validators/tx_validator/gas_validator.js +137 -53
  131. package/dest/msg_validators/tx_validator/index.d.ts +3 -1
  132. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  133. package/dest/msg_validators/tx_validator/index.js +2 -0
  134. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
  135. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  136. package/dest/msg_validators/tx_validator/metadata_validator.js +4 -4
  137. package/dest/msg_validators/tx_validator/nullifier_cache.d.ts +14 -0
  138. package/dest/msg_validators/tx_validator/nullifier_cache.d.ts.map +1 -0
  139. package/dest/msg_validators/tx_validator/nullifier_cache.js +24 -0
  140. package/dest/msg_validators/tx_validator/phases_validator.d.ts +22 -2
  141. package/dest/msg_validators/tx_validator/phases_validator.d.ts.map +1 -1
  142. package/dest/msg_validators/tx_validator/phases_validator.js +72 -24
  143. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts +2 -2
  144. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts.map +1 -1
  145. package/dest/msg_validators/tx_validator/timestamp_validator.js +6 -6
  146. package/dest/services/data_store.d.ts +1 -1
  147. package/dest/services/data_store.d.ts.map +1 -1
  148. package/dest/services/data_store.js +5 -5
  149. package/dest/services/dummy_service.d.ts +8 -5
  150. package/dest/services/dummy_service.d.ts.map +1 -1
  151. package/dest/services/dummy_service.js +10 -5
  152. package/dest/services/encoding.d.ts +6 -2
  153. package/dest/services/encoding.d.ts.map +1 -1
  154. package/dest/services/encoding.js +16 -9
  155. package/dest/services/gossipsub/topic_score_params.d.ts +30 -7
  156. package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -1
  157. package/dest/services/gossipsub/topic_score_params.js +53 -14
  158. package/dest/services/libp2p/instrumentation.d.ts +3 -1
  159. package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
  160. package/dest/services/libp2p/instrumentation.js +14 -0
  161. package/dest/services/libp2p/libp2p_service.d.ts +33 -38
  162. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  163. package/dest/services/libp2p/libp2p_service.js +256 -213
  164. package/dest/services/peer-manager/metrics.d.ts +3 -1
  165. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  166. package/dest/services/peer-manager/metrics.js +6 -0
  167. package/dest/services/peer-manager/peer_manager.d.ts +6 -2
  168. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  169. package/dest/services/peer-manager/peer_manager.js +39 -11
  170. package/dest/services/peer-manager/peer_scoring.d.ts +7 -2
  171. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  172. package/dest/services/peer-manager/peer_scoring.js +32 -10
  173. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +12 -8
  174. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  175. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +83 -106
  176. package/dest/services/reqresp/batch-tx-requester/interface.d.ts +4 -7
  177. package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map +1 -1
  178. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts +11 -13
  179. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts.map +1 -1
  180. package/dest/services/reqresp/batch-tx-requester/missing_txs.js +31 -46
  181. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts +19 -11
  182. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts.map +1 -1
  183. package/dest/services/reqresp/batch-tx-requester/peer_collection.js +52 -15
  184. package/dest/services/reqresp/batch-tx-requester/tx_validator.js +2 -2
  185. package/dest/services/reqresp/config.d.ts +3 -3
  186. package/dest/services/reqresp/config.d.ts.map +1 -1
  187. package/dest/services/reqresp/interface.d.ts +14 -9
  188. package/dest/services/reqresp/interface.d.ts.map +1 -1
  189. package/dest/services/reqresp/interface.js +10 -11
  190. package/dest/services/reqresp/metrics.d.ts +1 -1
  191. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  192. package/dest/services/reqresp/metrics.js +0 -1
  193. package/dest/services/reqresp/protocols/index.d.ts +1 -2
  194. package/dest/services/reqresp/protocols/index.d.ts.map +1 -1
  195. package/dest/services/reqresp/protocols/index.js +0 -1
  196. package/dest/services/reqresp/protocols/tx.d.ts +1 -1
  197. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  198. package/dest/services/reqresp/protocols/tx.js +1 -3
  199. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +5 -4
  200. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -1
  201. package/dest/services/reqresp/rate-limiter/rate_limiter.js +10 -8
  202. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts +1 -1
  203. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -1
  204. package/dest/services/reqresp/rate-limiter/rate_limits.js +0 -10
  205. package/dest/services/reqresp/reqresp.d.ts +4 -2
  206. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  207. package/dest/services/reqresp/reqresp.js +30 -12
  208. package/dest/services/service.d.ts +9 -4
  209. package/dest/services/service.d.ts.map +1 -1
  210. package/dest/services/tx_collection/fast_tx_collection.d.ts +1 -4
  211. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +1 -1
  212. package/dest/services/tx_collection/fast_tx_collection.js +65 -75
  213. package/dest/services/tx_collection/file_store_tx_collection.d.ts +1 -1
  214. package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -1
  215. package/dest/services/tx_collection/file_store_tx_collection.js +4 -2
  216. package/dest/services/tx_collection/file_store_tx_source.d.ts +16 -6
  217. package/dest/services/tx_collection/file_store_tx_source.d.ts.map +1 -1
  218. package/dest/services/tx_collection/file_store_tx_source.js +50 -9
  219. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  220. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  221. package/dest/services/tx_collection/instrumentation.js +2 -1
  222. package/dest/services/tx_collection/proposal_tx_collector.d.ts +7 -7
  223. package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +1 -1
  224. package/dest/services/tx_collection/proposal_tx_collector.js +5 -4
  225. package/dest/services/tx_collection/request_tracker.d.ts +53 -0
  226. package/dest/services/tx_collection/request_tracker.d.ts.map +1 -0
  227. package/dest/services/tx_collection/request_tracker.js +84 -0
  228. package/dest/services/tx_collection/slow_tx_collection.d.ts +2 -2
  229. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +1 -1
  230. package/dest/services/tx_collection/slow_tx_collection.js +10 -8
  231. package/dest/services/tx_collection/tx_collection.d.ts +5 -7
  232. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  233. package/dest/services/tx_collection/tx_collection_sink.d.ts +6 -5
  234. package/dest/services/tx_collection/tx_collection_sink.d.ts.map +1 -1
  235. package/dest/services/tx_collection/tx_collection_sink.js +13 -22
  236. package/dest/services/tx_collection/tx_source.d.ts +13 -7
  237. package/dest/services/tx_collection/tx_source.d.ts.map +1 -1
  238. package/dest/services/tx_collection/tx_source.js +26 -7
  239. package/dest/services/tx_file_store/tx_file_store.js +1 -1
  240. package/dest/services/tx_provider.d.ts +3 -3
  241. package/dest/services/tx_provider.d.ts.map +1 -1
  242. package/dest/services/tx_provider.js +4 -4
  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 +4 -2
  246. package/dest/test-helpers/mock-pubsub.d.ts +14 -6
  247. package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
  248. package/dest/test-helpers/mock-pubsub.js +43 -12
  249. package/dest/test-helpers/reqresp-nodes.d.ts +2 -3
  250. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  251. package/dest/test-helpers/reqresp-nodes.js +6 -4
  252. package/dest/test-helpers/testbench-utils.d.ts +6 -3
  253. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  254. package/dest/test-helpers/testbench-utils.js +24 -4
  255. package/dest/testbench/p2p_client_testbench_worker.d.ts +2 -2
  256. package/dest/testbench/p2p_client_testbench_worker.d.ts.map +1 -1
  257. package/dest/testbench/p2p_client_testbench_worker.js +83 -26
  258. package/dest/testbench/worker_client_manager.d.ts +10 -1
  259. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  260. package/dest/testbench/worker_client_manager.js +55 -3
  261. package/dest/util.d.ts +3 -3
  262. package/dest/util.d.ts.map +1 -1
  263. package/package.json +14 -14
  264. package/src/client/factory.ts +63 -50
  265. package/src/client/interface.ts +20 -21
  266. package/src/client/p2p_client.ts +89 -135
  267. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +35 -14
  268. package/src/config.ts +148 -45
  269. package/src/errors/p2p-service.error.ts +11 -0
  270. package/src/errors/tx-pool.error.ts +12 -0
  271. package/src/index.ts +0 -1
  272. package/src/mem_pools/attestation_pool/attestation_pool.ts +17 -12
  273. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +6 -6
  274. package/src/mem_pools/attestation_pool/mocks.ts +13 -8
  275. package/src/mem_pools/index.ts +0 -3
  276. package/src/mem_pools/instrumentation.ts +22 -14
  277. package/src/mem_pools/tx_pool_v2/README.md +10 -2
  278. package/src/mem_pools/tx_pool_v2/deleted_pool.ts +11 -0
  279. package/src/mem_pools/tx_pool_v2/eviction/eviction_manager.ts +21 -8
  280. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +5 -4
  281. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +18 -4
  282. package/src/mem_pools/tx_pool_v2/eviction/index.ts +5 -0
  283. package/src/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.ts +65 -0
  284. package/src/mem_pools/tx_pool_v2/eviction/interfaces.ts +59 -4
  285. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.ts +4 -4
  286. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +8 -8
  287. package/src/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.ts +12 -9
  288. package/src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts +33 -6
  289. package/src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts +4 -3
  290. package/src/mem_pools/tx_pool_v2/index.ts +1 -1
  291. package/src/mem_pools/tx_pool_v2/instrumentation.ts +69 -0
  292. package/src/mem_pools/tx_pool_v2/interfaces.ts +27 -10
  293. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +166 -28
  294. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +43 -46
  295. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +28 -8
  296. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +332 -149
  297. package/src/msg_validators/attestation_validator/README.md +49 -0
  298. package/src/msg_validators/attestation_validator/attestation_validator.ts +41 -9
  299. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +12 -2
  300. package/src/msg_validators/clock_tolerance.ts +79 -3
  301. package/src/msg_validators/proposal_validator/README.md +123 -0
  302. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +23 -4
  303. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +34 -7
  304. package/src/msg_validators/proposal_validator/proposal_validator.ts +111 -47
  305. package/src/msg_validators/tx_validator/README.md +127 -0
  306. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +3 -3
  307. package/src/msg_validators/tx_validator/allowed_public_setup.ts +22 -27
  308. package/src/msg_validators/tx_validator/allowed_setup_helpers.ts +31 -0
  309. package/src/msg_validators/tx_validator/archive_cache.ts +1 -1
  310. package/src/msg_validators/tx_validator/contract_instance_validator.ts +56 -0
  311. package/src/msg_validators/tx_validator/data_validator.ts +42 -1
  312. package/src/msg_validators/tx_validator/factory.ts +396 -78
  313. package/src/msg_validators/tx_validator/fee_payer_balance.ts +6 -2
  314. package/src/msg_validators/tx_validator/gas_validator.ts +199 -54
  315. package/src/msg_validators/tx_validator/index.ts +2 -0
  316. package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
  317. package/src/msg_validators/tx_validator/nullifier_cache.ts +30 -0
  318. package/src/msg_validators/tx_validator/phases_validator.ts +82 -27
  319. package/src/msg_validators/tx_validator/timestamp_validator.ts +7 -7
  320. package/src/services/data_store.ts +5 -13
  321. package/src/services/dummy_service.ts +13 -7
  322. package/src/services/encoding.ts +16 -8
  323. package/src/services/gossipsub/README.md +29 -14
  324. package/src/services/gossipsub/topic_score_params.ts +85 -17
  325. package/src/services/libp2p/instrumentation.ts +14 -0
  326. package/src/services/libp2p/libp2p_service.ts +278 -239
  327. package/src/services/peer-manager/metrics.ts +7 -0
  328. package/src/services/peer-manager/peer_manager.ts +45 -11
  329. package/src/services/peer-manager/peer_scoring.ts +27 -5
  330. package/src/services/reqresp/README.md +229 -0
  331. package/src/services/reqresp/batch-tx-requester/README.md +46 -7
  332. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +79 -112
  333. package/src/services/reqresp/batch-tx-requester/interface.ts +3 -6
  334. package/src/services/reqresp/batch-tx-requester/missing_txs.ts +30 -71
  335. package/src/services/reqresp/batch-tx-requester/peer_collection.ts +68 -24
  336. package/src/services/reqresp/batch-tx-requester/tx_validator.ts +2 -2
  337. package/src/services/reqresp/config.ts +2 -2
  338. package/src/services/reqresp/interface.ts +21 -11
  339. package/src/services/reqresp/metrics.ts +0 -1
  340. package/src/services/reqresp/protocols/index.ts +0 -1
  341. package/src/services/reqresp/protocols/tx.ts +1 -3
  342. package/src/services/reqresp/rate-limiter/rate_limiter.ts +13 -9
  343. package/src/services/reqresp/rate-limiter/rate_limits.ts +0 -10
  344. package/src/services/reqresp/reqresp.ts +40 -13
  345. package/src/services/service.ts +17 -3
  346. package/src/services/tx_collection/fast_tx_collection.ts +71 -76
  347. package/src/services/tx_collection/file_store_tx_collection.ts +7 -3
  348. package/src/services/tx_collection/file_store_tx_source.ts +65 -9
  349. package/src/services/tx_collection/instrumentation.ts +7 -1
  350. package/src/services/tx_collection/proposal_tx_collector.ts +9 -13
  351. package/src/services/tx_collection/request_tracker.ts +127 -0
  352. package/src/services/tx_collection/slow_tx_collection.ts +8 -9
  353. package/src/services/tx_collection/tx_collection.ts +5 -6
  354. package/src/services/tx_collection/tx_collection_sink.ts +15 -29
  355. package/src/services/tx_collection/tx_source.ts +28 -8
  356. package/src/services/tx_file_store/tx_file_store.ts +1 -1
  357. package/src/services/tx_provider.ts +2 -2
  358. package/src/test-helpers/make-test-p2p-clients.ts +3 -3
  359. package/src/test-helpers/mock-pubsub.ts +47 -11
  360. package/src/test-helpers/reqresp-nodes.ts +7 -8
  361. package/src/test-helpers/testbench-utils.ts +33 -6
  362. package/src/testbench/p2p_client_testbench_worker.ts +92 -29
  363. package/src/testbench/worker_client_manager.ts +68 -6
  364. package/src/util.ts +8 -2
  365. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +0 -125
  366. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +0 -1
  367. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +0 -596
  368. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +0 -32
  369. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +0 -1
  370. package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +0 -112
  371. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +0 -157
  372. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +0 -1
  373. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +0 -52
  374. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +0 -16
  375. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +0 -1
  376. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +0 -122
  377. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +0 -17
  378. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +0 -1
  379. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +0 -84
  380. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +0 -19
  381. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +0 -1
  382. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +0 -78
  383. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +0 -26
  384. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +0 -1
  385. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +0 -84
  386. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +0 -25
  387. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +0 -1
  388. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +0 -57
  389. package/dest/mem_pools/tx_pool/index.d.ts +0 -3
  390. package/dest/mem_pools/tx_pool/index.d.ts.map +0 -1
  391. package/dest/mem_pools/tx_pool/index.js +0 -2
  392. package/dest/mem_pools/tx_pool/priority.d.ts +0 -12
  393. package/dest/mem_pools/tx_pool/priority.d.ts.map +0 -1
  394. package/dest/mem_pools/tx_pool/priority.js +0 -15
  395. package/dest/mem_pools/tx_pool/tx_pool.d.ts +0 -127
  396. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +0 -1
  397. package/dest/mem_pools/tx_pool/tx_pool.js +0 -3
  398. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +0 -7
  399. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +0 -1
  400. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +0 -400
  401. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +0 -23
  402. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +0 -1
  403. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +0 -212
  404. package/dest/services/reqresp/protocols/block.d.ts +0 -9
  405. package/dest/services/reqresp/protocols/block.d.ts.map +0 -1
  406. package/dest/services/reqresp/protocols/block.js +0 -32
  407. package/src/mem_pools/tx_pool/README.md +0 -270
  408. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +0 -746
  409. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +0 -132
  410. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +0 -208
  411. package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +0 -162
  412. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +0 -104
  413. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +0 -93
  414. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +0 -106
  415. package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +0 -75
  416. package/src/mem_pools/tx_pool/index.ts +0 -2
  417. package/src/mem_pools/tx_pool/priority.ts +0 -20
  418. package/src/mem_pools/tx_pool/tx_pool.ts +0 -141
  419. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +0 -319
  420. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +0 -230
  421. package/src/services/reqresp/protocols/block.ts +0 -37
@@ -0,0 +1,15 @@
1
+ import { type TelemetryClient } from '@aztec/telemetry-client';
2
+ /** Callback that returns the current estimated metadata memory in bytes. */
3
+ export type MetadataMemoryCallback = () => number;
4
+ /** Instrumentation for TxPoolV2Impl internal operations. */
5
+ export declare class TxPoolV2Instrumentation {
6
+ #private;
7
+ constructor(telemetry: TelemetryClient, metadataMemoryCallback: MetadataMemoryCallback);
8
+ recordEvictions(count: number, reason: string): void;
9
+ recordIgnored(count: number): void;
10
+ recordRejected(count: number): void;
11
+ recordSoftDeletedHits(count: number): void;
12
+ recordMissingOnProtect(count: number): void;
13
+ recordMissingPreviouslyEvicted(count: number): void;
14
+ }
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL3R4X3Bvb2xfdjIvaW5zdHJ1bWVudGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFNTCxLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyw0RUFBNEU7QUFDNUUsTUFBTSxNQUFNLHNCQUFzQixHQUFHLE1BQU0sTUFBTSxDQUFDO0FBRWxELDREQUE0RDtBQUM1RCxxQkFBYSx1QkFBdUI7O0lBU2xDLFlBQVksU0FBUyxFQUFFLGVBQWUsRUFBRSxzQkFBc0IsRUFBRSxzQkFBc0IsRUFtQnJGO0lBRUQsZUFBZSxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFFNUM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFMUI7SUFFRCxjQUFjLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFM0I7SUFFRCxxQkFBcUIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxRQUVsQztJQUVELHNCQUFzQixDQUFDLEtBQUssRUFBRSxNQUFNLFFBRW5DO0lBRUQsOEJBQThCLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFM0M7Q0FDRiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,4EAA4E;AAC5E,MAAM,MAAM,sBAAsB,GAAG,MAAM,MAAM,CAAC;AAElD,4DAA4D;AAC5D,qBAAa,uBAAuB;;IASlC,YAAY,SAAS,EAAE,eAAe,EAAE,sBAAsB,EAAE,sBAAsB,EAmBrF;IAED,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAE5C;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,QAE1B;IAED,cAAc,CAAC,KAAK,EAAE,MAAM,QAE3B;IAED,qBAAqB,CAAC,KAAK,EAAE,MAAM,QAElC;IAED,sBAAsB,CAAC,KAAK,EAAE,MAAM,QAEnC;IAED,8BAA8B,CAAC,KAAK,EAAE,MAAM,QAE3C;CACF"}
@@ -0,0 +1,43 @@
1
+ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/telemetry-client';
2
+ /** Instrumentation for TxPoolV2Impl internal operations. */ export class TxPoolV2Instrumentation {
3
+ #evictedCounter;
4
+ #ignoredCounter;
5
+ #rejectedCounter;
6
+ #softDeletedHitsCounter;
7
+ #missingOnProtectCounter;
8
+ #missingPreviouslyEvictedCounter;
9
+ #metadataMemoryGauge;
10
+ constructor(telemetry, metadataMemoryCallback){
11
+ const meter = telemetry.getMeter('TxPoolV2Impl');
12
+ this.#evictedCounter = createUpDownCounterWithDefault(meter, Metrics.MEMPOOL_TX_POOL_V2_EVICTED_COUNT);
13
+ this.#ignoredCounter = createUpDownCounterWithDefault(meter, Metrics.MEMPOOL_TX_POOL_V2_IGNORED_COUNT);
14
+ this.#rejectedCounter = createUpDownCounterWithDefault(meter, Metrics.MEMPOOL_TX_POOL_V2_REJECTED_COUNT);
15
+ this.#softDeletedHitsCounter = createUpDownCounterWithDefault(meter, Metrics.MEMPOOL_TX_POOL_V2_SOFT_DELETED_HITS);
16
+ this.#missingOnProtectCounter = createUpDownCounterWithDefault(meter, Metrics.MEMPOOL_TX_POOL_V2_MISSING_ON_PROTECT);
17
+ this.#missingPreviouslyEvictedCounter = createUpDownCounterWithDefault(meter, Metrics.MEMPOOL_TX_POOL_V2_MISSING_PREVIOUSLY_EVICTED);
18
+ this.#metadataMemoryGauge = meter.createObservableGauge(Metrics.MEMPOOL_TX_POOL_V2_METADATA_MEMORY);
19
+ this.#metadataMemoryGauge.addCallback((result)=>{
20
+ result.observe(metadataMemoryCallback());
21
+ });
22
+ }
23
+ recordEvictions(count, reason) {
24
+ this.#evictedCounter.add(count, {
25
+ [Attributes.TX_POOL_EVICTION_REASON]: reason
26
+ });
27
+ }
28
+ recordIgnored(count) {
29
+ this.#ignoredCounter.add(count);
30
+ }
31
+ recordRejected(count) {
32
+ this.#rejectedCounter.add(count);
33
+ }
34
+ recordSoftDeletedHits(count) {
35
+ this.#softDeletedHitsCounter.add(count);
36
+ }
37
+ recordMissingOnProtect(count) {
38
+ this.#missingOnProtectCounter.add(count);
39
+ }
40
+ recordMissingPreviouslyEvicted(count) {
41
+ this.#missingPreviouslyEvictedCounter.add(count);
42
+ }
43
+ }
@@ -1,8 +1,10 @@
1
1
  import type { SlotNumber } from '@aztec/foundation/branded-types';
2
2
  import type { TypedEventEmitter } from '@aztec/foundation/types';
3
3
  import type { L2Block, L2BlockId, L2BlockSource } from '@aztec/stdlib/block';
4
+ import type { BlockMinFeesProvider } from '@aztec/stdlib/gas';
4
5
  import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
5
6
  import type { BlockHeader, Tx, TxHash, TxValidator } from '@aztec/stdlib/tx';
7
+ import type { TxPoolRejectionError } from './eviction/interfaces.js';
6
8
  import type { TxMetaData, TxState } from './tx_metadata.js';
7
9
  /**
8
10
  * Result of adding transactions to the pending pool.
@@ -15,6 +17,8 @@ export type AddTxsResult = {
15
17
  ignored: TxHash[];
16
18
  /** Transactions rejected because they failed validation (e.g., invalid proof, expired timestamp) */
17
19
  rejected: TxHash[];
20
+ /** Optional rejection errors, only present when there are rejections with structured errors. */
21
+ errors?: Map<string, TxPoolRejectionError>;
18
22
  };
19
23
  /**
20
24
  * Events emitted by TxPoolV2.
@@ -40,6 +44,12 @@ export type TxPoolV2Config = {
40
44
  archivedTxLimit: number;
41
45
  /** Minimum age (ms) a transaction must have been in the pool before it's eligible for block building */
42
46
  minTxPoolAgeMs: number;
47
+ /** Maximum number of evicted tx hashes to remember for metrics tracking */
48
+ evictedTxCacheSize: number;
49
+ /** The probability (0-1) that a transaction is discarded. 0 disables dropping. For testing purposes only. */
50
+ dropTransactionsProbability: number;
51
+ /** Minimum percentage fee increase required to replace an existing tx via RPC (0 = no bump). */
52
+ priceBumpPercentage: bigint;
43
53
  };
44
54
  /**
45
55
  * Default configuration values for TxPoolV2.
@@ -55,6 +65,10 @@ export type TxPoolV2Dependencies = {
55
65
  worldStateSynchronizer: WorldStateSynchronizer;
56
66
  /** Factory that creates a validator for re-validating pool transactions using metadata */
57
67
  createTxValidator: () => Promise<TxValidator<TxMetaData>>;
68
+ /** Checks whether a tx's setup-phase calls are on the allow list. Precomputed at receipt time. */
69
+ checkAllowedSetupCalls: (tx: Tx) => Promise<boolean>;
70
+ /** Provides projected minimum fees for the next block. Used by eviction rules instead of stale block header fees. */
71
+ blockMinFeesProvider: BlockMinFeesProvider;
58
72
  };
59
73
  /**
60
74
  * Read-only access to pool state for pre-add checks.
@@ -91,14 +105,15 @@ export interface TxPoolV2 extends TypedEventEmitter<TxPoolV2Events> {
91
105
  */
92
106
  addPendingTxs(txs: Tx[], opts?: {
93
107
  source?: string;
108
+ feeComparisonOnly?: boolean;
94
109
  }): Promise<AddTxsResult>;
95
110
  /**
96
- * Checks if a transaction can be added without modifying the pool.
97
- * Performs the same validation as addPendingTxs but doesn't persist changes.
111
+ * Checks if the pool would accept a transaction without modifying state.
112
+ * Used as a pre-check before expensive proof verification.
98
113
  * @param tx - Transaction to check
99
- * @returns Result: 'accepted', 'ignored' (if already in pool or undesirable), or 'rejected' (if validation fails)
114
+ * @returns 'accepted' if the pool would accept, 'ignored' if already in pool or undesirable
100
115
  */
101
- canAddPendingTx(tx: Tx): Promise<'accepted' | 'ignored' | 'rejected'>;
116
+ canAddPendingTx(tx: Tx): Promise<'accepted' | 'ignored'>;
102
117
  /**
103
118
  * Adds transactions as immediately protected for a given slot.
104
119
  * Used when receiving transactions from a block proposal we're validating.
@@ -135,10 +150,10 @@ export interface TxPoolV2 extends TypedEventEmitter<TxPoolV2Events> {
135
150
  */
136
151
  handleMinedBlock(block: L2Block): Promise<void>;
137
152
  /**
138
- * Prepares the pool for a new slot.
139
- * Unprotects transactions from earlier slots and validates them before
140
- * returning to pending state.
141
- * @param slotNumber - The slot number to prepare for
153
+ * Prepares the pool for a new slot by unprotecting transactions from earlier
154
+ * slots and re-validating them before returning to pending state.
155
+ * @param slotNumber - The pipeline slot we are building for (i.e. the slot
156
+ * the resulting blocks will target on L1).
142
157
  */
143
158
  prepareForSlot(slotNumber: SlotNumber): Promise<void>;
144
159
  /**
@@ -147,7 +162,9 @@ export interface TxPoolV2 extends TypedEventEmitter<TxPoolV2Events> {
147
162
  * and validates them before returning to pending.
148
163
  * @param latestBlock - The latest valid block ID after the prune
149
164
  */
150
- handlePrunedBlocks(latestBlock: L2BlockId): Promise<void>;
165
+ handlePrunedBlocks(latestBlock: L2BlockId, options?: {
166
+ deleteAllTxs?: boolean;
167
+ }): Promise<void>;
151
168
  /**
152
169
  * Handles failed transaction execution.
153
170
  * Deletes transactions that failed during block building.
@@ -198,4 +215,4 @@ export interface TxPoolV2 extends TypedEventEmitter<TxPoolV2Events> {
198
215
  /** Stops the pool and releases resources */
199
216
  stop(): Promise<void>;
200
217
  }
201
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sX3YyL2ludGVyZmFjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFN0UsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTVEOzs7R0FHRztBQUNILE1BQU0sTUFBTSxZQUFZLEdBQUc7SUFDekIsa0RBQWtEO0lBQ2xELFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNuQixzSEFBc0g7SUFDdEgsT0FBTyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ2xCLG9HQUFvRztJQUNwRyxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUM7Q0FDcEIsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQixtRUFBbUU7SUFDbkUsV0FBVyxFQUFFLENBQUMsSUFBSSxFQUFFO1FBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQUMsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsS0FBSyxJQUFJLENBQUM7SUFDNUQsMERBQTBEO0lBQzFELGFBQWEsRUFBRSxDQUFDLElBQUksRUFBRTtRQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUs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
218
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sX3YyL2ludGVyZmFjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU3RSxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxPQUFPLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RDs7O0dBR0c7QUFDSCxNQUFNLE1BQU0sWUFBWSxHQUFHO0lBQ3pCLGtEQUFrRDtJQUNsRCxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbkIsc0hBQXNIO0lBQ3RILE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNsQixvR0FBb0c7SUFDcEcsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ25CLGdHQUFnRztJQUNoRyxNQUFNLENBQUMsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLG9CQUFvQixDQUFDLENBQUM7Q0FDNUMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQixtRUFBbUU7SUFDbkUsV0FB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
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/interfaces.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/interfaces.ts"],"names":[],"mappings":"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"}
@@ -3,5 +3,8 @@
3
3
  */ export const DEFAULT_TX_POOL_V2_CONFIG = {
4
4
  maxPendingTxCount: 0,
5
5
  archivedTxLimit: 0,
6
- minTxPoolAgeMs: 2_000
6
+ minTxPoolAgeMs: 2_000,
7
+ evictedTxCacheSize: 10_000,
8
+ dropTransactionsProbability: 0,
9
+ priceBumpPercentage: 10n
7
10
  };
@@ -1,12 +1,15 @@
1
1
  import { BlockNumber } from '@aztec/foundation/branded-types';
2
2
  import { Fr } from '@aztec/foundation/curves/bn254';
3
3
  import { BlockHash, type L2BlockId } from '@aztec/stdlib/block';
4
- import type { Tx } from '@aztec/stdlib/tx';
5
- import type { PreAddResult } from './eviction/interfaces.js';
4
+ import { Gas, GasFees } from '@aztec/stdlib/gas';
5
+ import { type Tx } from '@aztec/stdlib/tx';
6
+ import { type PreAddResult } from './eviction/interfaces.js';
6
7
  /** Validator-compatible data interface, mirroring the subset of PrivateKernelTailCircuitPublicInputs used by validators. */
7
8
  export type TxMetaValidationData = {
8
9
  getNonEmptyNullifiers(): Fr[];
9
- includeByTimestamp: bigint;
10
+ expirationTimestamp: bigint;
11
+ /** Whether the tx has public calls. Used to select the correct L2 gas minimum. */
12
+ forPublic?: unknown;
10
13
  constants: {
11
14
  anchorBlockHeader: {
12
15
  hash(): Promise<BlockHash>;
@@ -14,6 +17,12 @@ export type TxMetaValidationData = {
14
17
  blockNumber: BlockNumber;
15
18
  };
16
19
  };
20
+ txContext: {
21
+ gasSettings: {
22
+ gasLimits: Gas;
23
+ maxFeesPerGas: GasFees;
24
+ };
25
+ };
17
26
  };
18
27
  };
19
28
  /**
@@ -27,6 +36,8 @@ export type TxMetaValidationData = {
27
36
  export type TxMetaData = {
28
37
  /** The transaction hash as hex string */
29
38
  readonly txHash: string;
39
+ /** The transaction hash as bigint (for efficient Fr conversion in comparisons) */
40
+ readonly txHashBigInt: bigint;
30
41
  /** Block ID (number and hash) in which the transaction was mined (undefined if not mined) */
31
42
  minedL2BlockId?: L2BlockId;
32
43
  /** Hash of the block header the transaction uses as its anchor (hex string) */
@@ -42,11 +53,15 @@ export type TxMetaData = {
42
53
  /** Non-empty nullifiers emitted by the transaction (hex strings) */
43
54
  readonly nullifiers: readonly string[];
44
55
  /** Timestamp by which the transaction must be included (for expiration checks) */
45
- readonly includeByTimestamp: bigint;
56
+ readonly expirationTimestamp: bigint;
57
+ /** Whether the tx's setup-phase calls pass the allow list check. Computed at receipt time. */
58
+ readonly allowedSetupCalls: boolean;
46
59
  /** Validator-compatible data, providing the same access patterns as Tx.data */
47
60
  readonly data: TxMetaValidationData;
48
61
  /** Timestamp (ms) when the tx was received into the pool. 0 for hydrated txs (always eligible). */
49
62
  receivedAt: number;
63
+ /** Estimated memory footprint of this metadata object in bytes */
64
+ readonly estimatedSizeBytes: number;
50
65
  };
51
66
  /** Transaction state derived from TxMetaData fields and pool protection status */
52
67
  export type TxState = 'pending' | 'protected' | 'mined' | 'deleted';
@@ -54,42 +69,69 @@ export type TxState = 'pending' | 'protected' | 'mined' | 'deleted';
54
69
  * Builds TxMetaData from a full Tx object.
55
70
  * Extracts all relevant fields for efficient in-memory storage and querying.
56
71
  * Fr values are captured in closures for zero-cost re-validation.
72
+ *
73
+ * @param allowedSetupCalls - Whether the tx's setup-phase calls pass the allow list.
74
+ * For gossip/RPC txs this is always `true` (already validated by PhasesTxValidator).
75
+ * For req/resp txs this should be computed by the caller using the phases validator.
57
76
  */
58
- export declare function buildTxMetaData(tx: Tx): Promise<TxMetaData>;
77
+ export declare function buildTxMetaData(tx: Tx, allowedSetupCalls?: boolean): Promise<TxMetaData>;
78
+ /** Converts a txHash bigint back to the canonical 0x-prefixed 64-char hex string. */
79
+ export declare function txHashFromBigInt(value: bigint): string;
59
80
  /** Minimal fields required for priority comparison. */
60
- type PriorityComparable = Pick<TxMetaData, 'txHash' | 'priorityFee'>;
81
+ export type PriorityComparable = Pick<TxMetaData, 'txHash' | 'txHashBigInt' | 'priorityFee'>;
61
82
  /**
62
83
  * Compares two priority fees in ascending order.
63
84
  * Returns negative if a < b, positive if a > b, 0 if equal.
64
85
  */
65
- export declare function compareFee(a: bigint, b: bigint): number;
86
+ export declare function compareFee(a: bigint, b: bigint): -1 | 0 | 1;
66
87
  /**
67
88
  * Compares two tx hashes in ascending order.
68
89
  * Uses field element comparison for deterministic ordering.
69
90
  * Returns negative if a < b, positive if a > b, 0 if equal.
70
91
  */
71
- export declare function compareTxHash(a: string, b: string): number;
92
+ export declare function compareTxHash(a: bigint, b: bigint): -1 | 0 | 1;
72
93
  /**
73
94
  * Compares two transactions by priority fee, with txHash as tiebreaker.
74
95
  * Returns negative if a < b, positive if a > b, 0 if equal.
75
96
  * Use with sort() for ascending order, or negate/reverse for descending.
76
97
  */
77
- export declare function comparePriority(a: PriorityComparable, b: PriorityComparable): number;
98
+ export declare function comparePriority(a: PriorityComparable, b: PriorityComparable): -1 | 0 | 1;
99
+ /**
100
+ * Returns the minimum fee required to replace an existing tx with the given price bump percentage.
101
+ * Uses integer arithmetic: `existingFee + existingFee * priceBumpPercentage / 100`.
102
+ */
103
+ export declare function getMinimumPriceBumpFee(existingFee: bigint, priceBumpPercentage: bigint): bigint;
78
104
  /**
79
105
  * Checks for nullifier conflicts between an incoming transaction and existing pool state.
80
106
  *
81
107
  * When the incoming tx shares nullifiers with existing pending txs:
82
- * - If the incoming tx has strictly higher priority, mark conflicting txs for eviction
83
- * - If any conflicting tx has equal or higher priority, ignore the incoming tx
108
+ * - If the incoming tx meets or exceeds the required priority, mark conflicting txs for eviction
109
+ * - Otherwise, ignore the incoming tx
110
+ *
111
+ * When `priceBumpPercentage` is provided (RPC path), uses fee-only comparison with the
112
+ * percentage bump instead of `comparePriority`.
84
113
  *
85
114
  * @param incomingMeta - Metadata for the incoming transaction
86
115
  * @param getTxHashByNullifier - Accessor to find which tx uses a nullifier
87
116
  * @param getMetadata - Accessor to get metadata for a tx hash
117
+ * @param priceBumpPercentage - Optional percentage bump required for fee-based replacement
88
118
  */
89
- export declare function checkNullifierConflict(incomingMeta: TxMetaData, getTxHashByNullifier: (nullifier: string) => string | undefined, getMetadata: (txHash: string) => TxMetaData | undefined): PreAddResult;
119
+ export declare function checkNullifierConflict(incomingMeta: TxMetaData, getTxHashByNullifier: (nullifier: string) => string | undefined, getMetadata: (txHash: string) => TxMetaData | undefined, priceBumpPercentage?: bigint): PreAddResult;
90
120
  /** Creates a stub TxMetaValidationData for tests that don't exercise validators. */
91
121
  export declare function stubTxMetaValidationData(overrides?: {
92
- includeByTimestamp?: bigint;
122
+ expirationTimestamp?: bigint;
123
+ maxFeesPerGas?: GasFees;
93
124
  }): TxMetaValidationData;
94
- export {};
95
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfbWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbF92Mi90eF9tZXRhZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUkzQyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RCw0SEFBNEg7QUFDNUgsTUFBTSxNQUFNLG9CQUFvQixHQUFHO0lBQ2pDLHFCQUFxQixJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQzlCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixTQUFTLEVBQUU7UUFDVCxpQkFBaUIsRUFBRTtZQUNqQixJQUFJLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQzNCLGVBQWUsRUFBRTtnQkFDZixXQUFXLEVBQUUsV0FBVyxDQUFDO2FBQzFCLENBQUM7U0FDSCxDQUFDO0tBQ0gsQ0FBQztDQUNILENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxNQUFNLFVBQVUsR0FBRztJQUN2Qix5Q0FBeUM7SUFDekMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFeEIsNkZBQTZGO0lBQzdGLGNBQWMsQ0FBQyxFQUFFLFNBQVMsQ0FBQztJQUUzQiwrRUFBK0U7SUFDL0UsUUFBUSxDQUFDLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUV2QyxnRUFBZ0U7SUFDaEUsUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLENBQUM7SUFFN0IsMENBQTBDO0lBQzFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO0lBRTFCLHlDQUF5QztJQUN6QyxRQUFRLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUU3QixvQkFBb0I7SUFDcEIsUUFBUSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFFMUIsb0VBQW9FO0lBQ3BFLFFBQVEsQ0FBQyxVQUFVLEVBQUUsU0FBUyxNQUFNLEVBQUUsQ0FBQztJQUV2QyxrRkFBa0Y7SUFDbEYsUUFBUSxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUVwQywrRUFBK0U7SUFDL0UsUUFBUSxDQUFDLElBQUksRUFBRSxvQkFBb0IsQ0FBQztJQUVwQyxtR0FBbUc7SUFDbkcsVUFBVSxFQUFFLE1BQU0sQ0FBQztDQUNwQixDQUFDO0FBRUYsa0ZBQWtGO0FBQ2xGLE1BQU0sTUFBTSxPQUFPLEdBQUcsU0FBUyxHQUFHLFdBQVcsR0FBRyxPQUFPLEdBQUcsU0FBUyxDQUFDO0FBRXBFOzs7O0dBSUc7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQWtDakU7QUFFRCx1REFBdUQ7QUFDdkQsS0FBSyxrQkFBa0IsR0FBRyxJQUFJLENBQUMsVUFBVSxFQUFFLFFBQVEsR0FBRyxhQUFhLENBQUMsQ0FBQztBQUVyRTs7O0dBR0c7QUFDSCx3QkFBZ0IsVUFBVSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBRXZEO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQixhQUFhLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FJMUQ7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxDQUFDLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxFQUFFLGtCQUFrQixHQUFHLE1BQU0sQ0FNcEY7QUFFRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxZQUFZLEVBQUUsVUFBVSxFQUN4QixvQkFBb0IsRUFBRSxDQUFDLFNBQVMsRUFBRSxNQUFNLEtBQUssTUFBTSxHQUFHLFNBQVMsRUFDL0QsV0FBVyxFQUFFLENBQUMsTUFBTSxFQUFFLE1BQU0sS0FBSyxVQUFVLEdBQUcsU0FBUyxHQUN0RCxZQUFZLENBbUNkO0FBRUQsb0ZBQW9GO0FBQ3BGLHdCQUFnQix3QkFBd0IsQ0FBQyxTQUFTLEdBQUU7SUFBRSxrQkFBa0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFPLEdBQUcsb0JBQW9CLENBVzlHIn0=
125
+ /** Creates a stub TxMetaData for tests. All fields have sensible defaults and can be overridden. */
126
+ export declare function stubTxMetaData(txHash: string, overrides?: {
127
+ priorityFee?: bigint;
128
+ feePayer?: string;
129
+ claimAmount?: bigint;
130
+ feeLimit?: bigint;
131
+ nullifiers?: string[];
132
+ expirationTimestamp?: bigint;
133
+ anchorBlockHeaderHash?: string;
134
+ allowedSetupCalls?: boolean;
135
+ maxFeesPerGas?: GasFees;
136
+ }): TxMetaData;
137
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfbWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbF92Mi90eF9tZXRhZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxLQUFLLEVBQUUsRUFBVSxNQUFNLGtCQUFrQixDQUFDO0FBR25ELE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsRiw0SEFBNEg7QUFDNUgsTUFBTSxNQUFNLG9CQUFvQixHQUFHO0lBQ2pDLHFCQUFxQixJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQzlCLG1CQUFtQixFQUFFLE1BQU0sQ0FBQztJQUM1QixrRkFBa0Y7SUFDbEYsU0FBUyxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ3BCLFNBQVMsRUFBRTtRQUNULGlCQUFpQixFQUFFO1lBQ2pCLElBQUksSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDM0IsZUFBZSxFQUFFO2dCQUNmLFdBQVcsRUFBRSxXQUFXLENBQUM7YUFDMUIsQ0FBQztTQUNILENBQUM7UUFDRixTQUFTLEVBQUU7WUFDVCxXQUFXLEVBQUU7Z0JBQUUsU0FBUyxFQUFFLEdBQUcsQ0FBQztnQkFBQyxhQUFhLEVBQUUsT0FBTyxDQUFBO2FBQUUsQ0FBQztTQUN6RCxDQUFDO0tBQ0gsQ0FBQztDQUNILENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxNQUFNLFVBQVUsR0FBRztJQUN2Qix5Q0FBeUM7SUFDekMs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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":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAI3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,4HAA4H;AAC5H,MAAM,MAAM,oBAAoB,GAAG;IACjC,qBAAqB,IAAI,EAAE,EAAE,CAAC;IAC9B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE;QACT,iBAAiB,EAAE;YACjB,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;YAC3B,eAAe,EAAE;gBACf,WAAW,EAAE,WAAW,CAAC;aAC1B,CAAC;SACH,CAAC;KACH,CAAC;CACH,CAAC;AAEF;;;;;;;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;IAEpC,+EAA+E;IAC/E,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IAEpC,mGAAmG;IACnG,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,kFAAkF;AAClF,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;AAEpE;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAkCjE;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;AAED,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,SAAS,GAAE;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,oBAAoB,CAW9G"}
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,48 +1,88 @@
1
+ import { minBigint } from '@aztec/foundation/bigint';
1
2
  import { BlockNumber } from '@aztec/foundation/branded-types';
2
3
  import { Fr } from '@aztec/foundation/curves/bn254';
3
4
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
4
5
  import { BlockHash } from '@aztec/stdlib/block';
6
+ import { Gas, GasFees } from '@aztec/stdlib/gas';
7
+ import { TxHash } from '@aztec/stdlib/tx';
5
8
  import { getFeePayerBalanceDelta } from '../../msg_validators/tx_validator/fee_payer_balance.js';
6
- import { getTxPriorityFee } from '../tx_pool/priority.js';
9
+ import { TxPoolRejectionCode } from './eviction/interfaces.js';
7
10
  /**
8
11
  * Builds TxMetaData from a full Tx object.
9
12
  * Extracts all relevant fields for efficient in-memory storage and querying.
10
13
  * Fr values are captured in closures for zero-cost re-validation.
11
- */ export async function buildTxMetaData(tx) {
12
- const txHash = tx.getTxHash().toString();
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();
13
22
  const nullifierFrs = tx.data.getNonEmptyNullifiers();
14
23
  const nullifiers = nullifierFrs.map((n)=>n.toString());
15
24
  const anchorBlockHeaderHashFr = await tx.data.constants.anchorBlockHeader.hash();
16
25
  const anchorBlockHeaderHash = anchorBlockHeaderHashFr.toString();
17
- const includeByTimestamp = tx.data.includeByTimestamp;
26
+ const expirationTimestamp = tx.data.expirationTimestamp;
18
27
  const anchorBlockNumber = tx.data.constants.anchorBlockHeader.globalVariables.blockNumber;
19
28
  const priorityFee = getTxPriorityFee(tx);
20
29
  const feePayer = tx.data.feePayer.toString();
21
30
  const { feeLimit, claimAmount } = await getFeePayerBalanceDelta(tx, ProtocolContractAddress.FeeJuice);
31
+ const estimatedSizeBytes = estimateTxMetaDataSize(nullifiers.length);
22
32
  return {
23
33
  txHash,
34
+ txHashBigInt,
24
35
  anchorBlockHeaderHash,
25
36
  priorityFee,
26
37
  feePayer,
27
38
  claimAmount,
28
39
  feeLimit,
29
40
  nullifiers,
30
- includeByTimestamp,
41
+ expirationTimestamp,
42
+ allowedSetupCalls,
31
43
  receivedAt: 0,
44
+ estimatedSizeBytes,
32
45
  data: {
33
46
  getNonEmptyNullifiers: ()=>nullifierFrs,
34
- includeByTimestamp,
47
+ expirationTimestamp,
48
+ forPublic: !!tx.data.forPublic,
35
49
  constants: {
36
50
  anchorBlockHeader: {
37
51
  hash: ()=>Promise.resolve(anchorBlockHeaderHashFr),
38
52
  globalVariables: {
39
53
  blockNumber: anchorBlockNumber
40
54
  }
55
+ },
56
+ txContext: {
57
+ gasSettings: {
58
+ gasLimits: tx.data.constants.txContext.gasSettings.gasLimits,
59
+ maxFeesPerGas: tx.data.constants.txContext.gasSettings.maxFeesPerGas
60
+ }
41
61
  }
42
62
  }
43
63
  }
44
64
  };
45
65
  }
66
+ // V8 JS object overhead (~64 bytes for a plain object with hidden class).
67
+ // String overhead: ~32 bytes header + 1 byte per ASCII char (V8 one-byte strings).
68
+ // Hex string (0x + 64 hex chars = 66 chars): ~98 bytes per string.
69
+ // bigint: ~32 bytes. number: 8 bytes. Fr: ~80 bytes (32 data + object overhead).
70
+ const OBJECT_OVERHEAD = 64;
71
+ const HEX_STRING_BYTES = 98;
72
+ const BIGINT_BYTES = 32;
73
+ const FR_BYTES = 80;
74
+ // Fixed cost: object shell + txHash + anchorBlockHeaderHash + feePayer (3 hex strings)
75
+ // + txHashBigInt + priorityFee + claimAmount + feeLimit + includeByTimestamp (5 bigints)
76
+ // + receivedAt (number, 8 bytes) + estimatedSizeBytes (number, 8 bytes)
77
+ // + data closure object (~OBJECT_OVERHEAD + anchorBlockHeaderHashFr Fr + anchorBlockNumber number)
78
+ const FIXED_METADATA_BYTES = OBJECT_OVERHEAD + 3 * HEX_STRING_BYTES + 5 * BIGINT_BYTES + 8 + 8 + OBJECT_OVERHEAD + FR_BYTES + 8;
79
+ /** Estimates the in-memory size of a TxMetaData object based on the number of nullifiers. */ function estimateTxMetaDataSize(nullifierCount) {
80
+ // Per nullifier: one hex string in nullifiers[] + one Fr in the captured nullifierFrs[]
81
+ return FIXED_METADATA_BYTES + nullifierCount * (HEX_STRING_BYTES + FR_BYTES);
82
+ }
83
+ /** Converts a txHash bigint back to the canonical 0x-prefixed 64-char hex string. */ export function txHashFromBigInt(value) {
84
+ return TxHash.fromBigInt(value).toString();
85
+ }
46
86
  /**
47
87
  * Compares two priority fees in ascending order.
48
88
  * Returns negative if a < b, positive if a > b, 0 if equal.
@@ -54,9 +94,7 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
54
94
  * Uses field element comparison for deterministic ordering.
55
95
  * Returns negative if a < b, positive if a > b, 0 if equal.
56
96
  */ export function compareTxHash(a, b) {
57
- const fieldA = Fr.fromHexString(a);
58
- const fieldB = Fr.fromHexString(b);
59
- return fieldA.cmp(fieldB);
97
+ return Fr.cmpAsBigInt(a, b);
60
98
  }
61
99
  /**
62
100
  * Compares two transactions by priority fee, with txHash as tiebreaker.
@@ -67,19 +105,33 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
67
105
  if (feeComparison !== 0) {
68
106
  return feeComparison;
69
107
  }
70
- return compareTxHash(a.txHash, b.txHash);
108
+ return compareTxHash(a.txHashBigInt, b.txHashBigInt);
109
+ }
110
+ /**
111
+ * Returns the minimum fee required to replace an existing tx with the given price bump percentage.
112
+ * Uses integer arithmetic: `existingFee + existingFee * priceBumpPercentage / 100`.
113
+ */ export function getMinimumPriceBumpFee(existingFee, priceBumpPercentage) {
114
+ const bump = existingFee * priceBumpPercentage / 100n;
115
+ // Ensure the minimum bump is at least 1, so that replacement always requires
116
+ // paying strictly more — even with 0% bump or zero existing fee.
117
+ const effectiveBump = bump > 0n ? bump : 1n;
118
+ return existingFee + effectiveBump;
71
119
  }
72
120
  /**
73
121
  * Checks for nullifier conflicts between an incoming transaction and existing pool state.
74
122
  *
75
123
  * When the incoming tx shares nullifiers with existing pending txs:
76
- * - If the incoming tx has strictly higher priority, mark conflicting txs for eviction
77
- * - If any conflicting tx has equal or higher priority, ignore the incoming tx
124
+ * - If the incoming tx meets or exceeds the required priority, mark conflicting txs for eviction
125
+ * - Otherwise, ignore the incoming tx
126
+ *
127
+ * When `priceBumpPercentage` is provided (RPC path), uses fee-only comparison with the
128
+ * percentage bump instead of `comparePriority`.
78
129
  *
79
130
  * @param incomingMeta - Metadata for the incoming transaction
80
131
  * @param getTxHashByNullifier - Accessor to find which tx uses a nullifier
81
132
  * @param getMetadata - Accessor to get metadata for a tx hash
82
- */ export function checkNullifierConflict(incomingMeta, getTxHashByNullifier, getMetadata) {
133
+ * @param priceBumpPercentage - Optional percentage bump required for fee-based replacement
134
+ */ export function checkNullifierConflict(incomingMeta, getTxHashByNullifier, getMetadata, priceBumpPercentage) {
83
135
  const txHashesToEvict = [];
84
136
  for (const nullifier of incomingMeta.nullifiers){
85
137
  const conflictingHashStr = getTxHashByNullifier(nullifier);
@@ -94,16 +146,23 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
94
146
  if (!conflictingMeta) {
95
147
  continue;
96
148
  }
97
- // If incoming tx has strictly higher priority, mark for eviction
98
- // Otherwise, ignore incoming tx (ties go to existing tx)
99
- // Use comparePriority for deterministic ordering (includes txHash as tiebreaker)
100
- if (comparePriority(incomingMeta, conflictingMeta) > 0) {
149
+ // When price bump is set (RPC path), require the incoming fee to meet the bumped threshold.
150
+ // Otherwise (P2P path), use full comparePriority with tx hash tiebreaker.
151
+ const isHigherPriority = priceBumpPercentage !== undefined ? incomingMeta.priorityFee >= getMinimumPriceBumpFee(conflictingMeta.priorityFee, priceBumpPercentage) : comparePriority(incomingMeta, conflictingMeta) > 0;
152
+ if (isHigherPriority) {
101
153
  txHashesToEvict.push(conflictingHashStr);
102
154
  } else {
155
+ const minimumFee = priceBumpPercentage !== undefined ? getMinimumPriceBumpFee(conflictingMeta.priorityFee, priceBumpPercentage) : undefined;
103
156
  return {
104
157
  shouldIgnore: true,
105
158
  txHashesToEvict: [],
106
- reason: `nullifier conflict with ${conflictingHashStr}`
159
+ reason: {
160
+ code: TxPoolRejectionCode.NULLIFIER_CONFLICT,
161
+ message: minimumFee !== undefined ? `Nullifier conflict with existing tx ${conflictingHashStr}. Minimum required fee: ${minimumFee}, got: ${incomingMeta.priorityFee}` : `Nullifier conflict with existing tx ${conflictingHashStr}`,
162
+ conflictingTxHash: conflictingHashStr,
163
+ minimumPriceBumpFee: minimumFee,
164
+ txPriorityFee: minimumFee !== undefined ? incomingMeta.priorityFee : undefined
165
+ }
107
166
  };
108
167
  }
109
168
  }
@@ -115,14 +174,50 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
115
174
  /** Creates a stub TxMetaValidationData for tests that don't exercise validators. */ export function stubTxMetaValidationData(overrides = {}) {
116
175
  return {
117
176
  getNonEmptyNullifiers: ()=>[],
118
- includeByTimestamp: overrides.includeByTimestamp ?? 0n,
177
+ expirationTimestamp: overrides.expirationTimestamp ?? 0n,
119
178
  constants: {
120
179
  anchorBlockHeader: {
121
- hash: ()=>Promise.resolve(new BlockHash(Fr.ZERO)),
180
+ hash: ()=>Promise.resolve(BlockHash.ZERO),
122
181
  globalVariables: {
123
182
  blockNumber: BlockNumber(0)
124
183
  }
184
+ },
185
+ txContext: {
186
+ gasSettings: {
187
+ gasLimits: Gas.empty(),
188
+ maxFeesPerGas: overrides.maxFeesPerGas ?? GasFees.empty()
189
+ }
125
190
  }
126
191
  }
127
192
  };
128
193
  }
194
+ /** Creates a stub TxMetaData for tests. All fields have sensible defaults and can be overridden. */ export function stubTxMetaData(txHash, overrides = {}) {
195
+ const txHashBigInt = Fr.fromHexString(txHash).toBigInt();
196
+ // Normalize to canonical zero-padded hex so txHashFromBigInt(txHashBigInt) === normalizedTxHash
197
+ const normalizedTxHash = txHashFromBigInt(txHashBigInt);
198
+ const expirationTimestamp = overrides.expirationTimestamp ?? 0n;
199
+ return {
200
+ txHash: normalizedTxHash,
201
+ txHashBigInt,
202
+ anchorBlockHeaderHash: overrides.anchorBlockHeaderHash ?? '0x1234',
203
+ priorityFee: overrides.priorityFee ?? 100n,
204
+ feePayer: overrides.feePayer ?? '0xfeepayer',
205
+ claimAmount: overrides.claimAmount ?? 0n,
206
+ feeLimit: overrides.feeLimit ?? 100n,
207
+ nullifiers: overrides.nullifiers ?? [
208
+ `0x${normalizedTxHash.slice(2)}null1`
209
+ ],
210
+ expirationTimestamp,
211
+ allowedSetupCalls: overrides.allowedSetupCalls ?? true,
212
+ receivedAt: 0,
213
+ estimatedSizeBytes: 0,
214
+ data: stubTxMetaValidationData({
215
+ expirationTimestamp,
216
+ maxFeesPerGas: overrides.maxFeesPerGas
217
+ })
218
+ };
219
+ }
220
+ /** Returns the priority fee for a tx, based on the L2 priority fee capped by the max fee per gas. */ function getTxPriorityFee(tx) {
221
+ const { maxPriorityFeesPerGas: priorityFees, maxFeesPerGas } = tx.getGasSettings();
222
+ return minBigint(maxFeesPerGas.feePerL2Gas, priorityFees.feePerL2Gas);
223
+ }