@aztec/end-to-end 0.0.1-commit.7d4e6cd → 0.0.1-commit.9372f48

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 (163) 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 +12 -13
  5. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  6. package/dest/bench/client_flows/client_flows_benchmark.js +117 -132
  7. package/dest/bench/utils.d.ts +6 -5
  8. package/dest/bench/utils.d.ts.map +1 -1
  9. package/dest/bench/utils.js +9 -7
  10. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +6 -7
  11. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  12. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +96 -112
  13. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +6 -7
  14. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  15. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +65 -62
  16. package/dest/e2e_deploy_contract/deploy_test.d.ts +4 -3
  17. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  18. package/dest/e2e_deploy_contract/deploy_test.js +18 -13
  19. package/dest/e2e_epochs/epochs_test.d.ts +7 -1
  20. package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
  21. package/dest/e2e_epochs/epochs_test.js +30 -8
  22. package/dest/e2e_fees/bridging_race.notest.js +3 -5
  23. package/dest/e2e_fees/fees_test.d.ts +13 -13
  24. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  25. package/dest/e2e_fees/fees_test.js +122 -140
  26. package/dest/e2e_l1_publisher/write_json.d.ts +4 -3
  27. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
  28. package/dest/e2e_l1_publisher/write_json.js +14 -13
  29. package/dest/e2e_nested_contract/nested_contract_test.d.ts +6 -9
  30. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  31. package/dest/e2e_nested_contract/nested_contract_test.js +31 -39
  32. package/dest/e2e_p2p/inactivity_slash_test.d.ts +3 -3
  33. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
  34. package/dest/e2e_p2p/inactivity_slash_test.js +3 -3
  35. package/dest/e2e_p2p/p2p_network.d.ts +7 -6
  36. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  37. package/dest/e2e_p2p/p2p_network.js +110 -103
  38. package/dest/e2e_p2p/reqresp/utils.d.ts +22 -0
  39. package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -0
  40. package/dest/e2e_p2p/reqresp/utils.js +153 -0
  41. package/dest/e2e_p2p/shared.d.ts +6 -6
  42. package/dest/e2e_p2p/shared.d.ts.map +1 -1
  43. package/dest/e2e_p2p/shared.js +9 -16
  44. package/dest/e2e_token_contract/token_contract_test.d.ts +16 -9
  45. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  46. package/dest/e2e_token_contract/token_contract_test.js +89 -91
  47. package/dest/fixtures/e2e_prover_test.d.ts +8 -14
  48. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  49. package/dest/fixtures/e2e_prover_test.js +85 -93
  50. package/dest/fixtures/setup.d.ts +218 -0
  51. package/dest/fixtures/setup.d.ts.map +1 -0
  52. package/dest/fixtures/setup.js +695 -0
  53. package/dest/fixtures/setup_p2p_test.d.ts +4 -5
  54. package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
  55. package/dest/fixtures/setup_p2p_test.js +24 -19
  56. package/dest/fixtures/token_utils.d.ts +1 -1
  57. package/dest/fixtures/token_utils.d.ts.map +1 -1
  58. package/dest/fixtures/token_utils.js +7 -4
  59. package/dest/fixtures/utils.d.ts +5 -191
  60. package/dest/fixtures/utils.d.ts.map +1 -1
  61. package/dest/fixtures/utils.js +4 -615
  62. package/dest/quality_of_service/prometheus_client.d.ts +38 -0
  63. package/dest/quality_of_service/prometheus_client.d.ts.map +1 -0
  64. package/dest/quality_of_service/prometheus_client.js +67 -0
  65. package/dest/shared/cross_chain_test_harness.d.ts +14 -4
  66. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  67. package/dest/shared/cross_chain_test_harness.js +11 -11
  68. package/dest/shared/gas_portal_test_harness.d.ts +11 -1
  69. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  70. package/dest/shared/gas_portal_test_harness.js +1 -1
  71. package/dest/shared/submit-transactions.d.ts +3 -3
  72. package/dest/shared/submit-transactions.d.ts.map +1 -1
  73. package/dest/shared/submit-transactions.js +9 -11
  74. package/dest/shared/uniswap_l1_l2.d.ts +1 -1
  75. package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
  76. package/dest/shared/uniswap_l1_l2.js +12 -12
  77. package/dest/simulators/lending_simulator.d.ts +5 -1
  78. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  79. package/dest/simulators/lending_simulator.js +2 -2
  80. package/dest/spartan/setup_test_wallets.d.ts +1 -1
  81. package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
  82. package/dest/spartan/setup_test_wallets.js +61 -34
  83. package/dest/spartan/tx_metrics.d.ts +51 -2
  84. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  85. package/dest/spartan/tx_metrics.js +333 -6
  86. package/dest/spartan/utils/bot.d.ts +27 -0
  87. package/dest/spartan/utils/bot.d.ts.map +1 -0
  88. package/dest/spartan/utils/bot.js +141 -0
  89. package/dest/spartan/utils/chaos.d.ts +79 -0
  90. package/dest/spartan/utils/chaos.d.ts.map +1 -0
  91. package/dest/spartan/utils/chaos.js +142 -0
  92. package/dest/spartan/utils/clients.d.ts +39 -0
  93. package/dest/spartan/utils/clients.d.ts.map +1 -0
  94. package/dest/spartan/utils/clients.js +90 -0
  95. package/dest/spartan/utils/config.d.ts +36 -0
  96. package/dest/spartan/utils/config.d.ts.map +1 -0
  97. package/dest/spartan/utils/config.js +20 -0
  98. package/dest/spartan/utils/health.d.ts +63 -0
  99. package/dest/spartan/utils/health.d.ts.map +1 -0
  100. package/dest/spartan/utils/health.js +202 -0
  101. package/dest/spartan/utils/helm.d.ts +15 -0
  102. package/dest/spartan/utils/helm.d.ts.map +1 -0
  103. package/dest/spartan/utils/helm.js +47 -0
  104. package/dest/spartan/utils/index.d.ts +9 -0
  105. package/dest/spartan/utils/index.d.ts.map +1 -0
  106. package/dest/spartan/utils/index.js +18 -0
  107. package/dest/spartan/utils/k8s.d.ts +126 -0
  108. package/dest/spartan/utils/k8s.d.ts.map +1 -0
  109. package/dest/spartan/utils/k8s.js +375 -0
  110. package/dest/spartan/utils/nodes.d.ts +41 -0
  111. package/dest/spartan/utils/nodes.d.ts.map +1 -0
  112. package/dest/spartan/utils/nodes.js +461 -0
  113. package/dest/spartan/utils/scripts.d.ts +16 -0
  114. package/dest/spartan/utils/scripts.d.ts.map +1 -0
  115. package/dest/spartan/utils/scripts.js +66 -0
  116. package/dest/spartan/utils.d.ts +2 -253
  117. package/dest/spartan/utils.d.ts.map +1 -1
  118. package/dest/spartan/utils.js +1 -892
  119. package/package.json +40 -39
  120. package/src/bench/client_flows/benchmark.ts +24 -2
  121. package/src/bench/client_flows/client_flows_benchmark.ts +137 -203
  122. package/src/bench/utils.ts +9 -7
  123. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +104 -142
  124. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +99 -106
  125. package/src/e2e_deploy_contract/deploy_test.ts +21 -14
  126. package/src/e2e_epochs/epochs_test.ts +59 -33
  127. package/src/e2e_fees/bridging_race.notest.ts +3 -9
  128. package/src/e2e_fees/fees_test.ts +171 -217
  129. package/src/e2e_l1_publisher/write_json.ts +16 -13
  130. package/src/e2e_nested_contract/nested_contract_test.ts +33 -56
  131. package/src/e2e_p2p/inactivity_slash_test.ts +5 -5
  132. package/src/e2e_p2p/p2p_network.ts +171 -167
  133. package/src/e2e_p2p/reqresp/utils.ts +207 -0
  134. package/src/e2e_p2p/shared.ts +20 -22
  135. package/src/e2e_token_contract/token_contract_test.ts +103 -118
  136. package/src/fixtures/e2e_prover_test.ts +99 -133
  137. package/src/fixtures/setup.ts +1017 -0
  138. package/src/fixtures/setup_p2p_test.ts +15 -20
  139. package/src/fixtures/token_utils.ts +6 -5
  140. package/src/fixtures/utils.ts +27 -901
  141. package/src/quality_of_service/prometheus_client.ts +113 -0
  142. package/src/shared/cross_chain_test_harness.ts +13 -27
  143. package/src/shared/gas_portal_test_harness.ts +1 -1
  144. package/src/shared/submit-transactions.ts +9 -15
  145. package/src/shared/uniswap_l1_l2.ts +12 -19
  146. package/src/simulators/lending_simulator.ts +2 -2
  147. package/src/spartan/setup_test_wallets.ts +72 -24
  148. package/src/spartan/tx_metrics.ts +255 -9
  149. package/src/spartan/utils/bot.ts +185 -0
  150. package/src/spartan/utils/chaos.ts +253 -0
  151. package/src/spartan/utils/clients.ts +100 -0
  152. package/src/spartan/utils/config.ts +26 -0
  153. package/src/spartan/utils/health.ts +255 -0
  154. package/src/spartan/utils/helm.ts +84 -0
  155. package/src/spartan/utils/index.ts +64 -0
  156. package/src/spartan/utils/k8s.ts +527 -0
  157. package/src/spartan/utils/nodes.ts +538 -0
  158. package/src/spartan/utils/scripts.ts +63 -0
  159. package/src/spartan/utils.ts +1 -1158
  160. package/dest/fixtures/snapshot_manager.d.ts +0 -93
  161. package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
  162. package/dest/fixtures/snapshot_manager.js +0 -488
  163. package/src/fixtures/snapshot_manager.ts +0 -646
@@ -0,0 +1,207 @@
1
+ import type { AztecNodeService } from '@aztec/aztec-node';
2
+ import { createLogger } from '@aztec/aztec.js/log';
3
+ import { waitForTx } from '@aztec/aztec.js/node';
4
+ import { Tx } from '@aztec/aztec.js/tx';
5
+ import { RollupContract } from '@aztec/ethereum/contracts';
6
+ import { SlotNumber } from '@aztec/foundation/branded-types';
7
+ import { timesAsync } from '@aztec/foundation/collection';
8
+ import { retryUntil } from '@aztec/foundation/retry';
9
+
10
+ import { jest } from '@jest/globals';
11
+ import fs from 'fs';
12
+ import os from 'os';
13
+ import path from 'path';
14
+
15
+ import { shouldCollectMetrics } from '../../fixtures/fixtures.js';
16
+ import { createNodes } from '../../fixtures/setup_p2p_test.js';
17
+ import { P2PNetworkTest, SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES, WAIT_FOR_TX_TIMEOUT } from '../p2p_network.js';
18
+ import { prepareTransactions } from '../shared.js';
19
+
20
+ // Don't set this to a higher value than 9 because each node will use a different L1 publisher account and anvil seeds
21
+ export const NUM_VALIDATORS = 6;
22
+ export const NUM_TXS_PER_NODE = 2;
23
+ export const BOOT_NODE_UDP_PORT = 4500;
24
+
25
+ export const createReqrespDataDir = () => fs.mkdtempSync(path.join(os.tmpdir(), 'reqresp-'));
26
+
27
+ type ReqrespOptions = {
28
+ disableStatusHandshake?: boolean;
29
+ };
30
+
31
+ export async function createReqrespTest(options: ReqrespOptions = {}): Promise<P2PNetworkTest> {
32
+ const { disableStatusHandshake = false } = options;
33
+ const t = await P2PNetworkTest.create({
34
+ testName: 'e2e_p2p_reqresp_tx',
35
+ numberOfNodes: 0,
36
+ numberOfValidators: NUM_VALIDATORS,
37
+ basePort: BOOT_NODE_UDP_PORT,
38
+ // To collect metrics - run in aztec-packages `docker compose --profile metrics up`
39
+ metricsPort: shouldCollectMetrics(),
40
+ initialConfig: {
41
+ ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
42
+ aztecSlotDuration: 24,
43
+ ...(disableStatusHandshake ? { p2pDisableStatusHandshake: true } : {}),
44
+ listenAddress: '127.0.0.1',
45
+ aztecEpochDuration: 64, // stable committee
46
+ },
47
+ });
48
+ await t.setup();
49
+ await t.applyBaseSetup();
50
+ return t;
51
+ }
52
+
53
+ export async function cleanupReqrespTest(params: { t: P2PNetworkTest; nodes?: AztecNodeService[]; dataDir: string }) {
54
+ const { t, nodes, dataDir } = params;
55
+ if (nodes) {
56
+ await t.stopNodes(nodes);
57
+ }
58
+ await t.teardown();
59
+ for (let i = 0; i < NUM_VALIDATORS; i++) {
60
+ fs.rmSync(`${dataDir}-${i}`, { recursive: true, force: true, maxRetries: 3 });
61
+ }
62
+ }
63
+
64
+ const getNodePort = (nodeIndex: number) => BOOT_NODE_UDP_PORT + 1 + nodeIndex;
65
+
66
+ export async function runReqrespTxTest(params: {
67
+ t: P2PNetworkTest;
68
+ dataDir: string;
69
+ disableStatusHandshake?: boolean;
70
+ }): Promise<AztecNodeService[]> {
71
+ const { t, dataDir, disableStatusHandshake = false } = params;
72
+
73
+ if (!t.bootstrapNodeEnr) {
74
+ throw new Error('Bootstrap node ENR is not available');
75
+ }
76
+
77
+ t.logger.info('Creating nodes');
78
+ const aztecNodeConfig = disableStatusHandshake
79
+ ? { ...t.ctx.aztecNodeConfig, p2pDisableStatusHandshake: true }
80
+ : t.ctx.aztecNodeConfig;
81
+
82
+ const nodes = await createNodes(
83
+ aztecNodeConfig,
84
+ t.ctx.dateProvider!,
85
+ t.bootstrapNodeEnr,
86
+ NUM_VALIDATORS,
87
+ BOOT_NODE_UDP_PORT,
88
+ t.prefilledPublicData,
89
+ dataDir,
90
+ shouldCollectMetrics(),
91
+ );
92
+
93
+ t.logger.info('Waiting for nodes to connect');
94
+ await t.waitForP2PMeshConnectivity(nodes, NUM_VALIDATORS);
95
+
96
+ await t.setupAccount();
97
+
98
+ const targetBlockNumber = await t.ctx.aztecNodeService!.getBlockNumber();
99
+ await retryUntil(
100
+ async () => {
101
+ const blockNumbers = await Promise.all(nodes.map(node => node.getBlockNumber()));
102
+ return blockNumbers.every(blockNumber => blockNumber >= targetBlockNumber) ? true : undefined;
103
+ },
104
+ `validators to sync to L2 block ${targetBlockNumber}`,
105
+ 60,
106
+ 0.5,
107
+ );
108
+
109
+ t.logger.info('Preparing transactions to send');
110
+ const txBatches = await timesAsync(2, () =>
111
+ prepareTransactions(t.logger, t.ctx.aztecNodeService!, NUM_TXS_PER_NODE, t.fundedAccount),
112
+ );
113
+
114
+ t.logger.info('Removing initial node');
115
+ await t.removeInitialNode();
116
+
117
+ t.logger.info('Starting fresh slot');
118
+ const [timestamp] = await t.ctx.cheatCodes.rollup.advanceToNextSlot();
119
+ t.ctx.dateProvider!.setTime(Number(timestamp) * 1000);
120
+ const startSlotTimestamp = BigInt(timestamp);
121
+
122
+ const { proposerIndexes, nodesToTurnOffTxGossip } = await getProposerIndexes(t, startSlotTimestamp);
123
+ t.logger.info(`Turning off tx gossip for nodes: ${nodesToTurnOffTxGossip.map(getNodePort)}`);
124
+ t.logger.info(`Sending txs to proposer nodes: ${proposerIndexes.map(getNodePort)}`);
125
+
126
+ // Replace the p2p node implementation of some of the nodes with a spy such that it does not store transactions that are gossiped to it
127
+ // Original implementation of `handleGossipedTx` will store received transactions in the tx pool.
128
+ // We chose the first 2 nodes that will be the proposers for the next few slots
129
+ for (const nodeIndex of nodesToTurnOffTxGossip) {
130
+ const logger = createLogger(`p2p:${getNodePort(nodeIndex)}`);
131
+ jest.spyOn((nodes[nodeIndex] as any).p2pClient.p2pService, 'handleGossipedTx').mockImplementation(((
132
+ payloadData: Buffer,
133
+ ) => {
134
+ const txHash = Tx.fromBuffer(payloadData).getTxHash();
135
+ logger.info(`Skipping storage of gossiped transaction ${txHash.toString()}`);
136
+ return Promise.resolve();
137
+ }) as any);
138
+ }
139
+
140
+ // We send the tx to the proposer nodes directly, ignoring the pxe and node in each context
141
+ // We cannot just call tx.send since they were created using a pxe wired to the first node which is now stopped
142
+ t.logger.info('Sending transactions through proposer nodes');
143
+ const submittedTxs = await Promise.all(
144
+ txBatches.map(async (batch, batchIndex) => {
145
+ const proposerNode = nodes[proposerIndexes[batchIndex]];
146
+ await Promise.all(
147
+ batch.map(async tx => {
148
+ try {
149
+ await proposerNode.sendTx(tx);
150
+ } catch (err) {
151
+ t.logger.error(`Error sending tx: ${err}`);
152
+ throw err;
153
+ }
154
+ }),
155
+ );
156
+ return batch.map(tx => ({ node: proposerNode, txHash: tx.getTxHash() }));
157
+ }),
158
+ );
159
+
160
+ t.logger.info('Waiting for all transactions to be mined');
161
+ await Promise.all(
162
+ submittedTxs.flatMap((batch, batchIndex) =>
163
+ batch.map(async (submittedTx, txIndex) => {
164
+ t.logger.info(`Waiting for tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} to be mined`);
165
+ await waitForTx(submittedTx.node, submittedTx.txHash, { timeout: WAIT_FOR_TX_TIMEOUT * 1.5 });
166
+ t.logger.info(`Tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} has been mined`);
167
+ }),
168
+ ),
169
+ );
170
+
171
+ t.logger.info('All transactions mined');
172
+
173
+ return nodes;
174
+ }
175
+
176
+ async function getProposerIndexes(t: P2PNetworkTest, startSlotTimestamp: bigint) {
177
+ // Get the nodes for the next set of slots
178
+ const rollupContract = new RollupContract(
179
+ t.ctx.deployL1ContractsValues.l1Client,
180
+ t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress,
181
+ );
182
+
183
+ const attesters = await rollupContract.getAttesters();
184
+ const startSlot = await rollupContract.getSlotAt(startSlotTimestamp);
185
+
186
+ const proposers = await Promise.all(
187
+ Array.from({ length: 3 }, async (_, i) => {
188
+ const slot = SlotNumber(startSlot + i);
189
+ const slotTimestamp = await rollupContract.getTimestampForSlot(slot);
190
+ return await rollupContract.getProposerAt(slotTimestamp);
191
+ }),
192
+ );
193
+ // Get the indexes of the nodes that are responsible for the next two slots
194
+ const proposerIndexes = proposers.map(proposer => attesters.findIndex(a => a.equals(proposer)));
195
+
196
+ if (proposerIndexes.some(i => i === -1)) {
197
+ throw new Error(
198
+ `Proposer index not found for proposer ` +
199
+ `(proposers=${proposers.map(p => p.toString()).join(',')}, indices=${proposerIndexes.join(',')})`,
200
+ );
201
+ }
202
+
203
+ const nodesToTurnOffTxGossip = Array.from({ length: NUM_VALIDATORS }, (_, i) => i).filter(
204
+ i => !proposerIndexes.includes(i),
205
+ );
206
+ return { proposerIndexes, nodesToTurnOffTxGossip };
207
+ }
@@ -1,10 +1,10 @@
1
1
  import type { InitialAccountData } from '@aztec/accounts/testing';
2
2
  import type { AztecNodeService } from '@aztec/aztec-node';
3
3
  import { AztecAddress } from '@aztec/aztec.js/addresses';
4
- import { type SentTx, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
4
+ import { NO_WAIT, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
5
5
  import { Fr } from '@aztec/aztec.js/fields';
6
6
  import type { Logger } from '@aztec/aztec.js/log';
7
- import { Tx, TxStatus } from '@aztec/aztec.js/tx';
7
+ import { TxHash } from '@aztec/aztec.js/tx';
8
8
  import type { RollupCheatCodes } from '@aztec/aztec/testing';
9
9
  import type {
10
10
  EmpireSlashingProposerContract,
@@ -22,7 +22,7 @@ import { getPXEConfig, getPXEConfig as getRpcConfig } from '@aztec/pxe/server';
22
22
  import { getRoundForOffense } from '@aztec/slasher';
23
23
  import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
24
24
  import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
25
- import { TestWallet, proveInteraction } from '@aztec/test-wallet/server';
25
+ import { type ProvenTx, TestWallet, proveInteraction } from '@aztec/test-wallet/server';
26
26
 
27
27
  import { submitTxsTo } from '../shared/submit-transactions.js';
28
28
 
@@ -34,24 +34,15 @@ export const submitComplexTxsTo = async (
34
34
  numTxs: number,
35
35
  opts: { callPublic?: boolean } = {},
36
36
  ) => {
37
- const txs: SentTx[] = [];
37
+ const txs: TxHash[] = [];
38
38
 
39
39
  const seed = 1234n;
40
40
  const spamCount = 15;
41
41
  for (let i = 0; i < numTxs; i++) {
42
- const tx = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic).send({ from });
43
- const txHash = await tx.getTxHash();
44
-
42
+ const method = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic);
43
+ const txHash = await method.send({ from, wait: NO_WAIT });
45
44
  logger.info(`Tx sent with hash ${txHash.toString()}`);
46
- const receipt = await tx.getReceipt();
47
- expect(receipt).toEqual(
48
- expect.objectContaining({
49
- status: TxStatus.PENDING,
50
- error: '',
51
- }),
52
- );
53
- logger.info(`Receipt received for ${txHash.toString()}`);
54
- txs.push(tx);
45
+ txs.push(txHash);
55
46
  }
56
47
  return txs;
57
48
  };
@@ -62,10 +53,14 @@ export const submitTransactions = async (
62
53
  node: AztecNodeService,
63
54
  numTxs: number,
64
55
  fundedAccount: InitialAccountData,
65
- ): Promise<SentTx[]> => {
56
+ ): Promise<TxHash[]> => {
66
57
  const rpcConfig = getRpcConfig();
67
58
  rpcConfig.proverEnabled = false;
68
- const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
59
+ const wallet = await TestWallet.create(
60
+ node,
61
+ { ...getPXEConfig(), proverEnabled: false },
62
+ { loggerActorLabel: 'pxe-tx' },
63
+ );
69
64
  const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
70
65
  return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
71
66
  };
@@ -75,11 +70,15 @@ export async function prepareTransactions(
75
70
  node: AztecNodeService,
76
71
  numTxs: number,
77
72
  fundedAccount: InitialAccountData,
78
- ): Promise<Tx[]> {
73
+ ): Promise<ProvenTx[]> {
79
74
  const rpcConfig = getRpcConfig();
80
75
  rpcConfig.proverEnabled = false;
81
76
 
82
- const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
77
+ const wallet = await TestWallet.create(
78
+ node,
79
+ { ...getPXEConfig(), proverEnabled: false },
80
+ { loggerActorLabel: 'pxe-tx' },
81
+ );
83
82
  const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
84
83
 
85
84
  const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {
@@ -92,8 +91,7 @@ export async function prepareTransactions(
92
91
  const tx = await proveInteraction(wallet, contract.methods.emit_nullifier(Fr.random()), {
93
92
  from: fundedAccountManager.address,
94
93
  });
95
- const txHash = tx.getTxHash();
96
- logger.info(`Tx prepared with hash ${txHash}`);
94
+ logger.info(`Tx prepared with hash ${tx.getTxHash()}`);
97
95
  return tx;
98
96
  });
99
97
  }
@@ -7,24 +7,19 @@ import type { TestWallet } from '@aztec/test-wallet/server';
7
7
 
8
8
  import { jest } from '@jest/globals';
9
9
 
10
- import {
11
- type ISnapshotManager,
12
- type SubsystemsContext,
13
- createSnapshotManager,
14
- deployAccounts,
15
- publicDeployAccounts,
16
- } from '../fixtures/snapshot_manager.js';
10
+ import { type EndToEndContext, deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
17
11
  import { mintTokensToPrivate } from '../fixtures/token_utils.js';
18
12
  import { TokenSimulator } from '../simulators/token_simulator.js';
19
13
 
20
- const { E2E_DATA_PATH: dataPath, METRICS_PORT: metricsPort } = process.env;
14
+ const { METRICS_PORT: metricsPort } = process.env;
21
15
 
22
16
  export class TokenContractTest {
23
17
  static TOKEN_NAME = 'USDC';
24
18
  static TOKEN_SYMBOL = 'USD';
25
19
  static TOKEN_DECIMALS = 18n;
26
- private snapshotManager: ISnapshotManager;
20
+ context!: EndToEndContext;
27
21
  logger: Logger;
22
+ metricsPort?: number;
28
23
  asset!: TokenContract;
29
24
  tokenSim!: TokenSimulator;
30
25
  node!: AztecNode;
@@ -35,133 +30,123 @@ export class TokenContractTest {
35
30
  account1Address!: AztecAddress;
36
31
  account2Address!: AztecAddress;
37
32
 
33
+ private shouldApplyBaseSetup = false;
34
+ private shouldApplyMint = false;
35
+
38
36
  constructor(testName: string) {
39
37
  this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
40
- this.snapshotManager = createSnapshotManager(`e2e_token_contract/${testName}`, dataPath, {
41
- metricsPort: metricsPort ? parseInt(metricsPort) : undefined,
42
- });
38
+ this.metricsPort = metricsPort ? parseInt(metricsPort) : undefined;
39
+ }
40
+
41
+ /**
42
+ * Registers that base setup should be applied during setup().
43
+ * Call this before setup() to deploy 3 accounts, publicly deploy accounts, token contract and a "bad account".
44
+ */
45
+ applyBaseSnapshots() {
46
+ this.shouldApplyBaseSetup = true;
43
47
  }
44
48
 
45
49
  /**
46
- * Adds two state shifts to snapshot manager.
47
- * 1. Add 3 accounts.
48
- * 2. Publicly deploy accounts, deploy token contract and a "bad account".
50
+ * Registers that mint should be applied during setup().
51
+ * Call this before setup() to mint tokens to the admin account.
49
52
  */
50
- async applyBaseSnapshots() {
53
+ applyMintSnapshot() {
54
+ this.shouldApplyMint = true;
55
+ }
56
+
57
+ /**
58
+ * Applies base setup: deploys 3 accounts, publicly deploys accounts, token contract and a "bad account".
59
+ */
60
+ private async applyBaseSetup() {
51
61
  // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
52
62
  jest.setTimeout(120_000);
53
63
 
54
- await this.snapshotManager.snapshot(
55
- '3_accounts',
56
- deployAccounts(3, this.logger),
57
- ({ deployedAccounts }, { wallet, aztecNode }) => {
58
- this.node = aztecNode;
59
- this.wallet = wallet;
60
- [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map(acc => acc.address);
61
- return Promise.resolve();
62
- },
63
- );
64
+ this.logger.info('Applying base setup - deploying 3 accounts');
65
+ const { deployedAccounts } = await deployAccounts(
66
+ 3,
67
+ this.logger,
68
+ )({
69
+ wallet: this.context.wallet,
70
+ initialFundedAccounts: this.context.initialFundedAccounts,
71
+ });
64
72
 
65
- await this.snapshotManager.snapshot(
66
- 'e2e_token_contract',
67
- async () => {
68
- // Create the token contract state.
69
- // Move this account thing to addAccounts above?
70
- this.logger.verbose(`Public deploy accounts...`);
71
- await publicDeployAccounts(this.wallet, [this.adminAddress, this.account1Address]);
72
-
73
- this.logger.verbose(`Deploying TokenContract...`);
74
- const asset = await TokenContract.deploy(
75
- this.wallet,
76
- this.adminAddress,
77
- TokenContractTest.TOKEN_NAME,
78
- TokenContractTest.TOKEN_SYMBOL,
79
- TokenContractTest.TOKEN_DECIMALS,
80
- )
81
- .send({ from: this.adminAddress })
82
- .deployed();
83
- this.logger.verbose(`Token deployed to ${asset.address}`);
84
-
85
- this.logger.verbose(`Deploying bad account...`);
86
- this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress }).deployed();
87
- this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
88
-
89
- return { tokenContractAddress: asset.address, badAccountAddress: this.badAccount.address };
90
- },
91
- async ({ tokenContractAddress, badAccountAddress }) => {
92
- // Restore the token contract state.
93
- this.asset = TokenContract.at(tokenContractAddress, this.wallet);
94
- this.logger.verbose(`Token contract address: ${this.asset.address}`);
95
-
96
- this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
97
- this.adminAddress,
98
- this.account1Address,
99
- ]);
100
-
101
- this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
102
- this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
103
-
104
- expect(await this.asset.methods.get_admin().simulate({ from: this.adminAddress })).toBe(
105
- this.adminAddress.toBigInt(),
106
- );
107
- },
73
+ this.node = this.context.aztecNodeService!;
74
+ this.wallet = this.context.wallet;
75
+ [this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map(acc => acc.address);
76
+
77
+ this.logger.info('Applying base setup - deploying token contract');
78
+ this.logger.verbose(`Public deploy accounts...`);
79
+ await publicDeployAccounts(this.wallet, [this.adminAddress, this.account1Address]);
80
+
81
+ this.logger.verbose(`Deploying TokenContract...`);
82
+ this.asset = await TokenContract.deploy(
83
+ this.wallet,
84
+ this.adminAddress,
85
+ TokenContractTest.TOKEN_NAME,
86
+ TokenContractTest.TOKEN_SYMBOL,
87
+ TokenContractTest.TOKEN_DECIMALS,
88
+ ).send({ from: this.adminAddress });
89
+ this.logger.verbose(`Token deployed to ${this.asset.address}`);
90
+
91
+ this.logger.verbose(`Deploying bad account...`);
92
+ this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress });
93
+ this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
94
+
95
+ this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
96
+ this.adminAddress,
97
+ this.account1Address,
98
+ ]);
99
+
100
+ expect(await this.asset.methods.get_admin().simulate({ from: this.adminAddress })).toBe(
101
+ this.adminAddress.toBigInt(),
108
102
  );
109
-
110
- // TokenContract.artifact.functions.forEach(fn => {
111
- // const sig = decodeFunctionSignature(fn.name, fn.parameters);
112
- // logger.verbose(`Function ${sig} and the selector: ${FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)}`);
113
- // });
114
103
  }
115
104
 
116
105
  async setup() {
117
- await this.snapshotManager.setup();
118
- }
106
+ this.context = await setup(0, {
107
+ metricsPort: this.metricsPort,
108
+ fundSponsoredFPC: true,
109
+ skipAccountDeployment: true,
110
+ });
119
111
 
120
- snapshot = <T>(
121
- name: string,
122
- apply: (context: SubsystemsContext) => Promise<T>,
123
- restore: (snapshotData: T, context: SubsystemsContext) => Promise<void> = () => Promise.resolve(),
124
- ): Promise<void> => this.snapshotManager.snapshot(name, apply, restore);
112
+ if (this.shouldApplyBaseSetup) {
113
+ await this.applyBaseSetup();
114
+ }
115
+
116
+ if (this.shouldApplyMint) {
117
+ await this.applyMint();
118
+ }
119
+ }
125
120
 
126
121
  async teardown() {
127
- await this.snapshotManager.teardown();
122
+ await teardown(this.context);
128
123
  }
129
124
 
130
- async applyMintSnapshot() {
131
- await this.snapshotManager.snapshot(
132
- 'mint',
133
- async () => {
134
- const { asset, adminAddress } = this;
135
- const amount = 10000n;
136
-
137
- this.logger.verbose(`Minting ${amount} publicly...`);
138
- await asset.methods.mint_to_public(adminAddress, amount).send({ from: adminAddress }).wait();
139
-
140
- this.logger.verbose(`Minting ${amount} privately...`);
141
- await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
142
- this.logger.verbose(`Minting complete.`);
143
-
144
- return { amount };
145
- },
146
- async ({ amount }) => {
147
- const { asset, adminAddress, tokenSim } = this;
148
- tokenSim.mintPublic(adminAddress, amount);
149
-
150
- const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({ from: adminAddress });
151
- this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
152
- expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
153
-
154
- tokenSim.mintPrivate(adminAddress, amount);
155
- const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({ from: adminAddress });
156
- this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
157
- expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
158
-
159
- const totalSupply = await asset.methods.total_supply().simulate({ from: adminAddress });
160
- this.logger.verbose(`Total supply: ${totalSupply}`);
161
- expect(totalSupply).toEqual(tokenSim.totalSupply);
162
-
163
- return Promise.resolve();
164
- },
165
- );
125
+ private async applyMint() {
126
+ this.logger.info('Applying mint setup');
127
+ const { asset, adminAddress, tokenSim } = this;
128
+ const amount = 10000n;
129
+
130
+ this.logger.verbose(`Minting ${amount} publicly...`);
131
+ await asset.methods.mint_to_public(adminAddress, amount).send({ from: adminAddress });
132
+ tokenSim.mintPublic(adminAddress, amount);
133
+
134
+ const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({ from: adminAddress });
135
+ this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
136
+ expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
137
+
138
+ this.logger.verbose(`Minting ${amount} privately...`);
139
+ await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
140
+ tokenSim.mintPrivate(adminAddress, amount);
141
+
142
+ const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({ from: adminAddress });
143
+ this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
144
+ expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
145
+
146
+ const totalSupply = await asset.methods.total_supply().simulate({ from: adminAddress });
147
+ this.logger.verbose(`Total supply: ${totalSupply}`);
148
+ expect(totalSupply).toEqual(tokenSim.totalSupply);
149
+
150
+ this.logger.verbose(`Minting complete.`);
166
151
  }
167
152
  }