@aztec/end-to-end 0.0.1-commit.d3ec352c → 0.0.1-commit.e3c1de76

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 (196) hide show
  1. package/dest/bench/client_flows/benchmark.d.ts +3 -2
  2. package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
  3. package/dest/bench/client_flows/benchmark.js +21 -1
  4. package/dest/bench/client_flows/client_flows_benchmark.d.ts +14 -15
  5. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  6. package/dest/bench/client_flows/client_flows_benchmark.js +123 -136
  7. package/dest/bench/client_flows/data_extractor.js +3 -1
  8. package/dest/bench/utils.d.ts +9 -8
  9. package/dest/bench/utils.d.ts.map +1 -1
  10. package/dest/bench/utils.js +27 -18
  11. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +6 -7
  12. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  13. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +96 -112
  14. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +19 -13
  15. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  16. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +91 -71
  17. package/dest/e2e_deploy_contract/deploy_test.d.ts +4 -3
  18. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  19. package/dest/e2e_deploy_contract/deploy_test.js +18 -13
  20. package/dest/e2e_epochs/epochs_test.d.ts +9 -2
  21. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  22. package/dest/e2e_epochs/epochs_test.js +42 -18
  23. package/dest/e2e_fees/bridging_race.notest.js +4 -6
  24. package/dest/e2e_fees/fees_test.d.ts +18 -15
  25. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  26. package/dest/e2e_fees/fees_test.js +126 -141
  27. package/dest/e2e_l1_publisher/write_json.d.ts +4 -3
  28. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
  29. package/dest/e2e_l1_publisher/write_json.js +14 -16
  30. package/dest/e2e_multi_validator/utils.js +1 -1
  31. package/dest/e2e_nested_contract/nested_contract_test.d.ts +6 -9
  32. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  33. package/dest/e2e_nested_contract/nested_contract_test.js +31 -39
  34. package/dest/e2e_p2p/inactivity_slash_test.d.ts +4 -4
  35. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
  36. package/dest/e2e_p2p/inactivity_slash_test.js +6 -9
  37. package/dest/e2e_p2p/p2p_network.d.ts +13 -11
  38. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  39. package/dest/e2e_p2p/p2p_network.js +120 -111
  40. package/dest/e2e_p2p/reqresp/utils.d.ts +22 -0
  41. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -0
  42. package/dest/e2e_p2p/reqresp/utils.js +153 -0
  43. package/dest/e2e_p2p/shared.d.ts +7 -7
  44. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  45. package/dest/e2e_p2p/shared.js +13 -20
  46. package/dest/e2e_token_contract/token_contract_test.d.ts +16 -9
  47. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  48. package/dest/e2e_token_contract/token_contract_test.js +89 -91
  49. package/dest/fixtures/e2e_prover_test.d.ts +10 -18
  50. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  51. package/dest/fixtures/e2e_prover_test.js +91 -103
  52. package/dest/fixtures/fixtures.d.ts +2 -3
  53. package/dest/fixtures/fixtures.d.ts.map +1 -1
  54. package/dest/fixtures/fixtures.js +1 -2
  55. package/dest/fixtures/get_acvm_config.js +1 -1
  56. package/dest/fixtures/l1_to_l2_messaging.d.ts +4 -3
  57. package/dest/fixtures/l1_to_l2_messaging.d.ts.map +1 -1
  58. package/dest/fixtures/l1_to_l2_messaging.js +2 -2
  59. package/dest/fixtures/setup.d.ts +218 -0
  60. package/dest/fixtures/setup.d.ts.map +1 -0
  61. package/dest/fixtures/setup.js +695 -0
  62. package/dest/fixtures/setup_p2p_test.d.ts +4 -5
  63. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  64. package/dest/fixtures/setup_p2p_test.js +27 -22
  65. package/dest/fixtures/token_utils.d.ts +1 -1
  66. package/dest/fixtures/token_utils.d.ts.map +1 -1
  67. package/dest/fixtures/token_utils.js +7 -4
  68. package/dest/fixtures/utils.d.ts +5 -638
  69. package/dest/fixtures/utils.d.ts.map +1 -1
  70. package/dest/fixtures/utils.js +4 -647
  71. package/dest/fixtures/web3signer.js +1 -1
  72. package/dest/fixtures/with_telemetry_utils.d.ts +2 -2
  73. package/dest/fixtures/with_telemetry_utils.d.ts.map +1 -1
  74. package/dest/fixtures/with_telemetry_utils.js +2 -2
  75. package/dest/quality_of_service/grafana_client.d.ts +41 -0
  76. package/dest/quality_of_service/grafana_client.d.ts.map +1 -0
  77. package/dest/quality_of_service/{alert_checker.js → grafana_client.js} +1 -1
  78. package/dest/quality_of_service/prometheus_client.d.ts +38 -0
  79. package/dest/quality_of_service/prometheus_client.d.ts.map +1 -0
  80. package/dest/quality_of_service/prometheus_client.js +67 -0
  81. package/dest/shared/cross_chain_test_harness.d.ts +18 -7
  82. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  83. package/dest/shared/cross_chain_test_harness.js +14 -14
  84. package/dest/shared/gas_portal_test_harness.d.ts +12 -2
  85. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  86. package/dest/shared/gas_portal_test_harness.js +1 -1
  87. package/dest/shared/index.d.ts +2 -2
  88. package/dest/shared/index.d.ts.map +1 -1
  89. package/dest/shared/submit-transactions.d.ts +3 -3
  90. package/dest/shared/submit-transactions.d.ts.map +1 -1
  91. package/dest/shared/submit-transactions.js +9 -11
  92. package/dest/shared/uniswap_l1_l2.d.ts +3 -27
  93. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  94. package/dest/shared/uniswap_l1_l2.js +55 -35
  95. package/dest/simulators/lending_simulator.d.ts +6 -2
  96. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  97. package/dest/simulators/lending_simulator.js +2 -2
  98. package/dest/spartan/setup_test_wallets.d.ts +4 -3
  99. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  100. package/dest/spartan/setup_test_wallets.js +63 -35
  101. package/dest/spartan/tx_metrics.d.ts +88 -0
  102. package/dest/spartan/tx_metrics.d.ts.map +1 -0
  103. package/dest/spartan/tx_metrics.js +422 -0
  104. package/dest/spartan/utils/bot.d.ts +27 -0
  105. package/dest/spartan/utils/bot.d.ts.map +1 -0
  106. package/dest/spartan/utils/bot.js +141 -0
  107. package/dest/spartan/utils/chaos.d.ts +79 -0
  108. package/dest/spartan/utils/chaos.d.ts.map +1 -0
  109. package/dest/spartan/utils/chaos.js +142 -0
  110. package/dest/spartan/utils/clients.d.ts +39 -0
  111. package/dest/spartan/utils/clients.d.ts.map +1 -0
  112. package/dest/spartan/utils/clients.js +90 -0
  113. package/dest/spartan/utils/config.d.ts +36 -0
  114. package/dest/spartan/utils/config.d.ts.map +1 -0
  115. package/dest/spartan/utils/config.js +20 -0
  116. package/dest/spartan/utils/health.d.ts +63 -0
  117. package/dest/spartan/utils/health.d.ts.map +1 -0
  118. package/dest/spartan/utils/health.js +202 -0
  119. package/dest/spartan/utils/helm.d.ts +15 -0
  120. package/dest/spartan/utils/helm.d.ts.map +1 -0
  121. package/dest/spartan/utils/helm.js +47 -0
  122. package/dest/spartan/utils/index.d.ts +9 -0
  123. package/dest/spartan/utils/index.d.ts.map +1 -0
  124. package/dest/spartan/utils/index.js +18 -0
  125. package/dest/spartan/utils/k8s.d.ts +126 -0
  126. package/dest/spartan/utils/k8s.d.ts.map +1 -0
  127. package/dest/spartan/utils/k8s.js +375 -0
  128. package/dest/spartan/utils/nodes.d.ts +41 -0
  129. package/dest/spartan/utils/nodes.d.ts.map +1 -0
  130. package/dest/spartan/utils/nodes.js +461 -0
  131. package/dest/spartan/utils/scripts.d.ts +16 -0
  132. package/dest/spartan/utils/scripts.d.ts.map +1 -0
  133. package/dest/spartan/utils/scripts.js +66 -0
  134. package/dest/spartan/utils.d.ts +2 -221
  135. package/dest/spartan/utils.d.ts.map +1 -1
  136. package/dest/spartan/utils.js +1 -782
  137. package/package.json +40 -39
  138. package/src/bench/client_flows/benchmark.ts +24 -2
  139. package/src/bench/client_flows/client_flows_benchmark.ts +145 -208
  140. package/src/bench/client_flows/data_extractor.ts +1 -1
  141. package/src/bench/utils.ts +30 -20
  142. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +104 -142
  143. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +140 -125
  144. package/src/e2e_deploy_contract/deploy_test.ts +21 -14
  145. package/src/e2e_epochs/epochs_test.ts +83 -44
  146. package/src/e2e_fees/bridging_race.notest.ts +4 -10
  147. package/src/e2e_fees/fees_test.ts +177 -220
  148. package/src/e2e_l1_publisher/write_json.ts +16 -16
  149. package/src/e2e_multi_validator/utils.ts +1 -1
  150. package/src/e2e_nested_contract/nested_contract_test.ts +33 -56
  151. package/src/e2e_p2p/inactivity_slash_test.ts +9 -12
  152. package/src/e2e_p2p/p2p_network.ts +180 -183
  153. package/src/e2e_p2p/reqresp/utils.ts +207 -0
  154. package/src/e2e_p2p/shared.ts +31 -28
  155. package/src/e2e_token_contract/token_contract_test.ts +103 -118
  156. package/src/fixtures/e2e_prover_test.ts +104 -141
  157. package/src/fixtures/fixtures.ts +1 -3
  158. package/src/fixtures/get_acvm_config.ts +1 -1
  159. package/src/fixtures/l1_to_l2_messaging.ts +4 -2
  160. package/src/fixtures/setup.ts +1017 -0
  161. package/src/fixtures/setup_p2p_test.ts +18 -23
  162. package/src/fixtures/token_utils.ts +6 -5
  163. package/src/fixtures/utils.ts +27 -966
  164. package/src/fixtures/web3signer.ts +1 -1
  165. package/src/fixtures/with_telemetry_utils.ts +2 -2
  166. package/src/quality_of_service/{alert_checker.ts → grafana_client.ts} +1 -1
  167. package/src/quality_of_service/prometheus_client.ts +113 -0
  168. package/src/shared/cross_chain_test_harness.ts +19 -37
  169. package/src/shared/gas_portal_test_harness.ts +2 -2
  170. package/src/shared/index.ts +1 -1
  171. package/src/shared/submit-transactions.ts +9 -15
  172. package/src/shared/uniswap_l1_l2.ts +65 -86
  173. package/src/simulators/lending_simulator.ts +3 -3
  174. package/src/spartan/setup_test_wallets.ts +81 -26
  175. package/src/spartan/tx_metrics.ts +376 -0
  176. package/src/spartan/utils/bot.ts +185 -0
  177. package/src/spartan/utils/chaos.ts +253 -0
  178. package/src/spartan/utils/clients.ts +100 -0
  179. package/src/spartan/utils/config.ts +26 -0
  180. package/src/spartan/utils/health.ts +255 -0
  181. package/src/spartan/utils/helm.ts +84 -0
  182. package/src/spartan/utils/index.ts +64 -0
  183. package/src/spartan/utils/k8s.ts +527 -0
  184. package/src/spartan/utils/nodes.ts +538 -0
  185. package/src/spartan/utils/scripts.ts +63 -0
  186. package/src/spartan/utils.ts +1 -983
  187. package/dest/fixtures/setup_l1_contracts.d.ts +0 -477
  188. package/dest/fixtures/setup_l1_contracts.d.ts.map +0 -1
  189. package/dest/fixtures/setup_l1_contracts.js +0 -17
  190. package/dest/fixtures/snapshot_manager.d.ts +0 -95
  191. package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
  192. package/dest/fixtures/snapshot_manager.js +0 -505
  193. package/dest/quality_of_service/alert_checker.d.ts +0 -41
  194. package/dest/quality_of_service/alert_checker.d.ts.map +0 -1
  195. package/src/fixtures/setup_l1_contracts.ts +0 -26
  196. package/src/fixtures/snapshot_manager.ts +0 -665
@@ -1,4 +1,6 @@
1
- import { BatchCall } from '@aztec/aztec.js/contracts';
1
+ import { AztecAddress } from '@aztec/aztec.js/addresses';
2
+ import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
3
+ import { waitForTx } from '@aztec/aztec.js/node';
2
4
  import { mean, stdDev, times } from '@aztec/foundation/collection';
3
5
  import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
4
6
  import { mkdirSync, writeFileSync } from 'fs';
@@ -16,7 +18,7 @@ import { setup } from '../fixtures/utils.js';
16
18
  const defaultAccountAddress = context.accounts[0];
17
19
  const contract = await BenchmarkingContract.deploy(context.wallet).send({
18
20
  from: defaultAccountAddress
19
- }).deployed();
21
+ });
20
22
  context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
21
23
  const sequencer = context.aztecNode.getSequencer();
22
24
  const telemetry = context.telemetryClient;
@@ -45,17 +47,20 @@ import { setup } from '../fixtures/utils.js';
45
47
  sequencer
46
48
  };
47
49
  }
50
+ function isMetricDefinition(f) {
51
+ return 'description' in f;
52
+ }
48
53
  function formatMetricsForGithubBenchmarkAction(data, filter) {
49
- const allFilters = filter.map((f)=>typeof f === 'string' ? {
50
- name: f,
54
+ const allFilters = filter.map((f)=>isMetricDefinition(f) ? {
55
+ name: f.name,
51
56
  source: f,
52
57
  transform: (x)=>x,
53
- unit: undefined
58
+ unit: f.unit
54
59
  } : f);
55
60
  return data.flatMap((meter)=>{
56
- return meter.metrics.filter((metric)=>allFilters.map((f)=>f.source).includes(metric.name)).map((metric)=>[
61
+ return meter.metrics.filter((metric)=>allFilters.map((f)=>f.source.name).includes(metric.name)).map((metric)=>[
57
62
  metric,
58
- allFilters.find((f)=>f.source === metric.name)
63
+ allFilters.find((f)=>f.source.name === metric.name)
59
64
  ]).map(([metric, filter])=>({
60
65
  name: `${meter.name}/${filter.name}`,
61
66
  unit: filter.unit ?? metric.unit ?? 'unknown',
@@ -91,16 +96,19 @@ function getMetricValues(points) {
91
96
  * @param contract - Benchmarking contract.
92
97
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
93
98
  * @returns A BatchCall instance.
94
- */ function makeCall(index, context, contract, heavyPublicCompute) {
95
- const [owner] = context.accounts;
99
+ */ async function makeCall(index, context, contract, heavyPublicCompute) {
96
100
  if (heavyPublicCompute) {
97
101
  return new BatchCall(context.wallet, [
98
102
  contract.methods.sha256_hash_1024(randomBytesAsBigInts(1024))
99
103
  ]);
100
104
  } else {
105
+ // We use random address for the new note owner because we can emit at most UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN
106
+ // logs for a given sender-recipient-contract tuple.
107
+ const ownerOfNewNote = await AztecAddress.random();
108
+ const [ownerOfBalance] = context.accounts;
101
109
  return new BatchCall(context.wallet, [
102
- contract.methods.create_note(owner, index + 1),
103
- contract.methods.increment_balance(owner, index + 1)
110
+ contract.methods.create_note(ownerOfNewNote, index + 1),
111
+ contract.methods.increment_balance(ownerOfBalance, index + 1)
104
112
  ]);
105
113
  }
106
114
  }
@@ -112,19 +120,20 @@ function getMetricValues(points) {
112
120
  * @param contract - Target contract.
113
121
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
114
122
  * @returns Array of sent txs.
115
- */ export function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
116
- const calls = times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute));
123
+ */ export async function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
124
+ const calls = await Promise.all(times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute)));
117
125
  context.logger.info(`Creating ${txCount} txs`);
118
126
  const [from] = context.accounts;
119
127
  context.logger.info(`Sending ${txCount} txs`);
120
- return calls.map((call)=>call.send({
121
- from
122
- }));
128
+ return Promise.all(calls.map((call)=>call.send({
129
+ from,
130
+ wait: NO_WAIT
131
+ })));
123
132
  }
124
133
  export async function waitTxs(txs, context, txWaitOpts) {
125
134
  context.logger.info(`Awaiting ${txs.length} txs to be mined`);
126
- await Promise.all(txs.map((tx)=>tx.wait(txWaitOpts)));
127
- context.logger.info(`All ${txs.length} txs have been mined`);
135
+ await Promise.all(txs.map((txHash)=>waitForTx(context.aztecNode, txHash, txWaitOpts)));
136
+ context.logger.info(`${txs.length} txs have been mined`);
128
137
  }
129
138
  function randomBytesAsBigInts(length) {
130
139
  return [
@@ -8,7 +8,7 @@ import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist'
8
8
  import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
9
9
  import type { SequencerClient } from '@aztec/sequencer-client';
10
10
  import type { TestWallet } from '@aztec/test-wallet/server';
11
- import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
11
+ import { type EndToEndContext } from '../fixtures/setup.js';
12
12
  import { TokenSimulator } from '../simulators/token_simulator.js';
13
13
  export declare class Role {
14
14
  private isAdmin;
@@ -25,7 +25,7 @@ export declare class Role {
25
25
  }
26
26
  export declare class BlacklistTokenContractTest {
27
27
  static CHANGE_ROLES_DELAY: number;
28
- private snapshotManager;
28
+ context: EndToEndContext;
29
29
  logger: Logger;
30
30
  wallet: TestWallet;
31
31
  asset: TokenBlacklistContract;
@@ -40,15 +40,14 @@ export declare class BlacklistTokenContractTest {
40
40
  constructor(testName: string);
41
41
  crossTimestampOfChange(): Promise<void>;
42
42
  /**
43
- * Adds two state shifts to snapshot manager.
43
+ * Applies base setup:
44
44
  * 1. Add 3 accounts.
45
45
  * 2. Publicly deploy accounts, deploy token contract and a "bad account".
46
46
  */
47
- applyBaseSnapshots(): Promise<void>;
47
+ applyBaseSetup(): Promise<void>;
48
48
  setup(): Promise<void>;
49
- snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
50
49
  teardown(): Promise<void>;
51
50
  addPendingShieldNoteToPXE(contract: TokenBlacklistContract, recipient: AztecAddress, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
52
- applyMintSnapshot(): Promise<void>;
51
+ applyMint(): Promise<void>;
53
52
  }
54
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0L2JsYWNrbGlzdF90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXZELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFFTCxLQUFLLGlCQUFpQixFQUl2QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUlsRSxxQkFBYSxJQUFJO0lBQ2YsT0FBTyxDQUFDLE9BQU8sQ0FBUztJQUN4QixPQUFPLENBQUMsUUFBUSxDQUFTO0lBQ3pCLE9BQU8sQ0FBQyxhQUFhLENBQVM7SUFFOUIsU0FBUyxTQUdSO0lBRUQsVUFBVSxTQUdUO0lBRUQsZUFBZSxTQUdkO0lBRUQsWUFBWTs7OztNQUlYO0NBQ0Y7QUFFRCxxQkFBYSwwQkFBMEI7SUFFckMsTUFBTSxDQUFDLGtCQUFrQixTQUFTO0lBRWxDLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsRUFBRyxlQUFlLENBQUM7SUFDNUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsa0JBQWtCLEVBQUcsWUFBWSxDQUFDO0lBRWxDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFHM0I7SUFFSyxzQkFBc0Isa0JBTTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkE4RHZCO0lBRUssS0FBSyxrQkFFVjtJQUVELFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQUViO0lBRUsseUJBQXlCLENBQzdCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFlBQVksRUFDdkIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUNkLE1BQU0sRUFBRSxNQUFNLGlCQWNmO0lBRUssaUJBQWlCLGtCQWtFdEI7Q0FDRiJ9
53
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0L2JsYWNrbGlzdF90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXZELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUNuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEUscUJBQWEsSUFBSTtJQUNmLE9BQU8sQ0FBQyxPQUFPLENBQVM7SUFDeEIsT0FBTyxDQUFDLFFBQVEsQ0FBUztJQUN6QixPQUFPLENBQUMsYUFBYSxDQUFTO0lBRTlCLFNBQVMsU0FHUjtJQUVELFVBQVUsU0FHVDtJQUVELGVBQWUsU0FHZDtJQUVELFlBQVk7Ozs7TUFJWDtDQUNGO0FBRUQscUJBQWEsMEJBQTBCO0lBRXJDLE1BQU0sQ0FBQyxrQkFBa0IsU0FBUztJQUVsQyxPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsRUFBRyxlQUFlLENBQUM7SUFDNUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsa0JBQWtCLEVBQUcsWUFBWSxDQUFDO0lBRWxDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFFM0I7SUFFSyxzQkFBc0Isa0JBTTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGNBQWMsa0JBaURuQjtJQUVLLEtBQUssa0JBT1Y7SUFFSyxRQUFRLGtCQUViO0lBRUsseUJBQXlCLENBQzdCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFlBQVksRUFDdkIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUNkLE1BQU0sRUFBRSxNQUFNLGlCQWNmO0lBRUssU0FBUyxrQkFtRGQ7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS,SAGR;IAED,UAAU,SAGT;IAED,eAAe,SAGd;IAED,YAAY;;;;MAIX;CACF;AAED,qBAAa,0BAA0B;IAErC,MAAM,CAAC,kBAAkB,SAAS;IAElC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,EAAG,eAAe,CAAC;IAC5B,SAAS,EAAG,SAAS,CAAC;IAEtB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,kBAAkB,EAAG,YAAY,CAAC;IAElC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAEK,sBAAsB,kBAM3B;IAED;;;;OAIG;IACG,kBAAkB,kBA8DvB;IAEK,KAAK,kBAEV;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAEb;IAEK,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM,iBAcf;IAEK,iBAAiB,kBAkEtB;CACF"}
1
+ {"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,EAAE,KAAK,eAAe,EAAyD,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS,SAGR;IAED,UAAU,SAGT;IAED,eAAe,SAGd;IAED,YAAY;;;;MAIX;CACF;AAED,qBAAa,0BAA0B;IAErC,MAAM,CAAC,kBAAkB,SAAS;IAElC,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,EAAG,eAAe,CAAC;IAC5B,SAAS,EAAG,SAAS,CAAC;IAEtB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,kBAAkB,EAAG,YAAY,CAAC;IAElC,YAAY,QAAQ,EAAE,MAAM,EAE3B;IAEK,sBAAsB,kBAM3B;IAED;;;;OAIG;IACG,cAAc,kBAiDnB;IAEK,KAAK,kBAOV;IAEK,QAAQ,kBAEb;IAEK,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM,iBAcf;IAEK,SAAS,kBAmDd;CACF"}
@@ -4,9 +4,8 @@ import { createLogger } from '@aztec/aztec.js/log';
4
4
  import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
5
5
  import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
6
6
  import { jest } from '@jest/globals';
7
- import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
7
+ import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
8
8
  import { TokenSimulator } from '../simulators/token_simulator.js';
9
- const { E2E_DATA_PATH: dataPath } = process.env;
10
9
  export class Role {
11
10
  isAdmin = false;
12
11
  isMinter = false;
@@ -36,7 +35,7 @@ export class Role {
36
35
  export class BlacklistTokenContractTest {
37
36
  // This value MUST match the same value that we have in the contract
38
37
  static CHANGE_ROLES_DELAY = 86400;
39
- snapshotManager;
38
+ context;
40
39
  logger;
41
40
  wallet;
42
41
  asset;
@@ -50,136 +49,121 @@ export class BlacklistTokenContractTest {
50
49
  blacklistedAddress;
51
50
  constructor(testName){
52
51
  this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
53
- this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
54
52
  }
55
53
  async crossTimestampOfChange() {
56
54
  await this.cheatCodes.warpL2TimeAtLeastBy(this.sequencer, this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
57
55
  }
58
56
  /**
59
- * Adds two state shifts to snapshot manager.
57
+ * Applies base setup:
60
58
  * 1. Add 3 accounts.
61
59
  * 2. Publicly deploy accounts, deploy token contract and a "bad account".
62
- */ async applyBaseSnapshots() {
60
+ */ async applyBaseSetup() {
63
61
  // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
64
62
  jest.setTimeout(120_000);
65
- await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { cheatCodes, aztecNode, sequencer, wallet })=>{
66
- this.cheatCodes = cheatCodes;
67
- this.aztecNode = aztecNode;
68
- this.sequencer = sequencer;
69
- this.wallet = wallet;
70
- this.adminAddress = deployedAccounts[0].address;
71
- this.otherAddress = deployedAccounts[1].address;
72
- this.blacklistedAddress = deployedAccounts[2].address;
73
- return Promise.resolve();
63
+ this.logger.info('Deploying 3 accounts');
64
+ const { deployedAccounts } = await deployAccounts(3, this.logger)({
65
+ wallet: this.context.wallet,
66
+ initialFundedAccounts: this.context.initialFundedAccounts
74
67
  });
75
- await this.snapshotManager.snapshot('e2e_blacklist_token_contract', async ()=>{
76
- // Create the token contract state.
77
- // Move this account thing to addAccounts above?
78
- this.logger.verbose(`Public deploy accounts...`);
79
- await publicDeployAccounts(this.wallet, [
80
- this.adminAddress,
81
- this.otherAddress,
82
- this.blacklistedAddress
83
- ]);
84
- this.logger.verbose(`Deploying TokenContract...`);
85
- this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
86
- from: this.adminAddress
87
- }).deployed();
88
- this.logger.verbose(`Token deployed to ${this.asset.address}`);
89
- this.logger.verbose(`Deploying bad account...`);
90
- this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
91
- from: this.adminAddress
92
- }).deployed();
93
- this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
94
- await this.crossTimestampOfChange();
95
- return {
96
- tokenContractAddress: this.asset.address,
97
- badAccountAddress: this.badAccount.address
98
- };
99
- }, async ({ tokenContractAddress, badAccountAddress })=>{
100
- // Restore the token contract state.
101
- this.asset = TokenBlacklistContract.at(tokenContractAddress, this.wallet);
102
- this.logger.verbose(`Token contract address: ${this.asset.address}`);
103
- this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
104
- this.adminAddress,
105
- this.otherAddress,
106
- this.blacklistedAddress
107
- ]);
108
- this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
109
- this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
110
- expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
111
- from: this.adminAddress
112
- })).toEqual(new Role().withAdmin().toNoirStruct());
68
+ this.cheatCodes = this.context.cheatCodes;
69
+ this.aztecNode = this.context.aztecNodeService;
70
+ this.sequencer = this.context.sequencer;
71
+ this.wallet = this.context.wallet;
72
+ this.adminAddress = deployedAccounts[0].address;
73
+ this.otherAddress = deployedAccounts[1].address;
74
+ this.blacklistedAddress = deployedAccounts[2].address;
75
+ this.logger.info('Setting up blacklist token contract');
76
+ // Create the token contract state.
77
+ this.logger.verbose(`Public deploy accounts...`);
78
+ await publicDeployAccounts(this.wallet, [
79
+ this.adminAddress,
80
+ this.otherAddress,
81
+ this.blacklistedAddress
82
+ ]);
83
+ this.logger.verbose(`Deploying TokenContract...`);
84
+ this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
85
+ from: this.adminAddress
113
86
  });
87
+ this.logger.verbose(`Token deployed to ${this.asset.address}`);
88
+ this.logger.verbose(`Deploying bad account...`);
89
+ this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
90
+ from: this.adminAddress
91
+ });
92
+ this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
93
+ await this.crossTimestampOfChange();
94
+ this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
95
+ this.adminAddress,
96
+ this.otherAddress,
97
+ this.blacklistedAddress
98
+ ]);
99
+ expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
100
+ from: this.adminAddress
101
+ })).toEqual(new Role().withAdmin().toNoirStruct());
114
102
  }
115
103
  async setup() {
116
- await this.snapshotManager.setup();
104
+ this.logger.info('Setting up fresh context');
105
+ this.context = await setup(0, {
106
+ fundSponsoredFPC: true,
107
+ skipAccountDeployment: true
108
+ });
109
+ await this.applyBaseSetup();
117
110
  }
118
- snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
119
111
  async teardown() {
120
- await this.snapshotManager.teardown();
112
+ await teardown(this.context);
121
113
  }
122
114
  async addPendingShieldNoteToPXE(contract, recipient, amount, secretHash, txHash) {
123
115
  const txEffects = await this.aztecNode.getTxEffect(txHash);
124
- await contract.methods.deliver_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
116
+ await contract.methods.process_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
125
117
  from: recipient
126
118
  });
127
119
  }
128
- async applyMintSnapshot() {
129
- await this.snapshotManager.snapshot('mint', async ()=>{
130
- const { asset } = this;
131
- const amount = 10000n;
132
- const adminMinterRole = new Role().withAdmin().withMinter();
133
- await this.asset.methods.update_roles(this.adminAddress, adminMinterRole.toNoirStruct()).send({
134
- from: this.adminAddress
135
- }).wait();
136
- const blacklistRole = new Role().withBlacklisted();
137
- await this.asset.methods.update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct()).send({
138
- from: this.adminAddress
139
- }).wait();
140
- await this.crossTimestampOfChange();
141
- expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
142
- from: this.adminAddress
143
- })).toEqual(adminMinterRole.toNoirStruct());
144
- this.logger.verbose(`Minting ${amount} publicly...`);
145
- await asset.methods.mint_public(this.adminAddress, amount).send({
146
- from: this.adminAddress
147
- }).wait();
148
- this.logger.verbose(`Minting ${amount} privately...`);
149
- const secret = Fr.random();
150
- const secretHash = await computeSecretHash(secret);
151
- const receipt = await asset.methods.mint_private(amount, secretHash).send({
152
- from: this.adminAddress
153
- }).wait();
154
- await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
155
- const txClaim = asset.methods.redeem_shield(this.adminAddress, amount, secret).send({
156
- from: this.adminAddress
157
- });
158
- await txClaim.wait();
159
- this.logger.verbose(`Minting complete.`);
160
- return {
161
- amount
162
- };
163
- }, async ({ amount })=>{
164
- const { asset, tokenSim } = this;
165
- tokenSim.mintPublic(this.adminAddress, amount);
166
- const publicBalance = await asset.methods.balance_of_public(this.adminAddress).simulate({
167
- from: this.adminAddress
168
- });
169
- this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
170
- expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
171
- tokenSim.mintPrivate(this.adminAddress, amount);
172
- const privateBalance = await asset.methods.balance_of_private(this.adminAddress).simulate({
173
- from: this.adminAddress
174
- });
175
- this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
176
- expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
177
- const totalSupply = await asset.methods.total_supply().simulate({
178
- from: this.adminAddress
179
- });
180
- this.logger.verbose(`Total supply: ${totalSupply}`);
181
- expect(totalSupply).toEqual(tokenSim.totalSupply);
182
- return Promise.resolve();
120
+ async applyMint() {
121
+ this.logger.info('Applying mint setup');
122
+ const { asset, tokenSim } = this;
123
+ const amount = 10000n;
124
+ const adminMinterRole = new Role().withAdmin().withMinter();
125
+ await this.asset.methods.update_roles(this.adminAddress, adminMinterRole.toNoirStruct()).send({
126
+ from: this.adminAddress
127
+ });
128
+ const blacklistRole = new Role().withBlacklisted();
129
+ await this.asset.methods.update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct()).send({
130
+ from: this.adminAddress
131
+ });
132
+ await this.crossTimestampOfChange();
133
+ expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
134
+ from: this.adminAddress
135
+ })).toEqual(adminMinterRole.toNoirStruct());
136
+ this.logger.verbose(`Minting ${amount} publicly...`);
137
+ await asset.methods.mint_public(this.adminAddress, amount).send({
138
+ from: this.adminAddress
139
+ });
140
+ this.logger.verbose(`Minting ${amount} privately...`);
141
+ const secret = Fr.random();
142
+ const secretHash = await computeSecretHash(secret);
143
+ const receipt = await asset.methods.mint_private(amount, secretHash).send({
144
+ from: this.adminAddress
145
+ });
146
+ await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
147
+ await asset.methods.redeem_shield(this.adminAddress, amount, secret).send({
148
+ from: this.adminAddress
149
+ });
150
+ this.logger.verbose(`Minting complete.`);
151
+ tokenSim.mintPublic(this.adminAddress, amount);
152
+ const publicBalance = await asset.methods.balance_of_public(this.adminAddress).simulate({
153
+ from: this.adminAddress
154
+ });
155
+ this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
156
+ expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
157
+ tokenSim.mintPrivate(this.adminAddress, amount);
158
+ const privateBalance = await asset.methods.balance_of_private(this.adminAddress).simulate({
159
+ from: this.adminAddress
160
+ });
161
+ this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
162
+ expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
163
+ const totalSupply = await asset.methods.total_supply().simulate({
164
+ from: this.adminAddress
183
165
  });
166
+ this.logger.verbose(`Total supply: ${totalSupply}`);
167
+ expect(totalSupply).toEqual(tokenSim.totalSupply);
184
168
  }
185
169
  }
@@ -2,22 +2,27 @@ import type { AztecNodeConfig } from '@aztec/aztec-node';
2
2
  import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
3
3
  import { type Logger } from '@aztec/aztec.js/log';
4
4
  import type { AztecNode } from '@aztec/aztec.js/node';
5
+ import type { TxReceipt } from '@aztec/aztec.js/tx';
5
6
  import { CheatCodes } from '@aztec/aztec/testing';
6
- import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
7
+ import { InboxContract, OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
8
+ import type { DeployAztecL1ContractsArgs, DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
9
+ import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
10
+ import { EpochNumber } from '@aztec/foundation/branded-types';
7
11
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
8
12
  import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
9
13
  import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
10
14
  import type { TestWallet } from '@aztec/test-wallet/server';
11
- import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
12
- import type { SetupOptions } from '../fixtures/utils.js';
15
+ import { type EndToEndContext, type SetupOptions } from '../fixtures/setup.js';
13
16
  import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
14
17
  export declare class CrossChainMessagingTest {
15
- private snapshotManager;
18
+ private requireEpochProven;
19
+ private setupOptions;
20
+ private deployL1ContractsArgs;
16
21
  logger: Logger;
22
+ context: EndToEndContext;
17
23
  aztecNode: AztecNode;
18
24
  aztecNodeConfig: AztecNodeConfig;
19
25
  aztecNodeAdmin: AztecNodeAdmin;
20
- ctx: SubsystemsContext;
21
26
  l1Client: ExtendedViemWalletClient | undefined;
22
27
  wallet: TestWallet;
23
28
  ownerAddress: AztecAddress;
@@ -27,15 +32,16 @@ export declare class CrossChainMessagingTest {
27
32
  ethAccount: EthAddress;
28
33
  l2Token: TokenContract;
29
34
  l2Bridge: TokenBridgeContract;
30
- inbox: any;
31
- outbox: any;
35
+ rollup: RollupContract;
36
+ inbox: InboxContract;
37
+ outbox: OutboxContract;
32
38
  cheatCodes: CheatCodes;
33
- deployL1ContractsValues: DeployL1ContractsReturnType;
34
- constructor(testName: string, opts?: SetupOptions, deployL1ContractsArgs?: Partial<DeployL1ContractsArgs>);
35
- assumeProven(): Promise<void>;
39
+ deployL1ContractsValues: DeployAztecL1ContractsReturnType;
40
+ constructor(testName: string, opts?: SetupOptions, deployL1ContractsArgs?: Partial<DeployAztecL1ContractsArgs>);
36
41
  setup(): Promise<void>;
37
- snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
42
+ advanceToEpochProven(l2TxReceipt: TxReceipt): Promise<EpochNumber>;
43
+ catchUpProvenChain(): Promise<void>;
38
44
  teardown(): Promise<void>;
39
- applyBaseSnapshots(): Promise<void>;
45
+ applyBaseSetup(): Promise<void>;
40
46
  }
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fbWVzc2FnaW5nX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfY3Jvc3NfY2hhaW5fbWVzc2FnaW5nL2Nyb3NzX2NoYWluX21lc3NhZ2luZ190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSywyQkFBMkIsRUFDaEMsS0FBSyx3QkFBd0IsRUFHOUIsTUFBTSxpQkFBaUIsQ0FBQztBQUV6QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDM0UsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFLNUQsT0FBTyxFQUVMLEtBQUssaUJBQWlCLEVBSXZCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFJOUUscUJBQWEsdUJBQXVCO0lBQ2xDLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGVBQWUsRUFBRyxlQUFlLENBQUM7SUFDbEMsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxHQUFHLEVBQUcsaUJBQWlCLENBQUM7SUFFeEIsUUFBUSxFQUFHLHdCQUF3QixHQUFHLFNBQVMsQ0FBQztJQUVoRCxNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLHFCQUFxQixFQUFHLHFCQUFxQixDQUFDO0lBQzlDLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFDeEIsT0FBTyxFQUFHLGFBQWEsQ0FBQztJQUN4QixRQUFRLEVBQUcsbUJBQW1CLENBQUM7SUFFL0IsS0FBSyxFQUFHLEdBQUcsQ0FBQztJQUNaLE1BQU0sRUFBRyxHQUFHLENBQUM7SUFDYixVQUFVLEVBQUcsVUFBVSxDQUFDO0lBRXhCLHVCQUF1QixFQUFHLDJCQUEyQixDQUFDO0lBRXRELFlBQVksUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLEdBQUUsWUFBaUIsRUFBRSxxQkFBcUIsR0FBRSxPQUFPLENBQUMscUJBQXFCLENBQU0sRUFNaEg7SUFFSyxZQUFZLGtCQUVqQjtJQUVLLEtBQUssa0JBUVY7SUFFRCxRQUFRLEdBQUksQ0FBQyw4SkFJMkQ7SUFFbEUsUUFBUSxrQkFFYjtJQUVLLGtCQUFrQixrQkF1RnZCO0NBQ0YifQ==
47
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fbWVzc2FnaW5nX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfY3Jvc3NfY2hhaW5fbWVzc2FnaW5nL2Nyb3NzX2NoYWluX21lc3NhZ2luZ190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFDViwwQkFBMEIsRUFDMUIsZ0NBQWdDLEVBQ2pDLE1BQU0sMkNBQTJDLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN0RSxPQUFPLEVBQW9CLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2hGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUc1RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssWUFBWSxFQUtsQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRTlFLHFCQUFhLHVCQUF1QjtJQUNsQyxPQUFPLENBQUMsa0JBQWtCLENBQVU7SUFDcEMsT0FBTyxDQUFDLFlBQVksQ0FBZTtJQUNuQyxPQUFPLENBQUMscUJBQXFCLENBQXNDO0lBQ25FLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsZUFBZSxFQUFHLGVBQWUsQ0FBQztJQUNsQyxjQUFjLEVBQUcsY0FBYyxDQUFDO0lBRWhDLFFBQVEsRUFBRyx3QkFBd0IsR0FBRyxTQUFTLENBQUM7SUFFaEQsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixxQkFBcUIsRUFBRyxxQkFBcUIsQ0FBQztJQUM5QyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sRUFBRyxhQUFhLENBQUM7SUFDeEIsUUFBUSxFQUFHLG1CQUFtQixDQUFDO0lBRS9CLE1BQU0sRUFBRyxjQUFjLENBQUM7SUFDeEIsS0FBSyxFQUFHLGFBQWEsQ0FBQztJQUN0QixNQUFNLEVBQUcsY0FBYyxDQUFDO0lBQ3hCLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFFeEIsdUJBQXVCLEVBQUcsZ0NBQWdDLENBQUM7SUFFM0QsWUFDRSxRQUFRLEVBQUUsTUFBTSxFQUNoQixJQUFJLEdBQUUsWUFBaUIsRUFDdkIscUJBQXFCLEdBQUUsT0FBTyxDQUFDLDBCQUEwQixDQUFNLEVBU2hFO0lBRUssS0FBSyxrQkFTVjtJQUVLLG9CQUFvQixDQUFDLFdBQVcsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQVV2RTtJQUVLLGtCQUFrQixrQkFLdkI7SUFFSyxRQUFRLGtCQUViO0lBRUssY0FBYyxrQkFrRm5CO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAG9B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAK5D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAG,SAAS,CAAC;IACtB,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,iBAAiB,CAAC;IAExB,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,KAAK,EAAG,GAAG,CAAC;IACZ,MAAM,EAAG,GAAG,CAAC;IACb,UAAU,EAAG,UAAU,CAAC;IAExB,uBAAuB,EAAG,2BAA2B,CAAC;IAEtD,YAAY,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,EAAE,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM,EAMhH;IAEK,YAAY,kBAEjB;IAEK,KAAK,kBAQV;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAEb;IAEK,kBAAkB,kBAuFvB;CACF"}
1
+ {"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,KAAK,EACV,0BAA0B,EAC1B,gCAAgC,EACjC,MAAM,2CAA2C,CAAC;AAEnD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAoB,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGhF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG5D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAKlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,qBAAqB,CAAsC;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,eAAe,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAEhC,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,MAAM,EAAG,cAAc,CAAC;IACxB,KAAK,EAAG,aAAa,CAAC;IACtB,MAAM,EAAG,cAAc,CAAC;IACxB,UAAU,EAAG,UAAU,CAAC;IAExB,uBAAuB,EAAG,gCAAgC,CAAC;IAE3D,YACE,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,YAAiB,EACvB,qBAAqB,GAAE,OAAO,CAAC,0BAA0B,CAAM,EAShE;IAEK,KAAK,kBASV;IAEK,oBAAoB,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAUvE;IAEK,kBAAkB,kBAKvB;IAEK,QAAQ,kBAEb;IAEK,cAAc,kBAkFnB;CACF"}