@aztec/end-to-end 0.0.1-commit.a89ec08 → 0.0.1-commit.aa0c64f

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 (318) hide show
  1. package/README.md +215 -27
  2. package/dest/automine/automine_test_context.d.ts +85 -0
  3. package/dest/automine/automine_test_context.d.ts.map +1 -0
  4. package/dest/automine/automine_test_context.js +98 -0
  5. package/dest/automine/contracts/fixtures/storage_proof_fetcher.d.ts +2 -0
  6. package/dest/automine/contracts/fixtures/storage_proof_fetcher.d.ts.map +1 -0
  7. package/dest/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fixture.d.ts +1 -1
  8. package/dest/automine/contracts/fixtures/storage_proof_fixture.d.ts.map +1 -0
  9. package/dest/automine/delivery/interactive_handshake_responder.d.ts +48 -0
  10. package/dest/automine/delivery/interactive_handshake_responder.d.ts.map +1 -0
  11. package/dest/automine/delivery/interactive_handshake_responder.js +76 -0
  12. package/dest/automine/delivery/onchain_delivery_harness.d.ts +19 -0
  13. package/dest/automine/delivery/onchain_delivery_harness.d.ts.map +1 -0
  14. package/dest/automine/delivery/onchain_delivery_harness.js +141 -0
  15. package/dest/automine/token/blacklist_token_contract_test.d.ts +49 -0
  16. package/dest/automine/token/blacklist_token_contract_test.d.ts.map +1 -0
  17. package/dest/{e2e_blacklist_token_contract → automine/token}/blacklist_token_contract_test.js +23 -36
  18. package/dest/automine/token/token_contract_test.d.ts +40 -0
  19. package/dest/automine/token/token_contract_test.d.ts.map +1 -0
  20. package/dest/{e2e_token_contract → automine/token}/token_contract_test.js +24 -39
  21. package/dest/automine/token/token_test_helpers.d.ts +73 -0
  22. package/dest/automine/token/token_test_helpers.d.ts.map +1 -0
  23. package/dest/automine/token/token_test_helpers.js +97 -0
  24. package/dest/bench/client_flows/benchmark.d.ts +15 -1
  25. package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
  26. package/dest/bench/client_flows/benchmark.js +19 -0
  27. package/dest/bench/client_flows/client_flows_benchmark.d.ts +5 -5
  28. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  29. package/dest/bench/client_flows/client_flows_benchmark.js +53 -51
  30. package/dest/bench/client_flows/data_extractor.js +1 -0
  31. package/dest/bench/utils.d.ts +3 -3
  32. package/dest/bench/utils.d.ts.map +1 -1
  33. package/dest/bench/utils.js +97 -6
  34. package/dest/composed/ha/ha_full_setup.d.ts +77 -0
  35. package/dest/composed/ha/ha_full_setup.d.ts.map +1 -0
  36. package/dest/composed/ha/ha_full_setup.js +383 -0
  37. package/dest/composed/web3signer/multi_validator_keystore_utils.d.ts +12 -0
  38. package/dest/composed/web3signer/multi_validator_keystore_utils.d.ts.map +1 -0
  39. package/dest/fixtures/e2e_prover_test.d.ts +15 -11
  40. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  41. package/dest/fixtures/e2e_prover_test.js +56 -40
  42. package/dest/fixtures/elu_monitor.d.ts +21 -0
  43. package/dest/fixtures/elu_monitor.d.ts.map +1 -0
  44. package/dest/fixtures/elu_monitor.js +102 -0
  45. package/dest/fixtures/fixtures.d.ts +79 -1
  46. package/dest/fixtures/fixtures.d.ts.map +1 -1
  47. package/dest/fixtures/fixtures.js +80 -0
  48. package/dest/fixtures/get_bb_config.d.ts +1 -1
  49. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  50. package/dest/fixtures/get_bb_config.js +5 -5
  51. package/dest/fixtures/ha_setup.d.ts +4 -4
  52. package/dest/fixtures/ha_setup.d.ts.map +1 -1
  53. package/dest/fixtures/ha_setup.js +5 -2
  54. package/dest/fixtures/index.d.ts +2 -1
  55. package/dest/fixtures/index.d.ts.map +1 -1
  56. package/dest/fixtures/index.js +1 -0
  57. package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts +25 -0
  58. package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts.map +1 -0
  59. package/dest/fixtures/schnorr_hardcoded_account_contract.js +37 -0
  60. package/dest/fixtures/setup.d.ts +81 -41
  61. package/dest/fixtures/setup.d.ts.map +1 -1
  62. package/dest/fixtures/setup.js +289 -198
  63. package/dest/fixtures/setup_p2p_test.d.ts +10 -6
  64. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  65. package/dest/fixtures/setup_p2p_test.js +11 -11
  66. package/dest/fixtures/standard_contracts_genesis.d.ts +16 -0
  67. package/dest/fixtures/standard_contracts_genesis.d.ts.map +1 -0
  68. package/dest/fixtures/standard_contracts_genesis.js +25 -0
  69. package/dest/fixtures/timing.d.ts +42 -0
  70. package/dest/fixtures/timing.d.ts.map +1 -0
  71. package/dest/fixtures/timing.js +72 -0
  72. package/dest/fixtures/token_utils.d.ts +22 -4
  73. package/dest/fixtures/token_utils.d.ts.map +1 -1
  74. package/dest/fixtures/token_utils.js +23 -6
  75. package/dest/fixtures/utils.d.ts +2 -2
  76. package/dest/fixtures/utils.d.ts.map +1 -1
  77. package/dest/fixtures/utils.js +1 -1
  78. package/dest/fixtures/wait_helpers.d.ts +135 -0
  79. package/dest/fixtures/wait_helpers.d.ts.map +1 -0
  80. package/dest/fixtures/wait_helpers.js +154 -0
  81. package/dest/forward-compatibility/wallet_service.js +3 -3
  82. package/dest/install_legacy_contracts.d.cts +10 -0
  83. package/dest/install_legacy_contracts.d.cts.map +1 -0
  84. package/dest/legacy-jest-resolver.d.cts +1 -1
  85. package/dest/legacy-jest-resolver.d.cts.map +1 -1
  86. package/dest/multi-node/block-production/setup.d.ts +97 -0
  87. package/dest/multi-node/block-production/setup.d.ts.map +1 -0
  88. package/dest/multi-node/block-production/setup.js +158 -0
  89. package/dest/multi-node/governance/setup.d.ts +67 -0
  90. package/dest/multi-node/governance/setup.d.ts.map +1 -0
  91. package/dest/multi-node/governance/setup.js +126 -0
  92. package/dest/multi-node/multi_node_test_context.d.ts +212 -0
  93. package/dest/multi-node/multi_node_test_context.d.ts.map +1 -0
  94. package/dest/multi-node/multi_node_test_context.js +347 -0
  95. package/dest/multi-node/slashing/inactivity_setup.d.ts +27 -0
  96. package/dest/multi-node/slashing/inactivity_setup.d.ts.map +1 -0
  97. package/dest/multi-node/slashing/inactivity_setup.js +111 -0
  98. package/dest/multi-node/slashing/setup.d.ts +167 -0
  99. package/dest/multi-node/slashing/setup.d.ts.map +1 -0
  100. package/dest/multi-node/slashing/setup.js +275 -0
  101. package/dest/{e2e_p2p → p2p}/p2p_network.d.ts +20 -11
  102. package/dest/p2p/p2p_network.d.ts.map +1 -0
  103. package/dest/{e2e_p2p → p2p}/p2p_network.js +83 -39
  104. package/dest/p2p/reqresp/utils.d.ts +19 -0
  105. package/dest/p2p/reqresp/utils.d.ts.map +1 -0
  106. package/dest/{e2e_p2p → p2p}/reqresp/utils.js +45 -29
  107. package/dest/p2p/shared.d.ts +72 -0
  108. package/dest/p2p/shared.d.ts.map +1 -0
  109. package/dest/p2p/shared.js +212 -0
  110. package/dest/shared/cross_chain_test_harness.d.ts +6 -4
  111. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  112. package/dest/shared/cross_chain_test_harness.js +33 -21
  113. package/dest/shared/gas_portal_test_harness.d.ts +8 -5
  114. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  115. package/dest/shared/gas_portal_test_harness.js +24 -12
  116. package/dest/shared/jest_setup.js +41 -1
  117. package/dest/shared/submit-transactions.d.ts +1 -1
  118. package/dest/shared/submit-transactions.d.ts.map +1 -1
  119. package/dest/shared/submit-transactions.js +12 -5
  120. package/dest/shared/timing_env.d.js +5 -0
  121. package/dest/shared/timing_env.js +365 -0
  122. package/dest/shared/uniswap_l1_l2.d.ts +1 -1
  123. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  124. package/dest/shared/uniswap_l1_l2.js +50 -37
  125. package/dest/shared/wait_for_l1_to_l2_message.d.ts +13 -0
  126. package/dest/shared/wait_for_l1_to_l2_message.d.ts.map +1 -0
  127. package/dest/shared/wait_for_l1_to_l2_message.js +10 -0
  128. package/dest/simulators/lending_simulator.d.ts +10 -3
  129. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  130. package/dest/simulators/lending_simulator.js +24 -12
  131. package/dest/simulators/token_simulator.js +1 -1
  132. package/dest/single-node/cross-chain/cross_chain_messaging_test.d.ts +75 -0
  133. package/dest/single-node/cross-chain/cross_chain_messaging_test.d.ts.map +1 -0
  134. package/dest/single-node/cross-chain/cross_chain_messaging_test.js +209 -0
  135. package/dest/single-node/cross-chain/message_test_helpers.d.ts +38 -0
  136. package/dest/single-node/cross-chain/message_test_helpers.d.ts.map +1 -0
  137. package/dest/single-node/cross-chain/message_test_helpers.js +70 -0
  138. package/dest/{e2e_fees → single-node/fees}/bridging_race.notest.d.ts +1 -1
  139. package/dest/single-node/fees/bridging_race.notest.d.ts.map +1 -0
  140. package/dest/{e2e_fees → single-node/fees}/bridging_race.notest.js +17 -4
  141. package/dest/single-node/fees/fees_test.d.ts +95 -0
  142. package/dest/single-node/fees/fees_test.d.ts.map +1 -0
  143. package/dest/single-node/fees/fees_test.js +347 -0
  144. package/dest/single-node/l1-reorgs/setup.d.ts +42 -0
  145. package/dest/single-node/l1-reorgs/setup.d.ts.map +1 -0
  146. package/dest/single-node/l1-reorgs/setup.js +57 -0
  147. package/dest/single-node/partial-proofs/setup.d.ts +5 -0
  148. package/dest/single-node/partial-proofs/setup.d.ts.map +1 -0
  149. package/dest/single-node/partial-proofs/setup.js +5 -0
  150. package/dest/single-node/proving/setup.d.ts +5 -0
  151. package/dest/single-node/proving/setup.d.ts.map +1 -0
  152. package/dest/single-node/proving/setup.js +5 -0
  153. package/dest/single-node/recovery/setup.d.ts +5 -0
  154. package/dest/single-node/recovery/setup.d.ts.map +1 -0
  155. package/dest/single-node/recovery/setup.js +5 -0
  156. package/dest/single-node/setup.d.ts +49 -0
  157. package/dest/single-node/setup.d.ts.map +1 -0
  158. package/dest/single-node/setup.js +56 -0
  159. package/dest/single-node/single_node_test_context.d.ts +374 -0
  160. package/dest/single-node/single_node_test_context.d.ts.map +1 -0
  161. package/dest/single-node/single_node_test_context.js +847 -0
  162. package/dest/spartan/setup_test_wallets.d.ts +1 -1
  163. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  164. package/dest/spartan/setup_test_wallets.js +84 -50
  165. package/dest/spartan/tx_metrics.d.ts +27 -4
  166. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  167. package/dest/spartan/tx_metrics.js +106 -21
  168. package/dest/spartan/utils/config.d.ts +10 -30
  169. package/dest/spartan/utils/config.d.ts.map +1 -1
  170. package/dest/spartan/utils/config.js +3 -1
  171. package/dest/spartan/utils/index.d.ts +2 -1
  172. package/dest/spartan/utils/index.d.ts.map +1 -1
  173. package/dest/spartan/utils/index.js +2 -0
  174. package/dest/spartan/utils/nodes.d.ts +4 -5
  175. package/dest/spartan/utils/nodes.d.ts.map +1 -1
  176. package/dest/spartan/utils/nodes.js +11 -11
  177. package/dest/spartan/utils/pod_logs.d.ts +25 -0
  178. package/dest/spartan/utils/pod_logs.d.ts.map +1 -0
  179. package/dest/spartan/utils/pod_logs.js +74 -0
  180. package/dest/test-wallet/test_wallet.d.ts +25 -4
  181. package/dest/test-wallet/test_wallet.d.ts.map +1 -1
  182. package/dest/test-wallet/test_wallet.js +107 -36
  183. package/dest/test-wallet/utils.d.ts +38 -3
  184. package/dest/test-wallet/utils.d.ts.map +1 -1
  185. package/dest/test-wallet/utils.js +65 -10
  186. package/dest/test-wallet/wallet_worker_script.js +12 -4
  187. package/dest/test-wallet/worker_wallet.d.ts +6 -5
  188. package/dest/test-wallet/worker_wallet.d.ts.map +1 -1
  189. package/dest/test-wallet/worker_wallet.js +10 -4
  190. package/dest/test-wallet/worker_wallet_schema.d.ts +3 -273
  191. package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -1
  192. package/dest/test-wallet/worker_wallet_schema.js +15 -2
  193. package/package.json +49 -47
  194. package/src/automine/README.md +60 -0
  195. package/src/automine/automine_test_context.ts +153 -0
  196. package/src/automine/delivery/interactive_handshake_responder.ts +125 -0
  197. package/src/automine/delivery/onchain_delivery_harness.ts +213 -0
  198. package/src/{e2e_blacklist_token_contract → automine/token}/blacklist_token_contract_test.ts +24 -44
  199. package/src/{e2e_token_contract → automine/token}/token_contract_test.ts +25 -48
  200. package/src/automine/token/token_test_helpers.ts +138 -0
  201. package/src/bench/client_flows/benchmark.ts +21 -0
  202. package/src/bench/client_flows/client_flows_benchmark.ts +104 -74
  203. package/src/bench/client_flows/data_extractor.ts +1 -0
  204. package/src/bench/utils.ts +110 -6
  205. package/src/composed/ha/ha_full_setup.ts +466 -0
  206. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  207. package/src/fixtures/e2e_prover_test.ts +73 -63
  208. package/src/fixtures/elu_monitor.ts +126 -0
  209. package/src/fixtures/fixtures.ts +100 -0
  210. package/src/fixtures/get_bb_config.ts +7 -6
  211. package/src/fixtures/ha_setup.ts +11 -5
  212. package/src/fixtures/index.ts +1 -0
  213. package/src/fixtures/schnorr_hardcoded_account_contract.ts +49 -0
  214. package/src/fixtures/setup.ts +360 -254
  215. package/src/fixtures/setup_p2p_test.ts +15 -11
  216. package/src/fixtures/standard_contracts_genesis.ts +28 -0
  217. package/src/fixtures/timing.ts +97 -0
  218. package/src/fixtures/token_utils.ts +40 -8
  219. package/src/fixtures/utils.ts +2 -3
  220. package/src/fixtures/wait_helpers.ts +333 -0
  221. package/src/forward-compatibility/wallet_service.ts +6 -4
  222. package/src/guides/up_quick_start.sh +5 -2
  223. package/src/infra/README.md +12 -0
  224. package/src/install_legacy_contracts.cjs +75 -0
  225. package/src/legacy-jest-resolver.cjs +25 -48
  226. package/src/multi-node/README.md +96 -0
  227. package/src/multi-node/block-production/setup.ts +272 -0
  228. package/src/multi-node/governance/setup.ts +172 -0
  229. package/src/multi-node/multi_node_test_context.ts +447 -0
  230. package/src/multi-node/slashing/inactivity_setup.ts +139 -0
  231. package/src/multi-node/slashing/setup.ts +433 -0
  232. package/src/p2p/README.md +78 -0
  233. package/src/{e2e_p2p → p2p}/p2p_network.ts +96 -51
  234. package/src/{e2e_p2p → p2p}/reqresp/utils.ts +56 -28
  235. package/src/p2p/shared.ts +329 -0
  236. package/src/shared/cross_chain_test_harness.ts +36 -17
  237. package/src/shared/gas_portal_test_harness.ts +32 -14
  238. package/src/shared/jest_setup.ts +51 -1
  239. package/src/shared/submit-transactions.ts +13 -8
  240. package/src/shared/timing_env.d.mts +39 -0
  241. package/src/shared/timing_env.mjs +363 -0
  242. package/src/shared/uniswap_l1_l2.ts +80 -43
  243. package/src/shared/wait_for_l1_to_l2_message.ts +23 -0
  244. package/src/simulators/lending_simulator.ts +28 -14
  245. package/src/simulators/token_simulator.ts +1 -1
  246. package/src/single-node/README.md +66 -0
  247. package/src/single-node/cross-chain/cross_chain_messaging_test.ts +302 -0
  248. package/src/single-node/cross-chain/message_test_helpers.ts +125 -0
  249. package/src/{e2e_fees → single-node/fees}/bridging_race.notest.ts +19 -5
  250. package/src/{e2e_fees → single-node/fees}/fees_test.ts +176 -70
  251. package/src/single-node/l1-reorgs/setup.ts +93 -0
  252. package/src/single-node/partial-proofs/setup.ts +8 -0
  253. package/src/single-node/proving/setup.ts +15 -0
  254. package/src/single-node/recovery/setup.ts +8 -0
  255. package/src/single-node/setup.ts +63 -0
  256. package/src/single-node/single_node_test_context.ts +1058 -0
  257. package/src/spartan/setup_test_wallets.ts +87 -47
  258. package/src/spartan/tx_metrics.ts +108 -24
  259. package/src/spartan/utils/config.ts +2 -0
  260. package/src/spartan/utils/index.ts +3 -0
  261. package/src/spartan/utils/nodes.ts +17 -12
  262. package/src/spartan/utils/pod_logs.ts +99 -0
  263. package/src/test-wallet/test_wallet.ts +108 -33
  264. package/src/test-wallet/utils.ts +104 -11
  265. package/src/test-wallet/wallet_worker_script.ts +11 -5
  266. package/src/test-wallet/worker_wallet.ts +16 -14
  267. package/src/test-wallet/worker_wallet_schema.ts +4 -3
  268. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +0 -56
  269. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +0 -1
  270. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +0 -47
  271. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +0 -1
  272. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +0 -129
  273. package/dest/e2e_deploy_contract/deploy_test.d.ts +0 -37
  274. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +0 -1
  275. package/dest/e2e_deploy_contract/deploy_test.js +0 -50
  276. package/dest/e2e_epochs/epochs_test.d.ts +0 -104
  277. package/dest/e2e_epochs/epochs_test.d.ts.map +0 -1
  278. package/dest/e2e_epochs/epochs_test.js +0 -389
  279. package/dest/e2e_fees/bridging_race.notest.d.ts.map +0 -1
  280. package/dest/e2e_fees/fees_test.d.ts +0 -88
  281. package/dest/e2e_fees/fees_test.d.ts.map +0 -1
  282. package/dest/e2e_fees/fees_test.js +0 -255
  283. package/dest/e2e_l1_publisher/write_json.d.ts +0 -11
  284. package/dest/e2e_l1_publisher/write_json.d.ts.map +0 -1
  285. package/dest/e2e_l1_publisher/write_json.js +0 -56
  286. package/dest/e2e_multi_validator/utils.d.ts +0 -12
  287. package/dest/e2e_multi_validator/utils.d.ts.map +0 -1
  288. package/dest/e2e_nested_contract/nested_contract_test.d.ts +0 -26
  289. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +0 -1
  290. package/dest/e2e_nested_contract/nested_contract_test.js +0 -54
  291. package/dest/e2e_p2p/inactivity_slash_test.d.ts +0 -31
  292. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +0 -1
  293. package/dest/e2e_p2p/inactivity_slash_test.js +0 -137
  294. package/dest/e2e_p2p/p2p_network.d.ts.map +0 -1
  295. package/dest/e2e_p2p/reqresp/utils.d.ts +0 -22
  296. package/dest/e2e_p2p/reqresp/utils.d.ts.map +0 -1
  297. package/dest/e2e_p2p/shared.d.ts +0 -78
  298. package/dest/e2e_p2p/shared.d.ts.map +0 -1
  299. package/dest/e2e_p2p/shared.js +0 -235
  300. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +0 -2
  301. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +0 -1
  302. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +0 -1
  303. package/dest/e2e_token_contract/token_contract_test.d.ts +0 -44
  304. package/dest/e2e_token_contract/token_contract_test.d.ts.map +0 -1
  305. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +0 -193
  306. package/src/e2e_deploy_contract/deploy_test.ts +0 -85
  307. package/src/e2e_epochs/epochs_test.ts +0 -499
  308. package/src/e2e_l1_publisher/write_json.ts +0 -77
  309. package/src/e2e_nested_contract/nested_contract_test.ts +0 -75
  310. package/src/e2e_p2p/inactivity_slash_test.ts +0 -180
  311. package/src/e2e_p2p/shared.ts +0 -385
  312. /package/dest/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fetcher.js +0 -0
  313. /package/dest/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fixture.js +0 -0
  314. /package/dest/{e2e_multi_validator/utils.js → composed/web3signer/multi_validator_keystore_utils.js} +0 -0
  315. /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof.json +0 -0
  316. /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fetcher.ts +0 -0
  317. /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fixture.ts +0 -0
  318. /package/src/{e2e_multi_validator/utils.ts → composed/web3signer/multi_validator_keystore_utils.ts} +0 -0
@@ -13,6 +13,7 @@ import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
13
13
  import { ChainMonitor } from '@aztec/ethereum/test';
14
14
  import { randomBytes } from '@aztec/foundation/crypto/random';
15
15
  import { Fr } from '@aztec/foundation/curves/bn254';
16
+ import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
16
17
  import { EthAddress } from '@aztec/foundation/eth-address';
17
18
  import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
18
19
  import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode';
@@ -20,16 +21,21 @@ import { AMMContract } from '@aztec/noir-contracts.js/AMM';
20
21
  import { FPCContract } from '@aztec/noir-contracts.js/FPC';
21
22
  import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
22
23
  import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
23
- import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contracts.js/Token';
24
+ import { TestTokenContract as BananaCoin, TestTokenContract } from '@aztec/noir-test-contracts.js/TestToken';
24
25
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
25
26
  import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
26
27
  import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
27
28
  import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
28
- import { GasSettings } from '@aztec/stdlib/gas';
29
- import { deriveSigningKey } from '@aztec/stdlib/keys';
29
+ import { Gas, GasSettings } from '@aztec/stdlib/gas';
30
+ import { AppTaggingSecretKind } from '@aztec/stdlib/logs';
30
31
 
31
- import { MNEMONIC } from '../../fixtures/fixtures.js';
32
- import { type EndToEndContext, type SetupOptions, deployAccounts, setup, teardown } from '../../fixtures/setup.js';
32
+ import {
33
+ AUTOMINE_E2E_OPTS,
34
+ L1_DIRECT_WRITE_ACCOUNT_INDEX,
35
+ MNEMONIC,
36
+ getPaddedMaxFeesPerGas,
37
+ } from '../../fixtures/fixtures.js';
38
+ import { type EndToEndContext, type SetupOptions, setup, teardown } from '../../fixtures/setup.js';
33
39
  import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
34
40
  import { setupSponsoredFPC } from '../../fixtures/utils.js';
35
41
  import { CrossChainTestHarness } from '../../shared/cross_chain_test_harness.js';
@@ -71,13 +77,13 @@ export class ClientFlowsBenchmark {
71
77
  public bananaFPC!: FPCContract;
72
78
  public bananaFPCInstance!: ContractInstanceWithAddress;
73
79
  // Random asset we want to trade
74
- public candyBarCoin!: TokenContract;
80
+ public candyBarCoin!: TestTokenContract;
75
81
  public candyBarCoinInstance!: ContractInstanceWithAddress;
76
82
  // AMM contract
77
83
  public amm!: AMMContract;
78
84
  public ammInstance!: ContractInstanceWithAddress;
79
85
  // Liquidity token for AMM
80
- public liquidityToken!: TokenContract;
86
+ public liquidityToken!: TestTokenContract;
81
87
  public liquidityTokenInstance!: ContractInstanceWithAddress;
82
88
  // Sponsored FPC contract
83
89
  public sponsoredFPC!: SponsoredFPCContract;
@@ -88,33 +94,35 @@ export class ClientFlowsBenchmark {
88
94
 
89
95
  public realProofs = ['true', '1'].includes(process.env.REAL_PROOFS ?? '');
90
96
 
91
- public paymentMethods: Record<BenchmarkingFeePaymentMethod, { forWallet: FeePaymentMethodGetter; circuits: number }> =
92
- {
93
- // eslint-disable-next-line camelcase
94
- bridged_fee_juice: {
95
- forWallet: this.getBridgedFeeJuicePaymentMethodForWallet.bind(this),
96
- circuits: 2, // FeeJuice claim + kernel inner
97
- },
98
- // eslint-disable-next-line camelcase
99
- private_fpc: {
100
- forWallet: this.getPrivateFPCPaymentMethodForWallet.bind(this),
101
- circuits:
102
- 2 + // FPC entrypoint + kernel inner
103
- 2 + // BananaCoin transfer_to_public + kernel inner
104
- 2 + // Account verify_private_authwit + kernel inner
105
- 2, // BananaCoin prepare_private_balance_increase + kernel inner
106
- },
107
- // eslint-disable-next-line camelcase
108
- sponsored_fpc: {
109
- forWallet: this.getSponsoredFPCPaymentMethodForWallet.bind(this),
110
- circuits: 2, // Sponsored FPC sponsor_unconditionally + kernel inner
111
- },
112
- // eslint-disable-next-line camelcase
113
- fee_juice: {
114
- forWallet: () => Promise.resolve(undefined),
115
- circuits: 0,
116
- },
117
- };
97
+ // `apps` is the number of private function calls contributed by this payment method.
98
+ // Each app produces one execution step at proving time; the orchestrator additionally produces
99
+ // one kernel step per batch of N apps (see `expectedExecutionSteps` in `benchmark.ts`).
100
+ public paymentMethods: Record<BenchmarkingFeePaymentMethod, { forWallet: FeePaymentMethodGetter; apps: number }> = {
101
+ // eslint-disable-next-line camelcase
102
+ bridged_fee_juice: {
103
+ forWallet: this.getBridgedFeeJuicePaymentMethodForWallet.bind(this),
104
+ apps: 1, // FeeJuice claim
105
+ },
106
+ // eslint-disable-next-line camelcase
107
+ private_fpc: {
108
+ forWallet: this.getPrivateFPCPaymentMethodForWallet.bind(this),
109
+ apps:
110
+ 1 + // FPC entrypoint
111
+ 1 + // BananaCoin transfer_to_public
112
+ 1 + // Account verify_private_authwit
113
+ 1, // BananaCoin prepare_private_balance_increase
114
+ },
115
+ // eslint-disable-next-line camelcase
116
+ sponsored_fpc: {
117
+ forWallet: this.getSponsoredFPCPaymentMethodForWallet.bind(this),
118
+ apps: 1, // Sponsored FPC sponsor_unconditionally
119
+ },
120
+ // eslint-disable-next-line camelcase
121
+ fee_juice: {
122
+ forWallet: () => Promise.resolve(undefined),
123
+ apps: 0,
124
+ },
125
+ };
118
126
 
119
127
  public config: ClientFlowsConfig;
120
128
 
@@ -123,7 +131,7 @@ export class ClientFlowsBenchmark {
123
131
 
124
132
  constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs> = {}) {
125
133
  this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
126
- this.setupOptions = { startProverNode: true, ...setupOptions };
134
+ this.setupOptions = { ...AUTOMINE_E2E_OPTS, startProverNode: true, ...setupOptions };
127
135
  this.config = BENCHMARK_CONFIG === 'key_flows' ? KEY_FLOWS_CONFIG : FULL_FLOWS_CONFIG;
128
136
  ProxyLogger.create();
129
137
  this.proxyLogger = ProxyLogger.getInstance();
@@ -132,11 +140,11 @@ export class ClientFlowsBenchmark {
132
140
  async setup() {
133
141
  this.logger.info('Setting up subsystems from fresh');
134
142
  // Token allowlist entries are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
135
- const tokenAllowList = await getTokenAllowedSetupFunctions();
136
- this.context = await setup(0, {
143
+ // BananaCoin is the codegen'd TestToken here, so the allowlist must key on its class, not canonical Token's.
144
+ const tokenAllowList = await getTokenAllowedSetupFunctions(BananaCoin.artifact);
145
+ this.context = await setup(2, {
137
146
  ...this.setupOptions,
138
147
  fundSponsoredFPC: true,
139
- skipAccountDeployment: true,
140
148
  l1ContractsArgs: this.setupOptions,
141
149
  txPublicSetupAllowListExtend: [...(this.setupOptions.txPublicSetupAllowListExtend ?? []), ...tokenAllowList],
142
150
  });
@@ -152,6 +160,7 @@ export class ClientFlowsBenchmark {
152
160
 
153
161
  async teardown() {
154
162
  await this.chainMonitor.stop();
163
+ await this.userWallet?.stop();
155
164
  await teardown(this.context);
156
165
  }
157
166
 
@@ -183,7 +192,7 @@ export class ClientFlowsBenchmark {
183
192
 
184
193
  let benchysPrivateSigningKey;
185
194
  if (type === 'schnorr') {
186
- benchysPrivateSigningKey = deriveSigningKey(benchysSecret);
195
+ benchysPrivateSigningKey = GrumpkinScalar.random();
187
196
  return wallet.createSchnorrAccount(benchysSecret, salt, benchysPrivateSigningKey);
188
197
  } else if (type === 'ecdsar1') {
189
198
  benchysPrivateSigningKey = randomBytes(32);
@@ -200,15 +209,7 @@ export class ClientFlowsBenchmark {
200
209
 
201
210
  async applyInitialAccounts() {
202
211
  this.logger.info('Applying initial accounts setup');
203
- const { deployedAccounts } = await deployAccounts(
204
- 2,
205
- this.logger,
206
- )({
207
- wallet: this.context.wallet,
208
- initialFundedAccounts: this.context.initialFundedAccounts,
209
- });
210
-
211
- const [{ address: adminAddress }, { address: sequencerAddress }] = deployedAccounts;
212
+ const [adminAddress, sequencerAddress] = this.context.accounts;
212
213
 
213
214
  this.adminWallet = this.context.wallet;
214
215
  this.aztecNode = this.context.aztecNodeService;
@@ -231,6 +232,19 @@ export class ClientFlowsBenchmark {
231
232
  loggers: {
232
233
  prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied'),
233
234
  },
235
+ // The benchmark measures steady-state app cost, not first-send discovery cost. Reproduce the pre-handshake-default
236
+ // behavior of unconstrained delivery: derive the tagging secret from the (sender, recipient) key pair via ECDH
237
+ // instead of taking the current default (a non-interactive handshake, which injects two extra private app
238
+ // executions and a nullifier per cold chain). Constrained delivery is unaffected: the Noir circuit rejects
239
+ // address-derived for constrained, so the hook falls through to a handshake there.
240
+ hooks: {
241
+ resolveTaggingSecretStrategy: ({ deliveryMode }) =>
242
+ Promise.resolve(
243
+ deliveryMode === AppTaggingSecretKind.UNCONSTRAINED
244
+ ? { type: 'address-derived' }
245
+ : { type: 'non-interactive-handshake' },
246
+ ),
247
+ },
234
248
  });
235
249
  }
236
250
 
@@ -241,7 +255,15 @@ export class ClientFlowsBenchmark {
241
255
  this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
242
256
  aztecNode: this.context.aztecNodeService,
243
257
  aztecNodeAdmin: this.context.aztecNodeService,
244
- l1Client: this.context.deployL1ContractsValues.l1Client,
258
+ // Bridge from a dedicated L1 account so its direct writes don't race the sequencer publisher's
259
+ // txs on the deployer account (see L1_DIRECT_WRITE_ACCOUNT_INDEX).
260
+ l1Client: createExtendedL1Client(
261
+ this.context.config.l1RpcUrls,
262
+ MNEMONIC,
263
+ undefined,
264
+ undefined,
265
+ L1_DIRECT_WRITE_ACCOUNT_INDEX,
266
+ ),
245
267
  wallet: this.adminWallet,
246
268
  logger: this.logger,
247
269
  });
@@ -249,11 +271,14 @@ export class ClientFlowsBenchmark {
249
271
 
250
272
  async applyDeployBananaToken() {
251
273
  this.logger.info('Applying banana token deployment');
252
- const {
253
- receipt: { contract: bananaCoin, instance: bananaCoinInstance },
254
- } = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n).send({
274
+ const { contract: bananaCoin, instance: bananaCoinInstance } = await BananaCoin.deploy(
275
+ this.adminWallet,
276
+ this.adminAddress,
277
+ 'BC',
278
+ 'BC',
279
+ 18n,
280
+ ).send({
255
281
  from: this.adminAddress,
256
- wait: { returnReceipt: true },
257
282
  });
258
283
  this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
259
284
  this.bananaCoin = bananaCoin;
@@ -262,11 +287,14 @@ export class ClientFlowsBenchmark {
262
287
 
263
288
  async applyDeployCandyBarToken() {
264
289
  this.logger.info('Applying candy bar token deployment');
265
- const {
266
- receipt: { contract: candyBarCoin, instance: candyBarCoinInstance },
267
- } = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n).send({
290
+ const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TestTokenContract.deploy(
291
+ this.adminWallet,
292
+ this.adminAddress,
293
+ 'CBC',
294
+ 'CBC',
295
+ 18n,
296
+ ).send({
268
297
  from: this.adminAddress,
269
- wait: { returnReceipt: true },
270
298
  });
271
299
  this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
272
300
  this.candyBarCoin = candyBarCoin;
@@ -279,11 +307,12 @@ export class ClientFlowsBenchmark {
279
307
  expect((await this.context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
280
308
 
281
309
  const bananaCoin = this.bananaCoin;
282
- const {
283
- receipt: { contract: bananaFPC, instance: bananaFPCInstance },
284
- } = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress).send({
310
+ const { contract: bananaFPC, instance: bananaFPCInstance } = await FPCContract.deploy(
311
+ this.adminWallet,
312
+ bananaCoin.address,
313
+ this.adminAddress,
314
+ ).send({
285
315
  from: this.adminAddress,
286
- wait: { returnReceipt: true },
287
316
  });
288
317
 
289
318
  this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
@@ -328,7 +357,6 @@ export class ClientFlowsBenchmark {
328
357
 
329
358
  public async createAndFundBenchmarkingAccountOnUserWallet(accountType: AccountType) {
330
359
  const benchysAccountManager = await this.createBenchmarkingAccountManager(this.adminWallet, accountType);
331
- const benchysAccount = await benchysAccountManager.getAccount();
332
360
  const benchysAddress = benchysAccountManager.address;
333
361
  const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
334
362
  const behchysDeployMethod = await benchysAccountManager.getDeployMethod();
@@ -338,8 +366,8 @@ export class ClientFlowsBenchmark {
338
366
  });
339
367
  // Register benchy on the user's Wallet, where we're going to be interacting from
340
368
  const accountManager = await this.userWallet.createAccount({
341
- secret: benchysAccount.getSecretKey(),
342
- salt: new Fr(benchysAccount.salt),
369
+ secret: benchysAccountManager.getSecretKey(),
370
+ salt: new Fr(benchysAccountManager.getInstance().salt),
343
371
  contract: benchysAccountManager.getAccountContract(),
344
372
  });
345
373
  return accountManager.address;
@@ -347,20 +375,21 @@ export class ClientFlowsBenchmark {
347
375
 
348
376
  public async applyDeployAmm() {
349
377
  this.logger.info('Applying AMM deployment');
350
- const {
351
- receipt: { contract: liquidityToken, instance: liquidityTokenInstance },
352
- } = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n).send({
378
+ const { contract: liquidityToken, instance: liquidityTokenInstance } = await TestTokenContract.deploy(
379
+ this.adminWallet,
380
+ this.adminAddress,
381
+ 'LPT',
382
+ 'LPT',
383
+ 18n,
384
+ ).send({
353
385
  from: this.adminAddress,
354
- wait: { returnReceipt: true },
355
386
  });
356
- const {
357
- receipt: { contract: amm, instance: ammInstance },
358
- } = await AMMContract.deploy(
387
+ const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
359
388
  this.adminWallet,
360
389
  this.bananaCoin.address,
361
390
  this.candyBarCoin.address,
362
391
  liquidityToken.address,
363
- ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
392
+ ).send({ from: this.adminAddress });
364
393
  this.logger.info(`AMM deployed at ${amm.address}`);
365
394
  await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress });
366
395
  this.liquidityToken = liquidityToken;
@@ -377,8 +406,9 @@ export class ClientFlowsBenchmark {
377
406
  public async getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress) {
378
407
  // The private fee paying method assembled on the app side requires knowledge of the maximum
379
408
  // fee the user is willing to pay
380
- const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1.5);
381
- const gasSettings = GasSettings.fallback({ maxFeesPerGas });
409
+ const maxFeesPerGas = await getPaddedMaxFeesPerGas(this.aztecNode);
410
+ const gasLimits = Gas.from((await this.aztecNode.getNodeInfo()).txsLimits.gas);
411
+ const gasSettings = GasSettings.fallback({ gasLimits, maxFeesPerGas });
382
412
  return new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet, gasSettings);
383
413
  }
384
414
 
@@ -51,6 +51,7 @@ async function main() {
51
51
  // TODO(AD) do we still want to take this from witness.json?
52
52
  witness: witnessStack[i],
53
53
  vk: stepsFromFile[i].vk,
54
+ kind: stepsFromFile[i].kind,
54
55
  timings: {
55
56
  witgen: step.timings.witgen,
56
57
  gateCount: step.timings.gateCount,
@@ -2,8 +2,10 @@ import type { AztecNodeService } from '@aztec/aztec-node';
2
2
  import { AztecAddress } from '@aztec/aztec.js/addresses';
3
3
  import { BatchCall, NO_WAIT, type WaitOpts } from '@aztec/aztec.js/contracts';
4
4
  import { waitForTx } from '@aztec/aztec.js/node';
5
+ import { SlotNumber } from '@aztec/foundation/branded-types';
5
6
  import { mean, stdDev, times } from '@aztec/foundation/collection';
6
7
  import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
8
+ import { type Sequencer, type SequencerEvents, SequencerState } from '@aztec/sequencer-client';
7
9
  import type { TxHash } from '@aztec/stdlib/tx';
8
10
  import type { MetricDefinition } from '@aztec/telemetry-client';
9
11
  import type { BenchmarkDataPoint, BenchmarkMetricsType, BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
@@ -11,10 +13,16 @@ import type { BenchmarkDataPoint, BenchmarkMetricsType, BenchmarkTelemetryClient
11
13
  import { mkdirSync, writeFileSync } from 'fs';
12
14
  import path from 'path';
13
15
 
16
+ import { PIPELINING_SETUP_OPTS } from '../fixtures/fixtures.js';
14
17
  import { type EndToEndContext, type SetupOptions, setup } from '../fixtures/utils.js';
15
18
 
19
+ const MAX_BENCH_WAIT_BLOCKS = 6;
20
+ const BENCH_FINAL_WAIT_TIMEOUT_SECONDS = 10;
21
+ const SEQUENCER_IDLE_TIMEOUT_MS = 60_000;
22
+ const DEFAULT_L1_PUBLISHING_TIME_SECONDS = 12;
23
+
16
24
  /**
17
- * Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
25
+ * Setup for benchmarks. Initializes a remote node with a funded hardcoded account and deploys a benchmark contract.
18
26
  */
19
27
  export async function benchmarkSetup(
20
28
  opts: Partial<SetupOptions> & {
@@ -23,11 +31,19 @@ export async function benchmarkSetup(
23
31
  benchOutput?: string;
24
32
  },
25
33
  ) {
26
- const context = await setup(1, { ...opts, telemetryConfig: { benchmark: true } });
27
- const defaultAccountAddress = context.accounts[0];
28
- const { contract } = await BenchmarkingContract.deploy(context.wallet).send({ from: defaultAccountAddress });
34
+ const context = await setup(1, {
35
+ ...PIPELINING_SETUP_OPTS,
36
+ ...opts,
37
+ telemetryConfig: { benchmark: true },
38
+ });
39
+ const [defaultAccountAddress] = context.accounts;
40
+ const sequencer = getSequencerClient(context);
41
+ await waitForSequencerIdle(sequencer.getSequencer());
42
+ const deployment = BenchmarkingContract.deploy(context.wallet);
43
+ const { txHash } = await deployment.send({ from: defaultAccountAddress, wait: NO_WAIT });
44
+ await waitTxs([txHash], context);
45
+ const contract = await deployment.register();
29
46
  context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
30
- const sequencer = (context.aztecNode as AztecNodeService).getSequencer()!;
31
47
  const telemetry = context.telemetryClient as BenchmarkTelemetryClient;
32
48
  context.logger.warn(`Cleared benchmark data points from setup`);
33
49
  telemetry.clear();
@@ -48,6 +64,14 @@ export async function benchmarkSetup(
48
64
  return { telemetry, context, contract, sequencer };
49
65
  }
50
66
 
67
+ function getSequencerClient(context: EndToEndContext) {
68
+ const sequencer = (context.aztecNode as AztecNodeService).getSequencer();
69
+ if (!sequencer) {
70
+ throw new Error('Benchmark setup requires a local sequencer');
71
+ }
72
+ return sequencer;
73
+ }
74
+
51
75
  type MetricFilter = {
52
76
  source: MetricDefinition;
53
77
  transform: (value: number) => number;
@@ -159,10 +183,90 @@ export async function sendTxs(
159
183
 
160
184
  export async function waitTxs(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
161
185
  context.logger.info(`Awaiting ${txs.length} txs to be mined`);
162
- await Promise.all(txs.map(txHash => waitForTx(context.aztecNode, txHash, txWaitOpts)));
186
+ await waitTxsWithBlockMining(txs, context, txWaitOpts);
163
187
  context.logger.info(`${txs.length} txs have been mined`);
164
188
  }
165
189
 
190
+ async function waitTxsWithBlockMining(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
191
+ const sequencer = getSequencerClient(context).getSequencer();
192
+ for (let attempt = 0; attempt <= MAX_BENCH_WAIT_BLOCKS; attempt++) {
193
+ if (await haveAllTxsMined(txs, context, txWaitOpts)) {
194
+ await waitForSequencerIdle(sequencer);
195
+ return;
196
+ }
197
+ await waitForSequencerIdle(sequencer);
198
+ context.logger.info('Mining next benchmark block while waiting for txs', {
199
+ attempt,
200
+ txs: txs.length,
201
+ });
202
+ await mineNextBenchmarkBlock(context, sequencer);
203
+ }
204
+ await Promise.all(
205
+ txs.map(txHash =>
206
+ waitForTx(context.aztecNode, txHash, {
207
+ ...txWaitOpts,
208
+ timeout: txWaitOpts?.timeout ?? BENCH_FINAL_WAIT_TIMEOUT_SECONDS,
209
+ }),
210
+ ),
211
+ );
212
+ }
213
+
214
+ async function haveAllTxsMined(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts): Promise<boolean> {
215
+ const receipts = await Promise.all(txs.map(txHash => context.aztecNode.getTxReceipt(txHash)));
216
+ for (const receipt of receipts) {
217
+ if (receipt.isDropped()) {
218
+ throw new Error(`Transaction ${receipt.txHash.toString()} was dropped. Reason: ${receipt.error ?? 'unknown'}`);
219
+ }
220
+ if (!receipt.isMined()) {
221
+ return false;
222
+ }
223
+ if (!receipt.hasExecutionSucceeded() && !txWaitOpts?.dontThrowOnRevert) {
224
+ throw new Error(
225
+ `Transaction ${receipt.txHash.toString()} reverted: ${receipt.executionResult}. Reason: ${
226
+ receipt.error ?? 'unknown'
227
+ }`,
228
+ );
229
+ }
230
+ }
231
+ return true;
232
+ }
233
+
234
+ async function mineNextBenchmarkBlock(context: EndToEndContext, sequencer: Sequencer) {
235
+ const l1PublishingTime = BigInt(context.config.l1PublishingTime ?? DEFAULT_L1_PUBLISHING_TIME_SECONDS);
236
+ const currentTimestamp = BigInt(await context.cheatCodes.eth.lastBlockTimestamp());
237
+ let targetSlot = SlotNumber((await context.cheatCodes.rollup.getSlot()) + 1);
238
+ let targetTimestamp = await context.cheatCodes.rollup.getTimestampForSlot(targetSlot);
239
+ while (targetTimestamp - l1PublishingTime - 1n <= currentTimestamp) {
240
+ targetSlot = SlotNumber(targetSlot + 1);
241
+ targetTimestamp = await context.cheatCodes.rollup.getTimestampForSlot(targetSlot);
242
+ }
243
+
244
+ const triggerTimestamp = targetTimestamp - l1PublishingTime - 1n;
245
+ await context.cheatCodes.eth.warp(triggerTimestamp, { resetBlockInterval: true });
246
+ await context.aztecNode.mineBlock();
247
+ await waitForSequencerIdle(sequencer);
248
+ }
249
+
250
+ function waitForSequencerIdle(sequencer: Sequencer, timeout = SEQUENCER_IDLE_TIMEOUT_MS): Promise<void> {
251
+ if (sequencer.status().state === SequencerState.IDLE) {
252
+ return Promise.resolve();
253
+ }
254
+ return new Promise((resolve, reject) => {
255
+ const timer = setTimeout(() => {
256
+ sequencer.off('state-changed', handler);
257
+ reject(new Error('Timeout waiting for sequencer IDLE state'));
258
+ }, timeout);
259
+ const handler = (args: Parameters<SequencerEvents['state-changed']>[0]) => {
260
+ if (args.newState === SequencerState.IDLE) {
261
+ clearTimeout(timer);
262
+ sequencer.off('state-changed', handler);
263
+ resolve();
264
+ }
265
+ };
266
+ sequencer.on('state-changed', handler);
267
+ });
268
+ }
269
+
166
270
  function randomBytesAsBigInts(length: number): bigint[] {
167
271
  return [...Array(length)].map(_ => BigInt(Math.floor(Math.random() * 255)));
168
272
  }