@aztec/end-to-end 4.0.0-nightly.20260113 → 4.0.0-nightly.20260115

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 (80) hide show
  1. package/dest/bench/client_flows/client_flows_benchmark.d.ts +12 -13
  2. package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
  3. package/dest/bench/client_flows/client_flows_benchmark.js +104 -134
  4. package/dest/bench/utils.d.ts +1 -1
  5. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +6 -7
  6. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
  7. package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +98 -113
  8. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +6 -7
  9. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
  10. package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +65 -62
  11. package/dest/e2e_deploy_contract/deploy_test.d.ts +4 -3
  12. package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
  13. package/dest/e2e_deploy_contract/deploy_test.js +18 -13
  14. package/dest/e2e_epochs/epochs_test.js +1 -1
  15. package/dest/e2e_fees/bridging_race.notest.js +2 -4
  16. package/dest/e2e_fees/fees_test.d.ts +13 -13
  17. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  18. package/dest/e2e_fees/fees_test.js +122 -140
  19. package/dest/e2e_l1_publisher/write_json.d.ts +1 -1
  20. package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
  21. package/dest/e2e_l1_publisher/write_json.js +1 -0
  22. package/dest/e2e_nested_contract/nested_contract_test.d.ts +6 -9
  23. package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
  24. package/dest/e2e_nested_contract/nested_contract_test.js +32 -40
  25. package/dest/e2e_p2p/inactivity_slash_test.d.ts +3 -3
  26. package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
  27. package/dest/e2e_p2p/inactivity_slash_test.js +3 -3
  28. package/dest/e2e_p2p/p2p_network.d.ts +7 -6
  29. package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
  30. package/dest/e2e_p2p/p2p_network.js +106 -103
  31. package/dest/e2e_token_contract/token_contract_test.d.ts +16 -9
  32. package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
  33. package/dest/e2e_token_contract/token_contract_test.js +90 -92
  34. package/dest/fixtures/e2e_prover_test.d.ts +8 -14
  35. package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
  36. package/dest/fixtures/e2e_prover_test.js +82 -93
  37. package/dest/fixtures/setup.d.ts +216 -0
  38. package/dest/fixtures/setup.d.ts.map +1 -0
  39. package/dest/fixtures/setup.js +683 -0
  40. package/dest/fixtures/utils.d.ts +5 -191
  41. package/dest/fixtures/utils.d.ts.map +1 -1
  42. package/dest/fixtures/utils.js +4 -615
  43. package/dest/quality_of_service/prometheus_client.d.ts +38 -0
  44. package/dest/quality_of_service/prometheus_client.d.ts.map +1 -0
  45. package/dest/quality_of_service/prometheus_client.js +67 -0
  46. package/dest/shared/cross_chain_test_harness.d.ts +12 -1
  47. package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
  48. package/dest/shared/gas_portal_test_harness.d.ts +11 -1
  49. package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
  50. package/dest/simulators/lending_simulator.d.ts +5 -1
  51. package/dest/simulators/lending_simulator.d.ts.map +1 -1
  52. package/dest/spartan/tx_metrics.d.ts +4 -1
  53. package/dest/spartan/tx_metrics.d.ts.map +1 -1
  54. package/dest/spartan/tx_metrics.js +21 -1
  55. package/dest/spartan/utils.d.ts +5 -1
  56. package/dest/spartan/utils.d.ts.map +1 -1
  57. package/dest/spartan/utils.js +25 -8
  58. package/package.json +39 -39
  59. package/src/bench/client_flows/client_flows_benchmark.ts +142 -195
  60. package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +107 -142
  61. package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +99 -106
  62. package/src/e2e_deploy_contract/deploy_test.ts +21 -14
  63. package/src/e2e_epochs/epochs_test.ts +1 -1
  64. package/src/e2e_fees/bridging_race.notest.ts +2 -5
  65. package/src/e2e_fees/fees_test.ts +171 -213
  66. package/src/e2e_l1_publisher/write_json.ts +1 -0
  67. package/src/e2e_nested_contract/nested_contract_test.ts +35 -56
  68. package/src/e2e_p2p/inactivity_slash_test.ts +5 -5
  69. package/src/e2e_p2p/p2p_network.ts +165 -167
  70. package/src/e2e_token_contract/token_contract_test.ts +105 -118
  71. package/src/fixtures/e2e_prover_test.ts +107 -136
  72. package/src/fixtures/setup.ts +1009 -0
  73. package/src/fixtures/utils.ts +27 -901
  74. package/src/quality_of_service/prometheus_client.ts +113 -0
  75. package/src/spartan/tx_metrics.ts +21 -1
  76. package/src/spartan/utils.ts +26 -8
  77. package/dest/fixtures/snapshot_manager.d.ts +0 -93
  78. package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
  79. package/dest/fixtures/snapshot_manager.js +0 -488
  80. package/src/fixtures/snapshot_manager.ts +0 -646
@@ -1,616 +1,5 @@
1
- import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
2
- import { generateSchnorrAccounts, getInitialTestAccountsData } from '@aztec/accounts/testing';
3
- import { createArchiver } from '@aztec/archiver';
4
- import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
5
- import { BatchCall } from '@aztec/aztec.js/contracts';
6
- import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
7
- import { Fr } from '@aztec/aztec.js/fields';
8
- import { createLogger } from '@aztec/aztec.js/log';
9
- import { createAztecNodeClient, waitForNode } from '@aztec/aztec.js/node';
10
- import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
11
- import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
12
- import { SPONSORED_FPC_SALT } from '@aztec/constants';
13
- import { isAnvilTestChain } from '@aztec/ethereum/chain';
14
- import { createExtendedL1Client } from '@aztec/ethereum/client';
15
- import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
16
- import { NULL_KEY } from '@aztec/ethereum/constants';
17
- import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
18
- import { DelayedTxUtils, EthCheatCodes, EthCheatCodesWithState, createDelayedL1TxUtilsFromViemWallet, startAnvil } from '@aztec/ethereum/test';
19
- import { EpochNumber } from '@aztec/foundation/branded-types';
20
- import { SecretValue } from '@aztec/foundation/config';
21
- import { EthAddress } from '@aztec/foundation/eth-address';
22
- import { tryRmDir } from '@aztec/foundation/fs';
23
- import { withLogNameSuffix } from '@aztec/foundation/log';
24
- import { retryUntil } from '@aztec/foundation/retry';
25
- import { sleep } from '@aztec/foundation/sleep';
26
- import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
27
- import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
28
- import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
29
- import { MockGossipSubNetwork, getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
30
- import { protocolContractsHash } from '@aztec/protocol-contracts';
31
- import { createProverNode } from '@aztec/prover-node';
32
- import { getPXEConfig } from '@aztec/pxe/server';
33
- import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
34
- import { tryStop } from '@aztec/stdlib/interfaces/server';
35
- import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
36
- import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
37
- import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
38
- import { getGenesisValues } from '@aztec/world-state/testing';
39
- import { randomBytes } from 'crypto';
40
- import fs from 'fs/promises';
41
- import { tmpdir } from 'os';
42
- import * as path from 'path';
43
- import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
44
- import { foundry } from 'viem/chains';
45
- import { MNEMONIC, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
46
- import { getACVMConfig } from './get_acvm_config.js';
47
- import { getBBConfig } from './get_bb_config.js';
48
- import { isMetricsLoggingRequested, setupMetricsLogger } from './logging.js';
49
- export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
50
- export { startAnvil };
51
- /**
52
- * Sets up shared blob storage using FileStore in the data directory.
53
- */ export async function setupSharedBlobStorage(config) {
54
- const sharedBlobPath = path.join(config.dataDirectory, 'shared-blobs');
55
- await fs.mkdir(sharedBlobPath, {
56
- recursive: true
57
- });
58
- config.blobFileStoreUrls = [
59
- `file://${sharedBlobPath}`
60
- ];
61
- config.blobFileStoreUploadUrl = `file://${sharedBlobPath}`;
62
- }
63
- const { AZTEC_NODE_URL = '' } = process.env;
64
- const getAztecUrl = ()=>AZTEC_NODE_URL;
65
- let telemetry = undefined;
66
- async function getTelemetryClient(partialConfig = {}) {
67
- if (!telemetry) {
68
- const config = {
69
- ...getTelemetryConfig(),
70
- ...partialConfig
71
- };
72
- telemetry = config.benchmark ? new BenchmarkTelemetryClient() : await initTelemetryClient(config);
73
- }
74
- return telemetry;
75
- }
76
- if (typeof afterAll === 'function') {
77
- afterAll(async ()=>{
78
- await telemetry?.stop();
79
- });
80
- }
81
- export const getPrivateKeyFromIndex = (index)=>{
82
- const hdAccount = mnemonicToAccount(MNEMONIC, {
83
- addressIndex: index
84
- });
85
- const privKeyRaw = hdAccount.getHdKey().privateKey;
86
- return privKeyRaw === null ? null : Buffer.from(privKeyRaw);
87
- };
88
- /**
89
- * Sets up Private eXecution Environment (PXE) and returns the corresponding test wallet.
90
- * @param aztecNode - An instance of Aztec Node.
91
- * @param opts - Partial configuration for the PXE.
92
- * @param logger - The logger to be used.
93
- * @param useLogSuffix - Whether to add a randomly generated suffix to the PXE debug logs.
94
- * @returns A test wallet, logger and teardown function.
95
- */ export async function setupPXEAndGetWallet(aztecNode, opts = {}, logger = getLogger(), useLogSuffix = false) {
96
- const PXEConfig = {
97
- ...getPXEConfig(),
98
- ...opts
99
- };
100
- // For tests we only want proving enabled if specifically requested
101
- PXEConfig.proverEnabled = !!opts.proverEnabled;
102
- // If no data directory provided, create a temp directory and clean up afterwards
103
- const configuredDataDirectory = PXEConfig.dataDirectory;
104
- if (!configuredDataDirectory) {
105
- PXEConfig.dataDirectory = path.join(tmpdir(), randomBytes(8).toString('hex'));
106
- }
107
- const teardown = configuredDataDirectory ? ()=>Promise.resolve() : ()=>tryRmDir(PXEConfig.dataDirectory);
108
- const wallet = await TestWallet.create(aztecNode, PXEConfig, {
109
- useLogSuffix
110
- });
111
- return {
112
- wallet,
113
- logger,
114
- teardown
115
- };
116
- }
117
- /**
118
- * Function to setup the test against a remote deployment. It is assumed that L1 contract are already deployed
119
- * @param account - The account for use in create viem wallets.
120
- * @param config - The aztec Node Configuration
121
- * @param logger - The logger to be used
122
- * @param numberOfAccounts - The number of new accounts to be created once the PXE is initiated.
123
- * (will create extra accounts if the environment doesn't already have enough accounts)
124
- * @returns Private eXecution Environment (PXE) client, viem wallets, contract addresses etc.
125
- */ async function setupWithRemoteEnvironment(account, config, logger, numberOfAccounts) {
126
- // we are setting up against a remote environment, l1 contracts are already deployed
127
- const aztecNodeUrl = getAztecUrl();
128
- logger.verbose(`Creating Aztec Node client to remote host ${aztecNodeUrl}`);
129
- const aztecNode = createAztecNodeClient(aztecNodeUrl);
130
- await waitForNode(aztecNode, logger);
131
- logger.verbose('JSON RPC client connected to Aztec Node');
132
- logger.verbose(`Retrieving contract addresses from ${aztecNodeUrl}`);
133
- const { l1ContractAddresses, rollupVersion } = await aztecNode.getNodeInfo();
134
- const l1Client = createExtendedL1Client(config.l1RpcUrls, account, foundry);
135
- const deployL1ContractsValues = {
136
- l1ContractAddresses,
137
- l1Client,
138
- rollupVersion
139
- };
140
- const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls, new DateProvider());
141
- const wallet = await TestWallet.create(aztecNode);
142
- const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNode, new DateProvider());
143
- const teardown = ()=>Promise.resolve();
144
- logger.verbose('Populating wallet from already registered accounts...');
145
- const initialFundedAccounts = await getInitialTestAccountsData();
146
- if (initialFundedAccounts.length < numberOfAccounts) {
147
- throw new Error(`Required ${numberOfAccounts} accounts. Found ${initialFundedAccounts.length}.`);
148
- // Deploy new accounts if there's a test that requires more funded accounts in the remote environment.
149
- }
150
- const testAccounts = await Promise.all(initialFundedAccounts.slice(0, numberOfAccounts).map(async (account)=>{
151
- const accountManager = await wallet.createSchnorrAccount(account.secret, account.salt, account.signingKey);
152
- return accountManager.address;
153
- }));
154
- return {
155
- aztecNode,
156
- aztecNodeAdmin: undefined,
157
- sequencer: undefined,
158
- proverNode: undefined,
159
- deployL1ContractsValues,
160
- config,
161
- initialFundedAccounts,
162
- wallet,
163
- accounts: testAccounts,
164
- logger,
165
- cheatCodes,
166
- ethCheatCodes,
167
- prefilledPublicData: undefined,
168
- mockGossipSubNetwork: undefined,
169
- watcher: undefined,
170
- dateProvider: undefined,
171
- telemetryClient: undefined,
172
- teardown
173
- };
174
- }
175
- /**
176
- * Sets up the environment for the end-to-end tests.
177
- * @param numberOfAccounts - The number of new accounts to be created once the PXE is initiated.
178
- * @param opts - Options to pass to the node initialization and to the setup script.
179
- * @param pxeOpts - Options to pass to the PXE initialization.
180
- */ export async function setup(numberOfAccounts = 1, opts = {}, pxeOpts = {}, chain = foundry) {
181
- let anvil;
182
- try {
183
- opts.aztecTargetCommitteeSize ??= 0;
184
- opts.slasherFlavor ??= 'none';
185
- const config = {
186
- ...getConfigEnvVars(),
187
- ...opts
188
- };
189
- // use initialValidators for the node config
190
- config.validatorPrivateKeys = new SecretValue(opts.initialValidators?.map((v)=>v.privateKey) ?? []);
191
- config.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
192
- // For tests we only want proving enabled if specifically requested
193
- config.realProofs = !!opts.realProofs;
194
- // Only enforce the time table if requested
195
- config.enforceTimeTable = !!opts.enforceTimeTable;
196
- const logger = getLogger();
197
- // Create a temp directory for any services that need it and cleanup later
198
- const directoryToCleanup = path.join(tmpdir(), randomBytes(8).toString('hex'));
199
- await fs.mkdir(directoryToCleanup, {
200
- recursive: true
201
- });
202
- if (!config.dataDirectory) {
203
- config.dataDirectory = directoryToCleanup;
204
- }
205
- if (!config.l1RpcUrls?.length) {
206
- if (!isAnvilTestChain(chain.id)) {
207
- throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
208
- }
209
- if (AZTEC_NODE_URL) {
210
- throw new Error(`AZTEC_NODE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`);
211
- }
212
- const res = await startAnvil({
213
- l1BlockTime: opts.ethereumSlotDuration,
214
- accounts: opts.anvilAccounts,
215
- port: opts.anvilPort
216
- });
217
- anvil = res.anvil;
218
- config.l1RpcUrls = [
219
- res.rpcUrl
220
- ];
221
- }
222
- // Enable logging metrics to a local file named after the test suite
223
- if (isMetricsLoggingRequested()) {
224
- const filename = path.join('log', getJobName() + '.jsonl');
225
- logger.info(`Logging metrics to ${filename}`);
226
- setupMetricsLogger(filename);
227
- }
228
- const dateProvider = new TestDateProvider();
229
- const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls, dateProvider);
230
- if (opts.stateLoad) {
231
- await ethCheatCodes.loadChainState(opts.stateLoad);
232
- }
233
- if (opts.l1StartTime) {
234
- await ethCheatCodes.warp(opts.l1StartTime, {
235
- resetBlockInterval: true
236
- });
237
- }
238
- let publisherPrivKeyHex = undefined;
239
- let publisherHdAccount = undefined;
240
- if (opts.l1PublisherKey && opts.l1PublisherKey.getValue() && opts.l1PublisherKey.getValue() != NULL_KEY) {
241
- publisherPrivKeyHex = opts.l1PublisherKey.getValue();
242
- publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
243
- } else if (config.publisherPrivateKeys && config.publisherPrivateKeys.length > 0 && config.publisherPrivateKeys[0].getValue() != NULL_KEY) {
244
- publisherPrivKeyHex = config.publisherPrivateKeys[0].getValue();
245
- publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
246
- } else if (!MNEMONIC) {
247
- throw new Error(`Mnemonic not provided and no publisher private key`);
248
- } else {
249
- publisherHdAccount = mnemonicToAccount(MNEMONIC, {
250
- addressIndex: 0
251
- });
252
- const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
253
- const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
254
- publisherPrivKeyHex = `0x${publisherPrivKey.toString('hex')}`;
255
- config.publisherPrivateKeys = [
256
- new SecretValue(publisherPrivKeyHex)
257
- ];
258
- }
259
- if (config.coinbase === undefined) {
260
- config.coinbase = EthAddress.fromString(publisherHdAccount.address);
261
- }
262
- if (AZTEC_NODE_URL) {
263
- // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
264
- return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
265
- }
266
- const initialFundedAccounts = opts.initialFundedAccounts ?? await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? numberOfAccounts);
267
- const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice, opts.genesisPublicData);
268
- const wasAutomining = await ethCheatCodes.isAutoMining();
269
- const enableAutomine = opts.automineL1Setup && !wasAutomining && isAnvilTestChain(chain.id);
270
- if (enableAutomine) {
271
- await ethCheatCodes.setAutomine(true);
272
- }
273
- const l1Client = createExtendedL1Client(config.l1RpcUrls, publisherHdAccount, chain);
274
- const deployL1ContractsValues = await deployAztecL1Contracts(config.l1RpcUrls[0], publisherPrivKeyHex, chain.id, {
275
- ...getL1ContractsConfigEnvVars(),
276
- ...opts,
277
- vkTreeRoot: getVKTreeRoot(),
278
- protocolContractsHash,
279
- genesisArchiveRoot,
280
- initialValidators: opts.initialValidators,
281
- feeJuicePortalInitialBalance: fundingNeeded,
282
- realVerifier: false
283
- });
284
- config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
285
- config.rollupVersion = deployL1ContractsValues.rollupVersion;
286
- if (enableAutomine) {
287
- await ethCheatCodes.setAutomine(false);
288
- await ethCheatCodes.setIntervalMining(config.ethereumSlotDuration);
289
- dateProvider.setTime(await ethCheatCodes.timestamp() * 1000);
290
- }
291
- if (opts.l2StartTime) {
292
- // This should only be used in synching test or when you need to have a stable
293
- // timestamp for the first l2 block.
294
- await ethCheatCodes.warp(opts.l2StartTime, {
295
- resetBlockInterval: true
296
- });
297
- }
298
- const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls, dateProvider), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
299
- if (!opts.disableAnvilTestWatcher) {
300
- await watcher.start();
301
- }
302
- const telemetry = await getTelemetryClient(opts.telemetryConfig);
303
- await setupSharedBlobStorage(config);
304
- logger.verbose('Creating and synching an aztec node', config);
305
- const acvmConfig = await getACVMConfig(logger);
306
- if (acvmConfig) {
307
- config.acvmWorkingDirectory = acvmConfig.acvmWorkingDirectory;
308
- config.acvmBinaryPath = acvmConfig.acvmBinaryPath;
309
- }
310
- const bbConfig = await getBBConfig(logger);
311
- if (bbConfig) {
312
- config.bbBinaryPath = bbConfig.bbBinaryPath;
313
- config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
314
- }
315
- let mockGossipSubNetwork;
316
- let p2pClientDeps = undefined;
317
- if (opts.mockGossipSubNetwork) {
318
- mockGossipSubNetwork = new MockGossipSubNetwork();
319
- p2pClientDeps = {
320
- p2pServiceFactory: getMockPubSubP2PServiceFactory(mockGossipSubNetwork)
321
- };
322
- }
323
- // Transactions built against the genesis state must be included in block 1, otherwise they are dropped.
324
- // To avoid test failures from dropped transactions, we ensure progression beyond genesis before proceeding.
325
- // For account deployments, we set minTxsPerBlock=1 and deploy accounts sequentially for guaranteed success.
326
- // If no accounts need deployment, we await an empty block to confirm network progression. After either path
327
- // completes, we restore the original minTxsPerBlock setting. The deployment and waiting for empty block is
328
- // handled by the if-else branches on line 632.
329
- // For more details on why the tx would be dropped see `validate_include_by_timestamp` function in
330
- // `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
331
- //
332
- // Note: If the following seems too convoluted or if it starts making problems, we could drop the "progressing
333
- // past genesis via an account contract deployment" optimization and just call flush() on the sequencer and wait
334
- // for an empty block to be mined. This would simplify it all quite a bit but the setup would be slower for tests
335
- // deploying accounts.
336
- const originalMinTxsPerBlock = config.minTxsPerBlock;
337
- if (originalMinTxsPerBlock === undefined) {
338
- throw new Error('minTxsPerBlock is undefined in e2e test setup');
339
- }
340
- config.minTxsPerBlock = numberOfAccounts === 0 ? 0 : 1;
341
- config.p2pEnabled = opts.mockGossipSubNetwork || config.p2pEnabled;
342
- config.p2pIp = opts.p2pIp ?? config.p2pIp ?? '127.0.0.1';
343
- if (!config.disableValidator) {
344
- if ((config.validatorPrivateKeys?.getValue().length ?? 0) === 0) {
345
- config.validatorPrivateKeys = new SecretValue([
346
- generatePrivateKey()
347
- ]);
348
- }
349
- }
350
- const aztecNode = await AztecNodeService.createAndSync(config, {
351
- dateProvider,
352
- telemetry,
353
- p2pClientDeps,
354
- logger: createLogger('node:MAIN-aztec-node')
355
- }, {
356
- prefilledPublicData
357
- });
358
- const sequencerClient = aztecNode.getSequencer();
359
- if (sequencerClient) {
360
- const publisher = sequencerClient.sequencer.publisher;
361
- publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration, l1Client);
362
- }
363
- let proverNode = undefined;
364
- if (opts.startProverNode) {
365
- logger.verbose('Creating and syncing a simulated prover node...');
366
- const proverNodePrivateKey = getPrivateKeyFromIndex(2);
367
- const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
368
- const proverNodeDataDirectory = path.join(directoryToCleanup, randomBytes(8).toString('hex'));
369
- const proverNodeConfig = {
370
- ...config.proverNodeConfig,
371
- dataDirectory: proverNodeDataDirectory
372
- };
373
- proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, proverNodeConfig, aztecNode, prefilledPublicData);
374
- }
375
- logger.verbose('Creating a pxe...');
376
- const { wallet, teardown: pxeTeardown } = await setupPXEAndGetWallet(aztecNode, pxeOpts, logger);
377
- const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNode, dateProvider);
378
- if (opts.aztecTargetCommitteeSize && opts.aztecTargetCommitteeSize > 0 || opts.initialValidators && opts.initialValidators.length > 0) {
379
- // We need to advance such that the committee is set up.
380
- await cheatCodes.rollup.advanceToEpoch(EpochNumber.fromBigInt(BigInt(await cheatCodes.rollup.getEpoch()) + BigInt(config.lagInEpochsForValidatorSet + 1)));
381
- await cheatCodes.rollup.setupEpoch();
382
- await cheatCodes.rollup.debugRollup();
383
- }
384
- let accounts = [];
385
- // Below we continue with what we described in the long comment on line 571.
386
- if (numberOfAccounts === 0) {
387
- logger.info('No accounts are being deployed, waiting for an empty block 1 to be mined');
388
- while(await aztecNode.getBlockNumber() === 0){
389
- await sleep(2000);
390
- }
391
- } else {
392
- logger.info(`${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`);
393
- const accountsData = initialFundedAccounts.slice(0, numberOfAccounts);
394
- const accountManagers = await deployFundedSchnorrAccounts(wallet, aztecNode, accountsData);
395
- accounts = accountManagers.map((accountManager)=>accountManager.address);
396
- }
397
- // Now we restore the original minTxsPerBlock setting.
398
- sequencerClient.getSequencer().updateConfig({
399
- minTxsPerBlock: originalMinTxsPerBlock
400
- });
401
- if (initialFundedAccounts.length < numberOfAccounts) {
402
- // TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
403
- throw new Error(`Unable to deploy ${numberOfAccounts} accounts. Only ${initialFundedAccounts.length} accounts were funded.`);
404
- }
405
- const teardown = async ()=>{
406
- try {
407
- await pxeTeardown();
408
- await tryStop(aztecNode, logger);
409
- await tryStop(proverNode, logger);
410
- if (acvmConfig?.cleanup) {
411
- await acvmConfig.cleanup();
412
- }
413
- if (bbConfig?.cleanup) {
414
- await bbConfig.cleanup();
415
- }
416
- await tryStop(watcher, logger);
417
- await tryStop(anvil, logger);
418
- await tryRmDir(directoryToCleanup, logger);
419
- } catch (err) {
420
- logger.error(`Error during e2e test teardown`, err);
421
- }
422
- };
423
- return {
424
- aztecNode,
425
- aztecNodeAdmin: aztecNode,
426
- cheatCodes,
427
- ethCheatCodes,
428
- config,
429
- dateProvider,
430
- deployL1ContractsValues,
431
- initialFundedAccounts,
432
- logger,
433
- mockGossipSubNetwork,
434
- prefilledPublicData,
435
- proverNode,
436
- sequencer: sequencerClient,
437
- teardown,
438
- telemetryClient: telemetry,
439
- wallet,
440
- accounts,
441
- watcher
442
- };
443
- } catch (err) {
444
- // TODO: Just hoisted anvil for now to ensure cleanup. Prob need to hoist the rest.
445
- await anvil?.stop();
446
- throw err;
447
- }
448
- }
449
- /**
450
- * Registers the contract class used for test accounts and publicly deploys the instances requested.
451
- * Use this when you need to make a public call to an account contract, such as for requesting a public authwit.
452
- * @param sender - Wallet to send the deployment tx.
453
- * @param accountsToDeploy - Which accounts to publicly deploy.
454
- */ export async function ensureAccountContractsPublished(wallet, accountsToDeploy) {
455
- // We have to check whether the accounts are already deployed. This can happen if the test runs against
456
- // the local network and the test accounts exist
457
- const accountsAndAddresses = await Promise.all(accountsToDeploy.map(async (address)=>{
458
- return {
459
- address,
460
- deployed: (await wallet.getContractMetadata(address)).isContractPublished
461
- };
462
- }));
463
- const instances = (await Promise.all(accountsAndAddresses.filter(({ deployed })=>!deployed).map(({ address })=>wallet.getContractMetadata(address)))).map((contractMetadata)=>contractMetadata.contractInstance);
464
- const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
465
- if (!(await wallet.getContractClassMetadata(contractClass.id, true)).isContractClassPubliclyRegistered) {
466
- await (await publishContractClass(wallet, SchnorrAccountContractArtifact)).send({
467
- from: accountsToDeploy[0]
468
- }).wait();
469
- }
470
- const requests = await Promise.all(instances.map(async (instance)=>await publishInstance(wallet, instance)));
471
- const batch = new BatchCall(wallet, requests);
472
- await batch.send({
473
- from: accountsToDeploy[0]
474
- }).wait();
475
- }
476
- /** Returns the job name for the current test. */ function getJobName() {
477
- return process.env.JOB_NAME ?? expect.getState().currentTestName?.split(' ')[0].replaceAll('/', '_') ?? 'unknown';
478
- }
479
1
  /**
480
- * Returns a logger instance for the current test.
481
- * @returns a logger instance for the current test.
482
- */ export function getLogger() {
483
- const describeBlockName = expect.getState().currentTestName?.split(' ')[0].replaceAll('/', ':');
484
- if (!describeBlockName) {
485
- const name = expect.getState().testPath?.split('/').pop()?.split('.')[0] ?? 'unknown';
486
- return createLogger('e2e:' + name);
487
- }
488
- return createLogger('e2e:' + describeBlockName);
489
- }
490
- export function getBalancesFn(symbol, method, from, logger) {
491
- const balances = async (...addressLikes)=>{
492
- const addresses = addressLikes.map((addressLike)=>'address' in addressLike ? addressLike.address : addressLike);
493
- const b = await Promise.all(addresses.map((address)=>method(address).simulate({
494
- from
495
- })));
496
- const debugString = `${symbol} balances: ${addresses.map((address, i)=>`${address}: ${b[i]}`).join(', ')}`;
497
- logger.verbose(debugString);
498
- return b;
499
- };
500
- return balances;
501
- }
502
- export async function expectMapping(fn, inputs, expectedOutputs) {
503
- expect(inputs.length).toBe(expectedOutputs.length);
504
- const outputs = await fn(...inputs);
505
- expect(outputs).toEqual(expectedOutputs);
506
- }
507
- export async function expectMappingDelta(initialValues, fn, inputs, expectedDiffs) {
508
- expect(inputs.length).toBe(expectedDiffs.length);
509
- const outputs = await fn(...inputs);
510
- const diffs = outputs.map((output, i)=>output - initialValues[i]);
511
- expect(diffs).toEqual(expectedDiffs);
512
- }
513
- /**
514
- * Computes the address of the "canonical" SponsoredFPCContract. This is not a protocol contract
515
- * but by conventions its address is computed with a salt of 0.
516
- * @returns The address of the sponsored FPC contract
517
- */ export function getSponsoredFPCInstance() {
518
- return Promise.resolve(getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
519
- salt: new Fr(SPONSORED_FPC_SALT)
520
- }));
521
- }
522
- /**
523
- * Computes the address of the "canonical" SponsoredFPCContract. This is not a protocol contract
524
- * but by conventions its address is computed with a salt of 0.
525
- * @returns The address of the sponsored FPC contract
526
- */ export async function getSponsoredFPCAddress() {
527
- const sponsoredFPCInstance = await getSponsoredFPCInstance();
528
- return sponsoredFPCInstance.address;
529
- }
530
- /**
531
- * Deploy a sponsored FPC contract to a running instance.
532
- */ export async function setupSponsoredFPC(wallet) {
533
- const instance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
534
- salt: new Fr(SPONSORED_FPC_SALT)
535
- });
536
- await wallet.registerContract(instance, SponsoredFPCContract.artifact);
537
- getLogger().info(`SponsoredFPC: ${instance.address}`);
538
- return instance;
539
- }
540
- /**
541
- * Registers the SponsoredFPC in this PXE instance
542
- * @param wallet - The wallet
543
- */ export async function registerSponsoredFPC(wallet) {
544
- await wallet.registerContract(await getSponsoredFPCInstance(), SponsoredFPCContract.artifact);
545
- }
546
- export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, intervalSec = 1) {
547
- targetBlock ??= await node.getBlockNumber();
548
- await retryUntil(async ()=>await node.getProvenBlockNumber() >= targetBlock, 'proven chain status', timeoutSec, intervalSec);
549
- }
550
- export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, proverNodeConfig, aztecNode, prefilledPublicData = [], proverNodeDeps = {}) {
551
- return withLogNameSuffix('prover-node', async ()=>{
552
- // Disable stopping the aztec node as the prover coordination test will kill it otherwise
553
- // This is only required when stopping the prover node for testing
554
- const aztecNodeTxProvider = aztecNode && {
555
- getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
556
- getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
557
- stop: ()=>Promise.resolve()
558
- };
559
- const blobClient = await createBlobClientWithFileStores(aztecNodeConfig, createLogger('blob-client:prover-node'));
560
- // Creating temp store and archiver for simulated prover node
561
- const archiverConfig = {
562
- ...aztecNodeConfig,
563
- dataDirectory: proverNodeConfig.dataDirectory
564
- };
565
- const archiver = await createArchiver(archiverConfig, {
566
- blobClient,
567
- dateProvider: proverNodeDeps.dateProvider
568
- }, {
569
- blockUntilSync: true
570
- });
571
- // Prover node config is for simulated proofs
572
- const proverConfig = {
573
- ...aztecNodeConfig,
574
- txCollectionNodeRpcUrls: [],
575
- realProofs: false,
576
- proverAgentCount: 2,
577
- publisherPrivateKeys: [
578
- new SecretValue(proverNodePrivateKey)
579
- ],
580
- proverNodeMaxPendingJobs: 10,
581
- proverNodeMaxParallelBlocksPerEpoch: 32,
582
- proverNodePollingIntervalMs: 200,
583
- txGatheringIntervalMs: 1000,
584
- txGatheringBatchSize: 10,
585
- txGatheringMaxParallelRequestsPerNode: 10,
586
- txGatheringTimeoutMs: 24_000,
587
- proverNodeFailedEpochStore: undefined,
588
- proverId: EthAddress.fromNumber(1),
589
- proverNodeEpochProvingDelayMs: undefined,
590
- ...proverNodeConfig
591
- };
592
- const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node', proverNodeDeps.dateProvider);
593
- const proverNode = await createProverNode(proverConfig, {
594
- ...proverNodeDeps,
595
- aztecNodeTxProvider,
596
- archiver: archiver,
597
- l1TxUtils
598
- }, {
599
- prefilledPublicData
600
- });
601
- getLogger().info(`Created and synced prover node`, {
602
- publisherAddress: l1TxUtils.client.account.address
603
- });
604
- if (!proverNodeConfig.dontStart) {
605
- await proverNode.start();
606
- }
607
- return proverNode;
608
- });
609
- }
610
- function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName, dateProvider) {
611
- const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
612
- const log = createLogger(logName);
613
- const l1TxUtils = createDelayedL1TxUtilsFromViemWallet(l1Client, log, dateProvider, aztecNodeConfig);
614
- l1TxUtils.enableDelayer(aztecNodeConfig.ethereumSlotDuration);
615
- return l1TxUtils;
616
- }
2
+ * Re-exports from the unified setup module for backward compatibility.
3
+ * Tests that previously used utils.ts should continue to work.
4
+ */ export { createAndSyncProverNode, deployAccounts, ensureAccountContractsPublished, expectMapping, expectMappingDelta, getBalancesFn, getLogger, getPrivateKeyFromIndex, getSponsoredFPCAddress, getSponsoredFPCInstance, publicDeployAccounts, registerSponsoredFPC, setup, setupPXEAndGetWallet, setupSharedBlobStorage, setupSponsoredFPC, startAnvil, teardown, waitForProvenChain } from './setup.js';
5
+ export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
@@ -0,0 +1,38 @@
1
+ export type PromteheusClientOptions = {
2
+ server: URL;
3
+ };
4
+ export declare class PrometheusClient {
5
+ private config;
6
+ private httpClient;
7
+ constructor(config: PromteheusClientOptions, httpClient?: typeof fetch);
8
+ querySingleValue(query: string, time?: Date): Promise<number>;
9
+ queryRaw(query: string, time?: Date): Promise<PrometheusResponse>;
10
+ queryRangeRaw(query: string, step: PrometheusDuration, start: Date, end?: Date): Promise<PrometheusResponse>;
11
+ private callPrometheus;
12
+ }
13
+ export type PrometheusDuration = `${number}s` | `${number}m` | `${number}h`;
14
+ export type PrometheusData = {
15
+ resultType: 'vector';
16
+ result: Array<{
17
+ metric: unknown;
18
+ value: [unixTimestamp: number, value: string];
19
+ }>;
20
+ } | {
21
+ resultType: 'matrix';
22
+ result: Array<{
23
+ metric: unknown;
24
+ values: [unixTimestamp: number, value: string];
25
+ }>;
26
+ } | {
27
+ resultType: 'scalar' | 'string';
28
+ result: unknown;
29
+ };
30
+ export type PrometheusResponse = {
31
+ status: 'error';
32
+ errorType: string;
33
+ error: string;
34
+ } | {
35
+ status: 'success';
36
+ data: PrometheusData;
37
+ };
38
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvbWV0aGV1c19jbGllbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWFsaXR5X29mX3NlcnZpY2UvcHJvbWV0aGV1c19jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQ3BDLE1BQU0sRUFBRSxHQUFHLENBQUM7Q0FDYixDQUFDO0FBRUYscUJBQWEsZ0JBQWdCO0lBRXpCLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFVBQVU7SUFGcEIsWUFDVSxNQUFNLEVBQUUsdUJBQXVCLEVBQy9CLFVBQVUsR0FBRSxPQUFPLEtBQWEsRUFDdEM7SUFFUyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksT0FBYSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FhL0U7SUFFTSxRQUFRLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxJQUFJLE9BQWEsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FPN0U7SUFFTSxhQUFhLENBQ2xCLEtBQUssRUFBRSxNQUFNLEVBQ2IsSUFBSSxFQUFFLGtCQUFrQixFQUN4QixLQUFLLEVBQUUsSUFBSSxFQUNYLEdBQUcsT0FBYSxHQUNmLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQVM3QjtZQUVhLGNBQWM7Q0E2QjdCO0FBRUQsTUFBTSxNQUFNLGtCQUFrQixHQUFHLEdBQUcsTUFBTSxHQUFHLEdBQUcsR0FBRyxNQUFNLEdBQUcsR0FBRyxHQUFHLE1BQU0sR0FBRyxDQUFDO0FBRTVFLE1BQU0sTUFBTSxjQUFjLEdBQ3RCO0lBQ0UsVUFBVSxFQUFFLFFBQVEsQ0FBQztJQUNyQixNQUFNLEVBQUUsS0FBSyxDQUFDO1FBQ1osTUFBTSxFQUFFLE9BQU8sQ0FBQztRQUNoQixLQUFLLEVBQUUsQ0FBQyxhQUFhLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztLQUMvQyxDQUFDLENBQUM7Q0FDSixHQUNEO0lBQ0UsVUFBVSxFQUFFLFFBQVEsQ0FBQztJQUNyQixNQUFNLEVBQUUsS0FBSyxDQUFDO1FBQ1osTUFBTSxFQUFFLE9BQU8sQ0FBQztRQUNoQixNQUFNLEVBQUUsQ0FBQyxhQUFhLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztLQUNoRCxDQUFDLENBQUM7Q0FDSixHQUNEO0lBQ0UsVUFBVSxFQUFFLFFBQVEsR0FBRyxRQUFRLENBQUM7SUFDaEMsTUFBTSxFQUFFLE9BQU8sQ0FBQztDQUNqQixDQUFDO0FBRU4sTUFBTSxNQUFNLGtCQUFrQixHQUMxQjtJQUNFLE1BQU0sRUFBRSxPQUFPLENBQUM7SUFDaEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixLQUFLLEVBQUUsTUFBTSxDQUFDO0NBQ2YsR0FDRDtJQUNFLE1BQU0sRUFBRSxTQUFTLENBQUM7SUFDbEIsSUFBSSxFQUFFLGNBQWMsQ0FBQztDQUN0QixDQUFDIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prometheus_client.d.ts","sourceRoot":"","sources":["../../src/quality_of_service/prometheus_client.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAFpB,YACU,MAAM,EAAE,uBAAuB,EAC/B,UAAU,GAAE,OAAO,KAAa,EACtC;IAES,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,OAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAa/E;IAEM,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,OAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAO7E;IAEM,aAAa,CAClB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,kBAAkB,EACxB,KAAK,EAAE,IAAI,EACX,GAAG,OAAa,GACf,OAAO,CAAC,kBAAkB,CAAC,CAS7B;YAEa,cAAc;CA6B7B;AAED,MAAM,MAAM,kBAAkB,GAAG,GAAG,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,CAAC;AAE5E,MAAM,MAAM,cAAc,GACtB;IACE,UAAU,EAAE,QAAQ,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC;QACZ,MAAM,EAAE,OAAO,CAAC;QAChB,KAAK,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;KAC/C,CAAC,CAAC;CACJ,GACD;IACE,UAAU,EAAE,QAAQ,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC;QACZ,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;KAChD,CAAC,CAAC;CACJ,GACD;IACE,UAAU,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAChC,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEN,MAAM,MAAM,kBAAkB,GAC1B;IACE,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf,GACD;IACE,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,cAAc,CAAC;CACtB,CAAC"}