@aztec/end-to-end 0.0.1-commit.03f7ef2 → 0.0.1-commit.08c5969dc

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 (213) 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 +13 -14
  5. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  6. package/dest/bench/client_flows/client_flows_benchmark.js +121 -136
  7. package/dest/bench/client_flows/config.d.ts +2 -2
  8. package/dest/bench/client_flows/config.d.ts.map +1 -1
  9. package/dest/bench/client_flows/config.js +18 -0
  10. package/dest/bench/client_flows/data_extractor.js +3 -1
  11. package/dest/bench/utils.d.ts +9 -8
  12. package/dest/bench/utils.d.ts.map +1 -1
  13. package/dest/bench/utils.js +27 -18
  14. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +9 -8
  15. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  16. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +106 -112
  17. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +16 -11
  18. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  19. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +90 -70
  20. package/dest/e2e_deploy_contract/deploy_test.d.ts +5 -4
  21. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  22. package/dest/e2e_deploy_contract/deploy_test.js +18 -13
  23. package/dest/e2e_epochs/epochs_test.d.ts +7 -1
  24. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  25. package/dest/e2e_epochs/epochs_test.js +40 -12
  26. package/dest/e2e_fees/bridging_race.notest.js +3 -5
  27. package/dest/e2e_fees/fees_test.d.ts +14 -14
  28. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  29. package/dest/e2e_fees/fees_test.js +125 -143
  30. package/dest/e2e_l1_publisher/write_json.d.ts +4 -3
  31. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
  32. package/dest/e2e_l1_publisher/write_json.js +14 -16
  33. package/dest/e2e_nested_contract/nested_contract_test.d.ts +6 -9
  34. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  35. package/dest/e2e_nested_contract/nested_contract_test.js +31 -39
  36. package/dest/e2e_p2p/inactivity_slash_test.d.ts +3 -3
  37. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
  38. package/dest/e2e_p2p/inactivity_slash_test.js +3 -3
  39. package/dest/e2e_p2p/p2p_network.d.ts +8 -7
  40. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  41. package/dest/e2e_p2p/p2p_network.js +111 -104
  42. package/dest/e2e_p2p/reqresp/utils.d.ts +22 -0
  43. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -0
  44. package/dest/e2e_p2p/reqresp/utils.js +153 -0
  45. package/dest/e2e_p2p/shared.d.ts +6 -6
  46. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  47. package/dest/e2e_p2p/shared.js +18 -21
  48. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +2 -0
  49. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +1 -0
  50. package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.js +184 -0
  51. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts +18 -0
  52. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +1 -0
  53. package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.js +120 -0
  54. package/dest/e2e_token_contract/token_contract_test.d.ts +19 -10
  55. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  56. package/dest/e2e_token_contract/token_contract_test.js +99 -91
  57. package/dest/fixtures/e2e_prover_test.d.ts +9 -15
  58. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  59. package/dest/fixtures/e2e_prover_test.js +86 -95
  60. package/dest/fixtures/fixtures.d.ts +2 -2
  61. package/dest/fixtures/fixtures.d.ts.map +1 -1
  62. package/dest/fixtures/fixtures.js +1 -1
  63. package/dest/fixtures/ha_setup.d.ts +71 -0
  64. package/dest/fixtures/ha_setup.d.ts.map +1 -0
  65. package/dest/fixtures/ha_setup.js +116 -0
  66. package/dest/fixtures/index.d.ts +2 -1
  67. package/dest/fixtures/index.d.ts.map +1 -1
  68. package/dest/fixtures/index.js +1 -0
  69. package/dest/fixtures/setup.d.ts +218 -0
  70. package/dest/fixtures/setup.d.ts.map +1 -0
  71. package/dest/fixtures/setup.js +636 -0
  72. package/dest/fixtures/setup_p2p_test.d.ts +12 -8
  73. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  74. package/dest/fixtures/setup_p2p_test.js +29 -21
  75. package/dest/fixtures/token_utils.d.ts +1 -1
  76. package/dest/fixtures/token_utils.d.ts.map +1 -1
  77. package/dest/fixtures/token_utils.js +7 -4
  78. package/dest/fixtures/utils.d.ts +5 -194
  79. package/dest/fixtures/utils.d.ts.map +1 -1
  80. package/dest/fixtures/utils.js +4 -619
  81. package/dest/quality_of_service/grafana_client.d.ts +41 -0
  82. package/dest/quality_of_service/grafana_client.d.ts.map +1 -0
  83. package/dest/quality_of_service/{alert_checker.js → grafana_client.js} +1 -1
  84. package/dest/quality_of_service/prometheus_client.d.ts +38 -0
  85. package/dest/quality_of_service/prometheus_client.d.ts.map +1 -0
  86. package/dest/quality_of_service/prometheus_client.js +67 -0
  87. package/dest/shared/cross_chain_test_harness.d.ts +16 -6
  88. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  89. package/dest/shared/cross_chain_test_harness.js +13 -13
  90. package/dest/shared/gas_portal_test_harness.d.ts +11 -1
  91. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  92. package/dest/shared/gas_portal_test_harness.js +1 -1
  93. package/dest/shared/index.d.ts +2 -2
  94. package/dest/shared/index.d.ts.map +1 -1
  95. package/dest/shared/submit-transactions.d.ts +4 -4
  96. package/dest/shared/submit-transactions.d.ts.map +1 -1
  97. package/dest/shared/submit-transactions.js +9 -11
  98. package/dest/shared/uniswap_l1_l2.d.ts +3 -28
  99. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  100. package/dest/shared/uniswap_l1_l2.js +53 -33
  101. package/dest/simulators/lending_simulator.d.ts +5 -1
  102. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  103. package/dest/simulators/lending_simulator.js +2 -2
  104. package/dest/simulators/token_simulator.d.ts +1 -1
  105. package/dest/simulators/token_simulator.d.ts.map +1 -1
  106. package/dest/simulators/token_simulator.js +2 -23
  107. package/dest/spartan/setup_test_wallets.d.ts +5 -4
  108. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  109. package/dest/spartan/setup_test_wallets.js +64 -35
  110. package/dest/spartan/tx_metrics.d.ts +51 -2
  111. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  112. package/dest/spartan/tx_metrics.js +333 -6
  113. package/dest/spartan/utils/bot.d.ts +27 -0
  114. package/dest/spartan/utils/bot.d.ts.map +1 -0
  115. package/dest/spartan/utils/bot.js +141 -0
  116. package/dest/spartan/utils/chaos.d.ts +79 -0
  117. package/dest/spartan/utils/chaos.d.ts.map +1 -0
  118. package/dest/spartan/utils/chaos.js +142 -0
  119. package/dest/spartan/utils/clients.d.ts +39 -0
  120. package/dest/spartan/utils/clients.d.ts.map +1 -0
  121. package/dest/spartan/utils/clients.js +90 -0
  122. package/dest/spartan/utils/config.d.ts +39 -0
  123. package/dest/spartan/utils/config.d.ts.map +1 -0
  124. package/dest/spartan/utils/config.js +21 -0
  125. package/dest/spartan/utils/health.d.ts +63 -0
  126. package/dest/spartan/utils/health.d.ts.map +1 -0
  127. package/dest/spartan/utils/health.js +202 -0
  128. package/dest/spartan/utils/helm.d.ts +15 -0
  129. package/dest/spartan/utils/helm.d.ts.map +1 -0
  130. package/dest/spartan/utils/helm.js +47 -0
  131. package/dest/spartan/utils/index.d.ts +9 -0
  132. package/dest/spartan/utils/index.d.ts.map +1 -0
  133. package/dest/spartan/utils/index.js +18 -0
  134. package/dest/spartan/utils/k8s.d.ts +126 -0
  135. package/dest/spartan/utils/k8s.d.ts.map +1 -0
  136. package/dest/spartan/utils/k8s.js +375 -0
  137. package/dest/spartan/utils/nodes.d.ts +41 -0
  138. package/dest/spartan/utils/nodes.d.ts.map +1 -0
  139. package/dest/spartan/utils/nodes.js +461 -0
  140. package/dest/spartan/utils/scripts.d.ts +30 -0
  141. package/dest/spartan/utils/scripts.d.ts.map +1 -0
  142. package/dest/spartan/utils/scripts.js +81 -0
  143. package/dest/spartan/utils.d.ts +2 -231
  144. package/dest/spartan/utils.d.ts.map +1 -1
  145. package/dest/spartan/utils.js +1 -853
  146. package/dest/test-wallet/test_wallet.d.ts +82 -0
  147. package/dest/test-wallet/test_wallet.d.ts.map +1 -0
  148. package/dest/test-wallet/test_wallet.js +214 -0
  149. package/dest/test-wallet/utils.d.ts +41 -0
  150. package/dest/test-wallet/utils.d.ts.map +1 -0
  151. package/dest/test-wallet/utils.js +71 -0
  152. package/package.json +44 -39
  153. package/src/bench/client_flows/benchmark.ts +24 -2
  154. package/src/bench/client_flows/client_flows_benchmark.ts +141 -211
  155. package/src/bench/client_flows/config.ts +9 -1
  156. package/src/bench/client_flows/data_extractor.ts +1 -1
  157. package/src/bench/utils.ts +31 -21
  158. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +114 -143
  159. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +127 -117
  160. package/src/e2e_deploy_contract/deploy_test.ts +22 -15
  161. package/src/e2e_epochs/epochs_test.ts +73 -37
  162. package/src/e2e_fees/bridging_race.notest.ts +4 -10
  163. package/src/e2e_fees/fees_test.ts +164 -227
  164. package/src/e2e_l1_publisher/write_json.ts +16 -16
  165. package/src/e2e_nested_contract/nested_contract_test.ts +33 -56
  166. package/src/e2e_p2p/inactivity_slash_test.ts +3 -3
  167. package/src/e2e_p2p/p2p_network.ts +173 -169
  168. package/src/e2e_p2p/reqresp/utils.ts +207 -0
  169. package/src/e2e_p2p/shared.ts +28 -27
  170. package/src/e2e_storage_proof/fixtures/storage_proof.json +915 -0
  171. package/src/e2e_storage_proof/fixtures/storage_proof_fetcher.ts +190 -0
  172. package/src/e2e_storage_proof/fixtures/storage_proof_fixture.ts +173 -0
  173. package/src/e2e_token_contract/token_contract_test.ts +113 -119
  174. package/src/fixtures/dumps/epoch_proof_result.json +1 -1
  175. package/src/fixtures/e2e_prover_test.ts +98 -133
  176. package/src/fixtures/fixtures.ts +1 -1
  177. package/src/fixtures/ha_setup.ts +186 -0
  178. package/src/fixtures/index.ts +1 -0
  179. package/src/fixtures/setup.ts +939 -0
  180. package/src/fixtures/setup_p2p_test.ts +31 -27
  181. package/src/fixtures/token_utils.ts +6 -5
  182. package/src/fixtures/utils.ts +27 -907
  183. package/src/guides/up_quick_start.sh +3 -3
  184. package/src/quality_of_service/{alert_checker.ts → grafana_client.ts} +1 -1
  185. package/src/quality_of_service/prometheus_client.ts +113 -0
  186. package/src/shared/cross_chain_test_harness.ts +16 -36
  187. package/src/shared/gas_portal_test_harness.ts +1 -1
  188. package/src/shared/index.ts +1 -1
  189. package/src/shared/submit-transactions.ts +11 -16
  190. package/src/shared/uniswap_l1_l2.ts +59 -80
  191. package/src/simulators/lending_simulator.ts +2 -2
  192. package/src/simulators/token_simulator.ts +1 -29
  193. package/src/spartan/setup_test_wallets.ts +82 -26
  194. package/src/spartan/tx_metrics.ts +255 -9
  195. package/src/spartan/utils/bot.ts +185 -0
  196. package/src/spartan/utils/chaos.ts +253 -0
  197. package/src/spartan/utils/clients.ts +100 -0
  198. package/src/spartan/utils/config.ts +27 -0
  199. package/src/spartan/utils/health.ts +255 -0
  200. package/src/spartan/utils/helm.ts +84 -0
  201. package/src/spartan/utils/index.ts +64 -0
  202. package/src/spartan/utils/k8s.ts +527 -0
  203. package/src/spartan/utils/nodes.ts +538 -0
  204. package/src/spartan/utils/scripts.ts +99 -0
  205. package/src/spartan/utils.ts +1 -1077
  206. package/src/test-wallet/test_wallet.ts +305 -0
  207. package/src/test-wallet/utils.ts +112 -0
  208. package/dest/fixtures/snapshot_manager.d.ts +0 -93
  209. package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
  210. package/dest/fixtures/snapshot_manager.js +0 -493
  211. package/dest/quality_of_service/alert_checker.d.ts +0 -41
  212. package/dest/quality_of_service/alert_checker.d.ts.map +0 -1
  213. package/src/fixtures/snapshot_manager.ts +0 -651
@@ -1,126 +1,134 @@
1
1
  import { createLogger } from '@aztec/aztec.js/log';
2
2
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
3
+ import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
3
4
  import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
4
5
  import { jest } from '@jest/globals';
5
- import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
6
+ import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
6
7
  import { mintTokensToPrivate } from '../fixtures/token_utils.js';
7
8
  import { TokenSimulator } from '../simulators/token_simulator.js';
8
- const { E2E_DATA_PATH: dataPath, METRICS_PORT: metricsPort } = process.env;
9
+ const { METRICS_PORT: metricsPort } = process.env;
9
10
  export class TokenContractTest {
10
11
  static TOKEN_NAME = 'USDC';
11
12
  static TOKEN_SYMBOL = 'USD';
12
13
  static TOKEN_DECIMALS = 18n;
13
- snapshotManager;
14
+ context;
14
15
  logger;
16
+ metricsPort;
15
17
  asset;
16
18
  tokenSim;
17
19
  node;
18
20
  badAccount;
21
+ proxy;
19
22
  wallet;
20
23
  adminAddress;
21
24
  account1Address;
22
25
  account2Address;
26
+ shouldApplyBaseSetup = false;
27
+ shouldApplyMint = false;
23
28
  constructor(testName){
24
29
  this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
25
- this.snapshotManager = createSnapshotManager(`e2e_token_contract/${testName}`, dataPath, {
26
- metricsPort: metricsPort ? parseInt(metricsPort) : undefined
27
- });
30
+ this.metricsPort = metricsPort ? parseInt(metricsPort) : undefined;
31
+ }
32
+ /**
33
+ * Registers that base setup should be applied during setup().
34
+ * Call this before setup() to deploy 3 accounts, publicly deploy accounts, token contract and a "bad account".
35
+ */ applyBaseSnapshots() {
36
+ this.shouldApplyBaseSetup = true;
28
37
  }
29
38
  /**
30
- * Adds two state shifts to snapshot manager.
31
- * 1. Add 3 accounts.
32
- * 2. Publicly deploy accounts, deploy token contract and a "bad account".
33
- */ async applyBaseSnapshots() {
39
+ * Registers that mint should be applied during setup().
40
+ * Call this before setup() to mint tokens to the admin account.
41
+ */ applyMintSnapshot() {
42
+ this.shouldApplyMint = true;
43
+ }
44
+ /**
45
+ * Applies base setup: deploys 3 accounts, publicly deploys accounts, token contract and a "bad account".
46
+ */ async applyBaseSetup() {
34
47
  // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
35
48
  jest.setTimeout(120_000);
36
- await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { wallet, aztecNode })=>{
37
- this.node = aztecNode;
38
- this.wallet = wallet;
39
- [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map((acc)=>acc.address);
40
- return Promise.resolve();
49
+ this.logger.info('Applying base setup - deploying 3 accounts');
50
+ const { deployedAccounts } = await deployAccounts(3, this.logger)({
51
+ wallet: this.context.wallet,
52
+ initialFundedAccounts: this.context.initialFundedAccounts
53
+ });
54
+ this.node = this.context.aztecNodeService;
55
+ this.wallet = this.context.wallet;
56
+ [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map((acc)=>acc.address);
57
+ this.logger.info('Applying base setup - deploying token contract');
58
+ this.logger.verbose(`Public deploy accounts...`);
59
+ await publicDeployAccounts(this.wallet, [
60
+ this.adminAddress,
61
+ this.account1Address
62
+ ]);
63
+ this.logger.verbose(`Deploying TokenContract...`);
64
+ this.asset = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
65
+ from: this.adminAddress
41
66
  });
42
- await this.snapshotManager.snapshot('e2e_token_contract', async ()=>{
43
- // Create the token contract state.
44
- // Move this account thing to addAccounts above?
45
- this.logger.verbose(`Public deploy accounts...`);
46
- await publicDeployAccounts(this.wallet, [
47
- this.adminAddress,
48
- this.account1Address
49
- ]);
50
- this.logger.verbose(`Deploying TokenContract...`);
51
- const asset = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
52
- from: this.adminAddress
53
- }).deployed();
54
- this.logger.verbose(`Token deployed to ${asset.address}`);
55
- this.logger.verbose(`Deploying bad account...`);
56
- this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
57
- from: this.adminAddress
58
- }).deployed();
59
- this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
60
- return {
61
- tokenContractAddress: asset.address,
62
- badAccountAddress: this.badAccount.address
63
- };
64
- }, async ({ tokenContractAddress, badAccountAddress })=>{
65
- // Restore the token contract state.
66
- this.asset = TokenContract.at(tokenContractAddress, this.wallet);
67
- this.logger.verbose(`Token contract address: ${this.asset.address}`);
68
- this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
69
- this.adminAddress,
70
- this.account1Address
71
- ]);
72
- this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
73
- this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
74
- expect(await this.asset.methods.get_admin().simulate({
75
- from: this.adminAddress
76
- })).toBe(this.adminAddress.toBigInt());
67
+ this.logger.verbose(`Token deployed to ${this.asset.address}`);
68
+ this.logger.verbose(`Deploying bad account...`);
69
+ this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
70
+ from: this.adminAddress
77
71
  });
78
- // TokenContract.artifact.functions.forEach(fn => {
79
- // const sig = decodeFunctionSignature(fn.name, fn.parameters);
80
- // logger.verbose(`Function ${sig} and the selector: ${FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)}`);
81
- // });
72
+ this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
73
+ // Deploy a proxy contract for "on behalf of other" tests. The note owner must be the tx sender
74
+ // (so their notes are in scope), but msg_sender in the target must differ from the note owner
75
+ // to trigger authwit validation. The proxy forwards calls so that msg_sender != tx sender.
76
+ this.logger.verbose(`Deploying generic proxy...`);
77
+ this.proxy = await GenericProxyContract.deploy(this.wallet).send({
78
+ from: this.adminAddress
79
+ });
80
+ this.logger.verbose(`Deployed to ${this.proxy.address}.`);
81
+ this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
82
+ this.adminAddress,
83
+ this.account1Address
84
+ ]);
85
+ expect(await this.asset.methods.get_admin().simulate({
86
+ from: this.adminAddress
87
+ })).toBe(this.adminAddress.toBigInt());
82
88
  }
83
89
  async setup() {
84
- await this.snapshotManager.setup();
90
+ this.context = await setup(0, {
91
+ metricsPort: this.metricsPort,
92
+ fundSponsoredFPC: true,
93
+ skipAccountDeployment: true
94
+ });
95
+ if (this.shouldApplyBaseSetup) {
96
+ await this.applyBaseSetup();
97
+ }
98
+ if (this.shouldApplyMint) {
99
+ await this.applyMint();
100
+ }
85
101
  }
86
- snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
87
102
  async teardown() {
88
- await this.snapshotManager.teardown();
103
+ await teardown(this.context);
89
104
  }
90
- async applyMintSnapshot() {
91
- await this.snapshotManager.snapshot('mint', async ()=>{
92
- const { asset, adminAddress } = this;
93
- const amount = 10000n;
94
- this.logger.verbose(`Minting ${amount} publicly...`);
95
- await asset.methods.mint_to_public(adminAddress, amount).send({
96
- from: adminAddress
97
- }).wait();
98
- this.logger.verbose(`Minting ${amount} privately...`);
99
- await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
100
- this.logger.verbose(`Minting complete.`);
101
- return {
102
- amount
103
- };
104
- }, async ({ amount })=>{
105
- const { asset, adminAddress, tokenSim } = this;
106
- tokenSim.mintPublic(adminAddress, amount);
107
- const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
108
- from: adminAddress
109
- });
110
- this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
111
- expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
112
- tokenSim.mintPrivate(adminAddress, amount);
113
- const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
114
- from: adminAddress
115
- });
116
- this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
117
- expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
118
- const totalSupply = await asset.methods.total_supply().simulate({
119
- from: adminAddress
120
- });
121
- this.logger.verbose(`Total supply: ${totalSupply}`);
122
- expect(totalSupply).toEqual(tokenSim.totalSupply);
123
- return Promise.resolve();
105
+ async applyMint() {
106
+ this.logger.info('Applying mint setup');
107
+ const { asset, adminAddress, tokenSim } = this;
108
+ const amount = 10000n;
109
+ this.logger.verbose(`Minting ${amount} publicly...`);
110
+ await asset.methods.mint_to_public(adminAddress, amount).send({
111
+ from: adminAddress
112
+ });
113
+ tokenSim.mintPublic(adminAddress, amount);
114
+ const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
115
+ from: adminAddress
116
+ });
117
+ this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
118
+ expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
119
+ this.logger.verbose(`Minting ${amount} privately...`);
120
+ await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
121
+ tokenSim.mintPrivate(adminAddress, amount);
122
+ const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
123
+ from: adminAddress
124
+ });
125
+ this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
126
+ expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
127
+ const totalSupply = await asset.methods.total_supply().simulate({
128
+ from: adminAddress
124
129
  });
130
+ this.logger.verbose(`Total supply: ${totalSupply}`);
131
+ expect(totalSupply).toEqual(tokenSim.totalSupply);
132
+ this.logger.verbose(`Minting complete.`);
125
133
  }
126
134
  }
@@ -8,9 +8,9 @@ import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-az
8
8
  import { TokenContract } from '@aztec/noir-contracts.js/Token';
9
9
  import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
10
10
  import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
11
- import { TestWallet } from '@aztec/test-wallet/server';
12
11
  import { TokenSimulator } from '../simulators/token_simulator.js';
13
- import { type SubsystemsContext } from './snapshot_manager.js';
12
+ import { TestWallet } from '../test-wallet/test_wallet.js';
13
+ import { type EndToEndContext } from './setup.js';
14
14
  /**
15
15
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
16
16
  * However, we then setup a second PXE with a full prover instance.
@@ -18,12 +18,9 @@ import { type SubsystemsContext } from './snapshot_manager.js';
18
18
  * We then prove and verify transactions created via this full prover PXE.
19
19
  */
20
20
  export declare class FullProverTest {
21
- private minNumberOfTxsPerBlock;
22
- private realProofs;
23
21
  static TOKEN_NAME: string;
24
22
  static TOKEN_SYMBOL: string;
25
23
  static TOKEN_DECIMALS: bigint;
26
- private snapshotManager;
27
24
  logger: Logger;
28
25
  wallet: TestWallet;
29
26
  provenWallet: TestWallet;
@@ -40,22 +37,19 @@ export declare class FullProverTest {
40
37
  private acvmConfigCleanup?;
41
38
  circuitProofVerifier?: ClientProtocolCircuitVerifier;
42
39
  provenAsset: TokenContract;
43
- private context;
40
+ context: EndToEndContext;
44
41
  private proverNode;
45
42
  private simulatedProverNode;
46
43
  l1Contracts: DeployAztecL1ContractsReturnType;
47
44
  proverAddress: EthAddress;
45
+ private minNumberOfTxsPerBlock;
46
+ private coinbase;
47
+ private realProofs;
48
48
  constructor(testName: string, minNumberOfTxsPerBlock: number, coinbase: EthAddress, realProofs?: boolean);
49
- /**
50
- * Adds two state shifts to snapshot manager.
51
- * 1. Add 2 accounts.
52
- * 2. Publicly deploy accounts, deploy token contract
53
- */
54
- applyBaseSnapshots(): Promise<void>;
49
+ private applyBaseSetup;
55
50
  setup(): Promise<this>;
56
51
  private mintFeeJuice;
57
- snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
58
52
  teardown(): Promise<void>;
59
- applyMintSnapshot(): Promise<void>;
53
+ private applyMint;
60
54
  }
61
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBTXZELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUdsRSxPQUFPLEVBRUwsS0FBSyxpQkFBaUIsRUFJdkIsTUFBTSx1QkFBdUIsQ0FBQztBQVUvQjs7Ozs7R0FLRztBQUVILHFCQUFhLGNBQWM7SUE2QnZCLE9BQU8sQ0FBQyxzQkFBc0I7SUFFOUIsT0FBTyxDQUFDLFVBQVU7SUE5QnBCLE1BQU0sQ0FBQyxVQUFVLFNBQVU7SUFDM0IsTUFBTSxDQUFDLFlBQVksU0FBUztJQUM1QixNQUFNLENBQUMsY0FBYyxTQUFPO0lBQzVCLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxVQUFVLENBQUM7SUFDMUIsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFNO0lBQzlCLGdCQUFnQixFQUFHLGtCQUFrQixFQUFFLENBQUM7SUFDeEMsZUFBZSxFQUFHLGFBQWEsQ0FBQztJQUNoQyx1QkFBdUIsRUFBRywyQkFBMkIsQ0FBQztJQUN0RCxRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBcUI7SUFDN0MsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFzQjtJQUM5QyxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBc0I7SUFDaEQsb0JBQW9CLENBQUMsRUFBRSw2QkFBNkIsQ0FBQztJQUNyRCxXQUFXLEVBQUcsYUFBYSxDQUFDO0lBQzVCLE9BQU8sQ0FBQyxPQUFPLENBQXFCO0lBQ3BDLE9BQU8sQ0FBQyxVQUFVLENBQWM7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFjO0lBQ2xDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBRWxDLFlBQ0UsUUFBUSxFQUFFLE1BQU0sRUFDUixzQkFBc0IsRUFBRSxNQUFNLEVBQ3RDLFFBQVEsRUFBRSxVQUFVLEVBQ1osVUFBVSxVQUFPLEVBVzFCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkFxRHZCO0lBRUssS0FBSyxrQkFxSVY7WUFFYSxZQUFZO0lBUzFCLFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQWNiO0lBRUssaUJBQWlCLGtCQTZDdEI7Q0FDRiJ9
55
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNdEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBUXJCLE1BQU0sWUFBWSxDQUFDO0FBT3BCOzs7OztHQUtHO0FBRUgscUJBQWEsY0FBYztJQUN6QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixnQkFBZ0IsRUFBRyxrQkFBa0IsRUFBRSxDQUFDO0lBQ3hDLGVBQWUsRUFBRyxhQUFhLENBQUM7SUFDaEMsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFDdEQsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLENBQUMsZ0JBQWdCLENBQXFCO0lBQzdDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQXNCO0lBQ2hELG9CQUFvQixDQUFDLEVBQUUsNkJBQTZCLENBQUM7SUFDckQsV0FBVyxFQUFHLGFBQWEsQ0FBQztJQUM1QixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxVQUFVLENBQWM7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFjO0lBQ2xDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBQ2xDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBUztJQUN2QyxPQUFPLENBQUMsUUFBUSxDQUFhO0lBQzdCLE9BQU8sQ0FBQyxVQUFVLENBQVU7SUFFNUIsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLFVBQVUsVUFBTyxFQUtwRztZQUthLGNBQWM7SUFxQ3RCLEtBQUssa0JBZ0pWO1lBRWEsWUFBWTtJQVNwQixRQUFRLGtCQWNiO1lBRWEsU0FBUztDQWtDeEIifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,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,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAMvD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,uBAAuB,CAAC;AAU/B;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,gBAAgB,EAAG,kBAAkB,EAAE,CAAC;IACxC,eAAe,EAAG,aAAa,CAAC;IAChC,uBAAuB,EAAG,2BAA2B,CAAC;IACtD,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAElC,YACE,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO,EAW1B;IAED;;;;OAIG;IACG,kBAAkB,kBAqDvB;IAEK,KAAK,kBAqIV;YAEa,YAAY;IAS1B,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAcb;IAEK,iBAAiB,kBA6CtB;CACF"}
1
+ {"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,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,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EACL,KAAK,eAAe,EAQrB,MAAM,YAAY,CAAC;AAOpB;;;;;GAKG;AAEH,qBAAa,cAAc;IACzB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,gBAAgB,EAAG,kBAAkB,EAAE,CAAC;IACxC,eAAe,EAAG,aAAa,CAAC;IAChC,uBAAuB,EAAG,2BAA2B,CAAC;IACtD,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAClC,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,UAAU,CAAU;IAE5B,YAAY,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,UAAO,EAKpG;YAKa,cAAc;IAqCtB,KAAK,kBAgJV;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAkCxB"}
@@ -15,25 +15,20 @@ import { privateKeyToAddress } from 'viem/accounts';
15
15
  import { TokenSimulator } from '../simulators/token_simulator.js';
16
16
  import { getACVMConfig } from './get_acvm_config.js';
17
17
  import { getBBConfig } from './get_bb_config.js';
18
- import { createSnapshotManager, deployAccounts, publicDeployAccounts } from './snapshot_manager.js';
19
- import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEAndGetWallet } from './utils.js';
20
- const { E2E_DATA_PATH: dataPath } = process.env;
18
+ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicDeployAccounts, setup, setupPXEAndGetWallet, teardown } from './setup.js';
21
19
  /**
22
20
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
23
21
  * However, we then setup a second PXE with a full prover instance.
24
22
  * We configure this instance with all of the accounts and contracts.
25
23
  * We then prove and verify transactions created via this full prover PXE.
26
24
  */ export class FullProverTest {
27
- minNumberOfTxsPerBlock;
28
- realProofs;
29
25
  static TOKEN_NAME = 'USDC';
30
26
  static TOKEN_SYMBOL = 'USD';
31
27
  static TOKEN_DECIMALS = 18n;
32
- snapshotManager;
33
28
  logger;
34
29
  wallet;
35
30
  provenWallet;
36
- accounts;
31
+ accounts = [];
37
32
  deployedAccounts;
38
33
  fakeProofsAsset;
39
34
  fakeProofsAssetInstance;
@@ -41,7 +36,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
41
36
  aztecNode;
42
37
  aztecNodeAdmin;
43
38
  cheatCodes;
44
- provenComponents;
39
+ provenComponents = [];
45
40
  bbConfigCleanup;
46
41
  acvmConfigCleanup;
47
42
  circuitProofVerifier;
@@ -51,63 +46,65 @@ const { E2E_DATA_PATH: dataPath } = process.env;
51
46
  simulatedProverNode;
52
47
  l1Contracts;
53
48
  proverAddress;
49
+ minNumberOfTxsPerBlock;
50
+ coinbase;
51
+ realProofs;
54
52
  constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
53
+ this.logger = createLogger(`e2e:full_prover_test:${testName}`);
55
54
  this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
55
+ this.coinbase = coinbase;
56
56
  this.realProofs = realProofs;
57
- this.accounts = [];
58
- this.provenComponents = [];
59
- this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
60
- this.logger = createLogger(`e2e:full_prover_test:${testName}`);
61
- this.snapshotManager = createSnapshotManager(`full_prover_integration/${testName}`, dataPath, {
62
- startProverNode: true,
63
- coinbase
64
- }, {
65
- realVerifier: realProofs
66
- });
67
57
  }
68
58
  /**
69
- * Adds two state shifts to snapshot manager.
70
- * 1. Add 2 accounts.
71
- * 2. Publicly deploy accounts, deploy token contract
72
- */ async applyBaseSnapshots() {
73
- await this.snapshotManager.snapshot('2_accounts', deployAccounts(2, this.logger), ({ deployedAccounts }, { wallet })=>{
74
- this.deployedAccounts = deployedAccounts;
75
- this.accounts = deployedAccounts.map((a)=>a.address);
76
- this.wallet = wallet;
77
- return Promise.resolve();
59
+ * Applies base setup: deploys 2 accounts and token contract.
60
+ */ async applyBaseSetup() {
61
+ this.logger.info('Applying base setup: deploying accounts');
62
+ const { deployedAccounts } = await deployAccounts(2, this.logger)({
63
+ wallet: this.context.wallet,
64
+ initialFundedAccounts: this.context.initialFundedAccounts
78
65
  });
79
- await this.snapshotManager.snapshot('client_prover_integration', async ()=>{
80
- // Create the token contract state.
81
- // Move this account thing to addAccounts above?
82
- this.logger.verbose(`Public deploy accounts...`);
83
- await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
84
- this.logger.verbose(`Deploying TokenContract...`);
85
- const { contract: asset, instance } = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
86
- from: this.accounts[0]
87
- }).wait();
88
- this.logger.verbose(`Token deployed to ${asset.address}`);
89
- return {
90
- tokenContractAddress: asset.address,
91
- tokenContractInstance: instance
92
- };
93
- }, async ({ tokenContractAddress, tokenContractInstance })=>{
94
- // Restore the token contract state.
95
- this.fakeProofsAsset = TokenContract.at(tokenContractAddress, this.wallet);
96
- this.fakeProofsAssetInstance = tokenContractInstance;
97
- this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
98
- this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
99
- expect(await this.fakeProofsAsset.methods.get_admin().simulate({
100
- from: this.accounts[0]
101
- })).toBe(this.accounts[0].toBigInt());
66
+ this.deployedAccounts = deployedAccounts;
67
+ this.accounts = deployedAccounts.map((a)=>a.address);
68
+ this.wallet = this.context.wallet;
69
+ this.logger.info('Applying base setup: publicly deploying accounts');
70
+ await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
71
+ this.logger.info('Applying base setup: deploying token contract');
72
+ const { contract: asset, instance } = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
73
+ from: this.accounts[0],
74
+ wait: {
75
+ returnReceipt: true
76
+ }
102
77
  });
78
+ this.logger.verbose(`Token deployed to ${asset.address}`);
79
+ this.fakeProofsAsset = asset;
80
+ this.fakeProofsAssetInstance = instance;
81
+ this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
82
+ this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
83
+ expect(await this.fakeProofsAsset.methods.get_admin().simulate({
84
+ from: this.accounts[0]
85
+ })).toBe(this.accounts[0].toBigInt());
103
86
  }
104
87
  async setup() {
105
- this.context = await this.snapshotManager.setup();
88
+ this.logger.info('Setting up subsystems from fresh');
89
+ this.context = await setup(0, {
90
+ startProverNode: true,
91
+ coinbase: this.coinbase,
92
+ fundSponsoredFPC: true,
93
+ skipAccountDeployment: true,
94
+ l1ContractsArgs: {
95
+ realVerifier: this.realProofs
96
+ }
97
+ });
98
+ await this.applyBaseSetup();
99
+ await this.applyMint();
100
+ this.logger.info(`Enabling proving`, {
101
+ realProofs: this.realProofs
102
+ });
106
103
  // We don't wish to mark as proven automatically, so we set the flag to false
107
104
  this.context.watcher.setIsMarkingAsProven(false);
108
105
  this.simulatedProverNode = this.context.proverNode;
109
106
  ({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes } = this.context);
110
- this.aztecNodeAdmin = this.context.aztecNode;
107
+ this.aztecNodeAdmin = this.context.aztecNodeService;
111
108
  const config = this.context.aztecNodeConfig;
112
109
  const blobClient = await createBlobClientWithFileStores(config, this.logger);
113
110
  // Configure a full prover PXE
@@ -147,7 +144,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
147
144
  this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
148
145
  const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, {
149
146
  proverEnabled: this.realProofs
150
- }, undefined, true);
147
+ }, undefined, 'pxe-proven');
151
148
  this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
152
149
  await provenWallet.registerContract(this.fakeProofsAssetInstance, TokenContract.artifact);
153
150
  for(let i = 0; i < 2; i++){
@@ -207,13 +204,14 @@ const { E2E_DATA_PATH: dataPath } = process.env;
207
204
  const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));
208
205
  this.proverNode = await createProverNode(proverConfig, {
209
206
  aztecNodeTxProvider: this.aztecNode,
210
- archiver: archiver,
211
- blobClient
207
+ archiver: archiver
212
208
  }, {
213
209
  prefilledPublicData
214
210
  });
215
211
  await this.proverNode.start();
216
- this.logger.warn(`Proofs are now enabled`);
212
+ this.logger.warn(`Proofs are now enabled`, {
213
+ realProofs: this.realProofs
214
+ });
217
215
  return this;
218
216
  }
219
217
  async mintFeeJuice(recipient) {
@@ -232,9 +230,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
232
230
  hash
233
231
  });
234
232
  }
235
- snapshot;
236
233
  async teardown() {
237
- await this.snapshotManager.teardown();
238
234
  // Cleanup related to the full prover PXEs
239
235
  for(let i = 0; i < this.provenComponents.length; i++){
240
236
  await this.provenComponents[i].teardown();
@@ -244,44 +240,39 @@ const { E2E_DATA_PATH: dataPath } = process.env;
244
240
  await Barretenberg.destroySingleton();
245
241
  await this.bbConfigCleanup?.();
246
242
  await this.acvmConfigCleanup?.();
243
+ await teardown(this.context);
247
244
  }
248
- async applyMintSnapshot() {
249
- await this.snapshotManager.snapshot('mint', async ()=>{
250
- const { fakeProofsAsset: asset, accounts } = this;
251
- const privateAmount = 10000n;
252
- const publicAmount = 10000n;
253
- this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
254
- await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({
255
- from: accounts[0]
256
- }).wait();
257
- this.logger.verbose(`Transferring ${privateAmount} to private...`);
258
- await asset.methods.transfer_to_private(accounts[0], privateAmount).send({
259
- from: accounts[0]
260
- }).wait();
261
- this.logger.verbose(`Minting complete.`);
262
- return {
263
- amount: publicAmount
264
- };
265
- }, async ({ amount })=>{
266
- const { fakeProofsAsset: asset, accounts: [address], tokenSim } = this;
267
- tokenSim.mintPublic(address, amount);
268
- const publicBalance = await asset.methods.balance_of_public(address).simulate({
269
- from: address
270
- });
271
- this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
272
- expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
273
- tokenSim.mintPrivate(address, amount);
274
- const privateBalance = await asset.methods.balance_of_private(address).simulate({
275
- from: address
276
- });
277
- this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
278
- expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
279
- const totalSupply = await asset.methods.total_supply().simulate({
280
- from: address
281
- });
282
- this.logger.verbose(`Total supply: ${totalSupply}`);
283
- expect(totalSupply).toEqual(tokenSim.totalSupply);
284
- return Promise.resolve();
245
+ async applyMint() {
246
+ this.logger.info('Applying mint setup');
247
+ const { fakeProofsAsset: asset, accounts } = this;
248
+ const privateAmount = 10000n;
249
+ const publicAmount = 10000n;
250
+ this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
251
+ await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({
252
+ from: accounts[0]
253
+ });
254
+ this.logger.verbose(`Transferring ${privateAmount} to private...`);
255
+ await asset.methods.transfer_to_private(accounts[0], privateAmount).send({
256
+ from: accounts[0]
257
+ });
258
+ this.logger.info(`Minting complete`);
259
+ const { fakeProofsAsset, accounts: [address], tokenSim } = this;
260
+ tokenSim.mintPublic(address, publicAmount);
261
+ const publicBalance = await fakeProofsAsset.methods.balance_of_public(address).simulate({
262
+ from: address
263
+ });
264
+ this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
265
+ expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
266
+ tokenSim.mintPrivate(address, publicAmount);
267
+ const privateBalance = await fakeProofsAsset.methods.balance_of_private(address).simulate({
268
+ from: address
269
+ });
270
+ this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
271
+ expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
272
+ const totalSupply = await fakeProofsAsset.methods.total_supply().simulate({
273
+ from: address
285
274
  });
275
+ this.logger.verbose(`Total supply: ${totalSupply}`);
276
+ expect(totalSupply).toEqual(tokenSim.totalSupply);
286
277
  }
287
278
  }
@@ -1,7 +1,7 @@
1
1
  export declare const METRICS_PORT = 4318;
2
2
  export declare const shouldCollectMetrics: () => 4318 | undefined;
3
3
  export declare const TEST_PEER_CHECK_INTERVAL_MS = 1000;
4
- export declare const TEST_MAX_TX_POOL_SIZE: number;
4
+ export declare const TEST_MAX_PENDING_TX_POOL_COUNT = 10000;
5
5
  export declare const MNEMONIC = "test test test test test test test test test test test junk";
6
6
  export declare const privateKey: Buffer<ArrayBuffer>;
7
7
  export declare const privateKey2: Buffer<ArrayBuffer>;
@@ -12,4 +12,4 @@ export declare const DUPLICATE_NULLIFIER_ERROR: RegExp;
12
12
  export declare const NO_L1_TO_L2_MSG_ERROR: RegExp;
13
13
  export declare const STATIC_CALL_STATE_MODIFICATION_ERROR: RegExp;
14
14
  export declare const STATIC_CONTEXT_ASSERTION_ERROR: RegExp;
15
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9maXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFPLE1BQU0sWUFBWSxPQUFPLENBQUM7QUFFakMsZUFBTyxNQUFNLG9CQUFvQix3QkFLaEMsQ0FBQztBQUVGLGVBQU8sTUFBTSwyQkFBMkIsT0FBTyxDQUFDO0FBQ2hELGVBQU8sTUFBTSxxQkFBcUIsUUFBeUIsQ0FBQztBQUU1RCxlQUFPLE1BQU0sUUFBUSxnRUFBZ0UsQ0FBQztBQUN0RixlQUFPLE1BQU0sVUFBVSxxQkFBeUYsQ0FBQztBQUNqSCxlQUFPLE1BQU0sV0FBVyxxQkFBeUYsQ0FBQztBQUdsSCxlQUFPLE1BQU0sb0JBQW9CLHdEQUF3RCxDQUFDO0FBQzFGLGVBQU8sTUFBTSxtQkFBbUIsbURBQW1ELENBQUM7QUFDcEYsZUFBTyxNQUFNLHFCQUFxQiwrRUFBK0UsQ0FBQztBQUVsSCxlQUFPLE1BQU0seUJBQXlCLFFBQWdDLENBQUM7QUFDdkUsZUFBTyxNQUFNLHFCQUFxQixRQUN3RSxDQUFDO0FBQzNHLGVBQU8sTUFBTSxvQ0FBb0MsUUFBMEMsQ0FBQztBQUM1RixlQUFPLE1BQU0sOEJBQThCLFFBQWtFLENBQUMifQ==
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9maXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFPLE1BQU0sWUFBWSxPQUFPLENBQUM7QUFFakMsZUFBTyxNQUFNLG9CQUFvQix3QkFLaEMsQ0FBQztBQUVGLGVBQU8sTUFBTSwyQkFBMkIsT0FBTyxDQUFDO0FBQ2hELGVBQU8sTUFBTSw4QkFBOEIsUUFBUyxDQUFDO0FBRXJELGVBQU8sTUFBTSxRQUFRLGdFQUFnRSxDQUFDO0FBQ3RGLGVBQU8sTUFBTSxVQUFVLHFCQUF5RixDQUFDO0FBQ2pILGVBQU8sTUFBTSxXQUFXLHFCQUF5RixDQUFDO0FBR2xILGVBQU8sTUFBTSxvQkFBb0Isd0RBQXdELENBQUM7QUFDMUYsZUFBTyxNQUFNLG1CQUFtQixtREFBbUQsQ0FBQztBQUNwRixlQUFPLE1BQU0scUJBQXFCLCtFQUErRSxDQUFDO0FBRWxILGVBQU8sTUFBTSx5QkFBeUIsUUFBZ0MsQ0FBQztBQUN2RSxlQUFPLE1BQU0scUJBQXFCLFFBQ3dFLENBQUM7QUFDM0csZUFBTyxNQUFNLG9DQUFvQyxRQUEwQyxDQUFDO0FBQzVGLGVBQU8sTUFBTSw4QkFBOEIsUUFBa0UsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,eAAO,MAAM,qBAAqB,QAAyB,CAAC;AAE5D,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,qBAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,qBAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,wDAAwD,CAAC;AAC1F,eAAO,MAAM,mBAAmB,mDAAmD,CAAC;AACpF,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AACvE,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAA0C,CAAC;AAC5F,eAAO,MAAM,8BAA8B,QAAkE,CAAC"}
1
+ {"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,eAAO,MAAM,8BAA8B,QAAS,CAAC;AAErD,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,qBAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,qBAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,wDAAwD,CAAC;AAC1F,eAAO,MAAM,mBAAmB,mDAAmD,CAAC;AACpF,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AACvE,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAA0C,CAAC;AAC5F,eAAO,MAAM,8BAA8B,QAAkE,CAAC"}
@@ -6,7 +6,7 @@ export const shouldCollectMetrics = ()=>{
6
6
  return undefined;
7
7
  };
8
8
  export const TEST_PEER_CHECK_INTERVAL_MS = 1000;
9
- export const TEST_MAX_TX_POOL_SIZE = 2 * 1024 * 1024 * 1024; // 2GB
9
+ export const TEST_MAX_PENDING_TX_POOL_COUNT = 10_000; // Number of max pending TXs ~ 1.56GB
10
10
  export const MNEMONIC = 'test test test test test test test test test test test junk';
11
11
  export const privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex');
12
12
  export const privateKey2 = Buffer.from('59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex');