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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (455) hide show
  1. package/README.md +129 -3
  2. package/dest/bootstrap/bootstrap.d.ts +1 -1
  3. package/dest/bootstrap/bootstrap.d.ts.map +1 -1
  4. package/dest/bootstrap/bootstrap.js +9 -1
  5. package/dest/client/factory.d.ts +7 -7
  6. package/dest/client/factory.d.ts.map +1 -1
  7. package/dest/client/factory.js +34 -16
  8. package/dest/client/interface.d.ts +17 -8
  9. package/dest/client/interface.d.ts.map +1 -1
  10. package/dest/client/p2p_client.d.ts +15 -11
  11. package/dest/client/p2p_client.d.ts.map +1 -1
  12. package/dest/client/p2p_client.js +93 -49
  13. package/dest/config.d.ts +153 -102
  14. package/dest/config.d.ts.map +1 -1
  15. package/dest/config.js +134 -35
  16. package/dest/errors/p2p-service.error.d.ts +9 -0
  17. package/dest/errors/p2p-service.error.d.ts.map +1 -0
  18. package/dest/errors/p2p-service.error.js +10 -0
  19. package/dest/errors/reqresp.error.d.ts +1 -20
  20. package/dest/errors/reqresp.error.d.ts.map +1 -1
  21. package/dest/errors/reqresp.error.js +0 -21
  22. package/dest/index.d.ts +1 -2
  23. package/dest/index.d.ts.map +1 -1
  24. package/dest/index.js +0 -1
  25. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +99 -59
  26. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  27. package/dest/mem_pools/attestation_pool/attestation_pool.js +267 -197
  28. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
  29. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  30. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +181 -65
  31. package/dest/mem_pools/attestation_pool/mocks.d.ts +1 -1
  32. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  33. package/dest/mem_pools/attestation_pool/mocks.js +6 -4
  34. package/dest/mem_pools/index.d.ts +1 -2
  35. package/dest/mem_pools/index.d.ts.map +1 -1
  36. package/dest/mem_pools/instrumentation.d.ts +4 -2
  37. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  38. package/dest/mem_pools/instrumentation.js +33 -15
  39. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts +1 -1
  40. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -1
  41. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +2 -1
  42. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +1 -1
  43. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -1
  44. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +2 -0
  45. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +2 -1
  46. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -1
  47. package/dest/mem_pools/tx_pool_v2/eviction/index.js +1 -0
  48. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts +16 -0
  49. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts.map +1 -0
  50. package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.js +62 -0
  51. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts +7 -1
  52. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts.map +1 -1
  53. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +2 -2
  54. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts +1 -1
  55. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts.map +1 -1
  56. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.js +8 -6
  57. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts +2 -2
  58. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts.map +1 -1
  59. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.js +2 -2
  60. package/dest/mem_pools/tx_pool_v2/index.d.ts +2 -2
  61. package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
  62. package/dest/mem_pools/tx_pool_v2/index.js +1 -1
  63. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +12 -5
  64. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
  65. package/dest/mem_pools/tx_pool_v2/interfaces.js +2 -1
  66. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +44 -12
  67. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
  68. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +81 -22
  69. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +1 -1
  70. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
  71. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +26 -44
  72. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +4 -2
  73. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
  74. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +6 -0
  75. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +2 -1
  76. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
  77. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +133 -110
  78. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +9 -3
  79. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  80. package/dest/msg_validators/attestation_validator/attestation_validator.js +37 -12
  81. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +7 -3
  82. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  83. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +4 -5
  84. package/dest/msg_validators/clock_tolerance.d.ts +12 -1
  85. package/dest/msg_validators/clock_tolerance.d.ts.map +1 -1
  86. package/dest/msg_validators/clock_tolerance.js +61 -3
  87. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +10 -4
  88. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
  89. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +10 -2
  90. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +10 -4
  91. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
  92. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +16 -2
  93. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +21 -8
  94. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
  95. package/dest/msg_validators/proposal_validator/proposal_validator.js +90 -44
  96. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +1 -1
  97. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  98. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +8 -15
  99. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts +2 -1
  100. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map +1 -1
  101. package/dest/msg_validators/tx_validator/allowed_public_setup.js +25 -21
  102. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts +17 -0
  103. package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts.map +1 -0
  104. package/dest/msg_validators/tx_validator/allowed_setup_helpers.js +24 -0
  105. package/dest/msg_validators/tx_validator/archive_cache.js +1 -1
  106. package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts +15 -0
  107. package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts.map +1 -0
  108. package/dest/msg_validators/tx_validator/cached_tx_validator.js +19 -0
  109. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts +9 -0
  110. package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts.map +1 -0
  111. package/dest/msg_validators/tx_validator/contract_instance_validator.js +48 -0
  112. package/dest/msg_validators/tx_validator/data_validator.d.ts +2 -1
  113. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  114. package/dest/msg_validators/tx_validator/data_validator.js +36 -2
  115. package/dest/msg_validators/tx_validator/factory.d.ts +27 -7
  116. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  117. package/dest/msg_validators/tx_validator/factory.js +47 -17
  118. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +1 -1
  119. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -1
  120. package/dest/msg_validators/tx_validator/fee_payer_balance.js +6 -2
  121. package/dest/msg_validators/tx_validator/gas_validator.d.ts +48 -7
  122. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  123. package/dest/msg_validators/tx_validator/gas_validator.js +88 -41
  124. package/dest/msg_validators/tx_validator/index.d.ts +4 -1
  125. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  126. package/dest/msg_validators/tx_validator/index.js +3 -0
  127. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
  128. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  129. package/dest/msg_validators/tx_validator/metadata_validator.js +4 -4
  130. package/dest/msg_validators/tx_validator/phases_validator.d.ts +22 -2
  131. package/dest/msg_validators/tx_validator/phases_validator.d.ts.map +1 -1
  132. package/dest/msg_validators/tx_validator/phases_validator.js +72 -24
  133. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +2 -1
  134. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -1
  135. package/dest/msg_validators/tx_validator/tx_proof_validator.js +2 -0
  136. package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts +48 -0
  137. package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts.map +1 -0
  138. package/dest/msg_validators/tx_validator/tx_validation_cache.js +69 -0
  139. package/dest/services/data_store.d.ts +1 -1
  140. package/dest/services/data_store.d.ts.map +1 -1
  141. package/dest/services/data_store.js +5 -5
  142. package/dest/services/discv5/discV5_service.d.ts +2 -1
  143. package/dest/services/discv5/discV5_service.d.ts.map +1 -1
  144. package/dest/services/discv5/discV5_service.js +35 -8
  145. package/dest/services/dummy_service.d.ts +11 -15
  146. package/dest/services/dummy_service.d.ts.map +1 -1
  147. package/dest/services/dummy_service.js +12 -16
  148. package/dest/services/encoding.d.ts +6 -2
  149. package/dest/services/encoding.d.ts.map +1 -1
  150. package/dest/services/encoding.js +14 -8
  151. package/dest/services/gossipsub/topic_score_params.d.ts +13 -2
  152. package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -1
  153. package/dest/services/gossipsub/topic_score_params.js +21 -4
  154. package/dest/services/libp2p/instrumentation.d.ts +3 -1
  155. package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
  156. package/dest/services/libp2p/instrumentation.js +14 -0
  157. package/dest/services/libp2p/libp2p_service.d.ts +39 -50
  158. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  159. package/dest/services/libp2p/libp2p_service.js +299 -250
  160. package/dest/services/peer-manager/metrics.d.ts +3 -1
  161. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  162. package/dest/services/peer-manager/metrics.js +6 -0
  163. package/dest/services/peer-manager/peer_manager.d.ts +6 -2
  164. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  165. package/dest/services/peer-manager/peer_manager.js +40 -11
  166. package/dest/services/peer-manager/peer_scoring.d.ts +7 -2
  167. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  168. package/dest/services/peer-manager/peer_scoring.js +32 -10
  169. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +11 -8
  170. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  171. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +84 -71
  172. package/dest/services/reqresp/batch-tx-requester/interface.d.ts +10 -6
  173. package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map +1 -1
  174. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts +5 -4
  175. package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts.map +1 -1
  176. package/dest/services/reqresp/batch-tx-requester/missing_txs.js +13 -7
  177. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts +3 -1
  178. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts.map +1 -1
  179. package/dest/services/reqresp/batch-tx-requester/peer_collection.js +3 -0
  180. package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts +5 -14
  181. package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts.map +1 -1
  182. package/dest/services/reqresp/batch-tx-requester/tx_validator.js +6 -20
  183. package/dest/services/reqresp/config.d.ts +3 -3
  184. package/dest/services/reqresp/config.d.ts.map +1 -1
  185. package/dest/services/reqresp/interface.d.ts +16 -18
  186. package/dest/services/reqresp/interface.d.ts.map +1 -1
  187. package/dest/services/reqresp/interface.js +10 -20
  188. package/dest/services/reqresp/metrics.d.ts +1 -1
  189. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  190. package/dest/services/reqresp/metrics.js +0 -1
  191. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +1 -1
  192. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
  193. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js +4 -2
  194. package/dest/services/reqresp/protocols/index.d.ts +1 -2
  195. package/dest/services/reqresp/protocols/index.d.ts.map +1 -1
  196. package/dest/services/reqresp/protocols/index.js +0 -1
  197. package/dest/services/reqresp/protocols/tx.d.ts +1 -1
  198. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  199. package/dest/services/reqresp/protocols/tx.js +1 -3
  200. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +5 -4
  201. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -1
  202. package/dest/services/reqresp/rate-limiter/rate_limiter.js +10 -8
  203. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts +1 -1
  204. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -1
  205. package/dest/services/reqresp/rate-limiter/rate_limits.js +0 -10
  206. package/dest/services/reqresp/reqresp.d.ts +7 -29
  207. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  208. package/dest/services/reqresp/reqresp.js +43 -215
  209. package/dest/services/service.d.ts +9 -12
  210. package/dest/services/service.d.ts.map +1 -1
  211. package/dest/services/tx_collection/config.d.ts +2 -23
  212. package/dest/services/tx_collection/config.d.ts.map +1 -1
  213. package/dest/services/tx_collection/config.js +2 -55
  214. package/dest/services/tx_collection/file_store_tx_collection.d.ts +12 -28
  215. package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -1
  216. package/dest/services/tx_collection/file_store_tx_collection.js +43 -83
  217. package/dest/services/tx_collection/file_store_tx_source.d.ts +5 -4
  218. package/dest/services/tx_collection/file_store_tx_source.d.ts.map +1 -1
  219. package/dest/services/tx_collection/file_store_tx_source.js +39 -29
  220. package/dest/services/tx_collection/index.d.ts +2 -3
  221. package/dest/services/tx_collection/index.d.ts.map +1 -1
  222. package/dest/services/tx_collection/index.js +0 -1
  223. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  224. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  225. package/dest/services/tx_collection/instrumentation.js +0 -2
  226. package/dest/services/tx_collection/request_tracker.d.ts +53 -0
  227. package/dest/services/tx_collection/request_tracker.d.ts.map +1 -0
  228. package/dest/services/tx_collection/request_tracker.js +84 -0
  229. package/dest/services/tx_collection/tx_collection.d.ts +36 -55
  230. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  231. package/dest/services/tx_collection/tx_collection.js +275 -119
  232. package/dest/services/tx_collection/tx_collection_sink.d.ts +1 -1
  233. package/dest/services/tx_collection/tx_collection_sink.js +2 -2
  234. package/dest/services/tx_collection/tx_source.d.ts +6 -5
  235. package/dest/services/tx_collection/tx_source.d.ts.map +1 -1
  236. package/dest/services/tx_collection/tx_source.js +9 -7
  237. package/dest/services/tx_file_store/tx_file_store.d.ts +1 -3
  238. package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
  239. package/dest/services/tx_file_store/tx_file_store.js +4 -14
  240. package/dest/services/tx_provider.d.ts +3 -1
  241. package/dest/services/tx_provider.d.ts.map +1 -1
  242. package/dest/services/tx_provider.js +3 -0
  243. package/dest/test-helpers/make-test-p2p-clients.d.ts +5 -6
  244. package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
  245. package/dest/test-helpers/make-test-p2p-clients.js +5 -3
  246. package/dest/test-helpers/mock-pubsub.d.ts +24 -11
  247. package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
  248. package/dest/test-helpers/mock-pubsub.js +45 -45
  249. package/dest/test-helpers/reqresp-nodes.d.ts +5 -7
  250. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  251. package/dest/test-helpers/reqresp-nodes.js +17 -19
  252. package/dest/test-helpers/test_tx_provider.d.ts +3 -1
  253. package/dest/test-helpers/test_tx_provider.d.ts.map +1 -1
  254. package/dest/test-helpers/test_tx_provider.js +3 -0
  255. package/dest/test-helpers/testbench-utils.d.ts +12 -14
  256. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  257. package/dest/test-helpers/testbench-utils.js +42 -15
  258. package/dest/testbench/p2p_client_testbench_worker.d.ts +3 -5
  259. package/dest/testbench/p2p_client_testbench_worker.d.ts.map +1 -1
  260. package/dest/testbench/p2p_client_testbench_worker.js +88 -42
  261. package/dest/testbench/worker_client_manager.d.ts +12 -6
  262. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  263. package/dest/testbench/worker_client_manager.js +57 -11
  264. package/dest/util.d.ts +12 -7
  265. package/dest/util.d.ts.map +1 -1
  266. package/dest/util.js +35 -14
  267. package/dest/versioning.d.ts +3 -6
  268. package/dest/versioning.d.ts.map +1 -1
  269. package/dest/versioning.js +3 -24
  270. package/package.json +15 -14
  271. package/src/bootstrap/bootstrap.ts +9 -1
  272. package/src/client/factory.ts +65 -21
  273. package/src/client/interface.ts +18 -20
  274. package/src/client/p2p_client.ts +108 -82
  275. package/src/client/test/{tx_proposal_collector/README.md → p2p_client.batch_tx_requester.bench.README.md} +23 -53
  276. package/src/config.ts +226 -36
  277. package/src/errors/p2p-service.error.ts +11 -0
  278. package/src/errors/reqresp.error.ts +0 -25
  279. package/src/index.ts +0 -1
  280. package/src/mem_pools/attestation_pool/attestation_pool.ts +318 -242
  281. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +204 -68
  282. package/src/mem_pools/attestation_pool/mocks.ts +13 -8
  283. package/src/mem_pools/index.ts +0 -3
  284. package/src/mem_pools/instrumentation.ts +22 -14
  285. package/src/mem_pools/tx_pool_v2/README.md +9 -1
  286. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +2 -1
  287. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +3 -0
  288. package/src/mem_pools/tx_pool_v2/eviction/index.ts +1 -0
  289. package/src/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.ts +65 -0
  290. package/src/mem_pools/tx_pool_v2/eviction/interfaces.ts +11 -1
  291. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +3 -3
  292. package/src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts +15 -6
  293. package/src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts +2 -1
  294. package/src/mem_pools/tx_pool_v2/index.ts +1 -1
  295. package/src/mem_pools/tx_pool_v2/interfaces.ts +12 -4
  296. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +121 -27
  297. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +29 -43
  298. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +16 -1
  299. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +141 -114
  300. package/src/msg_validators/attestation_validator/README.md +49 -0
  301. package/src/msg_validators/attestation_validator/attestation_validator.ts +41 -9
  302. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +14 -7
  303. package/src/msg_validators/clock_tolerance.ts +79 -3
  304. package/src/msg_validators/proposal_validator/README.md +123 -0
  305. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +24 -4
  306. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +35 -7
  307. package/src/msg_validators/proposal_validator/proposal_validator.ts +114 -47
  308. package/src/msg_validators/tx_validator/README.md +15 -3
  309. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +3 -12
  310. package/src/msg_validators/tx_validator/allowed_public_setup.ts +22 -27
  311. package/src/msg_validators/tx_validator/allowed_setup_helpers.ts +31 -0
  312. package/src/msg_validators/tx_validator/archive_cache.ts +1 -1
  313. package/src/msg_validators/tx_validator/cached_tx_validator.ts +31 -0
  314. package/src/msg_validators/tx_validator/contract_instance_validator.ts +56 -0
  315. package/src/msg_validators/tx_validator/data_validator.ts +44 -1
  316. package/src/msg_validators/tx_validator/factory.ts +61 -10
  317. package/src/msg_validators/tx_validator/fee_payer_balance.ts +6 -2
  318. package/src/msg_validators/tx_validator/gas_validator.ts +121 -39
  319. package/src/msg_validators/tx_validator/index.ts +3 -0
  320. package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
  321. package/src/msg_validators/tx_validator/phases_validator.ts +82 -27
  322. package/src/msg_validators/tx_validator/tx_proof_validator.ts +2 -0
  323. package/src/msg_validators/tx_validator/tx_validation_cache.ts +102 -0
  324. package/src/services/data_store.ts +5 -13
  325. package/src/services/discv5/discV5_service.ts +38 -5
  326. package/src/services/dummy_service.ts +14 -39
  327. package/src/services/encoding.ts +14 -7
  328. package/src/services/gossipsub/topic_score_params.ts +36 -4
  329. package/src/services/libp2p/instrumentation.ts +14 -0
  330. package/src/services/libp2p/libp2p_service.ts +326 -287
  331. package/src/services/peer-manager/metrics.ts +7 -0
  332. package/src/services/peer-manager/peer_manager.ts +46 -11
  333. package/src/services/peer-manager/peer_scoring.ts +27 -5
  334. package/src/services/reqresp/README.md +215 -0
  335. package/src/services/reqresp/batch-tx-requester/README.md +46 -7
  336. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +83 -77
  337. package/src/services/reqresp/batch-tx-requester/interface.ts +13 -5
  338. package/src/services/reqresp/batch-tx-requester/missing_txs.ts +13 -6
  339. package/src/services/reqresp/batch-tx-requester/peer_collection.ts +5 -0
  340. package/src/services/reqresp/batch-tx-requester/tx_validator.ts +12 -25
  341. package/src/services/reqresp/config.ts +2 -2
  342. package/src/services/reqresp/interface.ts +21 -47
  343. package/src/services/reqresp/metrics.ts +0 -1
  344. package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +4 -2
  345. package/src/services/reqresp/protocols/index.ts +0 -1
  346. package/src/services/reqresp/protocols/tx.ts +1 -3
  347. package/src/services/reqresp/rate-limiter/rate_limiter.ts +13 -9
  348. package/src/services/reqresp/rate-limiter/rate_limits.ts +0 -10
  349. package/src/services/reqresp/reqresp.ts +48 -261
  350. package/src/services/service.ts +12 -28
  351. package/src/services/tx_collection/config.ts +3 -80
  352. package/src/services/tx_collection/file_store_tx_collection.ts +54 -103
  353. package/src/services/tx_collection/file_store_tx_source.ts +43 -31
  354. package/src/services/tx_collection/index.ts +1 -6
  355. package/src/services/tx_collection/instrumentation.ts +1 -7
  356. package/src/services/tx_collection/request_tracker.ts +127 -0
  357. package/src/services/tx_collection/tx_collection.ts +331 -176
  358. package/src/services/tx_collection/tx_collection_sink.ts +2 -2
  359. package/src/services/tx_collection/tx_source.ts +8 -7
  360. package/src/services/tx_file_store/tx_file_store.ts +5 -17
  361. package/src/services/tx_provider.ts +5 -0
  362. package/src/test-helpers/make-test-p2p-clients.ts +4 -3
  363. package/src/test-helpers/mock-pubsub.ts +49 -66
  364. package/src/test-helpers/reqresp-nodes.ts +15 -28
  365. package/src/test-helpers/test_tx_provider.ts +5 -0
  366. package/src/test-helpers/testbench-utils.ts +53 -28
  367. package/src/testbench/p2p_client_testbench_worker.ts +91 -61
  368. package/src/testbench/worker_client_manager.ts +72 -25
  369. package/src/util.ts +33 -18
  370. package/src/versioning.ts +3 -33
  371. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts +0 -2
  372. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts.map +0 -1
  373. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +0 -305
  374. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts +0 -73
  375. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts.map +0 -1
  376. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.js +0 -8
  377. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +0 -125
  378. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +0 -1
  379. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +0 -596
  380. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +0 -32
  381. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +0 -1
  382. package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +0 -112
  383. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +0 -157
  384. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +0 -1
  385. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +0 -52
  386. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +0 -16
  387. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +0 -1
  388. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +0 -122
  389. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +0 -17
  390. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +0 -1
  391. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +0 -84
  392. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +0 -19
  393. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +0 -1
  394. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +0 -78
  395. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +0 -26
  396. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +0 -1
  397. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +0 -84
  398. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +0 -25
  399. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +0 -1
  400. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +0 -57
  401. package/dest/mem_pools/tx_pool/index.d.ts +0 -3
  402. package/dest/mem_pools/tx_pool/index.d.ts.map +0 -1
  403. package/dest/mem_pools/tx_pool/index.js +0 -2
  404. package/dest/mem_pools/tx_pool/priority.d.ts +0 -12
  405. package/dest/mem_pools/tx_pool/priority.d.ts.map +0 -1
  406. package/dest/mem_pools/tx_pool/priority.js +0 -15
  407. package/dest/mem_pools/tx_pool/tx_pool.d.ts +0 -127
  408. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +0 -1
  409. package/dest/mem_pools/tx_pool/tx_pool.js +0 -3
  410. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +0 -7
  411. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +0 -1
  412. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +0 -400
  413. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +0 -23
  414. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +0 -1
  415. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +0 -212
  416. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +0 -64
  417. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +0 -1
  418. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +0 -151
  419. package/dest/services/reqresp/protocols/block.d.ts +0 -9
  420. package/dest/services/reqresp/protocols/block.d.ts.map +0 -1
  421. package/dest/services/reqresp/protocols/block.js +0 -32
  422. package/dest/services/tx_collection/fast_tx_collection.d.ts +0 -54
  423. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +0 -1
  424. package/dest/services/tx_collection/fast_tx_collection.js +0 -327
  425. package/dest/services/tx_collection/missing_txs_tracker.d.ts +0 -32
  426. package/dest/services/tx_collection/missing_txs_tracker.d.ts.map +0 -1
  427. package/dest/services/tx_collection/missing_txs_tracker.js +0 -27
  428. package/dest/services/tx_collection/proposal_tx_collector.d.ts +0 -49
  429. package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +0 -1
  430. package/dest/services/tx_collection/proposal_tx_collector.js +0 -50
  431. package/dest/services/tx_collection/slow_tx_collection.d.ts +0 -57
  432. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +0 -1
  433. package/dest/services/tx_collection/slow_tx_collection.js +0 -211
  434. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +0 -346
  435. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.ts +0 -43
  436. package/src/mem_pools/tx_pool/README.md +0 -270
  437. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +0 -746
  438. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +0 -132
  439. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +0 -208
  440. package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +0 -162
  441. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +0 -104
  442. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +0 -93
  443. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +0 -106
  444. package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +0 -75
  445. package/src/mem_pools/tx_pool/index.ts +0 -2
  446. package/src/mem_pools/tx_pool/priority.ts +0 -20
  447. package/src/mem_pools/tx_pool/tx_pool.ts +0 -141
  448. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +0 -319
  449. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +0 -230
  450. package/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +0 -161
  451. package/src/services/reqresp/protocols/block.ts +0 -37
  452. package/src/services/tx_collection/fast_tx_collection.ts +0 -387
  453. package/src/services/tx_collection/missing_txs_tracker.ts +0 -52
  454. package/src/services/tx_collection/proposal_tx_collector.ts +0 -113
  455. package/src/services/tx_collection/slow_tx_collection.ts +0 -266
@@ -1 +1 @@
1
- {"version":3,"file":"p2p_client.d.ts","sourceRoot":"","sources":["../../src/client/p2p_client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"p2p_client.d.ts","sourceRoot":"","sources":["../../src/client/p2p_client.ts"],"names":[],"mappings":"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"}
@@ -371,7 +371,6 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
371
371
  return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
372
372
  }
373
373
  var _dec, _dec1, _initProto;
374
- import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
375
374
  import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
376
375
  import { createLogger } from '@aztec/foundation/log';
377
376
  import { RunningPromise } from '@aztec/foundation/promise';
@@ -437,7 +436,7 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
437
436
  validatorAddresses;
438
437
  /** Tracks the last slot for which we called prepareForSlot */ lastSlotProcessed;
439
438
  /** Polls for slot changes and calls prepareForSlot on the tx pool */ slotMonitor;
440
- constructor(_clientType, store, l2BlockSource, mempools, p2pService, txCollection, txFileStore, epochCache, config = {}, _dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('p2p')){
439
+ constructor(store, l2BlockSource, mempools, p2pService, txCollection, txFileStore, epochCache, config = {}, _dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('p2p'), initialBlockHash){
441
440
  super(telemetry, 'P2PClient'), this.store = store, this.l2BlockSource = l2BlockSource, this.p2pService = p2pService, this.txCollection = txCollection, this.txFileStore = txFileStore, this.epochCache = epochCache, this._dateProvider = _dateProvider, this.telemetry = telemetry, this.log = log, this.currentState = (_initProto(this), P2PClientState.IDLE), this.syncPromise = Promise.resolve(), this.syncResolve = undefined, this.latestBlockNumberAtStart = -1, this.provenBlockNumberAtStart = -1, this.finalizedBlockNumberAtStart = -1, this.validatorAddresses = [], this.lastSlotProcessed = SlotNumber.ZERO;
442
441
  this.config = {
443
442
  ...getP2PDefaultConfig(),
@@ -446,30 +445,7 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
446
445
  this.txPool = mempools.txPool;
447
446
  this.attestationPool = mempools.attestationPool;
448
447
  this.txProvider = new TxProvider(this.txCollection, this.txPool, this, this.log.createChild('tx-provider'), this.telemetry);
449
- // Default to collecting all txs when we see a valid proposal
450
- // This can be overridden by the validator client to validate, and it will call getTxsForBlockProposal on its own
451
- // Note: Validators do NOT attest to individual blocks - attestations are only for checkpoint proposals.
452
- // TODO(palla/txs): We should not trigger a request for txs on a proposal before fully validating it. We need to bring
453
- // validator-client code into here so we can validate a proposal is reasonable.
454
- this.registerBlockProposalHandler(async (block, sender)=>{
455
- this.log.debug(`Received block proposal from ${sender.toString()}`);
456
- // TODO(palla/txs): Need to subtract validatorReexecuteDeadlineMs from this deadline (see ValidatorClient.getReexecutionDeadline)
457
- const constants = this.txCollection.getConstants();
458
- const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(block.slotNumber + 1), constants));
459
- const deadline = new Date(nextSlotTimestampSeconds * 1000);
460
- const parentBlock = await this.l2BlockSource.getBlockHeaderByArchive(block.blockHeader.lastArchive.root);
461
- if (!parentBlock) {
462
- this.log.debug(`Cannot collect txs for proposal as parent block not found`);
463
- return false;
464
- }
465
- const blockNumber = BlockNumber(parentBlock.getBlockNumber() + 1);
466
- await this.txProvider.getTxsForBlockProposal(block, blockNumber, {
467
- pinnedPeer: sender,
468
- deadline
469
- });
470
- return true;
471
- });
472
- this.l2Tips = new L2TipsKVStore(store, 'p2p_client');
448
+ this.l2Tips = new L2TipsKVStore(store, 'p2p_client', initialBlockHash);
473
449
  this.synchedLatestSlot = store.openSingleton('p2p_pool_last_l2_slot');
474
450
  }
475
451
  registerThisValidatorAddresses(addresses) {
@@ -515,7 +491,10 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
515
491
  const from = BlockNumber(oldFinalizedBlockNum + 1);
516
492
  const limit = event.block.number - from + 1;
517
493
  if (limit > 0) {
518
- const oldBlocks = await this.l2BlockSource.getBlocks(from, limit);
494
+ const oldBlocks = await this.l2BlockSource.getBlocksData({
495
+ from,
496
+ limit
497
+ });
519
498
  await this.handleFinalizedL2Blocks(oldBlocks);
520
499
  }
521
500
  break;
@@ -596,16 +575,19 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
596
575
  syncedFinalizedBlock
597
576
  });
598
577
  }
578
+ // Should never happen: all branches above call initBlockStream()
579
+ if (!this.blockStream) {
580
+ throw new Error('Block stream not initialized');
581
+ }
599
582
  this.blockStream.start();
600
- await this.txCollection.start();
601
583
  this.txFileStore?.start();
602
584
  // Start slot monitor to call prepareForSlot when the slot changes
603
585
  this.slotMonitor = new RunningPromise(()=>this.maybeCallPrepareForSlot(), this.log, this.config.slotCheckIntervalMS);
604
586
  this.slotMonitor.start();
605
587
  return this.syncPromise;
606
588
  }
607
- addReqRespSubProtocol(subProtocol, handler, validator) {
608
- return this.p2pService.addReqRespSubProtocol(subProtocol, handler, validator);
589
+ addReqRespSubProtocol(subProtocol, handler) {
590
+ return this.p2pService.addReqRespSubProtocol(subProtocol, handler);
609
591
  }
610
592
  initBlockStream(startingBlock) {
611
593
  if (!this.blockStream) {
@@ -640,6 +622,10 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
640
622
  }
641
623
  /** Triggers a sync to the archiver. Used for testing. */ async sync() {
642
624
  this.initBlockStream();
625
+ // Should never happen: initBlockStream() creates blockStream if absent
626
+ if (!this.blockStream) {
627
+ throw new Error('Block stream not initialized');
628
+ }
643
629
  await this.blockStream.sync();
644
630
  }
645
631
  async broadcastProposal(proposal) {
@@ -666,18 +652,34 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
666
652
  // Store our own last-block proposal so we can respond to req/resp requests for it.
667
653
  await this.attestationPool.tryAddBlockProposal(blockProposal);
668
654
  }
655
+ const checkpointCore = proposal.toCore();
656
+ const { count } = await this.attestationPool.tryAddCheckpointProposal(checkpointCore);
657
+ if (count > 1) {
658
+ if (this.config.broadcastEquivocatedProposals) {
659
+ this.log.warn(`Broadcasting equivocated checkpoint proposal for slot ${proposal.slotNumber}`, {
660
+ slot: proposal.slotNumber,
661
+ archive: proposal.archive.toString(),
662
+ count
663
+ });
664
+ } else {
665
+ throw new Error(`Attempted to broadcast a duplicate checkpoint proposal for slot ${proposal.slotNumber}`);
666
+ }
667
+ }
669
668
  return this.p2pService.propagate(proposal);
670
669
  }
671
670
  async broadcastCheckpointAttestations(attestations) {
672
671
  this.log.verbose(`Broadcasting ${attestations.length} checkpoint attestations to peers`);
673
672
  await Promise.all(attestations.map((att)=>this.p2pService.propagate(att)));
674
673
  }
675
- async getCheckpointAttestationsForSlot(slot, proposalId) {
676
- return await (proposalId ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalId) : this.attestationPool.getCheckpointAttestationsForSlot(slot));
674
+ async getCheckpointAttestationsForSlot(slot, proposalPayloadHash) {
675
+ return await (proposalPayloadHash ? this.attestationPool.getCheckpointAttestationsForSlotAndProposal(slot, proposalPayloadHash) : this.attestationPool.getCheckpointAttestationsForSlot(slot));
677
676
  }
678
677
  addOwnCheckpointAttestations(attestations) {
679
678
  return this.attestationPool.addOwnCheckpointAttestations(attestations);
680
679
  }
680
+ getProposalsForSlot(slot) {
681
+ return this.attestationPool.getProposalsForSlot(slot);
682
+ }
681
683
  hasBlockProposalsForSlot(slot) {
682
684
  return this.attestationPool.hasBlockProposalsForSlot(slot);
683
685
  }
@@ -686,8 +688,11 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
686
688
  registerBlockProposalHandler(handler) {
687
689
  this.p2pService.registerBlockReceivedCallback(handler);
688
690
  }
689
- registerCheckpointProposalHandler(handler) {
690
- this.p2pService.registerCheckpointReceivedCallback(handler);
691
+ registerValidatorCheckpointProposalHandler(handler) {
692
+ this.p2pService.registerValidatorCheckpointReceivedCallback(handler);
693
+ }
694
+ registerAllNodesCheckpointProposalHandler(handler) {
695
+ this.p2pService.registerAllNodesCheckpointReceivedCallback(handler);
691
696
  }
692
697
  registerDuplicateProposalCallback(callback) {
693
698
  this.p2pService.registerDuplicateProposalCallback(callback);
@@ -695,6 +700,9 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
695
700
  registerDuplicateAttestationCallback(callback) {
696
701
  this.p2pService.registerDuplicateAttestationCallback(callback);
697
702
  }
703
+ registerCheckpointAttestationCallback(callback) {
704
+ this.p2pService.registerCheckpointAttestationCallback(callback);
705
+ }
698
706
  async getPendingTxs(limit, after) {
699
707
  if (limit !== undefined && limit <= 0) {
700
708
  throw new TypeError('limit must be greater than 0');
@@ -832,7 +840,9 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
832
840
  * @returns Information about p2p client status: state & syncedToBlockNum.
833
841
  */ async getStatus() {
834
842
  const blockNumber = await this.getSyncedLatestBlockNum();
835
- const blockHash = blockNumber === 0 ? GENESIS_BLOCK_HEADER_HASH.toString() : await this.l2BlockSource.getBlockHeader(blockNumber).then((header)=>header?.hash()).then((hash)=>hash?.toString());
843
+ const blockHash = await this.l2BlockSource.getBlockData({
844
+ number: blockNumber
845
+ }).then((data)=>data?.header.hash()).then((hash)=>hash?.toString());
836
846
  return {
837
847
  state: this.currentState,
838
848
  syncedToL2Block: {
@@ -860,11 +870,11 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
860
870
  }
861
871
  await this.handleMinedBlocks(blocks);
862
872
  await this.maybeCallPrepareForSlot();
863
- await this.startCollectingMissingTxs(blocks);
873
+ await this.collectingMissingTxs(blocks);
864
874
  const lastBlock = blocks.at(-1);
865
875
  await this.synchedLatestSlot.set(BigInt(lastBlock.header.getSlot()));
866
876
  }
867
- /** Request txs for unproven blocks so the prover node has more chances to get them. */ async startCollectingMissingTxs(blocks) {
877
+ /** Request txs for unproven blocks so the prover node can prove. */ async collectingMissingTxs(blocks) {
868
878
  try {
869
879
  // TODO(#15435): If the archiver has lagged behind L1, the reported proven block number may
870
880
  // be much lower than the actual one, and it does not update until the pending chain is
@@ -872,7 +882,9 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
872
882
  // are already proven, but the archiver has not yet updated its state. Until this is properly
873
883
  // fixed, it is mitigated by the expiration date of collection requests, which depends on
874
884
  // the slot number of the block.
875
- const provenBlockNumber = await this.l2BlockSource.getProvenBlockNumber();
885
+ const provenBlockNumber = await this.l2BlockSource.getBlockNumber({
886
+ tag: 'proven'
887
+ }) ?? BlockNumber.ZERO;
876
888
  const unprovenBlocks = blocks.filter((block)=>block.number > provenBlockNumber);
877
889
  for (const block of unprovenBlocks){
878
890
  const txHashes = block.body.txEffects.map((txEffect)=>txEffect.txHash);
@@ -883,7 +895,19 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
883
895
  blockNumber: block.number,
884
896
  blockHash: await block.hash().then((h)=>h.toString())
885
897
  });
886
- this.txCollection.startCollecting(block, missingTxHashes);
898
+ // Both `slashDataWithholdingToleranceSlots` and `p2pMissingTxCollectionDeadlineSlots`
899
+ // count *full slots after the block slot* — value N means collection runs until
900
+ // `slotStart(block.slot + N + 1)`. Take the larger of the two so collection never
901
+ // gives up before the data-withholding slash verdict is rendered.
902
+ const blockSlot = block.header.getSlot();
903
+ const toleranceSlots = this.config.slashDataWithholdingToleranceSlots;
904
+ const configuredSlots = this.config.p2pMissingTxCollectionDeadlineSlots ?? 0;
905
+ const deadlineSlot = SlotNumber(blockSlot + Math.max(toleranceSlots, configuredSlots) + 1);
906
+ const deadlineSeconds = getTimestampForSlot(deadlineSlot, this.epochCache.getL1Constants());
907
+ const deadline = new Date(Number(deadlineSeconds) * 1000);
908
+ await this.txCollection.collectFastForBlock(block, missingTxHashes, {
909
+ deadline
910
+ });
887
911
  }
888
912
  }
889
913
  } catch (err) {
@@ -915,26 +939,46 @@ _dec = trackSpan('p2pClient.broadcastProposal', async (proposal)=>({
915
939
  });
916
940
  }
917
941
  /**
918
- * Returns true if the prune crossed a checkpoint boundary.
919
- * If the old and new checkpoint numbers are the same, the prune is within a single checkpoint.
920
- * If they differ, the prune spans across checkpoints (epoch prune).
942
+ * Returns true if the prune is an epoch prune (new checkpoint number is less than old).
943
+ * If the checkpoint number stays the same or increases, the prune is within a checkpoint.
921
944
  */ async isEpochPrune(newCheckpoint) {
922
945
  const tips = await this.l2Tips.getL2Tips();
923
946
  const oldCheckpointNumber = tips.checkpointed.checkpoint.number;
924
- if (oldCheckpointNumber <= CheckpointNumber.ZERO) {
947
+ if (oldCheckpointNumber <= CheckpointNumber.INITIAL) {
925
948
  return false;
926
949
  }
927
- const isEpochPrune = oldCheckpointNumber !== newCheckpoint.number;
928
- this.log.info(`Detected epoch prune: ${isEpochPrune}. Old checkpoint: ${oldCheckpointNumber}, new checkpoint: ${newCheckpoint.number}`);
950
+ const newCheckpointNumber = newCheckpoint.number;
951
+ // We check that the new checkpoint number is less than the old checkpoint number in order to consider it an epoch prune.
952
+ // To be more certain that it is an epoch prune, we will check that at least 2 checkpoints were removed.
953
+ // This means we should avoid thinking checkpoints removed by L1 re-orgs are epoch prunes
954
+ const thresholdForEpochPrune = CheckpointNumber(oldCheckpointNumber - 2);
955
+ const isEpochPrune = newCheckpointNumber <= thresholdForEpochPrune;
956
+ if (isEpochPrune) {
957
+ this.log.info(`Detected epoch prune to ${newCheckpointNumber}`, {
958
+ oldCheckpointNumber,
959
+ newCheckpointNumber,
960
+ thresholdForEpochPrune
961
+ });
962
+ }
929
963
  return isEpochPrune;
930
964
  }
931
965
  /** Checks if the slot has changed and calls prepareForSlot if so. */ async maybeCallPrepareForSlot() {
932
- const { currentSlot } = this.epochCache.getCurrentAndNextSlot();
933
- if (currentSlot <= this.lastSlotProcessed) {
966
+ // If we have a proposed checkpoint available, we want to prepare the target slot - otherwise we prepare the current slot
967
+ const l2Tips = await this.l2Tips.getL2Tips();
968
+ const hasProposedCheckpoint = l2Tips.proposedCheckpoint.checkpoint.number > l2Tips.checkpointed.checkpoint.number;
969
+ let slot;
970
+ if (this.epochCache.isProposerPipeliningEnabled() && hasProposedCheckpoint) {
971
+ const { targetSlot } = this.epochCache.getTargetAndNextSlot();
972
+ slot = targetSlot;
973
+ } else {
974
+ const { currentSlot } = this.epochCache.getCurrentAndNextSlot();
975
+ slot = currentSlot;
976
+ }
977
+ if (slot <= this.lastSlotProcessed) {
934
978
  return;
935
979
  }
936
- this.lastSlotProcessed = currentSlot;
937
- await this.txPool.prepareForSlot(currentSlot);
980
+ this.lastSlotProcessed = slot;
981
+ await this.txPool.prepareForSlot(slot);
938
982
  }
939
983
  async startServiceIfSynched() {
940
984
  if (this.currentState !== P2PClientState.SYNCHING) {
package/dest/config.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
2
- import { type DataStoreConfig } from '@aztec/kv-store/config';
3
2
  import { type AllowedElement, type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
3
+ import { type DataStoreConfig } from '@aztec/stdlib/kv-store';
4
4
  import { type BatchTxRequesterConfig } from './services/reqresp/batch-tx-requester/config.js';
5
5
  import { type P2PReqRespConfig } from './services/reqresp/config.js';
6
6
  import { type TxCollectionConfig } from './services/tx_collection/config.js';
@@ -8,7 +8,15 @@ import { type TxFileStoreConfig } from './services/tx_file_store/config.js';
8
8
  /**
9
9
  * P2P client configuration values.
10
10
  */
11
- export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, ChainConfig, TxCollectionConfig, TxFileStoreConfig, Pick<SequencerConfig, 'blockDurationMs' | 'expectedBlockProposalsPerSlot'> {
11
+ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, ChainConfig, TxCollectionConfig, TxFileStoreConfig, Pick<SequencerConfig, 'blockDurationMs' | 'expectedBlockProposalsPerSlot' | 'l1PublishingTime' | 'maxTxsPerBlock' | 'attestationPropagationTime' | 'maxBlocksPerCheckpoint'> {
12
+ /** Maximum transactions per block for validation. Overrides maxTxsPerBlock for gossip validation when set. */
13
+ validateMaxTxsPerBlock?: number;
14
+ /** Maximum transactions per checkpoint for validation. Used as fallback for maxTxsPerBlock when that is not set. */
15
+ validateMaxTxsPerCheckpoint?: number;
16
+ /** Maximum L2 gas per block for validation. When set, txs exceeding this limit are rejected. */
17
+ validateMaxL2BlockGas?: number;
18
+ /** Maximum DA gas per block for validation. When set, txs exceeding this limit are rejected. */
19
+ validateMaxDABlockGas?: number;
12
20
  /** A flag dictating whether the P2P subsystem should be enabled. */
13
21
  p2pEnabled: boolean;
14
22
  /** The frequency in which to check for new L2 blocks. */
@@ -21,6 +29,8 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
21
29
  debugDisableColocationPenalty: boolean;
22
30
  /** The frequency in which to check for new peers. */
23
31
  peerCheckIntervalMS: number;
32
+ /** How long to ban a peer after it fails MAX_DIAL_ATTEMPTS dials. */
33
+ peerFailedBanTimeMs: number;
24
34
  /** Size of queue of L2 blocks to store. */
25
35
  l2QueueSize: number;
26
36
  /** The port for the P2P service. */
@@ -45,6 +55,10 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
45
55
  maxPeerCount: number;
46
56
  /** If announceUdpAddress or announceTcpAddress are not provided, query for the IP address of the machine. Default is false. */
47
57
  queryForIp: boolean;
58
+ /**
59
+ * HTTPS URLs that return plain-text public IPv4, tried in order when resolving the announce IP (e.g. when `queryForIp` is true and `p2pIp` is unset).
60
+ */
61
+ publicIpServices: string[];
48
62
  /** The interval of the gossipsub heartbeat to perform maintenance tasks. */
49
63
  gossipsubInterval: number;
50
64
  /** The D parameter for the gossipsub protocol. */
@@ -83,12 +97,14 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
83
97
  preferredPeers: string[];
84
98
  /** The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKb. */
85
99
  p2pStoreMapSizeKb?: number;
86
- /** Which calls are allowed in the public setup phase of a tx. */
87
- txPublicSetupAllowList: AllowedElement[];
100
+ /** Additional entries to extend the default setup allow list. */
101
+ txPublicSetupAllowListExtend: AllowedElement[];
88
102
  /** The maximum number of pending txs before evicting lower priority txs. */
89
103
  maxPendingTxCount: number;
90
104
  /** The node's seen message ID cache size */
91
105
  seenMessageCacheSize: number;
106
+ /** Maximum number of (validator, tx) pairs to keep in the tx validation LRU cache. */
107
+ txValidationCacheSize: number;
92
108
  /** True to disable the status handshake on peer connected. */
93
109
  p2pDisableStatusHandshake?: boolean;
94
110
  /** True to only permit validators to connect */
@@ -111,8 +127,34 @@ export interface P2PConfig extends P2PReqRespConfig, BatchTxRequesterConfig, Cha
111
127
  broadcastEquivocatedProposals?: boolean;
112
128
  /** Minimum age (ms) a transaction must have been in the pool before it's eligible for block building. */
113
129
  minTxPoolAgeMs: number;
130
+ /**
131
+ * Number of full L2 slots to wait after a checkpoint's slot before declaring its txs missing
132
+ * for data-withholding slashing.
133
+ */
134
+ slashDataWithholdingToleranceSlots: number;
135
+ /**
136
+ * Number of L2 slots after a mined block's slot to keep collecting its missing txs. Clamped
137
+ * up so that collection always runs at least until the data-withholding slash verdict is
138
+ * rendered (`block.slot + slashDataWithholdingToleranceSlots + 1`). Defaults to undefined,
139
+ * in which case the tolerance window is used directly.
140
+ */
141
+ p2pMissingTxCollectionDeadlineSlots?: number;
142
+ /** Minimum percentage fee increase required to replace an existing tx via RPC (0 = no bump). */
143
+ priceBumpPercentage: bigint;
144
+ /** Drop incoming block and checkpoint proposals at the libp2p dispatch layer (for testing only) */
145
+ skipIncomingProposals?: boolean;
146
+ /** Accept proposal gossip regardless of slot timing (for testing only). */
147
+ skipProposalSlotValidation?: boolean;
148
+ /**
149
+ * Whether this node skips checkpoint proposal validation and always attests. When set, the checkpoint
150
+ * attestation is created and broadcast before the embedded last block is processed, so it is not delayed
151
+ * past the slot's attestation window by that block's re-execution. Mirrors the validator config flag.
152
+ */
153
+ skipCheckpointProposalValidation?: boolean;
114
154
  }
115
155
  export declare const DEFAULT_P2P_PORT = 40400;
156
+ /** Default endpoints used to discover this machine's public IPv4 when `queryForIp` is enabled. */
157
+ export declare const DEFAULT_PUBLIC_IP_SERVICES: string[];
116
158
  export declare const p2pConfigMappings: ConfigMappingsType<P2PConfig>;
117
159
  /**
118
160
  * Gets the config values for p2p client from environment variables.
@@ -123,109 +165,118 @@ export declare function getP2PDefaultConfig(): P2PConfig;
123
165
  /**
124
166
  * Required P2P config values for a bootstrap node.
125
167
  */
126
- export type BootnodeConfig = Pick<P2PConfig, 'p2pIp' | 'p2pPort' | 'p2pBroadcastPort' | 'peerIdPrivateKey' | 'peerIdPrivateKeyPath' | 'bootstrapNodes' | 'listenAddress' | 'queryForIp'> & Required<Pick<P2PConfig, 'p2pIp' | 'p2pPort'>> & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb'> & Pick<ChainConfig, 'l1ChainId'>;
168
+ export type BootnodeConfig = Pick<P2PConfig, 'p2pIp' | 'p2pPort' | 'p2pBroadcastPort' | 'peerIdPrivateKey' | 'peerIdPrivateKeyPath' | 'bootstrapNodes' | 'listenAddress' | 'queryForIp' | 'publicIpServices'> & Required<Pick<P2PConfig, 'p2pIp' | 'p2pPort'>> & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb'> & Pick<ChainConfig, 'l1ChainId'>;
127
169
  export declare const bootnodeConfigMappings: ConfigMappingsType<Pick<{
128
- archivedTxLimit: unknown;
129
- batchTxRequesterBadPeerThreshold: unknown;
130
- batchTxRequesterDumbParallelWorkerCount: unknown;
131
- batchTxRequesterSmartParallelWorkerCount: unknown;
132
- batchTxRequesterTxBatchSize: unknown;
133
- blockCheckIntervalMS: unknown;
134
- blockDurationMs: unknown;
135
- blockRequestBatchSize: unknown;
136
- bootstrapNodeEnrVersionCheck: unknown;
137
- bootstrapNodes: unknown;
138
- bootstrapNodesAsFullPeers: unknown;
139
- broadcastEquivocatedProposals: unknown;
140
- dataDirectory: unknown;
141
- dataStoreMapSizeKb: unknown;
142
- debugDisableColocationPenalty: unknown;
143
- debugP2PInstrumentMessages: unknown;
144
- dialTimeoutMs: unknown;
145
- disableTransactions: unknown;
146
- doubleSpendSeverePeerPenaltyWindow: unknown;
147
- dropTransactionsProbability: unknown;
148
- expectedBlockProposalsPerSlot: unknown;
149
- fishermanMode: unknown;
150
- gossipsubD: unknown;
151
- gossipsubDLazy: unknown;
152
- gossipsubDhi: unknown;
153
- gossipsubDlo: unknown;
154
- gossipsubFloodPublish: unknown;
155
- gossipsubInterval: unknown;
156
- gossipsubMcacheGossip: unknown;
157
- gossipsubMcacheLength: unknown;
158
- gossipsubSeenTTL: unknown;
159
- gossipsubTxInvalidMessageDeliveriesDecay: unknown;
160
- gossipsubTxInvalidMessageDeliveriesWeight: unknown;
161
- gossipsubTxTopicWeight: unknown;
162
- individualRequestTimeoutMs: unknown;
163
- l1ChainId: unknown;
164
- l1Contracts: unknown;
165
- l2QueueSize: unknown;
166
- listenAddress: unknown;
167
- maxPeerCount: unknown;
168
- maxPendingTxCount: unknown;
169
- minTxPoolAgeMs: unknown;
170
- overallRequestTimeoutMs: unknown;
171
- p2pAllowOnlyValidators: unknown;
172
- p2pBroadcastPort: unknown;
173
- p2pDisableStatusHandshake: unknown;
174
- p2pDiscoveryDisabled: unknown;
175
- p2pEnabled: unknown;
176
- p2pIp: unknown;
177
- p2pMaxFailedAuthAttemptsAllowed: unknown;
178
- p2pOptimisticNegotiation: unknown;
179
- p2pPort: unknown;
180
- p2pStoreMapSizeKb: unknown;
181
- peerCheckIntervalMS: unknown;
182
- peerIdPrivateKey: unknown;
183
- peerIdPrivateKeyPath: unknown;
184
- peerPenaltyValues: unknown;
185
- preferredPeers: unknown;
186
- privatePeers: unknown;
187
- queryForIp: unknown;
188
- rollupVersion: unknown;
189
- seenMessageCacheSize: unknown;
190
- slotCheckIntervalMS: unknown;
191
- trustedPeers: unknown;
192
- txCollectionDisableSlowDuringFastRequests: unknown;
193
- txCollectionFastMaxParallelRequestsPerNode: unknown;
194
- txCollectionFastNodeIntervalMs: unknown;
195
- txCollectionFastNodesTimeoutBeforeReqRespMs: unknown;
196
- txCollectionFileStoreFastBackoffBaseMs: unknown;
197
- txCollectionFileStoreFastBackoffMaxMs: unknown;
198
- txCollectionFileStoreFastDelayMs: unknown;
199
- txCollectionFileStoreFastWorkerCount: unknown;
200
- txCollectionFileStoreSlowBackoffBaseMs: unknown;
201
- txCollectionFileStoreSlowBackoffMaxMs: unknown;
202
- txCollectionFileStoreSlowDelayMs: unknown;
203
- txCollectionFileStoreSlowWorkerCount: unknown;
204
- txCollectionFileStoreUrls: unknown;
205
- txCollectionMissingTxsCollectorType: unknown;
206
- txCollectionNodeRpcMaxBatchSize: unknown;
207
- txCollectionNodeRpcUrls: unknown;
208
- txCollectionReconcileIntervalMs: unknown;
209
- txCollectionSlowNodesIntervalMs: unknown;
210
- txCollectionSlowReqRespIntervalMs: unknown;
211
- txCollectionSlowReqRespTimeoutMs: unknown;
212
- txFileStoreEnabled: unknown;
213
- txFileStoreMaxQueueSize: unknown;
214
- txFileStoreUploadConcurrency: unknown;
215
- txFileStoreUrl: unknown;
216
- txPoolDeleteTxsAfterReorg: unknown;
217
- txPublicSetupAllowList: unknown;
218
- }, "bootstrapNodes" | "dataDirectory" | "dataStoreMapSizeKb" | "l1ChainId" | "listenAddress" | "p2pBroadcastPort" | "p2pIp" | "p2pPort" | "peerIdPrivateKey" | "peerIdPrivateKeyPath" | "queryForIp">>;
170
+ maxTxsPerBlock: number;
171
+ maxBlocksPerCheckpoint: number;
172
+ l1PublishingTime: number;
173
+ attestationPropagationTime: number;
174
+ blockDurationMs: number;
175
+ expectedBlockProposalsPerSlot: number;
176
+ l1ChainId: number;
177
+ rollupVersion: number;
178
+ dataDirectory: string;
179
+ dataStoreMapSizeKb: number;
180
+ batchTxRequesterSmartParallelWorkerCount: number;
181
+ batchTxRequesterDumbParallelWorkerCount: number;
182
+ batchTxRequesterTxBatchSize: number;
183
+ batchTxRequesterBadPeerThreshold: number;
184
+ overallRequestTimeoutMs: number;
185
+ individualRequestTimeoutMs: number;
186
+ p2pOptimisticNegotiation: boolean;
187
+ dialTimeoutMs: number;
188
+ txCollectionFastNodesTimeoutBeforeReqRespMs: number;
189
+ txCollectionFastNodeIntervalMs: number;
190
+ txCollectionNodeRpcUrls: string[];
191
+ txCollectionFastMaxParallelRequestsPerNode: number;
192
+ txCollectionNodeRpcMaxBatchSize: number;
193
+ txCollectionFileStoreUrls: string[];
194
+ txCollectionFileStoreFastDelayMs: number;
195
+ txCollectionFileStoreFastWorkerCount: number;
196
+ txCollectionFileStoreFastBackoffBaseMs: number;
197
+ txCollectionFileStoreFastBackoffMaxMs: number;
198
+ txFileStoreUrl: string;
199
+ txFileStoreUploadConcurrency: number;
200
+ txFileStoreMaxQueueSize: number;
201
+ txFileStoreEnabled: boolean;
202
+ validateMaxTxsPerBlock: number;
203
+ validateMaxTxsPerCheckpoint: number;
204
+ validateMaxL2BlockGas: number;
205
+ validateMaxDABlockGas: number;
206
+ p2pEnabled: boolean;
207
+ blockCheckIntervalMS: number;
208
+ slotCheckIntervalMS: number;
209
+ blockRequestBatchSize: number;
210
+ debugDisableColocationPenalty: boolean;
211
+ peerCheckIntervalMS: number;
212
+ peerFailedBanTimeMs: number;
213
+ l2QueueSize: number;
214
+ p2pPort: number;
215
+ p2pBroadcastPort: number;
216
+ p2pIp: string;
217
+ listenAddress: string;
218
+ peerIdPrivateKey: SecretValue<string>;
219
+ peerIdPrivateKeyPath: string;
220
+ bootstrapNodes: string[];
221
+ bootstrapNodeEnrVersionCheck: boolean;
222
+ bootstrapNodesAsFullPeers: boolean;
223
+ maxPeerCount: number;
224
+ queryForIp: boolean;
225
+ publicIpServices: string[];
226
+ gossipsubInterval: number;
227
+ gossipsubD: number;
228
+ gossipsubDlo: number;
229
+ gossipsubDhi: number;
230
+ gossipsubDLazy: number;
231
+ gossipsubFloodPublish: boolean;
232
+ gossipsubMcacheLength: number;
233
+ gossipsubMcacheGossip: number;
234
+ gossipsubSeenTTL: number;
235
+ doubleSpendSeverePeerPenaltyWindow: number;
236
+ gossipsubTxTopicWeight: number;
237
+ gossipsubTxInvalidMessageDeliveriesWeight: number;
238
+ gossipsubTxInvalidMessageDeliveriesDecay: number;
239
+ peerPenaltyValues: number[];
240
+ archivedTxLimit: number;
241
+ trustedPeers: string[];
242
+ privatePeers: string[];
243
+ preferredPeers: string[];
244
+ p2pStoreMapSizeKb: number;
245
+ txPublicSetupAllowListExtend: AllowedElement[];
246
+ maxPendingTxCount: number;
247
+ seenMessageCacheSize: number;
248
+ txValidationCacheSize: number;
249
+ p2pDisableStatusHandshake: boolean;
250
+ p2pAllowOnlyValidators: boolean;
251
+ p2pDiscoveryDisabled: boolean;
252
+ p2pMaxFailedAuthAttemptsAllowed: number;
253
+ disableTransactions: boolean;
254
+ dropTransactionsProbability: number;
255
+ txPoolDeleteTxsAfterReorg: boolean;
256
+ debugP2PInstrumentMessages: boolean;
257
+ fishermanMode: boolean;
258
+ broadcastEquivocatedProposals: boolean;
259
+ minTxPoolAgeMs: number;
260
+ slashDataWithholdingToleranceSlots: number;
261
+ p2pMissingTxCollectionDeadlineSlots: number;
262
+ priceBumpPercentage: bigint;
263
+ skipIncomingProposals: boolean;
264
+ skipProposalSlotValidation: boolean;
265
+ skipCheckpointProposalValidation: boolean;
266
+ rollupAddress: import("@aztec/foundation/eth-address").EthAddress;
267
+ }, "bootstrapNodes" | "dataDirectory" | "dataStoreMapSizeKb" | "l1ChainId" | "listenAddress" | "p2pBroadcastPort" | "p2pIp" | "p2pPort" | "peerIdPrivateKey" | "peerIdPrivateKeyPath" | "publicIpServices" | "queryForIp">>;
219
268
  /**
220
269
  * Parses a string to a list of allowed elements.
221
- * Each encoded is expected to be of one of the following formats
222
- * `I:${address}`
223
- * `I:${address}:${selector}`
224
- * `C:${classId}`
225
- * `C:${classId}:${selector}`
270
+ * Each entry is expected to be of one of the following formats:
271
+ * `I:${address}:${selector}` — instance (contract address) with function selector
272
+ * `C:${classId}:${selector}` — class with function selector
273
+ *
274
+ * An optional flags segment can be appended after the selector:
275
+ * `I:${address}:${selector}:${flags}` or `C:${classId}:${selector}:${flags}`
276
+ * where flags is a `+`-separated list of: `os` (onlySelf), `rn` (rejectNullMsgSender), `cl=N` (calldataLength).
226
277
  *
227
278
  * @param value The string to parse
228
279
  * @returns A list of allowed elements
229
280
  */
230
281
  export declare function parseAllowList(value: string): AllowedElement[];
231
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUN2QixXQUFXLEVBUVosTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFHbEYsT0FBTyxFQUNMLEtBQUssY0FBYyxFQUNuQixLQUFLLFdBQVcsRUFDaEIsS0FBSyxlQUFlLEVBR3JCLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsT0FBTyxFQUNMLEtBQUssc0JBQXNCLEVBRTVCLE1BQU0saURBQWlELENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQTRCLE1BQU0sOEJBQThCLENBQUM7QUFDL0YsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQThCLE1BQU0sb0NBQW9DLENBQUM7QUFDekcsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQTZCLE1BQU0sb0NBQW9DLENBQUM7QUFFdkc7O0dBRUc7QUFDSCxNQUFNLFdBQVcsU0FDZixTQUFRLGdCQUFnQixFQUN0QixzQkFBc0IsRUFDdEIsV0FBVyxFQUNYLGtCQUFrQixFQUNsQixpQkFBaUIsRUFDakIsSUFBSSxDQUFDLGVBQWUsRUFBRSxpQkFBaUIsR0FBRywrQkFBK0IsQ0FBQztJQUM1RSxvRUFBb0U7SUFDcEUsVUFBVSxFQUFFLE9BQU8sQ0FBQztJQUVwQix5REFBeUQ7SUFDekQsb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBRTdCLHdEQUF3RDtJQUN4RCxtQkFBbUIsRUFBRSxNQUFNLENBQUM7SUFFNUIsdURBQXVEO0lBQ3ZELHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUU5QixvRUFBb0U7SUFDcEUsNkJBQTZCLEVBQUUsT0FBTyxDQUFDO0lBRXZDLHFEQUFxRDtJQUNyRCxtQkFBbUIsRUFBRSxNQUFNLENBQUM7SUFFNUIsMkNBQTJDO0lB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
282
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUN2QixXQUFXLEVBVVosTUFBTSwwQkFBMEIsQ0FBQztBQUlsQyxPQUFPLEVBQ0wsS0FBSyxjQUFjLEVBQ25CLEtBQUssV0FBVyxFQUNoQixLQUFLLGVBQWUsRUFHckIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFFbEYsT0FBTyxFQUNMLEtBQUssc0JBQXNCLEVBRTVCLE1BQU0saURBQWlELENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQTRCLE1BQU0sOEJBQThCLENBQUM7QUFDL0YsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQThCLE1BQU0sb0NBQW9DLENBQUM7QUFDekcsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQTZCLE1BQU0sb0NBQW9DLENBQUM7QUFFdkc7O0dBRUc7QUFDSCxNQUFNLFdBQVcsU0FDZixTQUFRLGdCQUFnQixFQUN0QixzQkFBc0IsRUFDdEIsV0FBVyxFQUNYLGtCQUFrQixFQUNsQixpQkFBaUIsRUFDakIsSUFBSSxDQUNGLGVBQWUsRUFDYixpQkFBaUIsR0FDakIsK0JBQStCLEdBQy9CLGtCQUFrQixHQUNsQixnQkFBZ0IsR0FDaEIsNEJBQTRCLEdBQzVCLHdCQUF3QixDQUMzQjtJQUNILDhHQUE4RztJQUM5RyxzQkFBc0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVoQyxvSEFBb0g7SUFDcEgsMkJBQTJCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFckMsZ0dBQWdHO0lBQ2hHLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRS9CLGdHQUFnRztJQUNoRyxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUUvQixvRUFBb0U7SUFDcEUsVUFB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