@aztec/end-to-end 0.0.0-test.0 → 0.0.1-commit.001888fc

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 (293) hide show
  1. package/dest/bench/client_flows/benchmark.d.ts +62 -0
  2. package/dest/bench/client_flows/benchmark.d.ts.map +1 -0
  3. package/dest/bench/client_flows/benchmark.js +281 -0
  4. package/dest/bench/client_flows/client_flows_benchmark.d.ts +79 -0
  5. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -0
  6. package/dest/bench/client_flows/client_flows_benchmark.js +329 -0
  7. package/dest/bench/client_flows/config.d.ts +14 -0
  8. package/dest/bench/client_flows/config.d.ts.map +1 -0
  9. package/dest/bench/client_flows/config.js +124 -0
  10. package/dest/bench/client_flows/data_extractor.d.ts +2 -0
  11. package/dest/bench/client_flows/data_extractor.d.ts.map +1 -0
  12. package/dest/bench/client_flows/data_extractor.js +79 -0
  13. package/dest/bench/utils.d.ts +16 -41
  14. package/dest/bench/utils.d.ts.map +1 -1
  15. package/dest/bench/utils.js +44 -72
  16. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +28 -19
  17. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  18. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +125 -103
  19. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +32 -32
  20. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  21. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +105 -104
  22. package/dest/e2e_deploy_contract/deploy_test.d.ts +19 -10
  23. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  24. package/dest/e2e_deploy_contract/deploy_test.js +26 -27
  25. package/dest/e2e_epochs/epochs_test.d.ts +75 -24
  26. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  27. package/dest/e2e_epochs/epochs_test.js +290 -58
  28. package/dest/e2e_fees/bridging_race.notest.d.ts +2 -0
  29. package/dest/e2e_fees/bridging_race.notest.d.ts.map +1 -0
  30. package/dest/e2e_fees/bridging_race.notest.js +61 -0
  31. package/dest/e2e_fees/fees_test.d.ts +38 -23
  32. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  33. package/dest/e2e_fees/fees_test.js +169 -183
  34. package/dest/e2e_l1_publisher/write_json.d.ts +11 -0
  35. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -0
  36. package/dest/e2e_l1_publisher/write_json.js +56 -0
  37. package/dest/e2e_multi_validator/utils.d.ts +12 -0
  38. package/dest/e2e_multi_validator/utils.d.ts.map +1 -0
  39. package/dest/e2e_multi_validator/utils.js +214 -0
  40. package/dest/e2e_nested_contract/nested_contract_test.d.ts +15 -15
  41. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  42. package/dest/e2e_nested_contract/nested_contract_test.js +36 -42
  43. package/dest/e2e_p2p/inactivity_slash_test.d.ts +31 -0
  44. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -0
  45. package/dest/e2e_p2p/inactivity_slash_test.js +136 -0
  46. package/dest/e2e_p2p/p2p_network.d.ts +282 -27
  47. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  48. package/dest/e2e_p2p/p2p_network.js +255 -176
  49. package/dest/e2e_p2p/reqresp/utils.d.ts +22 -0
  50. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -0
  51. package/dest/e2e_p2p/reqresp/utils.js +190 -0
  52. package/dest/e2e_p2p/shared.d.ts +64 -8
  53. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  54. package/dest/e2e_p2p/shared.js +200 -27
  55. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +2 -0
  56. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +1 -0
  57. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.js +184 -0
  58. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts +18 -0
  59. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +1 -0
  60. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.js +120 -0
  61. package/dest/e2e_token_contract/token_contract_test.d.ts +29 -14
  62. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  63. package/dest/e2e_token_contract/token_contract_test.js +107 -75
  64. package/dest/fixtures/authwit_proxy.d.ts +15 -0
  65. package/dest/fixtures/authwit_proxy.d.ts.map +1 -0
  66. package/dest/fixtures/authwit_proxy.js +30 -0
  67. package/dest/fixtures/e2e_prover_test.d.ts +55 -0
  68. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -0
  69. package/dest/fixtures/e2e_prover_test.js +271 -0
  70. package/dest/fixtures/elu_monitor.d.ts +21 -0
  71. package/dest/fixtures/elu_monitor.d.ts.map +1 -0
  72. package/dest/fixtures/elu_monitor.js +102 -0
  73. package/dest/fixtures/fixtures.d.ts +10 -8
  74. package/dest/fixtures/fixtures.d.ts.map +1 -1
  75. package/dest/fixtures/fixtures.js +11 -5
  76. package/dest/fixtures/get_acvm_config.d.ts +2 -2
  77. package/dest/fixtures/get_acvm_config.d.ts.map +1 -1
  78. package/dest/fixtures/get_acvm_config.js +3 -15
  79. package/dest/fixtures/get_bb_config.d.ts +2 -2
  80. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  81. package/dest/fixtures/get_bb_config.js +10 -17
  82. package/dest/fixtures/ha_setup.d.ts +71 -0
  83. package/dest/fixtures/ha_setup.d.ts.map +1 -0
  84. package/dest/fixtures/ha_setup.js +116 -0
  85. package/dest/fixtures/index.d.ts +2 -1
  86. package/dest/fixtures/index.d.ts.map +1 -1
  87. package/dest/fixtures/index.js +1 -0
  88. package/dest/fixtures/l1_to_l2_messaging.d.ts +11 -7
  89. package/dest/fixtures/l1_to_l2_messaging.d.ts.map +1 -1
  90. package/dest/fixtures/l1_to_l2_messaging.js +45 -19
  91. package/dest/fixtures/logging.d.ts +1 -1
  92. package/dest/fixtures/setup.d.ts +239 -0
  93. package/dest/fixtures/setup.d.ts.map +1 -0
  94. package/dest/fixtures/setup.js +606 -0
  95. package/dest/fixtures/setup_p2p_test.d.ts +23 -15
  96. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  97. package/dest/fixtures/setup_p2p_test.js +102 -31
  98. package/dest/fixtures/token_utils.d.ts +10 -4
  99. package/dest/fixtures/token_utils.d.ts.map +1 -1
  100. package/dest/fixtures/token_utils.js +33 -13
  101. package/dest/fixtures/utils.d.ts +5 -153
  102. package/dest/fixtures/utils.d.ts.map +1 -1
  103. package/dest/fixtures/utils.js +4 -552
  104. package/dest/fixtures/web3signer.d.ts +5 -0
  105. package/dest/fixtures/web3signer.d.ts.map +1 -0
  106. package/dest/fixtures/web3signer.js +53 -0
  107. package/dest/fixtures/with_telemetry_utils.d.ts +2 -2
  108. package/dest/fixtures/with_telemetry_utils.d.ts.map +1 -1
  109. package/dest/fixtures/with_telemetry_utils.js +2 -2
  110. package/dest/index.d.ts +1 -1
  111. package/dest/quality_of_service/grafana_client.d.ts +41 -0
  112. package/dest/quality_of_service/grafana_client.d.ts.map +1 -0
  113. package/dest/quality_of_service/{alert_checker.js → grafana_client.js} +1 -1
  114. package/dest/quality_of_service/prometheus_client.d.ts +38 -0
  115. package/dest/quality_of_service/prometheus_client.d.ts.map +1 -0
  116. package/dest/quality_of_service/prometheus_client.js +67 -0
  117. package/dest/shared/cross_chain_test_harness.d.ts +44 -27
  118. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  119. package/dest/shared/cross_chain_test_harness.js +107 -53
  120. package/dest/shared/gas_portal_test_harness.d.ts +33 -25
  121. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  122. package/dest/shared/gas_portal_test_harness.js +51 -30
  123. package/dest/shared/index.d.ts +3 -2
  124. package/dest/shared/index.d.ts.map +1 -1
  125. package/dest/shared/index.js +1 -0
  126. package/dest/shared/jest_setup.d.ts +1 -1
  127. package/dest/shared/jest_setup.js +42 -2
  128. package/dest/shared/mock_state_view.d.ts +86 -0
  129. package/dest/shared/mock_state_view.d.ts.map +1 -0
  130. package/dest/shared/mock_state_view.js +186 -0
  131. package/dest/shared/submit-transactions.d.ts +6 -4
  132. package/dest/shared/submit-transactions.d.ts.map +1 -1
  133. package/dest/shared/submit-transactions.js +15 -16
  134. package/dest/shared/uniswap_l1_l2.d.ts +3 -25
  135. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  136. package/dest/shared/uniswap_l1_l2.js +175 -126
  137. package/dest/simulators/index.d.ts +1 -1
  138. package/dest/simulators/lending_simulator.d.ts +7 -7
  139. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  140. package/dest/simulators/lending_simulator.js +17 -18
  141. package/dest/simulators/token_simulator.d.ts +6 -3
  142. package/dest/simulators/token_simulator.d.ts.map +1 -1
  143. package/dest/simulators/token_simulator.js +12 -30
  144. package/dest/spartan/setup_test_wallets.d.ts +36 -11
  145. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  146. package/dest/spartan/setup_test_wallets.js +276 -62
  147. package/dest/spartan/tx_metrics.d.ts +88 -0
  148. package/dest/spartan/tx_metrics.d.ts.map +1 -0
  149. package/dest/spartan/tx_metrics.js +422 -0
  150. package/dest/spartan/utils/bot.d.ts +28 -0
  151. package/dest/spartan/utils/bot.d.ts.map +1 -0
  152. package/dest/spartan/utils/bot.js +142 -0
  153. package/dest/spartan/utils/chaos.d.ts +79 -0
  154. package/dest/spartan/utils/chaos.d.ts.map +1 -0
  155. package/dest/spartan/utils/chaos.js +142 -0
  156. package/dest/spartan/utils/clients.d.ts +39 -0
  157. package/dest/spartan/utils/clients.d.ts.map +1 -0
  158. package/dest/spartan/utils/clients.js +90 -0
  159. package/dest/spartan/utils/config.d.ts +45 -0
  160. package/dest/spartan/utils/config.d.ts.map +1 -0
  161. package/dest/spartan/utils/config.js +23 -0
  162. package/dest/spartan/utils/health.d.ts +63 -0
  163. package/dest/spartan/utils/health.d.ts.map +1 -0
  164. package/dest/spartan/utils/health.js +202 -0
  165. package/dest/spartan/utils/helm.d.ts +15 -0
  166. package/dest/spartan/utils/helm.d.ts.map +1 -0
  167. package/dest/spartan/utils/helm.js +47 -0
  168. package/dest/spartan/utils/index.d.ts +11 -0
  169. package/dest/spartan/utils/index.d.ts.map +1 -0
  170. package/dest/spartan/utils/index.js +22 -0
  171. package/dest/spartan/utils/k8s.d.ts +128 -0
  172. package/dest/spartan/utils/k8s.d.ts.map +1 -0
  173. package/dest/spartan/utils/k8s.js +381 -0
  174. package/dest/spartan/utils/nodes.d.ts +40 -0
  175. package/dest/spartan/utils/nodes.d.ts.map +1 -0
  176. package/dest/spartan/utils/nodes.js +461 -0
  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/spartan/utils/scripts.d.ts +30 -0
  181. package/dest/spartan/utils/scripts.d.ts.map +1 -0
  182. package/dest/spartan/utils/scripts.js +81 -0
  183. package/dest/spartan/utils.d.ts +2 -415
  184. package/dest/spartan/utils.d.ts.map +1 -1
  185. package/dest/spartan/utils.js +1 -445
  186. package/dest/test-wallet/test_wallet.d.ts +83 -0
  187. package/dest/test-wallet/test_wallet.d.ts.map +1 -0
  188. package/dest/test-wallet/test_wallet.js +214 -0
  189. package/dest/test-wallet/utils.d.ts +41 -0
  190. package/dest/test-wallet/utils.d.ts.map +1 -0
  191. package/dest/test-wallet/utils.js +71 -0
  192. package/dest/test-wallet/wallet_worker_script.d.ts +2 -0
  193. package/dest/test-wallet/wallet_worker_script.d.ts.map +1 -0
  194. package/dest/test-wallet/wallet_worker_script.js +48 -0
  195. package/dest/test-wallet/worker_wallet.d.ts +52 -0
  196. package/dest/test-wallet/worker_wallet.d.ts.map +1 -0
  197. package/dest/test-wallet/worker_wallet.js +151 -0
  198. package/dest/test-wallet/worker_wallet_schema.d.ts +274 -0
  199. package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -0
  200. package/dest/test-wallet/worker_wallet_schema.js +10 -0
  201. package/package.json +72 -62
  202. package/src/bench/client_flows/benchmark.ts +363 -0
  203. package/src/bench/client_flows/client_flows_benchmark.ts +388 -0
  204. package/src/bench/client_flows/config.ts +69 -0
  205. package/src/bench/client_flows/data_extractor.ts +89 -0
  206. package/src/bench/utils.ts +47 -86
  207. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +149 -171
  208. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +155 -182
  209. package/src/e2e_deploy_contract/deploy_test.ts +40 -48
  210. package/src/e2e_epochs/epochs_test.ts +364 -93
  211. package/src/e2e_fees/bridging_race.notest.ts +74 -0
  212. package/src/e2e_fees/fees_test.ts +213 -259
  213. package/src/e2e_l1_publisher/write_json.ts +77 -0
  214. package/src/e2e_multi_validator/utils.ts +258 -0
  215. package/src/e2e_nested_contract/nested_contract_test.ts +48 -59
  216. package/src/e2e_p2p/inactivity_slash_test.ts +179 -0
  217. package/src/e2e_p2p/p2p_network.ts +367 -234
  218. package/src/e2e_p2p/reqresp/utils.ts +256 -0
  219. package/src/e2e_p2p/shared.ts +315 -39
  220. package/src/e2e_storage_proof/fixtures/storage_proof.json +915 -0
  221. package/src/e2e_storage_proof/fixtures/storage_proof_fetcher.ts +190 -0
  222. package/src/e2e_storage_proof/fixtures/storage_proof_fixture.ts +173 -0
  223. package/src/e2e_token_contract/token_contract_test.ts +132 -126
  224. package/src/fixtures/authwit_proxy.ts +50 -0
  225. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  226. package/src/fixtures/e2e_prover_test.ts +332 -0
  227. package/src/fixtures/elu_monitor.ts +126 -0
  228. package/src/fixtures/fixtures.ts +15 -7
  229. package/src/fixtures/get_acvm_config.ts +4 -12
  230. package/src/fixtures/get_bb_config.ts +18 -13
  231. package/src/fixtures/ha_setup.ts +186 -0
  232. package/src/fixtures/index.ts +1 -0
  233. package/src/fixtures/l1_to_l2_messaging.ts +56 -24
  234. package/src/fixtures/setup.ts +903 -0
  235. package/src/fixtures/setup_p2p_test.ts +134 -50
  236. package/src/fixtures/token_utils.ts +37 -16
  237. package/src/fixtures/utils.ts +27 -820
  238. package/src/fixtures/web3signer.ts +63 -0
  239. package/src/fixtures/with_telemetry_utils.ts +2 -2
  240. package/src/guides/up_quick_start.sh +9 -17
  241. package/src/quality_of_service/{alert_checker.ts → grafana_client.ts} +2 -2
  242. package/src/quality_of_service/prometheus_client.ts +113 -0
  243. package/src/shared/cross_chain_test_harness.ts +110 -94
  244. package/src/shared/gas_portal_test_harness.ts +59 -50
  245. package/src/shared/index.ts +2 -1
  246. package/src/shared/jest_setup.ts +52 -2
  247. package/src/shared/mock_state_view.ts +188 -0
  248. package/src/shared/submit-transactions.ts +19 -20
  249. package/src/shared/uniswap_l1_l2.ts +207 -226
  250. package/src/simulators/lending_simulator.ts +18 -17
  251. package/src/simulators/token_simulator.ts +18 -34
  252. package/src/spartan/DEVELOP.md +128 -0
  253. package/src/spartan/setup_test_wallets.ts +393 -95
  254. package/src/spartan/tx_metrics.ts +376 -0
  255. package/src/spartan/utils/bot.ts +188 -0
  256. package/src/spartan/utils/chaos.ts +253 -0
  257. package/src/spartan/utils/clients.ts +100 -0
  258. package/src/spartan/utils/config.ts +29 -0
  259. package/src/spartan/utils/health.ts +255 -0
  260. package/src/spartan/utils/helm.ts +84 -0
  261. package/src/spartan/utils/index.ts +71 -0
  262. package/src/spartan/utils/k8s.ts +535 -0
  263. package/src/spartan/utils/nodes.ts +543 -0
  264. package/src/spartan/utils/pod_logs.ts +99 -0
  265. package/src/spartan/utils/scripts.ts +99 -0
  266. package/src/spartan/utils.ts +1 -582
  267. package/src/test-wallet/test_wallet.ts +306 -0
  268. package/src/test-wallet/utils.ts +112 -0
  269. package/src/test-wallet/wallet_worker_script.ts +60 -0
  270. package/src/test-wallet/worker_wallet.ts +213 -0
  271. package/src/test-wallet/worker_wallet_schema.ts +13 -0
  272. package/dest/e2e_prover/e2e_prover_test.d.ts +0 -56
  273. package/dest/e2e_prover/e2e_prover_test.d.ts.map +0 -1
  274. package/dest/e2e_prover/e2e_prover_test.js +0 -291
  275. package/dest/fixtures/setup_l1_contracts.d.ts +0 -6
  276. package/dest/fixtures/setup_l1_contracts.d.ts.map +0 -1
  277. package/dest/fixtures/setup_l1_contracts.js +0 -17
  278. package/dest/fixtures/snapshot_manager.d.ts +0 -87
  279. package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
  280. package/dest/fixtures/snapshot_manager.js +0 -479
  281. package/dest/quality_of_service/alert_checker.d.ts +0 -41
  282. package/dest/quality_of_service/alert_checker.d.ts.map +0 -1
  283. package/dest/sample-dapp/connect.js +0 -12
  284. package/dest/sample-dapp/contracts.js +0 -10
  285. package/dest/sample-dapp/deploy.js +0 -35
  286. package/dest/sample-dapp/index.js +0 -98
  287. package/src/e2e_prover/e2e_prover_test.ts +0 -418
  288. package/src/fixtures/setup_l1_contracts.ts +0 -27
  289. package/src/fixtures/snapshot_manager.ts +0 -617
  290. package/src/sample-dapp/connect.mjs +0 -16
  291. package/src/sample-dapp/contracts.mjs +0 -14
  292. package/src/sample-dapp/deploy.mjs +0 -40
  293. package/src/sample-dapp/index.mjs +0 -128
@@ -1,16 +1,15 @@
1
1
  import type { AztecNodeService } from '@aztec/aztec-node';
2
- import { type AztecNode, BatchCall, INITIAL_L2_BLOCK_NUM, type SentTx, type WaitOpts } from '@aztec/aztec.js';
3
- import { mean, stdDev, timesParallel } from '@aztec/foundation/collection';
4
- import { randomInt } from '@aztec/foundation/crypto';
5
- import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking';
6
- import { type PXEService, type PXEServiceConfig, createPXEService } from '@aztec/pxe/server';
7
- import type { MetricsType } from '@aztec/telemetry-client';
2
+ import { AztecAddress } from '@aztec/aztec.js/addresses';
3
+ import { BatchCall, NO_WAIT, type WaitOpts } from '@aztec/aztec.js/contracts';
4
+ import { waitForTx } from '@aztec/aztec.js/node';
5
+ import { mean, stdDev, times } from '@aztec/foundation/collection';
6
+ import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
7
+ import type { TxHash } from '@aztec/stdlib/tx';
8
+ import type { MetricDefinition } from '@aztec/telemetry-client';
8
9
  import type { BenchmarkDataPoint, BenchmarkMetricsType, BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
9
10
 
10
- import { writeFileSync } from 'fs';
11
- import { mkdirpSync } from 'fs-extra';
12
- import { globSync } from 'glob';
13
- import { join } from 'path';
11
+ import { mkdirSync, writeFileSync } from 'fs';
12
+ import path from 'path';
14
13
 
15
14
  import { type EndToEndContext, type SetupOptions, setup } from '../fixtures/utils.js';
16
15
 
@@ -19,16 +18,17 @@ import { type EndToEndContext, type SetupOptions, setup } from '../fixtures/util
19
18
  */
20
19
  export async function benchmarkSetup(
21
20
  opts: Partial<SetupOptions> & {
22
- /** What metrics to export */ metrics: (MetricsType | MetricFilter)[];
21
+ /** What metrics to export */ metrics: (MetricDefinition | MetricFilter)[];
23
22
  /** Where to output the benchmark data (defaults to BENCH_OUTPUT or bench.json) */
24
23
  benchOutput?: string;
25
24
  },
26
25
  ) {
27
26
  const context = await setup(1, { ...opts, telemetryConfig: { benchmark: true } });
28
- const contract = await BenchmarkingContract.deploy(context.wallet).send().deployed();
27
+ const defaultAccountAddress = context.accounts[0];
28
+ const { contract } = await BenchmarkingContract.deploy(context.wallet).send({ from: defaultAccountAddress });
29
29
  context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
30
30
  const sequencer = (context.aztecNode as AztecNodeService).getSequencer()!;
31
- const telemetry = context.telemetryClient! as BenchmarkTelemetryClient;
31
+ const telemetry = context.telemetryClient as BenchmarkTelemetryClient;
32
32
  context.logger.warn(`Cleared benchmark data points from setup`);
33
33
  telemetry.clear();
34
34
  const origTeardown = context.teardown.bind(context);
@@ -36,7 +36,11 @@ export async function benchmarkSetup(
36
36
  await telemetry.flush();
37
37
  const data = telemetry.getMeters();
38
38
  const formatted = formatMetricsForGithubBenchmarkAction(data, opts.metrics);
39
+ if (formatted.length === 0) {
40
+ throw new Error(`No benchmark data generated. Please review your test setup.`);
41
+ }
39
42
  const benchOutput = opts.benchOutput ?? process.env.BENCH_OUTPUT ?? 'bench.json';
43
+ mkdirSync(path.dirname(benchOutput), { recursive: true });
40
44
  writeFileSync(benchOutput, JSON.stringify(formatted));
41
45
  context.logger.info(`Wrote ${data.length} metrics to ${benchOutput}`);
42
46
  await origTeardown();
@@ -45,14 +49,14 @@ export async function benchmarkSetup(
45
49
  }
46
50
 
47
51
  type MetricFilter = {
48
- source: MetricsType;
52
+ source: MetricDefinition;
49
53
  transform: (value: number) => number;
50
54
  name: string;
51
55
  unit?: string;
52
56
  };
53
57
 
54
58
  // See https://github.com/benchmark-action/github-action-benchmark/blob/e3c661617bc6aa55f26ae4457c737a55545a86a4/src/extract.ts#L659-L670
55
- type GithubActionBenchmarkResult = {
59
+ export type GithubActionBenchmarkResult = {
56
60
  name: string;
57
61
  value: number;
58
62
  range?: string;
@@ -60,17 +64,21 @@ type GithubActionBenchmarkResult = {
60
64
  extra?: string;
61
65
  };
62
66
 
67
+ function isMetricDefinition(f: MetricDefinition | MetricFilter): f is MetricDefinition {
68
+ return 'description' in f;
69
+ }
70
+
63
71
  function formatMetricsForGithubBenchmarkAction(
64
72
  data: BenchmarkMetricsType,
65
- filter: (MetricsType | MetricFilter)[],
73
+ filter: (MetricDefinition | MetricFilter)[],
66
74
  ): GithubActionBenchmarkResult[] {
67
75
  const allFilters: MetricFilter[] = filter.map(f =>
68
- typeof f === 'string' ? { name: f, source: f, transform: (x: number) => x, unit: undefined } : f,
76
+ isMetricDefinition(f) ? { name: f.name, source: f, transform: (x: number) => x, unit: f.unit } : f,
69
77
  );
70
78
  return data.flatMap(meter => {
71
79
  return meter.metrics
72
- .filter(metric => allFilters.map(f => f.source).includes(metric.name as MetricsType))
73
- .map(metric => [metric, allFilters.find(f => f.source === metric.name)!] as const)
80
+ .filter(metric => allFilters.map(f => f.source.name).includes(metric.name))
81
+ .map(metric => [metric, allFilters.find(f => f.source.name === metric.name)!] as const)
74
82
  .map(([metric, filter]) => ({
75
83
  name: `${meter.name}/${filter.name}`,
76
84
  unit: filter.unit ?? metric.unit ?? 'unknown',
@@ -91,30 +99,6 @@ function getMetricValues(points: BenchmarkDataPoint[]) {
91
99
  }
92
100
  }
93
101
 
94
- /**
95
- * Creates and returns a directory with the current job name and a random number.
96
- * @param index - Index to merge into the dir path.
97
- * @returns A path to a created dir.
98
- */
99
- export function makeDataDirectory(index: number) {
100
- const testName = expect.getState().currentTestName!.split(' ')[0].replaceAll('/', '_');
101
- const db = join('data', testName, index.toString(), `${randomInt(99)}`);
102
- mkdirpSync(db);
103
- return db;
104
- }
105
-
106
- /**
107
- * Returns the size in disk of a folder.
108
- * @param path - Path to the folder.
109
- * @returns Size in bytes.
110
- */
111
- export function getFolderSize(path: string): number {
112
- return globSync('**', { stat: true, cwd: path, nodir: true, withFileTypes: true }).reduce(
113
- (accum, file) => accum + (file as any as { /** Size */ size: number }).size,
114
- 0,
115
- );
116
- }
117
-
118
102
  /**
119
103
  * Returns a call to the benchmark contract. Each call has a private execution (account entrypoint),
120
104
  * a nested private call (create_note), a public call (increment_balance), and a nested public
@@ -126,22 +110,22 @@ export function getFolderSize(path: string): number {
126
110
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
127
111
  * @returns A BatchCall instance.
128
112
  */
129
- export async function makeCall(
113
+ async function makeCall(
130
114
  index: number,
131
115
  context: EndToEndContext,
132
116
  contract: BenchmarkingContract,
133
117
  heavyPublicCompute: boolean,
134
118
  ) {
135
- const owner = context.wallet.getAddress();
136
- const sender = owner;
137
119
  if (heavyPublicCompute) {
138
- return new BatchCall(context.wallet, [
139
- await contract.methods.sha256_hash_2048(randomBytesAsBigInts(2048)).request(),
140
- ]);
120
+ return new BatchCall(context.wallet, [contract.methods.sha256_hash_1024(randomBytesAsBigInts(1024))]);
141
121
  } else {
122
+ // We use random address for the new note owner because we can emit at most UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN
123
+ // logs for a given sender-recipient-contract tuple.
124
+ const ownerOfNewNote = await AztecAddress.random();
125
+ const [ownerOfBalance] = context.accounts;
142
126
  return new BatchCall(context.wallet, [
143
- await contract.methods.create_note(owner, sender, index + 1).request(),
144
- await contract.methods.increment_balance(owner, index + 1).request(),
127
+ contract.methods.create_note(ownerOfNewNote, index + 1),
128
+ contract.methods.increment_balance(ownerOfBalance, index + 1),
145
129
  ]);
146
130
  }
147
131
  }
@@ -160,46 +144,23 @@ export async function sendTxs(
160
144
  context: EndToEndContext,
161
145
  contract: BenchmarkingContract,
162
146
  heavyPublicCompute: boolean = false,
163
- ): Promise<SentTx[]> {
164
- const calls = await timesParallel(txCount, index => makeCall(index, context, contract, heavyPublicCompute));
147
+ ): Promise<TxHash[]> {
148
+ const calls = await Promise.all(times(txCount, index => makeCall(index, context, contract, heavyPublicCompute)));
165
149
  context.logger.info(`Creating ${txCount} txs`);
166
- const provenTxs = await Promise.all(calls.map(call => call.prove({ skipPublicSimulation: true })));
150
+ const [from] = context.accounts;
167
151
  context.logger.info(`Sending ${txCount} txs`);
168
- return provenTxs.map(tx => tx.send());
152
+ return Promise.all(
153
+ calls.map(async call => {
154
+ const { txHash } = await call.send({ from, wait: NO_WAIT });
155
+ return txHash;
156
+ }),
157
+ );
169
158
  }
170
159
 
171
- export async function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
160
+ export async function waitTxs(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
172
161
  context.logger.info(`Awaiting ${txs.length} txs to be mined`);
173
- await Promise.all(txs.map(tx => tx.wait(txWaitOpts)));
174
- context.logger.info(`All ${txs.length} txs have been mined`);
175
- }
176
-
177
- /**
178
- * Creates a new PXE
179
- * @param node - Node to connect the pxe to.
180
- * @param contract - Benchmark contract to add to the pxe.
181
- * @param startingBlock - First l2 block to process.
182
- * @returns The new PXE.
183
- */
184
- export async function createNewPXE(
185
- node: AztecNode,
186
- contract: BenchmarkingContract,
187
- startingBlock: number = INITIAL_L2_BLOCK_NUM,
188
- ): Promise<PXEService> {
189
- const l1Contracts = await node.getL1ContractAddresses();
190
- const { l1ChainId, protocolVersion } = await node.getNodeInfo();
191
- const pxeConfig = {
192
- l2StartingBlock: startingBlock,
193
- l2BlockPollingIntervalMS: 100,
194
- dataDirectory: undefined,
195
- dataStoreMapSizeKB: 1024 * 1024,
196
- l1Contracts,
197
- l1ChainId,
198
- version: protocolVersion,
199
- } as PXEServiceConfig;
200
- const pxe = await createPXEService(node, pxeConfig);
201
- await pxe.registerContract(contract);
202
- return pxe;
162
+ await Promise.all(txs.map(txHash => waitForTx(context.aztecNode, txHash, txWaitOpts)));
163
+ context.logger.info(`${txs.length} txs have been mined`);
203
164
  }
204
165
 
205
166
  function randomBytesAsBigInts(length: number): bigint[] {
@@ -1,30 +1,21 @@
1
- import { getSchnorrWallet } from '@aztec/accounts/schnorr';
2
- import {
3
- type AccountWallet,
4
- type CompleteAddress,
5
- Fr,
6
- type Logger,
7
- type TxHash,
8
- computeSecretHash,
9
- createLogger,
10
- } from '@aztec/aztec.js';
11
- import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
12
- import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
1
+ import { AztecAddress } from '@aztec/aztec.js/addresses';
2
+ import { computeSecretHash } from '@aztec/aztec.js/crypto';
3
+ import { Fr } from '@aztec/aztec.js/fields';
4
+ import { type Logger, createLogger } from '@aztec/aztec.js/log';
5
+ import type { AztecNode } from '@aztec/aztec.js/node';
6
+ import type { TxHash } from '@aztec/aztec.js/tx';
7
+ import type { CheatCodes } from '@aztec/aztec/testing';
13
8
  import type { TokenContract } from '@aztec/noir-contracts.js/Token';
14
9
  import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
10
+ import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
11
+ import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
12
+ import type { SequencerClient } from '@aztec/sequencer-client';
15
13
 
16
14
  import { jest } from '@jest/globals';
17
15
 
18
- import {
19
- type ISnapshotManager,
20
- type SubsystemsContext,
21
- createSnapshotManager,
22
- deployAccounts,
23
- publicDeployAccounts,
24
- } from '../fixtures/snapshot_manager.js';
16
+ import { type EndToEndContext, deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
25
17
  import { TokenSimulator } from '../simulators/token_simulator.js';
26
-
27
- const { E2E_DATA_PATH: dataPath } = process.env;
18
+ import type { TestWallet } from '../test-wallet/test_wallet.js';
28
19
 
29
20
  export class Role {
30
21
  private isAdmin = false;
@@ -54,200 +45,187 @@ export class Role {
54
45
  }
55
46
 
56
47
  export class BlacklistTokenContractTest {
57
- // A low delay is really poor ux, but we need to keep it low for the tests to run "quickly".
58
48
  // This value MUST match the same value that we have in the contract
59
- static DELAY = 2;
49
+ static CHANGE_ROLES_DELAY = 86400;
60
50
 
61
- private snapshotManager: ISnapshotManager;
51
+ context!: EndToEndContext;
62
52
  logger: Logger;
63
- wallets: AccountWallet[] = [];
64
- accounts: CompleteAddress[] = [];
53
+ wallet!: TestWallet;
65
54
  asset!: TokenBlacklistContract;
66
55
  tokenSim!: TokenSimulator;
67
- badAccount!: DocsExampleContract;
56
+ badAccount!: InvalidAccountContract;
57
+ authwitProxy!: GenericProxyContract;
58
+ cheatCodes!: CheatCodes;
59
+ sequencer!: SequencerClient;
60
+ aztecNode!: AztecNode;
68
61
 
69
- admin!: AccountWallet;
70
- other!: AccountWallet;
71
- blacklisted!: AccountWallet;
62
+ adminAddress!: AztecAddress;
63
+ otherAddress!: AztecAddress;
64
+ blacklistedAddress!: AztecAddress;
72
65
 
73
66
  constructor(testName: string) {
74
67
  this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
75
- this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
76
68
  }
77
69
 
78
- async mineBlocks(amount: number = BlacklistTokenContractTest.DELAY) {
79
- for (let i = 0; i < amount; ++i) {
80
- await this.asset.methods.get_roles(this.admin.getAddress()).send().wait();
81
- }
70
+ async crossTimestampOfChange() {
71
+ await this.cheatCodes.warpL2TimeAtLeastBy(
72
+ this.sequencer,
73
+ this.aztecNode,
74
+ BlacklistTokenContractTest.CHANGE_ROLES_DELAY,
75
+ );
82
76
  }
83
77
 
84
78
  /**
85
- * Adds two state shifts to snapshot manager.
79
+ * Applies base setup:
86
80
  * 1. Add 3 accounts.
87
81
  * 2. Publicly deploy accounts, deploy token contract and a "bad account".
88
82
  */
89
- async applyBaseSnapshots() {
83
+ async applyBaseSetup() {
90
84
  // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
91
85
  jest.setTimeout(120_000);
92
86
 
93
- await this.snapshotManager.snapshot(
94
- '3_accounts',
95
- deployAccounts(3, this.logger),
96
- async ({ deployedAccounts }, { pxe }) => {
97
- this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
98
- this.admin = this.wallets[0];
99
- this.other = this.wallets[1];
100
- this.blacklisted = this.wallets[2];
101
- this.accounts = this.wallets.map(w => w.getCompleteAddress());
102
- },
87
+ this.logger.info('Deploying 3 accounts');
88
+ const { deployedAccounts } = await deployAccounts(
89
+ 3,
90
+ this.logger,
91
+ )({
92
+ wallet: this.context.wallet,
93
+ initialFundedAccounts: this.context.initialFundedAccounts,
94
+ });
95
+
96
+ this.cheatCodes = this.context.cheatCodes;
97
+ this.aztecNode = this.context.aztecNodeService;
98
+ this.sequencer = this.context.sequencer!;
99
+ this.wallet = this.context.wallet;
100
+ this.adminAddress = deployedAccounts[0].address;
101
+ this.otherAddress = deployedAccounts[1].address;
102
+ this.blacklistedAddress = deployedAccounts[2].address;
103
+
104
+ this.logger.info('Setting up blacklist token contract');
105
+ // Create the token contract state.
106
+ this.logger.verbose(`Public deploy accounts...`);
107
+ await publicDeployAccounts(this.wallet, [this.adminAddress, this.otherAddress, this.blacklistedAddress]);
108
+
109
+ this.logger.verbose(`Deploying TokenContract...`);
110
+ ({ contract: this.asset } = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
111
+ from: this.adminAddress,
112
+ }));
113
+ this.logger.verbose(`Token deployed to ${this.asset.address}`);
114
+
115
+ this.logger.verbose(`Deploying bad account...`);
116
+ ({ contract: this.badAccount } = await InvalidAccountContract.deploy(this.wallet).send({
117
+ from: this.adminAddress,
118
+ }));
119
+ this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
120
+
121
+ // Deploy a proxy contract for "on behalf of other" tests. The note owner must be the tx sender
122
+ // (so their notes are in scope), but msg_sender in the target must differ from the note owner
123
+ // to trigger authwit validation. The proxy forwards calls so that msg_sender != tx sender.
124
+ this.logger.verbose(`Deploying generic proxy...`);
125
+ ({ contract: this.authwitProxy } = await GenericProxyContract.deploy(this.wallet).send({
126
+ from: this.adminAddress,
127
+ }));
128
+ this.logger.verbose(`Deployed to ${this.authwitProxy.address}.`);
129
+
130
+ await this.crossTimestampOfChange();
131
+
132
+ this.tokenSim = new TokenSimulator(
133
+ this.asset as unknown as TokenContract,
134
+ this.wallet,
135
+ this.adminAddress,
136
+ this.logger,
137
+ [this.adminAddress, this.otherAddress, this.blacklistedAddress],
103
138
  );
104
139
 
105
- await this.snapshotManager.snapshot(
106
- 'e2e_blacklist_token_contract',
107
- async () => {
108
- // Create the token contract state.
109
- // Move this account thing to addAccounts above?
110
- this.logger.verbose(`Public deploy accounts...`);
111
- await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 3));
112
-
113
- this.logger.verbose(`Deploying TokenContract...`);
114
- this.asset = await TokenBlacklistContract.deploy(this.admin, this.admin.getAddress()).send().deployed();
115
- this.logger.verbose(`Token deployed to ${this.asset.address}`);
116
-
117
- this.logger.verbose(`Deploying bad account...`);
118
- this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
119
- this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
120
-
121
- await this.mineBlocks();
122
-
123
- return { tokenContractAddress: this.asset.address, badAccountAddress: this.badAccount.address };
124
- },
125
- async ({ tokenContractAddress, badAccountAddress }) => {
126
- // Restore the token contract state.
127
- this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallets[0]);
128
- this.logger.verbose(`Token contract address: ${this.asset.address}`);
129
-
130
- this.tokenSim = new TokenSimulator(
131
- this.asset as unknown as TokenContract,
132
- this.wallets[0],
133
- this.logger,
134
- this.accounts.map(a => a.address),
135
- );
136
-
137
- this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
138
- this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
139
-
140
- expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(
141
- new Role().withAdmin().toNoirStruct(),
142
- );
143
- },
144
- );
140
+ expect(
141
+ (await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).result,
142
+ ).toEqual(new Role().withAdmin().toNoirStruct());
145
143
  }
146
144
 
147
145
  async setup() {
148
- await this.snapshotManager.setup();
146
+ this.logger.info('Setting up fresh context');
147
+ this.context = await setup(0, {
148
+ fundSponsoredFPC: true,
149
+ skipAccountDeployment: true,
150
+ });
151
+ await this.applyBaseSetup();
149
152
  }
150
153
 
151
- snapshot = <T>(
152
- name: string,
153
- apply: (context: SubsystemsContext) => Promise<T>,
154
- restore: (snapshotData: T, context: SubsystemsContext) => Promise<void> = () => Promise.resolve(),
155
- ): Promise<void> => this.snapshotManager.snapshot(name, apply, restore);
156
-
157
154
  async teardown() {
158
- await this.snapshotManager.teardown();
159
- }
160
-
161
- #toBoundedVec(arr: Fr[], maxLen: number) {
162
- return { len: arr.length, storage: arr.concat(new Array(maxLen - arr.length).fill(new Fr(0))) };
155
+ await teardown(this.context);
163
156
  }
164
157
 
165
158
  async addPendingShieldNoteToPXE(
166
159
  contract: TokenBlacklistContract,
167
- wallet: AccountWallet,
160
+ recipient: AztecAddress,
168
161
  amount: bigint,
169
162
  secretHash: Fr,
170
163
  txHash: TxHash,
171
164
  ) {
172
- const txEffects = await wallet.getTxEffect(txHash);
165
+ const txEffects = await this.aztecNode.getTxEffect(txHash);
173
166
  await contract.methods
174
- .deliver_transparent_note(
167
+ .process_transparent_note(
175
168
  contract.address,
176
169
  amount,
177
170
  secretHash,
178
171
  txHash.hash,
179
- this.#toBoundedVec(txEffects!.data.noteHashes, MAX_NOTE_HASHES_PER_TX),
172
+ txEffects!.data.noteHashes,
180
173
  txEffects!.data.nullifiers[0],
181
- wallet.getAddress(),
174
+ recipient,
182
175
  )
183
- .simulate();
176
+ .simulate({ from: recipient });
184
177
  }
185
178
 
186
- async applyMintSnapshot() {
187
- await this.snapshotManager.snapshot(
188
- 'mint',
189
- async () => {
190
- const { asset, accounts, wallets } = this;
191
- const amount = 10000n;
192
-
193
- const adminMinterRole = new Role().withAdmin().withMinter();
194
- await this.asset
195
- .withWallet(this.admin)
196
- .methods.update_roles(this.admin.getAddress(), adminMinterRole.toNoirStruct())
197
- .send()
198
- .wait();
199
-
200
- const blacklistRole = new Role().withBlacklisted();
201
- await this.asset
202
- .withWallet(this.admin)
203
- .methods.update_roles(this.blacklisted.getAddress(), blacklistRole.toNoirStruct())
204
- .send()
205
- .wait();
206
-
207
- await this.mineBlocks(); // This gets us past the block of change
208
-
209
- expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(
210
- adminMinterRole.toNoirStruct(),
211
- );
212
-
213
- this.logger.verbose(`Minting ${amount} publicly...`);
214
- await asset.methods.mint_public(accounts[0].address, amount).send().wait();
215
-
216
- this.logger.verbose(`Minting ${amount} privately...`);
217
- const secret = Fr.random();
218
- const secretHash = await computeSecretHash(secret);
219
- const receipt = await asset.methods.mint_private(amount, secretHash).send().wait();
220
-
221
- await this.addPendingShieldNoteToPXE(asset, wallets[0], amount, secretHash, receipt.txHash);
222
- const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
223
- await txClaim.wait({ debug: true });
224
- this.logger.verbose(`Minting complete.`);
225
-
226
- return { amount };
227
- },
228
- async ({ amount }) => {
229
- const {
230
- asset,
231
- accounts: [{ address }],
232
- tokenSim,
233
- } = this;
234
- tokenSim.mintPublic(address, amount);
235
-
236
- const publicBalance = await asset.methods.balance_of_public(address).simulate();
237
- this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
238
- expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
239
-
240
- tokenSim.mintPrivate(address, amount);
241
- const privateBalance = await asset.methods.balance_of_private(address).simulate();
242
- this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
243
- expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
244
-
245
- const totalSupply = await asset.methods.total_supply().simulate();
246
- this.logger.verbose(`Total supply: ${totalSupply}`);
247
- expect(totalSupply).toEqual(tokenSim.totalSupply);
248
-
249
- return Promise.resolve();
250
- },
251
- );
179
+ async applyMint() {
180
+ this.logger.info('Applying mint setup');
181
+ const { asset, tokenSim } = this;
182
+ const amount = 10000n;
183
+
184
+ const adminMinterRole = new Role().withAdmin().withMinter();
185
+ await this.asset.methods
186
+ .update_roles(this.adminAddress, adminMinterRole.toNoirStruct())
187
+ .send({ from: this.adminAddress });
188
+
189
+ const blacklistRole = new Role().withBlacklisted();
190
+ await this.asset.methods
191
+ .update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct())
192
+ .send({ from: this.adminAddress });
193
+
194
+ await this.crossTimestampOfChange();
195
+
196
+ expect(
197
+ (await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).result,
198
+ ).toEqual(adminMinterRole.toNoirStruct());
199
+
200
+ this.logger.verbose(`Minting ${amount} publicly...`);
201
+ await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress });
202
+
203
+ this.logger.verbose(`Minting ${amount} privately...`);
204
+ const secret = Fr.random();
205
+ const secretHash = await computeSecretHash(secret);
206
+ const { receipt } = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress });
207
+
208
+ await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
209
+ await asset.methods.redeem_shield(this.adminAddress, amount, secret).send({ from: this.adminAddress });
210
+ this.logger.verbose(`Minting complete.`);
211
+
212
+ tokenSim.mintPublic(this.adminAddress, amount);
213
+
214
+ const { result: publicBalance } = await asset.methods
215
+ .balance_of_public(this.adminAddress)
216
+ .simulate({ from: this.adminAddress });
217
+ this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
218
+ expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
219
+
220
+ tokenSim.mintPrivate(this.adminAddress, amount);
221
+ const { result: privateBalance } = await asset.methods
222
+ .balance_of_private(this.adminAddress)
223
+ .simulate({ from: this.adminAddress });
224
+ this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
225
+ expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
226
+
227
+ const { result: totalSupply } = await asset.methods.total_supply().simulate({ from: this.adminAddress });
228
+ this.logger.verbose(`Total supply: ${totalSupply}`);
229
+ expect(totalSupply).toEqual(tokenSim.totalSupply);
252
230
  }
253
231
  }