@aztec/end-to-end 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

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 (322) hide show
  1. package/README.md +229 -14
  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 +62 -54
  30. package/dest/bench/utils.d.ts +3 -3
  31. package/dest/bench/utils.d.ts.map +1 -1
  32. package/dest/bench/utils.js +97 -6
  33. package/dest/composed/ha/ha_full_setup.d.ts +77 -0
  34. package/dest/composed/ha/ha_full_setup.d.ts.map +1 -0
  35. package/dest/composed/ha/ha_full_setup.js +383 -0
  36. package/dest/composed/web3signer/multi_validator_keystore_utils.d.ts +12 -0
  37. package/dest/composed/web3signer/multi_validator_keystore_utils.d.ts.map +1 -0
  38. package/dest/fixtures/authwit_proxy.d.ts +1 -1
  39. package/dest/fixtures/authwit_proxy.d.ts.map +1 -1
  40. package/dest/fixtures/authwit_proxy.js +4 -0
  41. package/dest/fixtures/e2e_prover_test.d.ts +15 -11
  42. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  43. package/dest/fixtures/e2e_prover_test.js +56 -40
  44. package/dest/fixtures/fixtures.d.ts +79 -1
  45. package/dest/fixtures/fixtures.d.ts.map +1 -1
  46. package/dest/fixtures/fixtures.js +80 -0
  47. package/dest/fixtures/get_bb_config.d.ts +1 -1
  48. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  49. package/dest/fixtures/get_bb_config.js +5 -5
  50. package/dest/fixtures/ha_setup.d.ts +4 -4
  51. package/dest/fixtures/ha_setup.d.ts.map +1 -1
  52. package/dest/fixtures/ha_setup.js +5 -2
  53. package/dest/fixtures/index.d.ts +2 -1
  54. package/dest/fixtures/index.d.ts.map +1 -1
  55. package/dest/fixtures/index.js +1 -0
  56. package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts +25 -0
  57. package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts.map +1 -0
  58. package/dest/fixtures/schnorr_hardcoded_account_contract.js +37 -0
  59. package/dest/fixtures/setup.d.ts +86 -42
  60. package/dest/fixtures/setup.d.ts.map +1 -1
  61. package/dest/fixtures/setup.js +295 -200
  62. package/dest/fixtures/setup_p2p_test.d.ts +10 -6
  63. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  64. package/dest/fixtures/setup_p2p_test.js +11 -11
  65. package/dest/fixtures/standard_contracts_genesis.d.ts +16 -0
  66. package/dest/fixtures/standard_contracts_genesis.d.ts.map +1 -0
  67. package/dest/fixtures/standard_contracts_genesis.js +25 -0
  68. package/dest/fixtures/timing.d.ts +42 -0
  69. package/dest/fixtures/timing.d.ts.map +1 -0
  70. package/dest/fixtures/timing.js +72 -0
  71. package/dest/fixtures/token_utils.d.ts +22 -4
  72. package/dest/fixtures/token_utils.d.ts.map +1 -1
  73. package/dest/fixtures/token_utils.js +23 -6
  74. package/dest/fixtures/utils.d.ts +2 -2
  75. package/dest/fixtures/utils.d.ts.map +1 -1
  76. package/dest/fixtures/utils.js +1 -1
  77. package/dest/fixtures/wait_helpers.d.ts +135 -0
  78. package/dest/fixtures/wait_helpers.d.ts.map +1 -0
  79. package/dest/fixtures/wait_helpers.js +154 -0
  80. package/dest/forward-compatibility/wallet_rpc_client.d.ts +7 -0
  81. package/dest/forward-compatibility/wallet_rpc_client.d.ts.map +1 -0
  82. package/dest/forward-compatibility/wallet_rpc_client.js +15 -0
  83. package/dest/forward-compatibility/wallet_service.d.ts +3 -0
  84. package/dest/forward-compatibility/wallet_service.d.ts.map +1 -0
  85. package/dest/forward-compatibility/wallet_service.js +109 -0
  86. package/dest/install_legacy_contracts.d.cts +13 -0
  87. package/dest/install_legacy_contracts.d.cts.map +1 -0
  88. package/dest/legacy-jest-resolver.d.cts +3 -0
  89. package/dest/legacy-jest-resolver.d.cts.map +1 -0
  90. package/dest/multi-node/block-production/setup.d.ts +97 -0
  91. package/dest/multi-node/block-production/setup.d.ts.map +1 -0
  92. package/dest/multi-node/block-production/setup.js +158 -0
  93. package/dest/multi-node/governance/setup.d.ts +67 -0
  94. package/dest/multi-node/governance/setup.d.ts.map +1 -0
  95. package/dest/multi-node/governance/setup.js +126 -0
  96. package/dest/multi-node/multi_node_test_context.d.ts +212 -0
  97. package/dest/multi-node/multi_node_test_context.d.ts.map +1 -0
  98. package/dest/multi-node/multi_node_test_context.js +347 -0
  99. package/dest/multi-node/slashing/inactivity_setup.d.ts +27 -0
  100. package/dest/multi-node/slashing/inactivity_setup.d.ts.map +1 -0
  101. package/dest/multi-node/slashing/inactivity_setup.js +111 -0
  102. package/dest/multi-node/slashing/setup.d.ts +167 -0
  103. package/dest/multi-node/slashing/setup.d.ts.map +1 -0
  104. package/dest/multi-node/slashing/setup.js +275 -0
  105. package/dest/{e2e_p2p → p2p}/p2p_network.d.ts +20 -11
  106. package/dest/p2p/p2p_network.d.ts.map +1 -0
  107. package/dest/{e2e_p2p → p2p}/p2p_network.js +83 -39
  108. package/dest/p2p/reqresp/utils.d.ts +19 -0
  109. package/dest/p2p/reqresp/utils.d.ts.map +1 -0
  110. package/dest/{e2e_p2p → p2p}/reqresp/utils.js +45 -29
  111. package/dest/p2p/shared.d.ts +72 -0
  112. package/dest/p2p/shared.d.ts.map +1 -0
  113. package/dest/p2p/shared.js +212 -0
  114. package/dest/shared/cross_chain_test_harness.d.ts +6 -4
  115. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  116. package/dest/shared/cross_chain_test_harness.js +33 -21
  117. package/dest/shared/gas_portal_test_harness.d.ts +8 -5
  118. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  119. package/dest/shared/gas_portal_test_harness.js +24 -12
  120. package/dest/shared/submit-transactions.d.ts +1 -1
  121. package/dest/shared/submit-transactions.d.ts.map +1 -1
  122. package/dest/shared/submit-transactions.js +12 -5
  123. package/dest/shared/timing_env.d.js +5 -0
  124. package/dest/shared/timing_env.js +365 -0
  125. package/dest/shared/uniswap_l1_l2.d.ts +1 -1
  126. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  127. package/dest/shared/uniswap_l1_l2.js +50 -40
  128. package/dest/shared/wait_for_l1_to_l2_message.d.ts +13 -0
  129. package/dest/shared/wait_for_l1_to_l2_message.d.ts.map +1 -0
  130. package/dest/shared/wait_for_l1_to_l2_message.js +10 -0
  131. package/dest/simulators/lending_simulator.d.ts +10 -3
  132. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  133. package/dest/simulators/lending_simulator.js +25 -13
  134. package/dest/simulators/token_simulator.js +1 -1
  135. package/dest/single-node/cross-chain/cross_chain_messaging_test.d.ts +75 -0
  136. package/dest/single-node/cross-chain/cross_chain_messaging_test.d.ts.map +1 -0
  137. package/dest/single-node/cross-chain/cross_chain_messaging_test.js +209 -0
  138. package/dest/single-node/cross-chain/message_test_helpers.d.ts +38 -0
  139. package/dest/single-node/cross-chain/message_test_helpers.d.ts.map +1 -0
  140. package/dest/single-node/cross-chain/message_test_helpers.js +70 -0
  141. package/dest/{e2e_fees → single-node/fees}/bridging_race.notest.d.ts +1 -1
  142. package/dest/single-node/fees/bridging_race.notest.d.ts.map +1 -0
  143. package/dest/{e2e_fees → single-node/fees}/bridging_race.notest.js +17 -4
  144. package/dest/single-node/fees/fees_test.d.ts +95 -0
  145. package/dest/single-node/fees/fees_test.d.ts.map +1 -0
  146. package/dest/single-node/fees/fees_test.js +347 -0
  147. package/dest/single-node/l1-reorgs/setup.d.ts +42 -0
  148. package/dest/single-node/l1-reorgs/setup.d.ts.map +1 -0
  149. package/dest/single-node/l1-reorgs/setup.js +57 -0
  150. package/dest/single-node/partial-proofs/setup.d.ts +5 -0
  151. package/dest/single-node/partial-proofs/setup.d.ts.map +1 -0
  152. package/dest/single-node/partial-proofs/setup.js +5 -0
  153. package/dest/single-node/proving/setup.d.ts +5 -0
  154. package/dest/single-node/proving/setup.d.ts.map +1 -0
  155. package/dest/single-node/proving/setup.js +5 -0
  156. package/dest/single-node/recovery/setup.d.ts +5 -0
  157. package/dest/single-node/recovery/setup.d.ts.map +1 -0
  158. package/dest/single-node/recovery/setup.js +5 -0
  159. package/dest/single-node/setup.d.ts +49 -0
  160. package/dest/single-node/setup.d.ts.map +1 -0
  161. package/dest/single-node/setup.js +56 -0
  162. package/dest/single-node/single_node_test_context.d.ts +374 -0
  163. package/dest/single-node/single_node_test_context.d.ts.map +1 -0
  164. package/dest/single-node/single_node_test_context.js +847 -0
  165. package/dest/spartan/setup_test_wallets.d.ts +4 -2
  166. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  167. package/dest/spartan/setup_test_wallets.js +94 -48
  168. package/dest/spartan/tx_metrics.d.ts +27 -4
  169. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  170. package/dest/spartan/tx_metrics.js +105 -20
  171. package/dest/spartan/utils/config.d.ts +9 -32
  172. package/dest/spartan/utils/config.d.ts.map +1 -1
  173. package/dest/spartan/utils/config.js +1 -0
  174. package/dest/spartan/utils/gossip_metrics.d.ts +9 -0
  175. package/dest/spartan/utils/gossip_metrics.d.ts.map +1 -0
  176. package/dest/spartan/utils/gossip_metrics.js +77 -0
  177. package/dest/spartan/utils/index.d.ts +3 -1
  178. package/dest/spartan/utils/index.d.ts.map +1 -1
  179. package/dest/spartan/utils/index.js +4 -0
  180. package/dest/spartan/utils/nodes.js +2 -2
  181. package/dest/spartan/utils/pod_logs.d.ts +25 -0
  182. package/dest/spartan/utils/pod_logs.d.ts.map +1 -0
  183. package/dest/spartan/utils/pod_logs.js +74 -0
  184. package/dest/test-wallet/test_wallet.d.ts +47 -25
  185. package/dest/test-wallet/test_wallet.d.ts.map +1 -1
  186. package/dest/test-wallet/test_wallet.js +197 -91
  187. package/dest/test-wallet/utils.d.ts +38 -3
  188. package/dest/test-wallet/utils.d.ts.map +1 -1
  189. package/dest/test-wallet/utils.js +65 -10
  190. package/dest/test-wallet/wallet_worker_script.js +12 -4
  191. package/dest/test-wallet/worker_wallet.d.ts +9 -8
  192. package/dest/test-wallet/worker_wallet.d.ts.map +1 -1
  193. package/dest/test-wallet/worker_wallet.js +10 -4
  194. package/dest/test-wallet/worker_wallet_schema.d.ts +3 -273
  195. package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -1
  196. package/dest/test-wallet/worker_wallet_schema.js +15 -2
  197. package/package.json +48 -44
  198. package/src/automine/README.md +60 -0
  199. package/src/automine/automine_test_context.ts +153 -0
  200. package/src/automine/delivery/interactive_handshake_responder.ts +125 -0
  201. package/src/automine/delivery/onchain_delivery_harness.ts +213 -0
  202. package/src/{e2e_blacklist_token_contract → automine/token}/blacklist_token_contract_test.ts +24 -47
  203. package/src/{e2e_token_contract → automine/token}/token_contract_test.ts +25 -48
  204. package/src/automine/token/token_test_helpers.ts +138 -0
  205. package/src/bench/client_flows/benchmark.ts +21 -0
  206. package/src/bench/client_flows/client_flows_benchmark.ts +108 -75
  207. package/src/bench/utils.ts +110 -6
  208. package/src/composed/ha/ha_full_setup.ts +466 -0
  209. package/src/fixtures/authwit_proxy.ts +4 -0
  210. package/src/fixtures/e2e_prover_test.ts +73 -63
  211. package/src/fixtures/fixtures.ts +100 -0
  212. package/src/fixtures/get_bb_config.ts +7 -6
  213. package/src/fixtures/ha_setup.ts +11 -5
  214. package/src/fixtures/index.ts +1 -0
  215. package/src/fixtures/schnorr_hardcoded_account_contract.ts +49 -0
  216. package/src/fixtures/setup.ts +372 -258
  217. package/src/fixtures/setup_p2p_test.ts +15 -11
  218. package/src/fixtures/standard_contracts_genesis.ts +28 -0
  219. package/src/fixtures/timing.ts +97 -0
  220. package/src/fixtures/token_utils.ts +40 -8
  221. package/src/fixtures/utils.ts +2 -3
  222. package/src/fixtures/wait_helpers.ts +333 -0
  223. package/src/forward-compatibility/wallet_rpc_client.ts +14 -0
  224. package/src/forward-compatibility/wallet_service.ts +106 -0
  225. package/src/guides/up_quick_start.sh +5 -2
  226. package/src/infra/README.md +12 -0
  227. package/src/install_legacy_contracts.cjs +81 -0
  228. package/src/legacy-jest-resolver.cjs +98 -0
  229. package/src/multi-node/README.md +96 -0
  230. package/src/multi-node/block-production/setup.ts +272 -0
  231. package/src/multi-node/governance/setup.ts +172 -0
  232. package/src/multi-node/multi_node_test_context.ts +447 -0
  233. package/src/multi-node/slashing/inactivity_setup.ts +139 -0
  234. package/src/multi-node/slashing/setup.ts +433 -0
  235. package/src/p2p/README.md +78 -0
  236. package/src/{e2e_p2p → p2p}/p2p_network.ts +96 -51
  237. package/src/{e2e_p2p → p2p}/reqresp/utils.ts +56 -28
  238. package/src/p2p/shared.ts +329 -0
  239. package/src/shared/cross_chain_test_harness.ts +36 -17
  240. package/src/shared/gas_portal_test_harness.ts +32 -14
  241. package/src/shared/submit-transactions.ts +13 -5
  242. package/src/shared/timing_env.d.mts +39 -0
  243. package/src/shared/timing_env.mjs +363 -0
  244. package/src/shared/uniswap_l1_l2.ts +92 -50
  245. package/src/shared/wait_for_l1_to_l2_message.ts +23 -0
  246. package/src/simulators/lending_simulator.ts +29 -13
  247. package/src/simulators/token_simulator.ts +1 -1
  248. package/src/single-node/README.md +66 -0
  249. package/src/single-node/cross-chain/cross_chain_messaging_test.ts +302 -0
  250. package/src/single-node/cross-chain/message_test_helpers.ts +125 -0
  251. package/src/{e2e_fees → single-node/fees}/bridging_race.notest.ts +19 -5
  252. package/src/single-node/fees/fees_test.ts +437 -0
  253. package/src/single-node/l1-reorgs/setup.ts +93 -0
  254. package/src/single-node/partial-proofs/setup.ts +8 -0
  255. package/src/single-node/proving/setup.ts +15 -0
  256. package/src/single-node/recovery/setup.ts +8 -0
  257. package/src/single-node/setup.ts +63 -0
  258. package/src/single-node/single_node_test_context.ts +1058 -0
  259. package/src/spartan/setup_test_wallets.ts +124 -45
  260. package/src/spartan/tx_metrics.ts +107 -23
  261. package/src/spartan/utils/config.ts +1 -0
  262. package/src/spartan/utils/gossip_metrics.ts +108 -0
  263. package/src/spartan/utils/index.ts +6 -0
  264. package/src/spartan/utils/nodes.ts +2 -2
  265. package/src/spartan/utils/pod_logs.ts +99 -0
  266. package/src/test-wallet/test_wallet.ts +227 -107
  267. package/src/test-wallet/utils.ts +104 -11
  268. package/src/test-wallet/wallet_worker_script.ts +11 -5
  269. package/src/test-wallet/worker_wallet.ts +19 -16
  270. package/src/test-wallet/worker_wallet_schema.ts +4 -3
  271. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +0 -55
  272. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +0 -1
  273. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +0 -47
  274. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +0 -1
  275. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +0 -129
  276. package/dest/e2e_deploy_contract/deploy_test.d.ts +0 -37
  277. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +0 -1
  278. package/dest/e2e_deploy_contract/deploy_test.js +0 -50
  279. package/dest/e2e_epochs/epochs_test.d.ts +0 -102
  280. package/dest/e2e_epochs/epochs_test.d.ts.map +0 -1
  281. package/dest/e2e_epochs/epochs_test.js +0 -386
  282. package/dest/e2e_fees/bridging_race.notest.d.ts.map +0 -1
  283. package/dest/e2e_fees/fees_test.d.ts +0 -88
  284. package/dest/e2e_fees/fees_test.d.ts.map +0 -1
  285. package/dest/e2e_fees/fees_test.js +0 -248
  286. package/dest/e2e_l1_publisher/write_json.d.ts +0 -11
  287. package/dest/e2e_l1_publisher/write_json.d.ts.map +0 -1
  288. package/dest/e2e_l1_publisher/write_json.js +0 -56
  289. package/dest/e2e_multi_validator/utils.d.ts +0 -12
  290. package/dest/e2e_multi_validator/utils.d.ts.map +0 -1
  291. package/dest/e2e_nested_contract/nested_contract_test.d.ts +0 -26
  292. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +0 -1
  293. package/dest/e2e_nested_contract/nested_contract_test.js +0 -54
  294. package/dest/e2e_p2p/inactivity_slash_test.d.ts +0 -31
  295. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +0 -1
  296. package/dest/e2e_p2p/inactivity_slash_test.js +0 -136
  297. package/dest/e2e_p2p/p2p_network.d.ts.map +0 -1
  298. package/dest/e2e_p2p/reqresp/utils.d.ts +0 -22
  299. package/dest/e2e_p2p/reqresp/utils.d.ts.map +0 -1
  300. package/dest/e2e_p2p/shared.d.ts +0 -60
  301. package/dest/e2e_p2p/shared.d.ts.map +0 -1
  302. package/dest/e2e_p2p/shared.js +0 -204
  303. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +0 -2
  304. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +0 -1
  305. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +0 -1
  306. package/dest/e2e_token_contract/token_contract_test.d.ts +0 -44
  307. package/dest/e2e_token_contract/token_contract_test.d.ts.map +0 -1
  308. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +0 -193
  309. package/src/e2e_deploy_contract/deploy_test.ts +0 -85
  310. package/src/e2e_epochs/epochs_test.ts +0 -487
  311. package/src/e2e_fees/fees_test.ts +0 -328
  312. package/src/e2e_l1_publisher/write_json.ts +0 -77
  313. package/src/e2e_nested_contract/nested_contract_test.ts +0 -75
  314. package/src/e2e_p2p/inactivity_slash_test.ts +0 -179
  315. package/src/e2e_p2p/shared.ts +0 -333
  316. /package/dest/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fetcher.js +0 -0
  317. /package/dest/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fixture.js +0 -0
  318. /package/dest/{e2e_multi_validator/utils.js → composed/web3signer/multi_validator_keystore_utils.js} +0 -0
  319. /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof.json +0 -0
  320. /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fetcher.ts +0 -0
  321. /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fixture.ts +0 -0
  322. /package/src/{e2e_multi_validator/utils.ts → composed/web3signer/multi_validator_keystore_utils.ts} +0 -0
@@ -57,6 +57,20 @@ type ClientFlowBenchmark = {
57
57
  };
58
58
  export declare function generateBenchmark(flow: string, logs: Log[], stats: ProvingStats | SimulationStats, privateExecutionSteps: PrivateExecutionStep[], proverType: ProverType, error: string | undefined): ClientFlowBenchmark;
59
59
  export declare function convertProfileToGHBenchmark(benchmark: ClientFlowBenchmark): GithubActionBenchmarkResult[];
60
+ /**
61
+ * Computes the expected number of `PrivateExecutionStep` entries the orchestrator will produce
62
+ * for a tx with `apps` private function calls.
63
+ *
64
+ * Step layout: `apps` app circuits + kernel iterations + 1 final reset + 1 tail + 1 hiding kernel.
65
+ * Each kernel iteration absorbs up to `MAX_APPS_PER_KERNEL` apps via the `init_K` / `inner_K`
66
+ * variants, so the kernel count is `ceil(apps / MAX_APPS_PER_KERNEL)`.
67
+ *
68
+ * Caveat: this assumes no mid-flow reset is triggered, which would split a batch into two kernels
69
+ * separated by a reset. For the flows currently exercised in this benchmark suite that holds, but
70
+ * a future flow that grows large enough to overflow per-tx limits before consuming all apps will
71
+ * not match this formula.
72
+ */
73
+ export declare function expectedExecutionSteps(apps: number): number;
60
74
  export declare function captureProfile(label: string, interaction: ContractFunctionInteraction | DeployMethod, opts: Omit<ProfileInteractionOptions & DeployOptions, 'profileMode'>, expectedSteps?: number): Promise<import("@aztec/stdlib/tx").TxProfileResult>;
61
75
  export {};
62
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmVuY2htYXJrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmVuY2gvY2xpZW50X2Zsb3dzL2JlbmNobWFyay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsMkJBQTJCLEVBQzNCLFlBQVksRUFDWixLQUFLLGFBQWEsRUFDbEIsS0FBSyx5QkFBeUIsRUFDL0IsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxPQUFPLEVBQUUsS0FBSyxvQkFBb0IsRUFBa0MsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRyxPQUFPLEtBQUssRUFDVixZQUFZLEVBQ1osY0FBYyxFQUNkLGNBQWMsRUFDZCxlQUFlLEVBQ2YsaUJBQWlCLEVBQ2xCLE1BQU0sa0JBQWtCLENBQUM7QUFNMUIsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFJL0QsUUFBQSxNQUFNLFFBQVEsb0ZBQXFGLENBQUM7QUFDcEcsS0FBSyxRQUFRLEdBQUcsQ0FBQyxPQUFPLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBRTFDLE1BQU0sTUFBTSxHQUFHLEdBQUc7SUFDaEIsSUFBSSxFQUFFLFFBQVEsQ0FBQztJQUNmLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE9BQU8sRUFBRSxNQUFNLENBQUM7SUFDaEIsSUFBSSxFQUFFLEdBQUcsQ0FBQztDQUNYLENBQUM7QUFFRixRQUFBLE1BQU0sVUFBVSwwS0FhTixDQUFDO0FBRVgsS0FBSyxRQUFRLEdBQUcsQ0FBQyxPQUFPLFVBQVUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBRTVDLEtBQUssZUFBZSxHQUFHO0tBQ3BCLENBQUMsSUFBSSxRQUFRLEdBQUcsTUFBTTtDQUN4QixDQUFDO0FBRUYscUJBQWEsV0FBVztJQUN0QixPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBYztJQUNyQyxPQUFPLENBQUMsSUFBSSxDQUFhO0lBRXpCLE9BQU8sZUFBaUI7SUFFeEIsTUFBTSxDQUFDLE1BQU0sU0FFWjtJQUVELE1BQU0sQ0FBQyxXQUFXLGdCQUVqQjtJQUVELFlBQVksQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FlbkM7SUFFRCxPQUFPLENBQUMsU0FBUztJQUlWLFNBQVMsU0FFZjtJQUVNLE9BQU8sVUFFYjtDQUNGO0FBRUQsTUFBTSxNQUFNLFVBQVUsR0FBRyxNQUFNLEdBQUcsUUFBUSxDQUFDO0FBRTNDLEtBQUssYUFBYSxHQUFHO0lBRW5CLEtBQUssRUFBRSxNQUFNLENBQUM7SUFFZCxHQUFHLEVBQUUsTUFBTSxDQUFDO0lBRVosR0FBRyxFQUFFLE1BQU0sQ0FBQztJQUVaLEdBQUcsRUFBRSxNQUFNLENBQUM7SUFFWixLQUFLLEVBQUUsTUFBTSxDQUFDO0NBQ2YsQ0FBQztBQUVGLEtBQUssSUFBSSxHQUFHLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxjQUFjLEdBQUcsV0FBVyxDQUFDLEdBQUc7SUFDckUsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN0QixPQUFPLEVBQUUsTUFBTSxDQUFDLE1BQU0sRUFBRSxhQUFhLENBQUMsQ0FBQztDQUN4QyxDQUFDO0FBRUYsS0FBSyxtQkFBbUIsR0FBRztJQUN6QixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsT0FBTyxFQUFFLElBQUksQ0FBQyxjQUFjLEdBQUcsaUJBQWlCLEVBQUUsYUFBYSxDQUFDLEdBQUc7UUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQztJQUN0RixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLEdBQUcsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBQ25DLFVBQVUsRUFBRSxjQUFjLENBQUM7SUFDM0IsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixZQUFZLEVBQUUsZUFBZSxDQUFDO0lBQzlCLGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDO0lBQ2QsS0FBSyxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7Q0FDM0IsQ0FBQztBQTBDRix3QkFBZ0IsaUJBQWlCLENBQy9CLElBQUksRUFBRSxNQUFNLEVBQ1osSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLEtBQUssRUFBRSxZQUFZLEdBQUcsZUFBZSxFQUNyQyxxQkFBcUIsRUFBRSxvQkFBb0IsRUFBRSxFQUM3QyxVQUFVLEVBQUUsVUFBVSxFQUN0QixLQUFLLEVBQUUsTUFBTSxHQUFHLFNBQVMsR0FDeEIsbUJBQW1CLENBMkVyQjtBQUVELHdCQUFnQiwyQkFBMkIsQ0FBQyxTQUFTLEVBQUUsbUJBQW1CLEdBQUcsMkJBQTJCLEVBQUUsQ0E2RHpHO0FBRUQsd0JBQXNCLGNBQWMsQ0FDbEMsS0FBSyxFQUFFLE1BQU0sRUFDYixXQUFXLEVBQUUsMkJBQTJCLEdBQUcsWUFBWSxFQUN2RCxJQUFJLEVBQUUsSUFBSSxDQUFDLHlCQUF5QixHQUFHLGFBQWEsRUFBRSxhQUFhLENBQUMsRUFDcEUsYUFBYSxDQUFDLEVBQUUsTUFBTSx1REFvQ3ZCIn0=
76
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmVuY2htYXJrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYmVuY2gvY2xpZW50X2Zsb3dzL2JlbmNobWFyay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsMkJBQTJCLEVBQzNCLFlBQVksRUFDWixLQUFLLGFBQWEsRUFDbEIsS0FBSyx5QkFBeUIsRUFDL0IsTUFBTSwyQkFBMkIsQ0FBQztBQUNuQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdsRCxPQUFPLEVBQUUsS0FBSyxvQkFBb0IsRUFBa0MsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRyxPQUFPLEtBQUssRUFDVixZQUFZLEVBQ1osY0FBYyxFQUNkLGNBQWMsRUFDZCxlQUFlLEVBQ2YsaUJBQWlCLEVBQ2xCLE1BQU0sa0JBQWtCLENBQUM7QUFNMUIsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFJL0QsUUFBQSxNQUFNLFFBQVEsb0ZBQXFGLENBQUM7QUFDcEcsS0FBSyxRQUFRLEdBQUcsQ0FBQyxPQUFPLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBRTFDLE1BQU0sTUFBTSxHQUFHLEdBQUc7SUFDaEIsSUFBSSxFQUFFLFFBQVEsQ0FBQztJQUNmLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE9BQU8sRUFBRSxNQUFNLENBQUM7SUFDaEIsSUFBSSxFQUFFLEdBQUcsQ0FBQztDQUNYLENBQUM7QUFFRixRQUFBLE1BQU0sVUFBVSwwS0FhTixDQUFDO0FBRVgsS0FBSyxRQUFRLEdBQUcsQ0FBQyxPQUFPLFVBQVUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBRTVDLEtBQUssZUFBZSxHQUFHO0tBQ3BCLENBQUMsSUFBSSxRQUFRLEdBQUcsTUFBTTtDQUN4QixDQUFDO0FBRUYscUJBQWEsV0FBVztJQUN0QixPQUFP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
@@ -1 +1 @@
1
- {"version":3,"file":"benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/benchmark.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/benchmark.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { MAX_APPS_PER_KERNEL } from '@aztec/constants';
1
2
  import { createLogger } from '@aztec/foundation/log';
2
3
  import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
3
4
  import assert from 'node:assert';
@@ -239,6 +240,24 @@ export function convertProfileToGHBenchmark(benchmark) {
239
240
  }
240
241
  return benches;
241
242
  }
243
+ /**
244
+ * Computes the expected number of `PrivateExecutionStep` entries the orchestrator will produce
245
+ * for a tx with `apps` private function calls.
246
+ *
247
+ * Step layout: `apps` app circuits + kernel iterations + 1 final reset + 1 tail + 1 hiding kernel.
248
+ * Each kernel iteration absorbs up to `MAX_APPS_PER_KERNEL` apps via the `init_K` / `inner_K`
249
+ * variants, so the kernel count is `ceil(apps / MAX_APPS_PER_KERNEL)`.
250
+ *
251
+ * Caveat: this assumes no mid-flow reset is triggered, which would split a batch into two kernels
252
+ * separated by a reset. For the flows currently exercised in this benchmark suite that holds, but
253
+ * a future flow that grows large enough to overflow per-tx limits before consuming all apps will
254
+ * not match this formula.
255
+ */ export function expectedExecutionSteps(apps) {
256
+ const kernels = Math.ceil(apps / MAX_APPS_PER_KERNEL);
257
+ // The final reset and tail are proved as a single circuit (reset_tail or reset_tail_to_public),
258
+ // so they share one execution step.
259
+ return apps + kernels + 1 /* reset+tail */ + 1 /* hiding */ ;
260
+ }
242
261
  export async function captureProfile(label, interaction, opts, expectedSteps) {
243
262
  // Make sure the proxy logger starts from a clean slate
244
263
  ProxyLogger.getInstance().flushLogs();
@@ -12,7 +12,7 @@ import { AMMContract } from '@aztec/noir-contracts.js/AMM';
12
12
  import { FPCContract } from '@aztec/noir-contracts.js/FPC';
13
13
  import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
14
14
  import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
15
- import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contracts.js/Token';
15
+ import { TestTokenContract as BananaCoin, TestTokenContract } from '@aztec/noir-test-contracts.js/TestToken';
16
16
  import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
17
17
  import { type EndToEndContext, type SetupOptions } from '../../fixtures/setup.js';
18
18
  import { CrossChainTestHarness } from '../../shared/cross_chain_test_harness.js';
@@ -38,11 +38,11 @@ export declare class ClientFlowsBenchmark {
38
38
  bananaCoinInstance: ContractInstanceWithAddress;
39
39
  bananaFPC: FPCContract;
40
40
  bananaFPCInstance: ContractInstanceWithAddress;
41
- candyBarCoin: TokenContract;
41
+ candyBarCoin: TestTokenContract;
42
42
  candyBarCoinInstance: ContractInstanceWithAddress;
43
43
  amm: AMMContract;
44
44
  ammInstance: ContractInstanceWithAddress;
45
- liquidityToken: TokenContract;
45
+ liquidityToken: TestTokenContract;
46
46
  liquidityTokenInstance: ContractInstanceWithAddress;
47
47
  sponsoredFPC: SponsoredFPCContract;
48
48
  sponsoredFPCInstance: ContractInstanceWithAddress;
@@ -50,7 +50,7 @@ export declare class ClientFlowsBenchmark {
50
50
  realProofs: boolean;
51
51
  paymentMethods: Record<BenchmarkingFeePaymentMethod, {
52
52
  forWallet: FeePaymentMethodGetter;
53
- circuits: number;
53
+ apps: number;
54
54
  }>;
55
55
  config: ClientFlowsConfig;
56
56
  private proxyLogger;
@@ -76,4 +76,4 @@ export declare class ClientFlowsBenchmark {
76
76
  getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress): Promise<PrivateFeePaymentMethod>;
77
77
  getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet, _sender: AztecAddress): Promise<SponsoredFeePaymentMethod>;
78
78
  }
79
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50X2Zsb3dzX2JlbmNobWFyay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2JlbmNoL2NsaWVudF9mbG93cy9jbGllbnRfZmxvd3NfYmVuY2htYXJrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSx1QkFBdUIsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hILE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHbEQsT0FBTyxLQUFLLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUU1RixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDckUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGFBQWEsSUFBSSxVQUFVLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJNUYsT0FBTyxLQUFL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
79
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50X2Zsb3dzX2JlbmNobWFyay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2JlbmNoL2NsaWVudF9mbG93cy9jbGllbnRfZmxvd3NfYmVuY2htYXJrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSx1QkFBdUIsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hILE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSxxQkFBcUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsVUFBVSxFQUFpQyxNQUFNLHNCQUFzQixDQUFDO0FBR2pGLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFFNUYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBSXBELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdFLE9BQU8sRUFBRSxpQkFBaUIsSUFBSSxVQUFVLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUk3RyxPQUFP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
@@ -1 +1 @@
1
- {"version":3,"file":"client_flows_benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/client_flows_benchmark.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client_flows_benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/client_flows_benchmark.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,15 @@
1
- import { AztecAddress } from '@aztec/aztec.js/addresses';
1
+ import { NO_FROM } from '@aztec/aztec.js/account';
2
2
  import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
3
3
  import { PrivateFeePaymentMethod, SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee';
4
4
  import { createLogger } from '@aztec/aztec.js/log';
5
+ import { getTokenAllowedSetupFunctions } from '@aztec/aztec/testing';
5
6
  import { createExtendedL1Client } from '@aztec/ethereum/client';
6
7
  import { RollupContract } from '@aztec/ethereum/contracts';
7
8
  import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
8
9
  import { ChainMonitor } from '@aztec/ethereum/test';
9
10
  import { randomBytes } from '@aztec/foundation/crypto/random';
10
11
  import { Fr } from '@aztec/foundation/curves/bn254';
12
+ import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
11
13
  import { EthAddress } from '@aztec/foundation/eth-address';
12
14
  import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
13
15
  import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode';
@@ -15,14 +17,14 @@ import { AMMContract } from '@aztec/noir-contracts.js/AMM';
15
17
  import { FPCContract } from '@aztec/noir-contracts.js/FPC';
16
18
  import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
17
19
  import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
18
- import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contracts.js/Token';
20
+ import { TestTokenContract as BananaCoin, TestTokenContract } from '@aztec/noir-test-contracts.js/TestToken';
19
21
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
20
22
  import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
21
23
  import { getPXEConfig } from '@aztec/pxe/server';
22
- import { GasSettings } from '@aztec/stdlib/gas';
23
- import { deriveSigningKey } from '@aztec/stdlib/keys';
24
- import { MNEMONIC } from '../../fixtures/fixtures.js';
25
- import { deployAccounts, setup, teardown } from '../../fixtures/setup.js';
24
+ import { Gas, GasSettings } from '@aztec/stdlib/gas';
25
+ import { AppTaggingSecretKind } from '@aztec/stdlib/logs';
26
+ import { AUTOMINE_E2E_OPTS, L1_DIRECT_WRITE_ACCOUNT_INDEX, MNEMONIC, getPaddedMaxFeesPerGas } from '../../fixtures/fixtures.js';
27
+ import { setup, teardown } from '../../fixtures/setup.js';
26
28
  import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
27
29
  import { setupSponsoredFPC } from '../../fixtures/utils.js';
28
30
  import { CrossChainTestHarness } from '../../shared/cross_chain_test_harness.js';
@@ -69,29 +71,32 @@ export class ClientFlowsBenchmark {
69
71
  'true',
70
72
  '1'
71
73
  ].includes(process.env.REAL_PROOFS ?? '');
74
+ // `apps` is the number of private function calls contributed by this payment method.
75
+ // Each app produces one execution step at proving time; the orchestrator additionally produces
76
+ // one kernel step per batch of N apps (see `expectedExecutionSteps` in `benchmark.ts`).
72
77
  paymentMethods = {
73
78
  // eslint-disable-next-line camelcase
74
79
  bridged_fee_juice: {
75
80
  forWallet: this.getBridgedFeeJuicePaymentMethodForWallet.bind(this),
76
- circuits: 2
81
+ apps: 1
77
82
  },
78
83
  // eslint-disable-next-line camelcase
79
84
  private_fpc: {
80
85
  forWallet: this.getPrivateFPCPaymentMethodForWallet.bind(this),
81
- circuits: 2 + // FPC entrypoint + kernel inner
82
- 2 + // BananaCoin transfer_to_public + kernel inner
83
- 2 + // Account verify_private_authwit + kernel inner
84
- 2
86
+ apps: 1 + // FPC entrypoint
87
+ 1 + // BananaCoin transfer_to_public
88
+ 1 + // Account verify_private_authwit
89
+ 1
85
90
  },
86
91
  // eslint-disable-next-line camelcase
87
92
  sponsored_fpc: {
88
93
  forWallet: this.getSponsoredFPCPaymentMethodForWallet.bind(this),
89
- circuits: 2
94
+ apps: 1
90
95
  },
91
96
  // eslint-disable-next-line camelcase
92
97
  fee_juice: {
93
98
  forWallet: ()=>Promise.resolve(undefined),
94
- circuits: 0
99
+ apps: 0
95
100
  }
96
101
  };
97
102
  config;
@@ -100,6 +105,7 @@ export class ClientFlowsBenchmark {
100
105
  constructor(testName, setupOptions = {}){
101
106
  this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
102
107
  this.setupOptions = {
108
+ ...AUTOMINE_E2E_OPTS,
103
109
  startProverNode: true,
104
110
  ...setupOptions
105
111
  };
@@ -109,11 +115,17 @@ export class ClientFlowsBenchmark {
109
115
  }
110
116
  async setup() {
111
117
  this.logger.info('Setting up subsystems from fresh');
112
- this.context = await setup(0, {
118
+ // Token allowlist entries are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
119
+ // BananaCoin is the codegen'd TestToken here, so the allowlist must key on its class, not canonical Token's.
120
+ const tokenAllowList = await getTokenAllowedSetupFunctions(BananaCoin.artifact);
121
+ this.context = await setup(2, {
113
122
  ...this.setupOptions,
114
123
  fundSponsoredFPC: true,
115
- skipAccountDeployment: true,
116
- l1ContractsArgs: this.setupOptions
124
+ l1ContractsArgs: this.setupOptions,
125
+ txPublicSetupAllowListExtend: [
126
+ ...this.setupOptions.txPublicSetupAllowListExtend ?? [],
127
+ ...tokenAllowList
128
+ ]
117
129
  });
118
130
  await this.applyBaseSetup();
119
131
  await this.context.aztecNodeService.setConfig({
@@ -151,7 +163,7 @@ export class ClientFlowsBenchmark {
151
163
  const salt = Fr.random();
152
164
  let benchysPrivateSigningKey;
153
165
  if (type === 'schnorr') {
154
- benchysPrivateSigningKey = deriveSigningKey(benchysSecret);
166
+ benchysPrivateSigningKey = GrumpkinScalar.random();
155
167
  return wallet.createSchnorrAccount(benchysSecret, salt, benchysPrivateSigningKey);
156
168
  } else if (type === 'ecdsar1') {
157
169
  benchysPrivateSigningKey = randomBytes(32);
@@ -166,11 +178,7 @@ export class ClientFlowsBenchmark {
166
178
  }
167
179
  async applyInitialAccounts() {
168
180
  this.logger.info('Applying initial accounts setup');
169
- const { deployedAccounts } = await deployAccounts(2, this.logger)({
170
- wallet: this.context.wallet,
171
- initialFundedAccounts: this.context.initialFundedAccounts
172
- });
173
- const [{ address: adminAddress }, { address: sequencerAddress }] = deployedAccounts;
181
+ const [adminAddress, sequencerAddress] = this.context.accounts;
174
182
  this.adminWallet = this.context.wallet;
175
183
  this.aztecNode = this.context.aztecNodeService;
176
184
  this.cheatCodes = this.context.cheatCodes;
@@ -187,6 +195,18 @@ export class ClientFlowsBenchmark {
187
195
  this.userWallet = await TestWallet.create(this.aztecNode, userPXEConfigWithContracts, {
188
196
  loggers: {
189
197
  prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied')
198
+ },
199
+ // The benchmark measures steady-state app cost, not first-send discovery cost. Reproduce the pre-handshake-default
200
+ // behavior of unconstrained delivery: derive the tagging secret from the (sender, recipient) key pair via ECDH
201
+ // instead of taking the current default (a non-interactive handshake, which injects two extra private app
202
+ // executions and a nullifier per cold chain). Constrained delivery is unaffected: the Noir circuit rejects
203
+ // address-derived for constrained, so the hook falls through to a handshake there.
204
+ hooks: {
205
+ resolveTaggingSecretStrategy: ({ deliveryMode })=>Promise.resolve(deliveryMode === AppTaggingSecretKind.UNCONSTRAINED ? {
206
+ type: 'address-derived'
207
+ } : {
208
+ type: 'non-interactive-handshake'
209
+ })
190
210
  }
191
211
  });
192
212
  }
@@ -196,18 +216,17 @@ export class ClientFlowsBenchmark {
196
216
  this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
197
217
  aztecNode: this.context.aztecNodeService,
198
218
  aztecNodeAdmin: this.context.aztecNodeService,
199
- l1Client: this.context.deployL1ContractsValues.l1Client,
219
+ // Bridge from a dedicated L1 account so its direct writes don't race the sequencer publisher's
220
+ // txs on the deployer account (see L1_DIRECT_WRITE_ACCOUNT_INDEX).
221
+ l1Client: createExtendedL1Client(this.context.config.l1RpcUrls, MNEMONIC, undefined, undefined, L1_DIRECT_WRITE_ACCOUNT_INDEX),
200
222
  wallet: this.adminWallet,
201
223
  logger: this.logger
202
224
  });
203
225
  }
204
226
  async applyDeployBananaToken() {
205
227
  this.logger.info('Applying banana token deployment');
206
- const { receipt: { contract: bananaCoin, instance: bananaCoinInstance } } = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n).send({
207
- from: this.adminAddress,
208
- wait: {
209
- returnReceipt: true
210
- }
228
+ const { contract: bananaCoin, instance: bananaCoinInstance } = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n).send({
229
+ from: this.adminAddress
211
230
  });
212
231
  this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
213
232
  this.bananaCoin = bananaCoin;
@@ -215,11 +234,8 @@ export class ClientFlowsBenchmark {
215
234
  }
216
235
  async applyDeployCandyBarToken() {
217
236
  this.logger.info('Applying candy bar token deployment');
218
- const { receipt: { contract: candyBarCoin, instance: candyBarCoinInstance } } = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n).send({
219
- from: this.adminAddress,
220
- wait: {
221
- returnReceipt: true
222
- }
237
+ const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TestTokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n).send({
238
+ from: this.adminAddress
223
239
  });
224
240
  this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
225
241
  this.candyBarCoin = candyBarCoin;
@@ -230,11 +246,8 @@ export class ClientFlowsBenchmark {
230
246
  const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
231
247
  expect((await this.context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
232
248
  const bananaCoin = this.bananaCoin;
233
- const { receipt: { contract: bananaFPC, instance: bananaFPCInstance } } = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress).send({
234
- from: this.adminAddress,
235
- wait: {
236
- returnReceipt: true
237
- }
249
+ const { contract: bananaFPC, instance: bananaFPCInstance } = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress).send({
250
+ from: this.adminAddress
238
251
  });
239
252
  this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
240
253
  await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.adminAddress);
@@ -262,37 +275,30 @@ export class ClientFlowsBenchmark {
262
275
  }
263
276
  async createAndFundBenchmarkingAccountOnUserWallet(accountType) {
264
277
  const benchysAccountManager = await this.createBenchmarkingAccountManager(this.adminWallet, accountType);
265
- const benchysAccount = await benchysAccountManager.getAccount();
266
278
  const benchysAddress = benchysAccountManager.address;
267
279
  const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
268
280
  const behchysDeployMethod = await benchysAccountManager.getDeployMethod();
269
281
  await behchysDeployMethod.send({
270
- from: AztecAddress.ZERO,
282
+ from: NO_FROM,
271
283
  fee: {
272
284
  paymentMethod: new FeeJuicePaymentMethodWithClaim(benchysAddress, claim)
273
285
  }
274
286
  });
275
287
  // Register benchy on the user's Wallet, where we're going to be interacting from
276
288
  const accountManager = await this.userWallet.createAccount({
277
- secret: benchysAccount.getSecretKey(),
278
- salt: new Fr(benchysAccount.salt),
289
+ secret: benchysAccountManager.getSecretKey(),
290
+ salt: new Fr(benchysAccountManager.getInstance().salt),
279
291
  contract: benchysAccountManager.getAccountContract()
280
292
  });
281
293
  return accountManager.address;
282
294
  }
283
295
  async applyDeployAmm() {
284
296
  this.logger.info('Applying AMM deployment');
285
- const { receipt: { contract: liquidityToken, instance: liquidityTokenInstance } } = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n).send({
286
- from: this.adminAddress,
287
- wait: {
288
- returnReceipt: true
289
- }
297
+ const { contract: liquidityToken, instance: liquidityTokenInstance } = await TestTokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n).send({
298
+ from: this.adminAddress
290
299
  });
291
- const { receipt: { contract: amm, instance: ammInstance } } = await AMMContract.deploy(this.adminWallet, this.bananaCoin.address, this.candyBarCoin.address, liquidityToken.address).send({
292
- from: this.adminAddress,
293
- wait: {
294
- returnReceipt: true
295
- }
300
+ const { contract: amm, instance: ammInstance } = await AMMContract.deploy(this.adminWallet, this.bananaCoin.address, this.candyBarCoin.address, liquidityToken.address).send({
301
+ from: this.adminAddress
296
302
  });
297
303
  this.logger.info(`AMM deployed at ${amm.address}`);
298
304
  await liquidityToken.methods.set_minter(amm.address, true).send({
@@ -310,8 +316,10 @@ export class ClientFlowsBenchmark {
310
316
  async getPrivateFPCPaymentMethodForWallet(wallet, sender) {
311
317
  // The private fee paying method assembled on the app side requires knowledge of the maximum
312
318
  // fee the user is willing to pay
313
- const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1.5);
314
- const gasSettings = GasSettings.default({
319
+ const maxFeesPerGas = await getPaddedMaxFeesPerGas(this.aztecNode);
320
+ const gasLimits = Gas.from((await this.aztecNode.getNodeInfo()).txsLimits.gas);
321
+ const gasSettings = GasSettings.fallback({
322
+ gasLimits,
315
323
  maxFeesPerGas
316
324
  });
317
325
  return new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet, gasSettings);
@@ -5,7 +5,7 @@ import type { MetricDefinition } from '@aztec/telemetry-client';
5
5
  import type { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
6
6
  import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
7
7
  /**
8
- * Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
8
+ * Setup for benchmarks. Initializes a remote node with a funded hardcoded account and deploys a benchmark contract.
9
9
  */
10
10
  export declare function benchmarkSetup(opts: Partial<SetupOptions> & {
11
11
  /** What metrics to export */ metrics: (MetricDefinition | MetricFilter)[];
@@ -13,7 +13,7 @@ export declare function benchmarkSetup(opts: Partial<SetupOptions> & {
13
13
  benchOutput?: string;
14
14
  }): Promise<{
15
15
  telemetry: BenchmarkTelemetryClient;
16
- context: EndToEndContext;
16
+ context: EndToEndContext<unknown>;
17
17
  contract: BenchmarkingContract;
18
18
  sequencer: import("@aztec/sequencer-client").SequencerClient;
19
19
  }>;
@@ -42,4 +42,4 @@ export type GithubActionBenchmarkResult = {
42
42
  export declare function sendTxs(txCount: number, context: EndToEndContext, contract: BenchmarkingContract, heavyPublicCompute?: boolean): Promise<TxHash[]>;
43
43
  export declare function waitTxs(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts): Promise<void>;
44
44
  export {};
45
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iZW5jaC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQXNCLEtBQUssUUFBUSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHOUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNENBQTRDLENBQUM7QUFDbEYsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDL0MsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBNEMsd0JBQXdCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUt4SCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsS0FBSyxZQUFZLEVBQVMsTUFBTSxzQkFBc0IsQ0FBQztBQUV0Rjs7R0FFRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLElBQUksRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDLEdBQUc7SUFDNUIsNkJBQTZCLENBQUMsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLEdBQUcsWUFBWSxDQUFDLEVBQUUsQ0FBQztJQUMzRSxrRkFBa0Y7SUFDbEYsV0FBVyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RCOzs7OztHQXlCRjtBQUVELEtBQUssWUFBWSxHQUFHO0lBQ2xCLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQztJQUN6QixTQUFTLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxLQUFLLE1BQU0sQ0FBQztJQUNyQyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsSUFBSSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2YsQ0FBQztBQUdGLE1BQU0sTUFBTSwyQkFBMkIsR0FBRztJQUN4QyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsS0FBSyxFQUFFLE1BQU0sQ0FBQztJQUNkLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNmLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDaEIsQ0FBQztBQW9FRjs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixPQUFPLENBQzNCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsT0FBTyxFQUFFLGVBQWUsRUFDeEIsUUFBUSxFQUFFLG9CQUFvQixFQUM5QixrQkFBa0IsR0FBRSxPQUFlLEdBQ2xDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQVduQjtBQUVELHdCQUFzQixPQUFPLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sRUFBRSxlQUFlLEVBQUUsVUFBVSxDQUFDLEVBQUUsUUFBUSxpQkFJM0YifQ==
45
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iZW5jaC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQXNCLEtBQUssUUFBUSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJOUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNENBQTRDLENBQUM7QUFFbEYsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDL0MsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBNEMsd0JBQXdCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQU14SCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsS0FBSyxZQUFZLEVBQVMsTUFBTSxzQkFBc0IsQ0FBQztBQU90Rjs7R0FFRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLElBQUksRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDLEdBQUc7SUFDNUIsNkJBQTZCLENBQUMsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLEdBQUcsWUFBWSxDQUFDLEVBQUUsQ0FBQztJQUMzRSxrRkFBa0Y7SUFDbEYsV0FBVyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RCOzs7OztHQWlDRjtBQVVELEtBQUssWUFBWSxHQUFHO0lBQ2xCLE1BQU0sRUFBRSxnQkFBZ0IsQ0FBQztJQUN6QixTQUFTLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxLQUFLLE1BQU0sQ0FBQztJQUNyQyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsSUFBSSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2YsQ0FBQztBQUdGLE1BQU0sTUFBTSwyQkFBMkIsR0FBRztJQUN4QyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsS0FBSyxFQUFFLE1BQU0sQ0FBQztJQUNkLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNmLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDaEIsQ0FBQztBQW9FRjs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixPQUFPLENBQzNCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsT0FBTyxFQUFFLGVBQWUsRUFDeEIsUUFBUSxFQUFFLG9CQUFvQixFQUM5QixrQkFBa0IsR0FBRSxPQUFlLEdBQ2xDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQVduQjtBQUVELHdCQUFzQixPQUFPLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sRUFBRSxlQUFlLEVBQUUsVUFBVSxDQUFDLEVBQUUsUUFBUSxpQkFJM0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAG9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAKxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,gBAAgB,GAAG,YAAY,CAAC,EAAE,CAAC;IAC3E,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAyBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAoEF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAWnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAI9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAElF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAMxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAOtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,gBAAgB,GAAG,YAAY,CAAC,EAAE,CAAC;IAC3E,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAiCF;AAUD,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAoEF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAWnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F"}
@@ -1,26 +1,41 @@
1
1
  import { AztecAddress } from '@aztec/aztec.js/addresses';
2
2
  import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
3
3
  import { waitForTx } from '@aztec/aztec.js/node';
4
+ import { SlotNumber } from '@aztec/foundation/branded-types';
4
5
  import { mean, stdDev, times } from '@aztec/foundation/collection';
5
6
  import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
7
+ import { SequencerState } from '@aztec/sequencer-client';
6
8
  import { mkdirSync, writeFileSync } from 'fs';
7
9
  import path from 'path';
10
+ import { PIPELINING_SETUP_OPTS } from '../fixtures/fixtures.js';
8
11
  import { setup } from '../fixtures/utils.js';
12
+ const MAX_BENCH_WAIT_BLOCKS = 6;
13
+ const BENCH_FINAL_WAIT_TIMEOUT_SECONDS = 10;
14
+ const SEQUENCER_IDLE_TIMEOUT_MS = 60_000;
15
+ const DEFAULT_L1_PUBLISHING_TIME_SECONDS = 12;
9
16
  /**
10
- * Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
17
+ * Setup for benchmarks. Initializes a remote node with a funded hardcoded account and deploys a benchmark contract.
11
18
  */ export async function benchmarkSetup(opts) {
12
19
  const context = await setup(1, {
20
+ ...PIPELINING_SETUP_OPTS,
13
21
  ...opts,
14
22
  telemetryConfig: {
15
23
  benchmark: true
16
24
  }
17
25
  });
18
- const defaultAccountAddress = context.accounts[0];
19
- const { contract } = await BenchmarkingContract.deploy(context.wallet).send({
20
- from: defaultAccountAddress
26
+ const [defaultAccountAddress] = context.accounts;
27
+ const sequencer = getSequencerClient(context);
28
+ await waitForSequencerIdle(sequencer.getSequencer());
29
+ const deployment = BenchmarkingContract.deploy(context.wallet);
30
+ const { txHash } = await deployment.send({
31
+ from: defaultAccountAddress,
32
+ wait: NO_WAIT
21
33
  });
34
+ await waitTxs([
35
+ txHash
36
+ ], context);
37
+ const contract = await deployment.register();
22
38
  context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
23
- const sequencer = context.aztecNode.getSequencer();
24
39
  const telemetry = context.telemetryClient;
25
40
  context.logger.warn(`Cleared benchmark data points from setup`);
26
41
  telemetry.clear();
@@ -47,6 +62,13 @@ import { setup } from '../fixtures/utils.js';
47
62
  sequencer
48
63
  };
49
64
  }
65
+ function getSequencerClient(context) {
66
+ const sequencer = context.aztecNode.getSequencer();
67
+ if (!sequencer) {
68
+ throw new Error('Benchmark setup requires a local sequencer');
69
+ }
70
+ return sequencer;
71
+ }
50
72
  function isMetricDefinition(f) {
51
73
  return 'description' in f;
52
74
  }
@@ -135,9 +157,78 @@ function getMetricValues(points) {
135
157
  }
136
158
  export async function waitTxs(txs, context, txWaitOpts) {
137
159
  context.logger.info(`Awaiting ${txs.length} txs to be mined`);
138
- await Promise.all(txs.map((txHash)=>waitForTx(context.aztecNode, txHash, txWaitOpts)));
160
+ await waitTxsWithBlockMining(txs, context, txWaitOpts);
139
161
  context.logger.info(`${txs.length} txs have been mined`);
140
162
  }
163
+ async function waitTxsWithBlockMining(txs, context, txWaitOpts) {
164
+ const sequencer = getSequencerClient(context).getSequencer();
165
+ for(let attempt = 0; attempt <= MAX_BENCH_WAIT_BLOCKS; attempt++){
166
+ if (await haveAllTxsMined(txs, context, txWaitOpts)) {
167
+ await waitForSequencerIdle(sequencer);
168
+ return;
169
+ }
170
+ await waitForSequencerIdle(sequencer);
171
+ context.logger.info('Mining next benchmark block while waiting for txs', {
172
+ attempt,
173
+ txs: txs.length
174
+ });
175
+ await mineNextBenchmarkBlock(context, sequencer);
176
+ }
177
+ await Promise.all(txs.map((txHash)=>waitForTx(context.aztecNode, txHash, {
178
+ ...txWaitOpts,
179
+ timeout: txWaitOpts?.timeout ?? BENCH_FINAL_WAIT_TIMEOUT_SECONDS
180
+ })));
181
+ }
182
+ async function haveAllTxsMined(txs, context, txWaitOpts) {
183
+ const receipts = await Promise.all(txs.map((txHash)=>context.aztecNode.getTxReceipt(txHash)));
184
+ for (const receipt of receipts){
185
+ if (receipt.isDropped()) {
186
+ throw new Error(`Transaction ${receipt.txHash.toString()} was dropped. Reason: ${receipt.error ?? 'unknown'}`);
187
+ }
188
+ if (!receipt.isMined()) {
189
+ return false;
190
+ }
191
+ if (!receipt.hasExecutionSucceeded() && !txWaitOpts?.dontThrowOnRevert) {
192
+ throw new Error(`Transaction ${receipt.txHash.toString()} reverted: ${receipt.executionResult}. Reason: ${receipt.error ?? 'unknown'}`);
193
+ }
194
+ }
195
+ return true;
196
+ }
197
+ async function mineNextBenchmarkBlock(context, sequencer) {
198
+ const l1PublishingTime = BigInt(context.config.l1PublishingTime ?? DEFAULT_L1_PUBLISHING_TIME_SECONDS);
199
+ const currentTimestamp = BigInt(await context.cheatCodes.eth.lastBlockTimestamp());
200
+ let targetSlot = SlotNumber(await context.cheatCodes.rollup.getSlot() + 1);
201
+ let targetTimestamp = await context.cheatCodes.rollup.getTimestampForSlot(targetSlot);
202
+ while(targetTimestamp - l1PublishingTime - 1n <= currentTimestamp){
203
+ targetSlot = SlotNumber(targetSlot + 1);
204
+ targetTimestamp = await context.cheatCodes.rollup.getTimestampForSlot(targetSlot);
205
+ }
206
+ const triggerTimestamp = targetTimestamp - l1PublishingTime - 1n;
207
+ await context.cheatCodes.eth.warp(triggerTimestamp, {
208
+ resetBlockInterval: true
209
+ });
210
+ await context.aztecNode.mineBlock();
211
+ await waitForSequencerIdle(sequencer);
212
+ }
213
+ function waitForSequencerIdle(sequencer, timeout = SEQUENCER_IDLE_TIMEOUT_MS) {
214
+ if (sequencer.status().state === SequencerState.IDLE) {
215
+ return Promise.resolve();
216
+ }
217
+ return new Promise((resolve, reject)=>{
218
+ const timer = setTimeout(()=>{
219
+ sequencer.off('state-changed', handler);
220
+ reject(new Error('Timeout waiting for sequencer IDLE state'));
221
+ }, timeout);
222
+ const handler = (args)=>{
223
+ if (args.newState === SequencerState.IDLE) {
224
+ clearTimeout(timer);
225
+ sequencer.off('state-changed', handler);
226
+ resolve();
227
+ }
228
+ };
229
+ sequencer.on('state-changed', handler);
230
+ });
231
+ }
141
232
  function randomBytesAsBigInts(length) {
142
233
  return [
143
234
  ...Array(length)