@aztec/p2p 0.0.1-commit.aada20e3 → 0.0.1-commit.b2a5d0dd1

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 (478) hide show
  1. package/README.md +129 -3
  2. package/dest/client/factory.d.ts +12 -11
  3. package/dest/client/factory.d.ts.map +1 -1
  4. package/dest/client/factory.js +55 -16
  5. package/dest/client/interface.d.ts +54 -34
  6. package/dest/client/interface.d.ts.map +1 -1
  7. package/dest/client/p2p_client.d.ts +41 -52
  8. package/dest/client/p2p_client.d.ts.map +1 -1
  9. package/dest/client/p2p_client.js +179 -226
  10. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +24 -11
  11. package/dest/config.d.ts +133 -92
  12. package/dest/config.d.ts.map +1 -1
  13. package/dest/config.js +109 -40
  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 +106 -88
  24. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  25. package/dest/mem_pools/attestation_pool/attestation_pool.js +448 -3
  26. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +2 -2
  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 +353 -87
  29. package/dest/mem_pools/attestation_pool/index.d.ts +2 -3
  30. package/dest/mem_pools/attestation_pool/index.d.ts.map +1 -1
  31. package/dest/mem_pools/attestation_pool/index.js +1 -2
  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 +3 -3
  36. package/dest/mem_pools/index.d.ts.map +1 -1
  37. package/dest/mem_pools/index.js +1 -1
  38. package/dest/mem_pools/instrumentation.d.ts +4 -2
  39. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  40. package/dest/mem_pools/instrumentation.js +16 -14
  41. package/dest/mem_pools/interface.d.ts +5 -5
  42. package/dest/mem_pools/interface.d.ts.map +1 -1
  43. package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts +104 -0
  44. package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts.map +1 -0
  45. package/dest/mem_pools/tx_pool_v2/deleted_pool.js +251 -0
  46. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts +3 -3
  47. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts.map +1 -1
  48. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.js +18 -9
  49. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts +1 -1
  50. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -1
  51. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +7 -3
  52. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +3 -3
  53. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -1
  54. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +12 -4
  55. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +3 -2
  56. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -1
  57. package/dest/mem_pools/tx_pool_v2/eviction/index.js +2 -1
  58. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts +16 -0
  59. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts.map +1 -0
  60. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.js +62 -0
  61. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts +54 -5
  62. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts.map +1 -1
  63. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.js +8 -0
  64. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.js +7 -5
  65. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +9 -7
  66. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts +2 -2
  67. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts.map +1 -1
  68. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.js +14 -6
  69. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts +4 -4
  70. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts.map +1 -1
  71. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.js +16 -4
  72. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts +3 -3
  73. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts.map +1 -1
  74. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.js +3 -3
  75. package/dest/mem_pools/tx_pool_v2/index.d.ts +3 -2
  76. package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
  77. package/dest/mem_pools/tx_pool_v2/index.js +2 -1
  78. package/dest/mem_pools/tx_pool_v2/instrumentation.d.ts +15 -0
  79. package/dest/mem_pools/tx_pool_v2/instrumentation.d.ts.map +1 -0
  80. package/dest/mem_pools/tx_pool_v2/instrumentation.js +43 -0
  81. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +37 -12
  82. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
  83. package/dest/mem_pools/tx_pool_v2/interfaces.js +5 -1
  84. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +81 -15
  85. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
  86. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +147 -18
  87. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +108 -0
  88. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -0
  89. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +337 -0
  90. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +12 -5
  91. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
  92. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +23 -6
  93. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +14 -5
  94. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
  95. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +477 -594
  96. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +5 -2
  97. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  98. package/dest/msg_validators/attestation_validator/attestation_validator.js +20 -11
  99. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +5 -3
  100. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  101. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +2 -2
  102. package/dest/msg_validators/clock_tolerance.d.ts +12 -1
  103. package/dest/msg_validators/clock_tolerance.d.ts.map +1 -1
  104. package/dest/msg_validators/clock_tolerance.js +54 -3
  105. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +7 -4
  106. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
  107. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +10 -2
  108. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +7 -4
  109. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
  110. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +16 -2
  111. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +15 -8
  112. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
  113. package/dest/msg_validators/proposal_validator/proposal_validator.js +67 -47
  114. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +4 -4
  115. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  116. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +3 -3
  117. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts +2 -1
  118. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map +1 -1
  119. package/dest/msg_validators/tx_validator/allowed_public_setup.js +24 -20
  120. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts +17 -0
  121. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts.map +1 -0
  122. package/dest/msg_validators/tx_validator/allowed_setup_helpers.js +24 -0
  123. package/dest/msg_validators/tx_validator/archive_cache.js +1 -1
  124. package/dest/msg_validators/tx_validator/block_header_validator.d.ts +16 -3
  125. package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -1
  126. package/dest/msg_validators/tx_validator/block_header_validator.js +1 -1
  127. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts +9 -0
  128. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts.map +1 -0
  129. package/dest/msg_validators/tx_validator/contract_instance_validator.js +48 -0
  130. package/dest/msg_validators/tx_validator/data_validator.d.ts +1 -1
  131. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  132. package/dest/msg_validators/tx_validator/data_validator.js +35 -2
  133. package/dest/msg_validators/tx_validator/double_spend_validator.d.ts +13 -3
  134. package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map +1 -1
  135. package/dest/msg_validators/tx_validator/double_spend_validator.js +4 -4
  136. package/dest/msg_validators/tx_validator/factory.d.ts +133 -6
  137. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  138. package/dest/msg_validators/tx_validator/factory.js +247 -60
  139. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +1 -1
  140. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -1
  141. package/dest/msg_validators/tx_validator/fee_payer_balance.js +6 -2
  142. package/dest/msg_validators/tx_validator/gas_validator.d.ts +99 -3
  143. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  144. package/dest/msg_validators/tx_validator/gas_validator.js +137 -53
  145. package/dest/msg_validators/tx_validator/index.d.ts +3 -1
  146. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  147. package/dest/msg_validators/tx_validator/index.js +2 -0
  148. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
  149. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  150. package/dest/msg_validators/tx_validator/metadata_validator.js +4 -4
  151. package/dest/msg_validators/tx_validator/nullifier_cache.d.ts +14 -0
  152. package/dest/msg_validators/tx_validator/nullifier_cache.d.ts.map +1 -0
  153. package/dest/msg_validators/tx_validator/nullifier_cache.js +24 -0
  154. package/dest/msg_validators/tx_validator/phases_validator.d.ts +22 -2
  155. package/dest/msg_validators/tx_validator/phases_validator.d.ts.map +1 -1
  156. package/dest/msg_validators/tx_validator/phases_validator.js +72 -24
  157. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts +20 -4
  158. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts.map +1 -1
  159. package/dest/msg_validators/tx_validator/timestamp_validator.js +6 -6
  160. package/dest/services/data_store.d.ts +1 -1
  161. package/dest/services/data_store.d.ts.map +1 -1
  162. package/dest/services/data_store.js +5 -5
  163. package/dest/services/dummy_service.d.ts +17 -6
  164. package/dest/services/dummy_service.d.ts.map +1 -1
  165. package/dest/services/dummy_service.js +16 -5
  166. package/dest/services/encoding.d.ts +7 -3
  167. package/dest/services/encoding.d.ts.map +1 -1
  168. package/dest/services/encoding.js +18 -11
  169. package/dest/services/gossipsub/index.d.ts +3 -0
  170. package/dest/services/gossipsub/index.d.ts.map +1 -0
  171. package/dest/services/gossipsub/index.js +2 -0
  172. package/dest/services/gossipsub/scoring.d.ts +21 -3
  173. package/dest/services/gossipsub/scoring.d.ts.map +1 -1
  174. package/dest/services/gossipsub/scoring.js +24 -7
  175. package/dest/services/gossipsub/topic_score_params.d.ts +184 -0
  176. package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -0
  177. package/dest/services/gossipsub/topic_score_params.js +363 -0
  178. package/dest/services/libp2p/instrumentation.d.ts +3 -1
  179. package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
  180. package/dest/services/libp2p/instrumentation.js +14 -0
  181. package/dest/services/libp2p/libp2p_service.d.ts +95 -51
  182. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  183. package/dest/services/libp2p/libp2p_service.js +566 -442
  184. package/dest/services/peer-manager/metrics.d.ts +3 -1
  185. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  186. package/dest/services/peer-manager/metrics.js +6 -0
  187. package/dest/services/peer-manager/peer_manager.d.ts +6 -2
  188. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  189. package/dest/services/peer-manager/peer_manager.js +39 -11
  190. package/dest/services/peer-manager/peer_scoring.d.ts +7 -2
  191. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  192. package/dest/services/peer-manager/peer_scoring.js +57 -12
  193. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +14 -10
  194. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  195. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +89 -112
  196. package/dest/services/reqresp/batch-tx-requester/interface.d.ts +4 -7
  197. package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map +1 -1
  198. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts +11 -13
  199. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts.map +1 -1
  200. package/dest/services/reqresp/batch-tx-requester/missing_txs.js +31 -46
  201. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts +19 -11
  202. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts.map +1 -1
  203. package/dest/services/reqresp/batch-tx-requester/peer_collection.js +52 -15
  204. package/dest/services/reqresp/batch-tx-requester/tx_validator.js +2 -2
  205. package/dest/services/reqresp/config.d.ts +3 -3
  206. package/dest/services/reqresp/config.d.ts.map +1 -1
  207. package/dest/services/reqresp/interface.d.ts +23 -9
  208. package/dest/services/reqresp/interface.d.ts.map +1 -1
  209. package/dest/services/reqresp/interface.js +23 -10
  210. package/dest/services/reqresp/metrics.d.ts +1 -1
  211. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  212. package/dest/services/reqresp/metrics.js +0 -1
  213. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +7 -5
  214. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
  215. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js +16 -11
  216. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts +21 -10
  217. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts.map +1 -1
  218. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.js +27 -11
  219. package/dest/services/reqresp/protocols/index.d.ts +1 -2
  220. package/dest/services/reqresp/protocols/index.d.ts.map +1 -1
  221. package/dest/services/reqresp/protocols/index.js +0 -1
  222. package/dest/services/reqresp/protocols/tx.d.ts +7 -1
  223. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  224. package/dest/services/reqresp/protocols/tx.js +21 -3
  225. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +5 -4
  226. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -1
  227. package/dest/services/reqresp/rate-limiter/rate_limiter.js +10 -8
  228. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts +1 -1
  229. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -1
  230. package/dest/services/reqresp/rate-limiter/rate_limits.js +0 -10
  231. package/dest/services/reqresp/reqresp.d.ts +4 -2
  232. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  233. package/dest/services/reqresp/reqresp.js +40 -15
  234. package/dest/services/service.d.ts +43 -4
  235. package/dest/services/service.d.ts.map +1 -1
  236. package/dest/services/tx_collection/config.d.ts +22 -4
  237. package/dest/services/tx_collection/config.d.ts.map +1 -1
  238. package/dest/services/tx_collection/config.js +49 -3
  239. package/dest/services/tx_collection/fast_tx_collection.d.ts +6 -8
  240. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +1 -1
  241. package/dest/services/tx_collection/fast_tx_collection.js +88 -88
  242. package/dest/services/tx_collection/file_store_tx_collection.d.ts +53 -0
  243. package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -0
  244. package/dest/services/tx_collection/file_store_tx_collection.js +167 -0
  245. package/dest/services/tx_collection/file_store_tx_source.d.ts +38 -0
  246. package/dest/services/tx_collection/file_store_tx_source.d.ts.map +1 -0
  247. package/dest/services/tx_collection/file_store_tx_source.js +100 -0
  248. package/dest/services/tx_collection/index.d.ts +3 -2
  249. package/dest/services/tx_collection/index.d.ts.map +1 -1
  250. package/dest/services/tx_collection/index.js +1 -0
  251. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  252. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  253. package/dest/services/tx_collection/instrumentation.js +2 -1
  254. package/dest/services/tx_collection/proposal_tx_collector.d.ts +15 -15
  255. package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +1 -1
  256. package/dest/services/tx_collection/proposal_tx_collector.js +6 -6
  257. package/dest/services/tx_collection/request_tracker.d.ts +53 -0
  258. package/dest/services/tx_collection/request_tracker.d.ts.map +1 -0
  259. package/dest/services/tx_collection/request_tracker.js +84 -0
  260. package/dest/services/tx_collection/slow_tx_collection.d.ts +7 -3
  261. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +1 -1
  262. package/dest/services/tx_collection/slow_tx_collection.js +60 -26
  263. package/dest/services/tx_collection/tx_collection.d.ts +23 -13
  264. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  265. package/dest/services/tx_collection/tx_collection.js +75 -3
  266. package/dest/services/tx_collection/tx_collection_sink.d.ts +18 -8
  267. package/dest/services/tx_collection/tx_collection_sink.d.ts.map +1 -1
  268. package/dest/services/tx_collection/tx_collection_sink.js +26 -29
  269. package/dest/services/tx_collection/tx_source.d.ts +13 -7
  270. package/dest/services/tx_collection/tx_source.d.ts.map +1 -1
  271. package/dest/services/tx_collection/tx_source.js +26 -7
  272. package/dest/services/tx_file_store/config.d.ts +1 -3
  273. package/dest/services/tx_file_store/config.d.ts.map +1 -1
  274. package/dest/services/tx_file_store/config.js +0 -4
  275. package/dest/services/tx_file_store/tx_file_store.d.ts +4 -3
  276. package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
  277. package/dest/services/tx_file_store/tx_file_store.js +9 -6
  278. package/dest/services/tx_provider.d.ts +4 -4
  279. package/dest/services/tx_provider.d.ts.map +1 -1
  280. package/dest/services/tx_provider.js +9 -8
  281. package/dest/test-helpers/make-test-p2p-clients.d.ts +7 -8
  282. package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
  283. package/dest/test-helpers/make-test-p2p-clients.js +4 -2
  284. package/dest/test-helpers/mock-pubsub.d.ts +40 -6
  285. package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
  286. package/dest/test-helpers/mock-pubsub.js +139 -13
  287. package/dest/test-helpers/reqresp-nodes.d.ts +2 -3
  288. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  289. package/dest/test-helpers/reqresp-nodes.js +8 -5
  290. package/dest/test-helpers/testbench-utils.d.ts +43 -38
  291. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  292. package/dest/test-helpers/testbench-utils.js +150 -61
  293. package/dest/testbench/p2p_client_testbench_worker.d.ts +2 -2
  294. package/dest/testbench/p2p_client_testbench_worker.d.ts.map +1 -1
  295. package/dest/testbench/p2p_client_testbench_worker.js +85 -28
  296. package/dest/testbench/worker_client_manager.d.ts +10 -1
  297. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  298. package/dest/testbench/worker_client_manager.js +55 -3
  299. package/dest/util.d.ts +3 -3
  300. package/dest/util.d.ts.map +1 -1
  301. package/package.json +14 -14
  302. package/src/client/factory.ts +110 -29
  303. package/src/client/interface.ts +65 -35
  304. package/src/client/p2p_client.ts +216 -272
  305. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +36 -15
  306. package/src/config.ts +172 -46
  307. package/src/errors/p2p-service.error.ts +11 -0
  308. package/src/errors/tx-pool.error.ts +12 -0
  309. package/src/index.ts +1 -1
  310. package/src/mem_pools/attestation_pool/attestation_pool.ts +501 -91
  311. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +442 -102
  312. package/src/mem_pools/attestation_pool/index.ts +9 -2
  313. package/src/mem_pools/attestation_pool/mocks.ts +2 -1
  314. package/src/mem_pools/index.ts +2 -2
  315. package/src/mem_pools/instrumentation.ts +17 -13
  316. package/src/mem_pools/interface.ts +4 -4
  317. package/src/mem_pools/tx_pool_v2/README.md +112 -17
  318. package/src/mem_pools/tx_pool_v2/deleted_pool.ts +321 -0
  319. package/src/mem_pools/tx_pool_v2/eviction/eviction_manager.ts +21 -8
  320. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +7 -3
  321. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +18 -4
  322. package/src/mem_pools/tx_pool_v2/eviction/index.ts +5 -0
  323. package/src/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.ts +65 -0
  324. package/src/mem_pools/tx_pool_v2/eviction/interfaces.ts +59 -4
  325. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.ts +5 -5
  326. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +8 -8
  327. package/src/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.ts +14 -9
  328. package/src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts +33 -6
  329. package/src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts +4 -3
  330. package/src/mem_pools/tx_pool_v2/index.ts +2 -1
  331. package/src/mem_pools/tx_pool_v2/instrumentation.ts +69 -0
  332. package/src/mem_pools/tx_pool_v2/interfaces.ts +37 -12
  333. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +215 -26
  334. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +430 -0
  335. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +37 -8
  336. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +520 -678
  337. package/src/msg_validators/attestation_validator/README.md +49 -0
  338. package/src/msg_validators/attestation_validator/attestation_validator.ts +21 -9
  339. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +6 -3
  340. package/src/msg_validators/clock_tolerance.ts +72 -3
  341. package/src/msg_validators/proposal_validator/README.md +123 -0
  342. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +17 -4
  343. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +23 -7
  344. package/src/msg_validators/proposal_validator/proposal_validator.ts +79 -49
  345. package/src/msg_validators/tx_validator/README.md +127 -0
  346. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +5 -5
  347. package/src/msg_validators/tx_validator/allowed_public_setup.ts +22 -27
  348. package/src/msg_validators/tx_validator/allowed_setup_helpers.ts +31 -0
  349. package/src/msg_validators/tx_validator/archive_cache.ts +1 -1
  350. package/src/msg_validators/tx_validator/block_header_validator.ts +15 -3
  351. package/src/msg_validators/tx_validator/contract_instance_validator.ts +56 -0
  352. package/src/msg_validators/tx_validator/data_validator.ts +42 -1
  353. package/src/msg_validators/tx_validator/double_spend_validator.ts +11 -6
  354. package/src/msg_validators/tx_validator/factory.ts +396 -78
  355. package/src/msg_validators/tx_validator/fee_payer_balance.ts +6 -2
  356. package/src/msg_validators/tx_validator/gas_validator.ts +199 -54
  357. package/src/msg_validators/tx_validator/index.ts +2 -0
  358. package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
  359. package/src/msg_validators/tx_validator/nullifier_cache.ts +30 -0
  360. package/src/msg_validators/tx_validator/phases_validator.ts +82 -27
  361. package/src/msg_validators/tx_validator/timestamp_validator.ts +23 -18
  362. package/src/services/data_store.ts +5 -13
  363. package/src/services/dummy_service.ts +25 -7
  364. package/src/services/encoding.ts +18 -10
  365. package/src/services/gossipsub/README.md +641 -0
  366. package/src/services/gossipsub/index.ts +2 -0
  367. package/src/services/gossipsub/scoring.ts +29 -5
  368. package/src/services/gossipsub/topic_score_params.ts +519 -0
  369. package/src/services/libp2p/instrumentation.ts +14 -0
  370. package/src/services/libp2p/libp2p_service.ts +593 -477
  371. package/src/services/peer-manager/metrics.ts +7 -0
  372. package/src/services/peer-manager/peer_manager.ts +45 -11
  373. package/src/services/peer-manager/peer_scoring.ts +52 -5
  374. package/src/services/reqresp/README.md +229 -0
  375. package/src/services/reqresp/batch-tx-requester/README.md +53 -14
  376. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +89 -122
  377. package/src/services/reqresp/batch-tx-requester/interface.ts +3 -6
  378. package/src/services/reqresp/batch-tx-requester/missing_txs.ts +30 -71
  379. package/src/services/reqresp/batch-tx-requester/peer_collection.ts +68 -24
  380. package/src/services/reqresp/batch-tx-requester/tx_validator.ts +2 -2
  381. package/src/services/reqresp/config.ts +2 -2
  382. package/src/services/reqresp/interface.ts +45 -10
  383. package/src/services/reqresp/metrics.ts +0 -1
  384. package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +23 -14
  385. package/src/services/reqresp/protocols/block_txs/block_txs_reqresp.ts +38 -15
  386. package/src/services/reqresp/protocols/index.ts +0 -1
  387. package/src/services/reqresp/protocols/tx.ts +23 -3
  388. package/src/services/reqresp/rate-limiter/rate_limiter.ts +13 -9
  389. package/src/services/reqresp/rate-limiter/rate_limits.ts +0 -10
  390. package/src/services/reqresp/reqresp.ts +53 -16
  391. package/src/services/service.ts +57 -3
  392. package/src/services/tx_collection/config.ts +74 -6
  393. package/src/services/tx_collection/fast_tx_collection.ts +94 -97
  394. package/src/services/tx_collection/file_store_tx_collection.ts +202 -0
  395. package/src/services/tx_collection/file_store_tx_source.ts +129 -0
  396. package/src/services/tx_collection/index.ts +2 -1
  397. package/src/services/tx_collection/instrumentation.ts +7 -1
  398. package/src/services/tx_collection/proposal_tx_collector.ts +21 -27
  399. package/src/services/tx_collection/request_tracker.ts +127 -0
  400. package/src/services/tx_collection/slow_tx_collection.ts +66 -33
  401. package/src/services/tx_collection/tx_collection.ts +114 -19
  402. package/src/services/tx_collection/tx_collection_sink.ts +30 -34
  403. package/src/services/tx_collection/tx_source.ts +28 -8
  404. package/src/services/tx_file_store/config.ts +0 -6
  405. package/src/services/tx_file_store/tx_file_store.ts +10 -8
  406. package/src/services/tx_provider.ts +10 -9
  407. package/src/test-helpers/make-test-p2p-clients.ts +6 -6
  408. package/src/test-helpers/mock-pubsub.ts +180 -14
  409. package/src/test-helpers/reqresp-nodes.ts +9 -9
  410. package/src/test-helpers/testbench-utils.ts +157 -74
  411. package/src/testbench/p2p_client_testbench_worker.ts +94 -31
  412. package/src/testbench/worker_client_manager.ts +68 -6
  413. package/src/util.ts +8 -2
  414. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +0 -40
  415. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +0 -1
  416. package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +0 -218
  417. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +0 -31
  418. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +0 -1
  419. package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +0 -180
  420. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +0 -125
  421. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +0 -1
  422. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +0 -596
  423. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +0 -32
  424. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +0 -1
  425. package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +0 -112
  426. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +0 -157
  427. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +0 -1
  428. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +0 -52
  429. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +0 -16
  430. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +0 -1
  431. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +0 -122
  432. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +0 -17
  433. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +0 -1
  434. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +0 -84
  435. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +0 -19
  436. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +0 -1
  437. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +0 -78
  438. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +0 -26
  439. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +0 -1
  440. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +0 -84
  441. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +0 -25
  442. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +0 -1
  443. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +0 -57
  444. package/dest/mem_pools/tx_pool/index.d.ts +0 -3
  445. package/dest/mem_pools/tx_pool/index.d.ts.map +0 -1
  446. package/dest/mem_pools/tx_pool/index.js +0 -2
  447. package/dest/mem_pools/tx_pool/priority.d.ts +0 -12
  448. package/dest/mem_pools/tx_pool/priority.d.ts.map +0 -1
  449. package/dest/mem_pools/tx_pool/priority.js +0 -15
  450. package/dest/mem_pools/tx_pool/tx_pool.d.ts +0 -127
  451. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +0 -1
  452. package/dest/mem_pools/tx_pool/tx_pool.js +0 -3
  453. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +0 -7
  454. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +0 -1
  455. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +0 -400
  456. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +0 -23
  457. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +0 -1
  458. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +0 -212
  459. package/dest/services/reqresp/protocols/block.d.ts +0 -9
  460. package/dest/services/reqresp/protocols/block.d.ts.map +0 -1
  461. package/dest/services/reqresp/protocols/block.js +0 -32
  462. package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +0 -320
  463. package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +0 -264
  464. package/src/mem_pools/tx_pool/README.md +0 -270
  465. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +0 -746
  466. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +0 -132
  467. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +0 -208
  468. package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +0 -162
  469. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +0 -104
  470. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +0 -93
  471. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +0 -106
  472. package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +0 -75
  473. package/src/mem_pools/tx_pool/index.ts +0 -2
  474. package/src/mem_pools/tx_pool/priority.ts +0 -20
  475. package/src/mem_pools/tx_pool/tx_pool.ts +0 -141
  476. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +0 -319
  477. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +0 -230
  478. package/src/services/reqresp/protocols/block.ts +0 -37
@@ -1,29 +1,88 @@
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, GasFees } 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
+ maxFeesPerGas: tx.data.constants.txContext.gasSettings.maxFeesPerGas
60
+ }
61
+ }
62
+ }
63
+ }
25
64
  };
26
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
+ }
27
86
  /**
28
87
  * Compares two priority fees in ascending order.
29
88
  * Returns negative if a < b, positive if a > b, 0 if equal.
@@ -35,9 +94,7 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
35
94
  * Uses field element comparison for deterministic ordering.
36
95
  * Returns negative if a < b, positive if a > b, 0 if equal.
37
96
  */ export function compareTxHash(a, b) {
38
- const fieldA = Fr.fromHexString(a);
39
- const fieldB = Fr.fromHexString(b);
40
- return fieldA.cmp(fieldB);
97
+ return Fr.cmpAsBigInt(a, b);
41
98
  }
42
99
  /**
43
100
  * Compares two transactions by priority fee, with txHash as tiebreaker.
@@ -48,19 +105,33 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
48
105
  if (feeComparison !== 0) {
49
106
  return feeComparison;
50
107
  }
51
- 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;
52
119
  }
53
120
  /**
54
121
  * Checks for nullifier conflicts between an incoming transaction and existing pool state.
55
122
  *
56
123
  * 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
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`.
59
129
  *
60
130
  * @param incomingMeta - Metadata for the incoming transaction
61
131
  * @param getTxHashByNullifier - Accessor to find which tx uses a nullifier
62
132
  * @param getMetadata - Accessor to get metadata for a tx hash
63
- */ 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) {
64
135
  const txHashesToEvict = [];
65
136
  for (const nullifier of incomingMeta.nullifiers){
66
137
  const conflictingHashStr = getTxHashByNullifier(nullifier);
@@ -75,15 +146,23 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
75
146
  if (!conflictingMeta) {
76
147
  continue;
77
148
  }
78
- // If incoming tx has strictly higher priority, mark for eviction
79
- // Otherwise, ignore incoming tx (ties go to existing tx)
80
- if (incomingMeta.priorityFee > conflictingMeta.priorityFee) {
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) {
81
153
  txHashesToEvict.push(conflictingHashStr);
82
154
  } else {
155
+ const minimumFee = priceBumpPercentage !== undefined ? getMinimumPriceBumpFee(conflictingMeta.priorityFee, priceBumpPercentage) : undefined;
83
156
  return {
84
157
  shouldIgnore: true,
85
158
  txHashesToEvict: [],
86
- 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
+ }
87
166
  };
88
167
  }
89
168
  }
@@ -92,3 +171,53 @@ import { getTxPriorityFee } from '../tx_pool/priority.js';
92
171
  txHashesToEvict
93
172
  };
94
173
  }
174
+ /** Creates a stub TxMetaValidationData for tests that don't exercise validators. */ export function stubTxMetaValidationData(overrides = {}) {
175
+ return {
176
+ getNonEmptyNullifiers: ()=>[],
177
+ expirationTimestamp: overrides.expirationTimestamp ?? 0n,
178
+ constants: {
179
+ anchorBlockHeader: {
180
+ hash: ()=>Promise.resolve(BlockHash.ZERO),
181
+ globalVariables: {
182
+ blockNumber: BlockNumber(0)
183
+ }
184
+ },
185
+ txContext: {
186
+ gasSettings: {
187
+ gasLimits: Gas.empty(),
188
+ maxFeesPerGas: overrides.maxFeesPerGas ?? GasFees.empty()
189
+ }
190
+ }
191
+ }
192
+ };
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
+ }
@@ -0,0 +1,108 @@
1
+ import { SlotNumber } from '@aztec/foundation/branded-types';
2
+ import type { L2BlockId } from '@aztec/stdlib/block';
3
+ import { type TxMetaData, type TxState } from './tx_metadata.js';
4
+ /**
5
+ * Manages in-memory indices for the transaction pool.
6
+ *
7
+ * Tracks transaction metadata and maintains several indices for efficient querying:
8
+ * - Metadata by txHash (primary store)
9
+ * - Nullifier to txHash mapping (pending txs only)
10
+ * - Fee payer to txHashes mapping (pending txs only)
11
+ * - Priority-ordered pending txs
12
+ * - Protected transaction tracking
13
+ *
14
+ * Key invariant: Only pending txs appear in nullifier/feePayer/priority indices.
15
+ */
16
+ export declare class TxPoolIndices {
17
+ #private;
18
+ /**
19
+ * Derives the transaction state from its metadata and protection status.
20
+ * A transaction is:
21
+ * - 'mined' if it has a minedL2BlockId
22
+ * - 'protected' if it's in the protectedTransactions map (but not mined)
23
+ * - 'pending' otherwise
24
+ */
25
+ getTxState(meta: TxMetaData): TxState;
26
+ getMetadata(txHash: string): TxMetaData | undefined;
27
+ has(txHash: string): boolean;
28
+ isEmpty(): boolean;
29
+ getTxCount(): number;
30
+ /**
31
+ * Iterates pending transaction hashes in priority order.
32
+ * @param order - 'desc' for highest priority first, 'asc' for lowest priority first
33
+ */
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>;
41
+ /** Iterates all metadata entries */
42
+ iterateMetadata(): Generator<[string, TxMetaData]>;
43
+ /** Adds a new pending transaction to all indices */
44
+ addPending(meta: TxMetaData): void;
45
+ /** Adds a new protected transaction (not added to pending indices) */
46
+ addProtected(meta: TxMetaData, slot: SlotNumber): void;
47
+ /** Adds a new mined transaction (not added to pending indices) */
48
+ addMined(meta: TxMetaData): void;
49
+ /** Marks an existing transaction as mined and removes from pending indices */
50
+ markAsMined(meta: TxMetaData, blockId: L2BlockId): void;
51
+ /** Clears the mined status from a transaction */
52
+ markAsUnmined(meta: TxMetaData): void;
53
+ /**
54
+ * Updates protection status for an existing transaction.
55
+ * Removes from pending indices if transitioning from pending to protected.
56
+ */
57
+ updateProtection(txHash: string, slotNumber: SlotNumber): void;
58
+ /** Sets protection for a txHash that may not have metadata yet */
59
+ setProtection(txHash: string, slotNumber: SlotNumber): void;
60
+ /** Gets the protection slot for a txHash, if protected */
61
+ getProtectionSlot(txHash: string): SlotNumber | undefined;
62
+ /** Removes protection from tx hashes */
63
+ clearProtection(txHashes: string[]): void;
64
+ /** Removes a transaction from all indices */
65
+ remove(txHash: string): void;
66
+ /** Removes a transaction from pending indices only (not metadata) */
67
+ removeFromPendingIndices(meta: TxMetaData): void;
68
+ /** Adds a transaction to pending indices (used during conflict resolution) */
69
+ addToPendingIndices(meta: TxMetaData): void;
70
+ /** Gets all pending transactions for a given fee payer */
71
+ getFeePayerPendingTxs(feePayer: string): TxMetaData[];
72
+ /** Gets the count of pending transactions */
73
+ getPendingTxCount(): number;
74
+ /** Gets the lowest priority pending transaction hashes (up to limit) */
75
+ getLowestPriorityPending(limit: number): string[];
76
+ /** Gets the lowest priority pending transaction */
77
+ getLowestPriorityPendingTx(): TxMetaData | undefined;
78
+ /** Gets all pending transactions */
79
+ getPendingTxs(): TxMetaData[];
80
+ /** Gets all fee payers with pending transactions */
81
+ getPendingFeePayers(): string[];
82
+ /** Gets the txHash that uses a given nullifier (pending txs only) */
83
+ getTxHashByNullifier(nullifier: string): string | undefined;
84
+ /** Gets txHashes for a fee payer */
85
+ getTxHashesByFeePayer(feePayer: string): Set<string> | undefined;
86
+ /** Finds all transactions mined in blocks after the given block number */
87
+ findTxsMinedAfter(blockNumber: number): TxMetaData[];
88
+ /** Finds tx hashes mined at or before the given block number */
89
+ findTxsMinedAtOrBefore(blockNumber: number): string[];
90
+ /** Finds protected tx hashes from slots earlier than the given slot number */
91
+ findExpiredProtectedTxs(slotNumber: SlotNumber): string[];
92
+ /** Filters out transactions that are currently protected */
93
+ filterUnprotected(txs: TxMetaData[]): TxMetaData[];
94
+ /** Filters to transactions that have metadata and are not mined */
95
+ filterRestorable(txHashes: string[]): TxMetaData[];
96
+ /** Counts transactions by state and estimates total metadata memory usage */
97
+ countTxs(): {
98
+ pending: number;
99
+ protected: number;
100
+ mined: number;
101
+ totalMetadataBytes: number;
102
+ };
103
+ /** Returns the estimated total memory consumed by all metadata objects */
104
+ getTotalMetadataBytes(): number;
105
+ /** Gets all mined transactions with their block IDs */
106
+ getMinedTxs(): [string, L2BlockId][];
107
+ }
108
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbF9pbmRpY2VzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL3R4X3Bvb2xfdjIvdHhfcG9vbF9pbmRpY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVyRCxPQUFPLEVBQTJCLEtBQUssVUFBVSxFQUFFLEtBQUssT0FBTyxFQUFtQixNQUFNLGtCQUFrQixDQUFDO0FBRTNHOzs7Ozs7Ozs7OztHQVdHO0FBQ0gscUJBQWEsYUFBYTs7SUFnQnhCOzs7Ozs7T0FNRztJQUNILFVBQVUsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FRcEM7SUFFRCxXQUFXLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxVQUFVLEdBQUcsU0FBUyxDQUVsRDtJQUVELEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FFM0I7SUFFRCxPQUFPLElBQUksT0FBTyxDQUVqQjtJQUVELFVBQVUsSUFBSSxNQUFNLENBRW5CO0lBTUQ7OztPQUdHO0lBQ0Ysd0JBQXdCLENBQUMsS0FBSyxFQUFFLEtBQUssR0FBRyxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxLQUFLLE9BQU8sR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDLENBV3RHO0lBRUQ7Ozs7T0FJRztJQUNGLGdDQUFnQyxDQUFDLEtBQUssRUFBRSxLQUFLLEdBQUcsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQU9qRztJQUVELG9DQUFvQztJQUNuQyxlQUFlLElBQUksU0FBUyxDQUFDLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBRWxEO0lBTUQsb0RBQW9EO0lBQ3BELFVBQVUsQ0FB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
@@ -0,0 +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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"}