@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.023c3e5

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 (240) 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 +321 -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 +106 -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 +41 -72
  16. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +26 -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 +114 -102
  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 +104 -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 +71 -22
  26. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  27. package/dest/e2e_epochs/epochs_test.js +260 -54
  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 +162 -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 +37 -41
  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 +281 -27
  47. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  48. package/dest/e2e_p2p/p2p_network.js +237 -175
  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 +153 -0
  52. package/dest/e2e_p2p/shared.d.ts +44 -8
  53. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  54. package/dest/e2e_p2p/shared.js +165 -27
  55. package/dest/e2e_token_contract/token_contract_test.d.ts +27 -14
  56. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  57. package/dest/e2e_token_contract/token_contract_test.js +96 -74
  58. package/dest/fixtures/e2e_prover_test.d.ts +55 -0
  59. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -0
  60. package/dest/fixtures/e2e_prover_test.js +278 -0
  61. package/dest/fixtures/fixtures.d.ts +6 -8
  62. package/dest/fixtures/fixtures.d.ts.map +1 -1
  63. package/dest/fixtures/fixtures.js +5 -5
  64. package/dest/fixtures/get_acvm_config.d.ts +2 -2
  65. package/dest/fixtures/get_acvm_config.d.ts.map +1 -1
  66. package/dest/fixtures/get_acvm_config.js +3 -15
  67. package/dest/fixtures/get_bb_config.d.ts +2 -2
  68. package/dest/fixtures/get_bb_config.d.ts.map +1 -1
  69. package/dest/fixtures/get_bb_config.js +10 -17
  70. package/dest/fixtures/index.d.ts +1 -1
  71. package/dest/fixtures/l1_to_l2_messaging.d.ts +11 -7
  72. package/dest/fixtures/l1_to_l2_messaging.d.ts.map +1 -1
  73. package/dest/fixtures/l1_to_l2_messaging.js +45 -19
  74. package/dest/fixtures/logging.d.ts +1 -1
  75. package/dest/fixtures/setup.d.ts +218 -0
  76. package/dest/fixtures/setup.d.ts.map +1 -0
  77. package/dest/fixtures/setup.js +695 -0
  78. package/dest/fixtures/setup_p2p_test.d.ts +15 -15
  79. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  80. package/dest/fixtures/setup_p2p_test.js +96 -31
  81. package/dest/fixtures/token_utils.d.ts +10 -4
  82. package/dest/fixtures/token_utils.d.ts.map +1 -1
  83. package/dest/fixtures/token_utils.js +31 -12
  84. package/dest/fixtures/utils.d.ts +5 -153
  85. package/dest/fixtures/utils.d.ts.map +1 -1
  86. package/dest/fixtures/utils.js +4 -552
  87. package/dest/fixtures/web3signer.d.ts +5 -0
  88. package/dest/fixtures/web3signer.d.ts.map +1 -0
  89. package/dest/fixtures/web3signer.js +53 -0
  90. package/dest/fixtures/with_telemetry_utils.d.ts +2 -2
  91. package/dest/fixtures/with_telemetry_utils.d.ts.map +1 -1
  92. package/dest/fixtures/with_telemetry_utils.js +2 -2
  93. package/dest/index.d.ts +1 -1
  94. package/dest/quality_of_service/grafana_client.d.ts +41 -0
  95. package/dest/quality_of_service/grafana_client.d.ts.map +1 -0
  96. package/dest/quality_of_service/{alert_checker.js → grafana_client.js} +1 -1
  97. package/dest/quality_of_service/prometheus_client.d.ts +38 -0
  98. package/dest/quality_of_service/prometheus_client.d.ts.map +1 -0
  99. package/dest/quality_of_service/prometheus_client.js +67 -0
  100. package/dest/shared/cross_chain_test_harness.d.ts +44 -27
  101. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  102. package/dest/shared/cross_chain_test_harness.js +105 -51
  103. package/dest/shared/gas_portal_test_harness.d.ts +33 -25
  104. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  105. package/dest/shared/gas_portal_test_harness.js +51 -30
  106. package/dest/shared/index.d.ts +2 -2
  107. package/dest/shared/index.d.ts.map +1 -1
  108. package/dest/shared/jest_setup.d.ts +1 -1
  109. package/dest/shared/jest_setup.js +1 -1
  110. package/dest/shared/submit-transactions.d.ts +6 -4
  111. package/dest/shared/submit-transactions.d.ts.map +1 -1
  112. package/dest/shared/submit-transactions.js +15 -16
  113. package/dest/shared/uniswap_l1_l2.d.ts +3 -25
  114. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  115. package/dest/shared/uniswap_l1_l2.js +176 -126
  116. package/dest/simulators/index.d.ts +1 -1
  117. package/dest/simulators/lending_simulator.d.ts +7 -7
  118. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  119. package/dest/simulators/lending_simulator.js +17 -18
  120. package/dest/simulators/token_simulator.d.ts +6 -3
  121. package/dest/simulators/token_simulator.d.ts.map +1 -1
  122. package/dest/simulators/token_simulator.js +16 -13
  123. package/dest/spartan/setup_test_wallets.d.ts +27 -11
  124. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  125. package/dest/spartan/setup_test_wallets.js +233 -62
  126. package/dest/spartan/tx_metrics.d.ts +88 -0
  127. package/dest/spartan/tx_metrics.d.ts.map +1 -0
  128. package/dest/spartan/tx_metrics.js +422 -0
  129. package/dest/spartan/utils/bot.d.ts +27 -0
  130. package/dest/spartan/utils/bot.d.ts.map +1 -0
  131. package/dest/spartan/utils/bot.js +141 -0
  132. package/dest/spartan/utils/chaos.d.ts +79 -0
  133. package/dest/spartan/utils/chaos.d.ts.map +1 -0
  134. package/dest/spartan/utils/chaos.js +142 -0
  135. package/dest/spartan/utils/clients.d.ts +39 -0
  136. package/dest/spartan/utils/clients.d.ts.map +1 -0
  137. package/dest/spartan/utils/clients.js +90 -0
  138. package/dest/spartan/utils/config.d.ts +36 -0
  139. package/dest/spartan/utils/config.d.ts.map +1 -0
  140. package/dest/spartan/utils/config.js +20 -0
  141. package/dest/spartan/utils/health.d.ts +63 -0
  142. package/dest/spartan/utils/health.d.ts.map +1 -0
  143. package/dest/spartan/utils/health.js +202 -0
  144. package/dest/spartan/utils/helm.d.ts +15 -0
  145. package/dest/spartan/utils/helm.d.ts.map +1 -0
  146. package/dest/spartan/utils/helm.js +47 -0
  147. package/dest/spartan/utils/index.d.ts +9 -0
  148. package/dest/spartan/utils/index.d.ts.map +1 -0
  149. package/dest/spartan/utils/index.js +18 -0
  150. package/dest/spartan/utils/k8s.d.ts +126 -0
  151. package/dest/spartan/utils/k8s.d.ts.map +1 -0
  152. package/dest/spartan/utils/k8s.js +375 -0
  153. package/dest/spartan/utils/nodes.d.ts +41 -0
  154. package/dest/spartan/utils/nodes.d.ts.map +1 -0
  155. package/dest/spartan/utils/nodes.js +461 -0
  156. package/dest/spartan/utils/scripts.d.ts +16 -0
  157. package/dest/spartan/utils/scripts.d.ts.map +1 -0
  158. package/dest/spartan/utils/scripts.js +66 -0
  159. package/dest/spartan/utils.d.ts +2 -415
  160. package/dest/spartan/utils.d.ts.map +1 -1
  161. package/dest/spartan/utils.js +1 -445
  162. package/package.json +66 -58
  163. package/src/bench/client_flows/benchmark.ts +363 -0
  164. package/src/bench/client_flows/client_flows_benchmark.ts +384 -0
  165. package/src/bench/client_flows/config.ts +61 -0
  166. package/src/bench/client_flows/data_extractor.ts +89 -0
  167. package/src/bench/utils.ts +41 -85
  168. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +134 -169
  169. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +156 -182
  170. package/src/e2e_deploy_contract/deploy_test.ts +40 -48
  171. package/src/e2e_epochs/epochs_test.ts +341 -81
  172. package/src/e2e_fees/bridging_race.notest.ts +74 -0
  173. package/src/e2e_fees/fees_test.ts +220 -258
  174. package/src/e2e_l1_publisher/write_json.ts +77 -0
  175. package/src/e2e_multi_validator/utils.ts +258 -0
  176. package/src/e2e_nested_contract/nested_contract_test.ts +46 -59
  177. package/src/e2e_p2p/inactivity_slash_test.ts +179 -0
  178. package/src/e2e_p2p/p2p_network.ts +341 -234
  179. package/src/e2e_p2p/reqresp/utils.ts +207 -0
  180. package/src/e2e_p2p/shared.ts +260 -39
  181. package/src/e2e_token_contract/token_contract_test.ts +115 -126
  182. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  183. package/src/fixtures/e2e_prover_test.ts +336 -0
  184. package/src/fixtures/fixtures.ts +5 -7
  185. package/src/fixtures/get_acvm_config.ts +4 -12
  186. package/src/fixtures/get_bb_config.ts +18 -13
  187. package/src/fixtures/l1_to_l2_messaging.ts +56 -24
  188. package/src/fixtures/setup.ts +1017 -0
  189. package/src/fixtures/setup_p2p_test.ts +133 -50
  190. package/src/fixtures/token_utils.ts +33 -15
  191. package/src/fixtures/utils.ts +27 -820
  192. package/src/fixtures/web3signer.ts +63 -0
  193. package/src/fixtures/with_telemetry_utils.ts +2 -2
  194. package/src/guides/up_quick_start.sh +7 -15
  195. package/src/quality_of_service/{alert_checker.ts → grafana_client.ts} +2 -2
  196. package/src/quality_of_service/prometheus_client.ts +113 -0
  197. package/src/shared/cross_chain_test_harness.ts +103 -91
  198. package/src/shared/gas_portal_test_harness.ts +59 -50
  199. package/src/shared/index.ts +1 -1
  200. package/src/shared/jest_setup.ts +1 -1
  201. package/src/shared/submit-transactions.ts +18 -20
  202. package/src/shared/uniswap_l1_l2.ts +197 -221
  203. package/src/simulators/lending_simulator.ts +16 -17
  204. package/src/simulators/token_simulator.ts +21 -13
  205. package/src/spartan/DEVELOP.md +128 -0
  206. package/src/spartan/setup_test_wallets.ts +308 -95
  207. package/src/spartan/tx_metrics.ts +376 -0
  208. package/src/spartan/utils/bot.ts +185 -0
  209. package/src/spartan/utils/chaos.ts +253 -0
  210. package/src/spartan/utils/clients.ts +100 -0
  211. package/src/spartan/utils/config.ts +26 -0
  212. package/src/spartan/utils/health.ts +255 -0
  213. package/src/spartan/utils/helm.ts +84 -0
  214. package/src/spartan/utils/index.ts +64 -0
  215. package/src/spartan/utils/k8s.ts +527 -0
  216. package/src/spartan/utils/nodes.ts +538 -0
  217. package/src/spartan/utils/scripts.ts +63 -0
  218. package/src/spartan/utils.ts +1 -582
  219. package/dest/e2e_prover/e2e_prover_test.d.ts +0 -56
  220. package/dest/e2e_prover/e2e_prover_test.d.ts.map +0 -1
  221. package/dest/e2e_prover/e2e_prover_test.js +0 -291
  222. package/dest/fixtures/setup_l1_contracts.d.ts +0 -6
  223. package/dest/fixtures/setup_l1_contracts.d.ts.map +0 -1
  224. package/dest/fixtures/setup_l1_contracts.js +0 -17
  225. package/dest/fixtures/snapshot_manager.d.ts +0 -87
  226. package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
  227. package/dest/fixtures/snapshot_manager.js +0 -479
  228. package/dest/quality_of_service/alert_checker.d.ts +0 -41
  229. package/dest/quality_of_service/alert_checker.d.ts.map +0 -1
  230. package/dest/sample-dapp/connect.js +0 -12
  231. package/dest/sample-dapp/contracts.js +0 -10
  232. package/dest/sample-dapp/deploy.js +0 -35
  233. package/dest/sample-dapp/index.js +0 -98
  234. package/src/e2e_prover/e2e_prover_test.ts +0 -418
  235. package/src/fixtures/setup_l1_contracts.ts +0 -27
  236. package/src/fixtures/snapshot_manager.ts +0 -617
  237. package/src/sample-dapp/connect.mjs +0 -16
  238. package/src/sample-dapp/contracts.mjs +0 -14
  239. package/src/sample-dapp/deploy.mjs +0 -40
  240. 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,13 +18,14 @@ 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
31
  const telemetry = context.telemetryClient! as BenchmarkTelemetryClient;
@@ -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,18 @@ 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(calls.map(call => call.send({ from, wait: NO_WAIT })));
169
153
  }
170
154
 
171
- export async function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
155
+ export async function waitTxs(txs: TxHash[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
172
156
  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;
157
+ await Promise.all(txs.map(txHash => waitForTx(context.aztecNode, txHash, txWaitOpts)));
158
+ context.logger.info(`${txs.length} txs have been mined`);
203
159
  }
204
160
 
205
161
  function randomBytesAsBigInts(length: number): bigint[] {
@@ -1,31 +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 { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
11
+ import type { SequencerClient } from '@aztec/sequencer-client';
12
+ import type { TestWallet } from '@aztec/test-wallet/server';
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
18
 
27
- const { E2E_DATA_PATH: dataPath } = process.env;
28
-
29
19
  export class Role {
30
20
  private isAdmin = false;
31
21
  private isMinter = false;
@@ -54,200 +44,175 @@ export class Role {
54
44
  }
55
45
 
56
46
  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
47
  // This value MUST match the same value that we have in the contract
59
- static DELAY = 2;
48
+ static CHANGE_ROLES_DELAY = 86400;
60
49
 
61
- private snapshotManager: ISnapshotManager;
50
+ context!: EndToEndContext;
62
51
  logger: Logger;
63
- wallets: AccountWallet[] = [];
64
- accounts: CompleteAddress[] = [];
52
+ wallet!: TestWallet;
65
53
  asset!: TokenBlacklistContract;
66
54
  tokenSim!: TokenSimulator;
67
- badAccount!: DocsExampleContract;
55
+ badAccount!: InvalidAccountContract;
56
+ cheatCodes!: CheatCodes;
57
+ sequencer!: SequencerClient;
58
+ aztecNode!: AztecNode;
68
59
 
69
- admin!: AccountWallet;
70
- other!: AccountWallet;
71
- blacklisted!: AccountWallet;
60
+ adminAddress!: AztecAddress;
61
+ otherAddress!: AztecAddress;
62
+ blacklistedAddress!: AztecAddress;
72
63
 
73
64
  constructor(testName: string) {
74
65
  this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
75
- this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
76
66
  }
77
67
 
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
- }
68
+ async crossTimestampOfChange() {
69
+ await this.cheatCodes.warpL2TimeAtLeastBy(
70
+ this.sequencer,
71
+ this.aztecNode,
72
+ BlacklistTokenContractTest.CHANGE_ROLES_DELAY,
73
+ );
82
74
  }
83
75
 
84
76
  /**
85
- * Adds two state shifts to snapshot manager.
77
+ * Applies base setup:
86
78
  * 1. Add 3 accounts.
87
79
  * 2. Publicly deploy accounts, deploy token contract and a "bad account".
88
80
  */
89
- async applyBaseSnapshots() {
81
+ async applyBaseSetup() {
90
82
  // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
91
83
  jest.setTimeout(120_000);
92
84
 
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
- },
85
+ this.logger.info('Deploying 3 accounts');
86
+ const { deployedAccounts } = await deployAccounts(
87
+ 3,
88
+ this.logger,
89
+ )({
90
+ wallet: this.context.wallet,
91
+ initialFundedAccounts: this.context.initialFundedAccounts,
92
+ });
93
+
94
+ this.cheatCodes = this.context.cheatCodes;
95
+ this.aztecNode = this.context.aztecNodeService!;
96
+ this.sequencer = this.context.sequencer!;
97
+ this.wallet = this.context.wallet;
98
+ this.adminAddress = deployedAccounts[0].address;
99
+ this.otherAddress = deployedAccounts[1].address;
100
+ this.blacklistedAddress = deployedAccounts[2].address;
101
+
102
+ this.logger.info('Setting up blacklist token contract');
103
+ // Create the token contract state.
104
+ this.logger.verbose(`Public deploy accounts...`);
105
+ await publicDeployAccounts(this.wallet, [this.adminAddress, this.otherAddress, this.blacklistedAddress]);
106
+
107
+ this.logger.verbose(`Deploying TokenContract...`);
108
+ this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
109
+ from: this.adminAddress,
110
+ });
111
+ this.logger.verbose(`Token deployed to ${this.asset.address}`);
112
+
113
+ this.logger.verbose(`Deploying bad account...`);
114
+ this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress });
115
+ this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
116
+
117
+ await this.crossTimestampOfChange();
118
+
119
+ this.tokenSim = new TokenSimulator(
120
+ this.asset as unknown as TokenContract,
121
+ this.wallet,
122
+ this.adminAddress,
123
+ this.logger,
124
+ [this.adminAddress, this.otherAddress, this.blacklistedAddress],
103
125
  );
104
126
 
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
- },
127
+ expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(
128
+ new Role().withAdmin().toNoirStruct(),
144
129
  );
145
130
  }
146
131
 
147
132
  async setup() {
148
- await this.snapshotManager.setup();
133
+ this.logger.info('Setting up fresh context');
134
+ this.context = await setup(0, {
135
+ fundSponsoredFPC: true,
136
+ skipAccountDeployment: true,
137
+ });
138
+ await this.applyBaseSetup();
149
139
  }
150
140
 
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
141
  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))) };
142
+ await teardown(this.context);
163
143
  }
164
144
 
165
145
  async addPendingShieldNoteToPXE(
166
146
  contract: TokenBlacklistContract,
167
- wallet: AccountWallet,
147
+ recipient: AztecAddress,
168
148
  amount: bigint,
169
149
  secretHash: Fr,
170
150
  txHash: TxHash,
171
151
  ) {
172
- const txEffects = await wallet.getTxEffect(txHash);
152
+ const txEffects = await this.aztecNode.getTxEffect(txHash);
173
153
  await contract.methods
174
- .deliver_transparent_note(
154
+ .process_transparent_note(
175
155
  contract.address,
176
156
  amount,
177
157
  secretHash,
178
158
  txHash.hash,
179
- this.#toBoundedVec(txEffects!.data.noteHashes, MAX_NOTE_HASHES_PER_TX),
159
+ txEffects!.data.noteHashes,
180
160
  txEffects!.data.nullifiers[0],
181
- wallet.getAddress(),
161
+ recipient,
182
162
  )
183
- .simulate();
163
+ .simulate({ from: recipient });
184
164
  }
185
165
 
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
- },
166
+ async applyMint() {
167
+ this.logger.info('Applying mint setup');
168
+ const { asset, tokenSim } = this;
169
+ const amount = 10000n;
170
+
171
+ const adminMinterRole = new Role().withAdmin().withMinter();
172
+ await this.asset.methods
173
+ .update_roles(this.adminAddress, adminMinterRole.toNoirStruct())
174
+ .send({ from: this.adminAddress });
175
+
176
+ const blacklistRole = new Role().withBlacklisted();
177
+ await this.asset.methods
178
+ .update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct())
179
+ .send({ from: this.adminAddress });
180
+
181
+ await this.crossTimestampOfChange();
182
+
183
+ expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(
184
+ adminMinterRole.toNoirStruct(),
251
185
  );
186
+
187
+ this.logger.verbose(`Minting ${amount} publicly...`);
188
+ await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress });
189
+
190
+ this.logger.verbose(`Minting ${amount} privately...`);
191
+ const secret = Fr.random();
192
+ const secretHash = await computeSecretHash(secret);
193
+ const receipt = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress });
194
+
195
+ await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
196
+ await asset.methods.redeem_shield(this.adminAddress, amount, secret).send({ from: this.adminAddress });
197
+ this.logger.verbose(`Minting complete.`);
198
+
199
+ tokenSim.mintPublic(this.adminAddress, amount);
200
+
201
+ const publicBalance = await asset.methods
202
+ .balance_of_public(this.adminAddress)
203
+ .simulate({ from: this.adminAddress });
204
+ this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
205
+ expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
206
+
207
+ tokenSim.mintPrivate(this.adminAddress, amount);
208
+ const privateBalance = await asset.methods
209
+ .balance_of_private(this.adminAddress)
210
+ .simulate({ from: this.adminAddress });
211
+ this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
212
+ expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
213
+
214
+ const totalSupply = await asset.methods.total_supply().simulate({ from: this.adminAddress });
215
+ this.logger.verbose(`Total supply: ${totalSupply}`);
216
+ expect(totalSupply).toEqual(tokenSim.totalSupply);
252
217
  }
253
218
  }