@aztec/end-to-end 0.0.1-commit.9593d84 → 0.0.1-commit.96bb3f7
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.
- package/dest/bench/client_flows/client_flows_benchmark.d.ts +3 -3
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +6 -4
- package/dest/bench/client_flows/data_extractor.js +3 -1
- package/dest/bench/utils.d.ts +5 -5
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +18 -11
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +14 -7
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +36 -19
- package/dest/e2e_epochs/epochs_test.d.ts +11 -9
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +14 -12
- package/dest/e2e_fees/bridging_race.notest.js +1 -1
- package/dest/e2e_fees/fees_test.d.ts +8 -4
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +7 -4
- package/dest/e2e_l1_publisher/write_json.d.ts +1 -1
- package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
- package/dest/e2e_l1_publisher/write_json.js +2 -5
- package/dest/e2e_multi_validator/utils.js +1 -1
- package/dest/e2e_p2p/inactivity_slash_test.d.ts +2 -2
- package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
- package/dest/e2e_p2p/inactivity_slash_test.js +3 -6
- package/dest/e2e_p2p/p2p_network.d.ts +7 -6
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +11 -9
- package/dest/e2e_p2p/shared.d.ts +2 -2
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +4 -4
- package/dest/fixtures/e2e_prover_test.d.ts +3 -5
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +6 -10
- package/dest/fixtures/fixtures.d.ts +2 -3
- package/dest/fixtures/fixtures.d.ts.map +1 -1
- package/dest/fixtures/fixtures.js +2 -3
- package/dest/fixtures/get_acvm_config.js +1 -1
- package/dest/fixtures/l1_to_l2_messaging.d.ts +4 -3
- package/dest/fixtures/l1_to_l2_messaging.d.ts.map +1 -1
- package/dest/fixtures/l1_to_l2_messaging.js +2 -2
- package/dest/fixtures/setup_p2p_test.js +3 -3
- package/dest/fixtures/snapshot_manager.d.ts +6 -8
- package/dest/fixtures/snapshot_manager.d.ts.map +1 -1
- package/dest/fixtures/snapshot_manager.js +27 -44
- package/dest/fixtures/utils.d.ts +17 -463
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +45 -77
- package/dest/fixtures/web3signer.js +1 -1
- package/dest/fixtures/with_telemetry_utils.d.ts +2 -2
- package/dest/fixtures/with_telemetry_utils.d.ts.map +1 -1
- package/dest/fixtures/with_telemetry_utils.js +2 -2
- package/dest/quality_of_service/grafana_client.d.ts +41 -0
- package/dest/quality_of_service/grafana_client.d.ts.map +1 -0
- package/dest/quality_of_service/{alert_checker.js → grafana_client.js} +1 -1
- package/dest/shared/cross_chain_test_harness.d.ts +5 -3
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +3 -3
- package/dest/shared/gas_portal_test_harness.d.ts +2 -2
- package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
- package/dest/shared/index.d.ts +2 -2
- package/dest/shared/index.d.ts.map +1 -1
- package/dest/shared/uniswap_l1_l2.d.ts +3 -27
- package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
- package/dest/shared/uniswap_l1_l2.js +43 -23
- package/dest/simulators/lending_simulator.d.ts +2 -2
- package/dest/simulators/lending_simulator.d.ts.map +1 -1
- package/dest/simulators/lending_simulator.js +1 -1
- package/dest/spartan/setup_test_wallets.d.ts +4 -3
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +2 -1
- package/dest/spartan/tx_metrics.d.ts +39 -0
- package/dest/spartan/tx_metrics.d.ts.map +1 -0
- package/dest/spartan/tx_metrics.js +95 -0
- package/dest/spartan/utils.d.ts +45 -10
- package/dest/spartan/utils.d.ts.map +1 -1
- package/dest/spartan/utils.js +203 -60
- package/package.json +40 -40
- package/src/bench/client_flows/client_flows_benchmark.ts +8 -5
- package/src/bench/client_flows/data_extractor.ts +1 -1
- package/src/bench/utils.ts +22 -14
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +53 -31
- package/src/e2e_epochs/epochs_test.ts +34 -21
- package/src/e2e_fees/bridging_race.notest.ts +1 -1
- package/src/e2e_fees/fees_test.ts +13 -9
- package/src/e2e_l1_publisher/write_json.ts +2 -5
- package/src/e2e_multi_validator/utils.ts +1 -1
- package/src/e2e_p2p/inactivity_slash_test.ts +4 -7
- package/src/e2e_p2p/p2p_network.ts +10 -17
- package/src/e2e_p2p/shared.ts +11 -6
- package/src/fixtures/e2e_prover_test.ts +7 -10
- package/src/fixtures/fixtures.ts +2 -5
- package/src/fixtures/get_acvm_config.ts +1 -1
- package/src/fixtures/l1_to_l2_messaging.ts +4 -2
- package/src/fixtures/setup_p2p_test.ts +3 -3
- package/src/fixtures/snapshot_manager.ts +44 -63
- package/src/fixtures/utils.ts +74 -139
- package/src/fixtures/web3signer.ts +1 -1
- package/src/fixtures/with_telemetry_utils.ts +2 -2
- package/src/quality_of_service/{alert_checker.ts → grafana_client.ts} +1 -1
- package/src/shared/cross_chain_test_harness.ts +6 -9
- package/src/shared/gas_portal_test_harness.ts +1 -1
- package/src/shared/index.ts +1 -1
- package/src/shared/uniswap_l1_l2.ts +53 -67
- package/src/simulators/lending_simulator.ts +2 -2
- package/src/spartan/DEVELOP.md +7 -0
- package/src/spartan/setup_test_wallets.ts +9 -2
- package/src/spartan/tx_metrics.ts +130 -0
- package/src/spartan/utils.ts +267 -51
- package/dest/fixtures/setup_l1_contracts.d.ts +0 -477
- package/dest/fixtures/setup_l1_contracts.d.ts.map +0 -1
- package/dest/fixtures/setup_l1_contracts.js +0 -17
- package/dest/quality_of_service/alert_checker.d.ts +0 -41
- package/dest/quality_of_service/alert_checker.d.ts.map +0 -1
- package/src/fixtures/setup_l1_contracts.ts +0 -26
package/dest/fixtures/utils.js
CHANGED
|
@@ -4,19 +4,21 @@ import { createArchiver } from '@aztec/archiver';
|
|
|
4
4
|
import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
|
|
5
5
|
import { BatchCall } from '@aztec/aztec.js/contracts';
|
|
6
6
|
import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
|
|
7
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
7
8
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
8
9
|
import { createAztecNodeClient, waitForNode } from '@aztec/aztec.js/node';
|
|
9
10
|
import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
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';
|
|
14
18
|
import { DelayedTxUtils, EthCheatCodes, EthCheatCodesWithState, createDelayedL1TxUtilsFromViemWallet, startAnvil } from '@aztec/ethereum/test';
|
|
15
19
|
import { EpochNumber } from '@aztec/foundation/branded-types';
|
|
16
20
|
import { SecretValue } from '@aztec/foundation/config';
|
|
17
|
-
import { randomBytes } from '@aztec/foundation/crypto';
|
|
18
21
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
19
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
20
22
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
21
23
|
import { withLogNameSuffix } from '@aztec/foundation/log';
|
|
22
24
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
@@ -34,11 +36,10 @@ import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@az
|
|
|
34
36
|
import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
|
|
35
37
|
import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
|
|
36
38
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
39
|
+
import { randomBytes } from 'crypto';
|
|
37
40
|
import fs from 'fs/promises';
|
|
38
|
-
import getPort from 'get-port';
|
|
39
41
|
import { tmpdir } from 'os';
|
|
40
42
|
import * as path from 'path';
|
|
41
|
-
import { getContract } from 'viem';
|
|
42
43
|
import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
|
|
43
44
|
import { foundry } from 'viem/chains';
|
|
44
45
|
import { MNEMONIC, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
|
|
@@ -47,16 +48,28 @@ import { getBBConfig } from './get_bb_config.js';
|
|
|
47
48
|
import { isMetricsLoggingRequested, setupMetricsLogger } from './logging.js';
|
|
48
49
|
export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
|
|
49
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
|
+
}
|
|
50
63
|
const { AZTEC_NODE_URL = '' } = process.env;
|
|
51
64
|
const getAztecUrl = ()=>AZTEC_NODE_URL;
|
|
52
65
|
let telemetry = undefined;
|
|
53
|
-
function getTelemetryClient(partialConfig = {}) {
|
|
66
|
+
async function getTelemetryClient(partialConfig = {}) {
|
|
54
67
|
if (!telemetry) {
|
|
55
68
|
const config = {
|
|
56
69
|
...getTelemetryConfig(),
|
|
57
70
|
...partialConfig
|
|
58
71
|
};
|
|
59
|
-
telemetry = config.benchmark ? new BenchmarkTelemetryClient() : initTelemetryClient(config);
|
|
72
|
+
telemetry = config.benchmark ? new BenchmarkTelemetryClient() : await initTelemetryClient(config);
|
|
60
73
|
}
|
|
61
74
|
return telemetry;
|
|
62
75
|
}
|
|
@@ -72,22 +85,6 @@ export const getPrivateKeyFromIndex = (index)=>{
|
|
|
72
85
|
const privKeyRaw = hdAccount.getHdKey().privateKey;
|
|
73
86
|
return privKeyRaw === null ? null : Buffer.from(privKeyRaw);
|
|
74
87
|
};
|
|
75
|
-
export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, chain = foundry)=>{
|
|
76
|
-
const l1Data = await deployL1Contracts(l1RpcUrls, account, chain, logger, {
|
|
77
|
-
vkTreeRoot: getVKTreeRoot(),
|
|
78
|
-
protocolContractsHash,
|
|
79
|
-
genesisArchiveRoot: args.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
|
|
80
|
-
salt: args.salt,
|
|
81
|
-
initialValidators: args.initialValidators,
|
|
82
|
-
...getL1ContractsConfigEnvVars(),
|
|
83
|
-
realVerifier: false,
|
|
84
|
-
...args
|
|
85
|
-
}, {
|
|
86
|
-
priorityFeeBumpPercentage: 0,
|
|
87
|
-
priorityFeeRetryBumpPercentage: 0
|
|
88
|
-
});
|
|
89
|
-
return l1Data;
|
|
90
|
-
};
|
|
91
88
|
/**
|
|
92
89
|
* Sets up Private eXecution Environment (PXE) and returns the corresponding test wallet.
|
|
93
90
|
* @param aztecNode - An instance of Aztec Node.
|
|
@@ -171,7 +168,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
171
168
|
mockGossipSubNetwork: undefined,
|
|
172
169
|
watcher: undefined,
|
|
173
170
|
dateProvider: undefined,
|
|
174
|
-
blobSink: undefined,
|
|
175
171
|
telemetryClient: undefined,
|
|
176
172
|
teardown
|
|
177
173
|
};
|
|
@@ -239,12 +235,14 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
239
235
|
resetBlockInterval: true
|
|
240
236
|
});
|
|
241
237
|
}
|
|
242
|
-
let
|
|
238
|
+
let publisherPrivKeyHex = undefined;
|
|
243
239
|
let publisherHdAccount = undefined;
|
|
244
240
|
if (opts.l1PublisherKey && opts.l1PublisherKey.getValue() && opts.l1PublisherKey.getValue() != NULL_KEY) {
|
|
245
|
-
|
|
241
|
+
publisherPrivKeyHex = opts.l1PublisherKey.getValue();
|
|
242
|
+
publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
|
|
246
243
|
} else if (config.publisherPrivateKeys && config.publisherPrivateKeys.length > 0 && config.publisherPrivateKeys[0].getValue() != NULL_KEY) {
|
|
247
|
-
|
|
244
|
+
publisherPrivKeyHex = config.publisherPrivateKeys[0].getValue();
|
|
245
|
+
publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
|
|
248
246
|
} else if (!MNEMONIC) {
|
|
249
247
|
throw new Error(`Mnemonic not provided and no publisher private key`);
|
|
250
248
|
} else {
|
|
@@ -252,12 +250,15 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
252
250
|
addressIndex: 0
|
|
253
251
|
});
|
|
254
252
|
const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
|
|
255
|
-
publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
|
|
253
|
+
const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
|
|
254
|
+
publisherPrivKeyHex = `0x${publisherPrivKey.toString('hex')}`;
|
|
256
255
|
config.publisherPrivateKeys = [
|
|
257
|
-
new SecretValue(
|
|
256
|
+
new SecretValue(publisherPrivKeyHex)
|
|
258
257
|
];
|
|
259
258
|
}
|
|
260
|
-
config.coinbase
|
|
259
|
+
if (config.coinbase === undefined) {
|
|
260
|
+
config.coinbase = EthAddress.fromString(publisherHdAccount.address);
|
|
261
|
+
}
|
|
261
262
|
if (AZTEC_NODE_URL) {
|
|
262
263
|
// we are setting up against a remote environment, l1 contracts are assumed to already be deployed
|
|
263
264
|
return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
|
|
@@ -270,34 +271,18 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
270
271
|
await ethCheatCodes.setAutomine(true);
|
|
271
272
|
}
|
|
272
273
|
const l1Client = createExtendedL1Client(config.l1RpcUrls, publisherHdAccount, chain);
|
|
273
|
-
await
|
|
274
|
-
|
|
274
|
+
const deployL1ContractsValues = await deployAztecL1Contracts(config.l1RpcUrls[0], publisherPrivKeyHex, chain.id, {
|
|
275
|
+
...getL1ContractsConfigEnvVars(),
|
|
275
276
|
...opts,
|
|
277
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
278
|
+
protocolContractsHash,
|
|
276
279
|
genesisArchiveRoot,
|
|
280
|
+
initialValidators: opts.initialValidators,
|
|
277
281
|
feeJuicePortalInitialBalance: fundingNeeded,
|
|
278
|
-
|
|
279
|
-
}
|
|
282
|
+
realVerifier: false
|
|
283
|
+
});
|
|
280
284
|
config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
|
|
281
285
|
config.rollupVersion = deployL1ContractsValues.rollupVersion;
|
|
282
|
-
if (opts.fundRewardDistributor) {
|
|
283
|
-
// Mints block rewards for 10000 blocks to the rewardDistributor contract
|
|
284
|
-
const rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
|
|
285
|
-
const blockReward = await rollup.getCheckpointReward();
|
|
286
|
-
const mintAmount = 10_000n * blockReward;
|
|
287
|
-
const feeJuice = getContract({
|
|
288
|
-
address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
|
|
289
|
-
abi: FeeAssetArtifact.contractAbi,
|
|
290
|
-
client: deployL1ContractsValues.l1Client
|
|
291
|
-
});
|
|
292
|
-
const rewardDistributorMintTxHash = await feeJuice.write.mint([
|
|
293
|
-
deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
|
|
294
|
-
mintAmount
|
|
295
|
-
], {});
|
|
296
|
-
await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
|
|
297
|
-
hash: rewardDistributorMintTxHash
|
|
298
|
-
});
|
|
299
|
-
logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
|
|
300
|
-
}
|
|
301
286
|
if (enableAutomine) {
|
|
302
287
|
await ethCheatCodes.setAutomine(false);
|
|
303
288
|
await ethCheatCodes.setIntervalMining(config.ethereumSlotDuration);
|
|
@@ -314,19 +299,8 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
314
299
|
if (!opts.disableAnvilTestWatcher) {
|
|
315
300
|
await watcher.start();
|
|
316
301
|
}
|
|
317
|
-
const telemetry = getTelemetryClient(opts.telemetryConfig);
|
|
318
|
-
|
|
319
|
-
const blobSinkPort = await getPort();
|
|
320
|
-
const blobSink = await createBlobSinkServer({
|
|
321
|
-
l1ChainId: config.l1ChainId,
|
|
322
|
-
l1RpcUrls: config.l1RpcUrls,
|
|
323
|
-
l1Contracts: config.l1Contracts,
|
|
324
|
-
port: blobSinkPort,
|
|
325
|
-
dataDirectory: config.dataDirectory,
|
|
326
|
-
dataStoreMapSizeKb: config.dataStoreMapSizeKb
|
|
327
|
-
}, telemetry);
|
|
328
|
-
await blobSink.start();
|
|
329
|
-
config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
|
|
302
|
+
const telemetry = await getTelemetryClient(opts.telemetryConfig);
|
|
303
|
+
await setupSharedBlobStorage(config);
|
|
330
304
|
logger.verbose('Creating and synching an aztec node', config);
|
|
331
305
|
const acvmConfig = await getACVMConfig(logger);
|
|
332
306
|
if (acvmConfig) {
|
|
@@ -338,9 +312,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
338
312
|
config.bbBinaryPath = bbConfig.bbBinaryPath;
|
|
339
313
|
config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
|
|
340
314
|
}
|
|
341
|
-
const blobSinkClient = createBlobSinkClient(config, {
|
|
342
|
-
logger: createLogger('node:blob-sink:client')
|
|
343
|
-
});
|
|
344
315
|
let mockGossipSubNetwork;
|
|
345
316
|
let p2pClientDeps = undefined;
|
|
346
317
|
if (opts.mockGossipSubNetwork) {
|
|
@@ -378,7 +349,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
378
349
|
}
|
|
379
350
|
const aztecNode = await AztecNodeService.createAndSync(config, {
|
|
380
351
|
dateProvider,
|
|
381
|
-
blobSinkClient,
|
|
382
352
|
telemetry,
|
|
383
353
|
p2pClientDeps,
|
|
384
354
|
logger: createLogger('node:MAIN-aztec-node')
|
|
@@ -445,7 +415,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
445
415
|
}
|
|
446
416
|
await tryStop(watcher, logger);
|
|
447
417
|
await tryStop(anvil, logger);
|
|
448
|
-
await tryStop(blobSink, logger);
|
|
449
418
|
await tryRmDir(directoryToCleanup, logger);
|
|
450
419
|
} catch (err) {
|
|
451
420
|
logger.error(`Error during e2e test teardown`, err);
|
|
@@ -454,7 +423,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
454
423
|
return {
|
|
455
424
|
aztecNode,
|
|
456
425
|
aztecNodeAdmin: aztecNode,
|
|
457
|
-
blobSink,
|
|
458
426
|
cheatCodes,
|
|
459
427
|
ethCheatCodes,
|
|
460
428
|
config,
|
|
@@ -588,14 +556,14 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
|
|
|
588
556
|
getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
|
|
589
557
|
stop: ()=>Promise.resolve()
|
|
590
558
|
};
|
|
591
|
-
const
|
|
559
|
+
const blobClient = await createBlobClientWithFileStores(aztecNodeConfig, createLogger('blob-client:prover-node'));
|
|
592
560
|
// Creating temp store and archiver for simulated prover node
|
|
593
561
|
const archiverConfig = {
|
|
594
562
|
...aztecNodeConfig,
|
|
595
563
|
dataDirectory: proverNodeConfig.dataDirectory
|
|
596
564
|
};
|
|
597
565
|
const archiver = await createArchiver(archiverConfig, {
|
|
598
|
-
|
|
566
|
+
blobClient,
|
|
599
567
|
dateProvider: proverNodeDeps.dateProvider
|
|
600
568
|
}, {
|
|
601
569
|
blockUntilSync: true
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { randomBytes } from '@aztec/foundation/crypto';
|
|
1
|
+
import { randomBytes } from '@aztec/foundation/crypto/random';
|
|
2
2
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
3
3
|
import { sleep } from '@aztec/foundation/sleep';
|
|
4
4
|
import { RemoteSigner } from '@aztec/node-keystore';
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
2
|
-
export declare function getEndToEndTestTelemetryClient(metricsPort?: number): TelemetryClient
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
export declare function getEndToEndTestTelemetryClient(metricsPort?: number): Promise<TelemetryClient>;
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aF90ZWxlbWV0cnlfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy93aXRoX3RlbGVtZXRyeV91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBSXJCLE1BQU0seUJBQXlCLENBQUM7QUFHakMsd0JBQXNCLDhCQUE4QixDQUFDLFdBQVcsQ0FBQyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBTW5HIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with_telemetry_utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/with_telemetry_utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,yBAAyB,CAAC;AAGjC,
|
|
1
|
+
{"version":3,"file":"with_telemetry_utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/with_telemetry_utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,yBAAyB,CAAC;AAGjC,wBAAsB,8BAA8B,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAMnG"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { levels, registerLoggingStream } from '@aztec/foundation/log';
|
|
2
2
|
import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
|
|
3
3
|
import { OTelPinoStream } from '@aztec/telemetry-client/otel-pino-stream';
|
|
4
|
-
export function getEndToEndTestTelemetryClient(metricsPort) {
|
|
4
|
+
export async function getEndToEndTestTelemetryClient(metricsPort) {
|
|
5
5
|
if (metricsPort) {
|
|
6
6
|
const otelStream = new OTelPinoStream({
|
|
7
7
|
levels
|
|
8
8
|
});
|
|
9
9
|
registerLoggingStream(otelStream);
|
|
10
10
|
}
|
|
11
|
-
return initTelemetryClient(getEndToEndTestTelemetryConfig(metricsPort));
|
|
11
|
+
return await initTelemetryClient(getEndToEndTestTelemetryConfig(metricsPort));
|
|
12
12
|
}
|
|
13
13
|
/**
|
|
14
14
|
* Utility functions for setting up end-to-end tests with telemetry.
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
2
|
+
export interface AlertConfig {
|
|
3
|
+
alert: string;
|
|
4
|
+
expr: string;
|
|
5
|
+
start?: number;
|
|
6
|
+
end?: number;
|
|
7
|
+
step?: number;
|
|
8
|
+
for: string;
|
|
9
|
+
labels: Record<string, string>;
|
|
10
|
+
annotations: Record<string, string>;
|
|
11
|
+
}
|
|
12
|
+
export interface AlertCheckerConfig {
|
|
13
|
+
grafanaEndpoint: string;
|
|
14
|
+
grafanaCredentials: string;
|
|
15
|
+
}
|
|
16
|
+
export declare class GrafanaClient {
|
|
17
|
+
private config;
|
|
18
|
+
private logger;
|
|
19
|
+
constructor(logger: Logger, config?: Partial<AlertCheckerConfig>);
|
|
20
|
+
/**
|
|
21
|
+
* Load the alerts config from a file path.
|
|
22
|
+
* @param filePath - The absolute path to the alerts file.
|
|
23
|
+
*/
|
|
24
|
+
private loadAlertsConfig;
|
|
25
|
+
private queryGrafana;
|
|
26
|
+
private checkAlerts;
|
|
27
|
+
/**
|
|
28
|
+
* Run the alert check based on the alerts defined in an array.
|
|
29
|
+
* @param alerts - The alerts to check.
|
|
30
|
+
*/
|
|
31
|
+
runAlertCheck(alerts: AlertConfig[]): Promise<void>;
|
|
32
|
+
/**
|
|
33
|
+
* Run the alert check based on the alerts defined in a yaml file.
|
|
34
|
+
* @param filePath - The absolute path to the alerts file.
|
|
35
|
+
*/
|
|
36
|
+
runAlertCheckFromFilePath(filePath: string): Promise<void>;
|
|
37
|
+
}
|
|
38
|
+
export declare class AlertTriggeredError extends Error {
|
|
39
|
+
name: string;
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3JhZmFuYV9jbGllbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWFsaXR5X29mX3NlcnZpY2UvZ3JhZmFuYV9jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFLbEQsTUFBTSxXQUFXLFdBQVc7SUFDMUIsS0FBSyxFQUFFLE1BQU0sQ0FBQztJQUNkLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZixHQUFHLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDYixJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZCxHQUFHLEVBQUUsTUFBTSxDQUFDO0lBQ1osTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDL0IsV0FBVyxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7Q0FDckM7QUFFRCxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLGVBQWUsRUFBRSxNQUFNLENBQUM7SUFDeEIsa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0NBQzVCO0FBUUQscUJBQWEsYUFBYTtJQUN4QixPQUFPLENBQUMsTUFBTSxDQUFxQjtJQUNuQyxPQUFPLENBQUMsTUFBTSxDQUFTO0lBRXZCLFlBQVksTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUUsT0FBTyxDQUFDLGtCQUFrQixDQUFNLEVBR25FO0lBRUQ7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLGdCQUFnQjtZQU1WLFlBQVk7WUFxQ1osV0FBVztJQXFCekI7OztPQUdHO0lBQ1UsYUFBYSxDQUFDLE1BQU0sRUFBRSxXQUFXLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBUS9EO0lBRUQ7OztPQUdHO0lBQ1UseUJBQXlCLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR3RFO0NBQ0Y7QUFFRCxxQkFBYSxtQkFBb0IsU0FBUSxLQUFLO0lBQ25DLElBQUksU0FBeUI7Q0FDdkMifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"grafana_client.d.ts","sourceRoot":"","sources":["../../src/quality_of_service/grafana_client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAQD,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAS;IAEvB,YAAY,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,kBAAkB,CAAM,EAGnE;IAED;;;OAGG;IACH,OAAO,CAAC,gBAAgB;YAMV,YAAY;YAqCZ,WAAW;IAqBzB;;;OAGG;IACU,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/D;IAED;;;OAGG;IACU,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtE;CACF;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IACnC,IAAI,SAAyB;CACvC"}
|
|
@@ -5,7 +5,7 @@ const DEFAULT_CONFIG = {
|
|
|
5
5
|
grafanaEndpoint: 'http://localhost:3000/api/datasources/proxy/uid/prometheus/api/v1',
|
|
6
6
|
grafanaCredentials: 'admin:admin'
|
|
7
7
|
};
|
|
8
|
-
export class
|
|
8
|
+
export class GrafanaClient {
|
|
9
9
|
config;
|
|
10
10
|
logger;
|
|
11
11
|
constructor(logger, config = {}){
|
|
@@ -8,7 +8,9 @@ import type { AztecNode } from '@aztec/aztec.js/node';
|
|
|
8
8
|
import type { SiblingPath } from '@aztec/aztec.js/trees';
|
|
9
9
|
import type { TxReceipt } from '@aztec/aztec.js/tx';
|
|
10
10
|
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
11
|
-
import
|
|
11
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
12
|
+
import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
|
|
13
|
+
import { EpochNumber } from '@aztec/foundation/branded-types';
|
|
12
14
|
import type { FieldsOf } from '@aztec/foundation/types';
|
|
13
15
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
14
16
|
import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
|
|
@@ -113,7 +115,7 @@ export declare class CrossChainTestHarness {
|
|
|
113
115
|
getL2PublicBalanceOf(owner: AztecAddress): Promise<any>;
|
|
114
116
|
expectPublicBalanceOnL2(owner: AztecAddress, expectedBalance: bigint): Promise<void>;
|
|
115
117
|
getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1?: EthAddress): Promise<Fr>;
|
|
116
|
-
withdrawFundsFromBridgeOnL1(amount: bigint,
|
|
118
|
+
withdrawFundsFromBridgeOnL1(amount: bigint, epochNumber: EpochNumber, messageIndex: bigint, siblingPath: SiblingPath<number>): Promise<void>;
|
|
117
119
|
transferToPrivateOnL2(shieldAmount: bigint): Promise<void>;
|
|
118
120
|
transferToPublicOnL2(amount: bigint, authwitNonce?: Fr): Promise<void>;
|
|
119
121
|
/**
|
|
@@ -126,4 +128,4 @@ export declare class CrossChainTestHarness {
|
|
|
126
128
|
makeMessageConsumable(msgHash: Fr | Hex): Promise<void>;
|
|
127
129
|
toCrossChainContext(): CrossChainContext;
|
|
128
130
|
}
|
|
129
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fdGVzdF9oYXJuZXNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2hhcmVkL2Nyb3NzX2NoYWluX3Rlc3RfaGFybmVzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzVELE9BQU8sRUFHTCxLQUFLLGFBQWEsRUFDbEIsS0FBSywwQkFBMEIsRUFDaEMsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0s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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,0BAA0B,EAChC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,0BAA0B,EAChC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAI7C;;;;;;;;;GASG;AACH,wBAAsB,0CAA0C,CAC9D,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,wBAAwB,EAClC,qBAAqB,EAAE,UAAU,EACjC,KAAK,EAAE,YAAY,EACnB,sBAAsB,EAAE,UAAU,GACjC,OAAO,CAAC;IACT;;OAEG;IACH,KAAK,EAAE,aAAa,CAAC;IACrB;;OAEG;IACH,MAAM,EAAE,mBAAmB,CAAC;IAC5B;;OAEG;IACH,kBAAkB,EAAE,UAAU,CAAC;IAC/B;;OAEG;IACH,WAAW,EAAE,GAAG,CAAC;IACjB;;OAEG;IACH,eAAe,EAAE,GAAG,CAAC;CACtB,CAAC,CA8CD;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,qBAAa,qBAAqB;IA2CvB,SAAS,EAAE,SAAS;IAEpB,MAAM,EAAE,MAAM;IAGd,OAAO,EAAE,aAAa;IAEtB,QAAQ,EAAE,mBAAmB;IAG7B,UAAU,EAAE,UAAU;IAGtB,kBAAkB,EAAE,UAAU;IAE9B,sBAAsB,EAAE,UAAU;IAElC,QAAQ,EAAE,wBAAwB;aAGzB,mBAAmB,EAAE,mBAAmB;aAGxC,MAAM,EAAE,MAAM;aAGd,YAAY,EAAE,YAAY;IApE5C,OAAa,GAAG,CACd,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,wBAAwB,EAClC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,sBAAsB,EAAE,UAAU,GACjC,OAAO,CAAC,qBAAqB,CAAC,CA4BhC;IAED,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAE5D;IACE,2BAA2B;IACpB,SAAS,EAAE,SAAS;IAC3B,cAAc;IACP,MAAM,EAAE,MAAM;IAErB,yBAAyB;IAClB,OAAO,EAAE,aAAa;IAC7B,gCAAgC;IACzB,QAAQ,EAAE,mBAAmB;IAEpC,oCAAoC;IAC7B,UAAU,EAAE,UAAU;IAE7B,sBAAsB;IACf,kBAAkB,EAAE,UAAU;IACrC,yCAAyC;IAClC,sBAAsB,EAAE,UAAU;IACzC,qCAAqC;IAC9B,QAAQ,EAAE,wBAAwB;IAEzC,gDAAgD;IAChC,mBAAmB,EAAE,mBAAmB;IAExD,4CAA4C;IAC5B,MAAM,EAAE,MAAM;IAE9B,uCAAuC;IACvB,YAAY,EAAE,YAAY,EAW3C;IAEK,cAAc,CAAC,MAAM,EAAE,MAAM,iBAUlC;IAED,cAAc,CAAC,OAAO,EAAE,UAAU,mBAEjC;IAED,wBAAwB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,UAAQ,0BAE1D;IAED,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,UAAQ,uCAE3D;IAEK,oBAAoB,CAAC,MAAM,EAAE,MAAM,iBAGxC;IAEK,qBAAqB,CAAC,MAAM,EAAE,MAAM,iBAEzC;IAEK,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,iBAM/E;IAEK,qCAAqC,CACzC,KAAK,EAAE,IAAI,CAAC,0BAA0B,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,GAAG,WAAW,CAAC,iBAQ1G;IAEK,oCAAoC,CACxC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAC,iBAQ/E;IAEK,4BAA4B,CAChC,cAAc,EAAE,MAAM,EACtB,YAAY,gBAAc,EAC1B,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAO9B;IAEK,2BAA2B,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,GAAE,EAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAOlH;IAEK,qBAAqB,CAAC,KAAK,EAAE,YAAY,gBAE9C;IAEK,wBAAwB,CAAC,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAI1E;IAEK,oBAAoB,CAAC,KAAK,EAAE,YAAY,gBAE7C;IAEK,uBAAuB,CAAC,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAGzE;IAEK,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,GAAE,UAA4B,GAAG,OAAO,CAAC,EAAE,CAAC,CAOxG;IAED,2BAA2B,CACzB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,iBAGjC;IAEK,qBAAqB,CAAC,YAAY,EAAE,MAAM,iBAM/C;IAEK,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,KAAU,iBAMhE;IAED;;;;;;OAMG;IACG,qBAAqB,CAAC,OAAO,EAAE,EAAE,GAAG,GAAG,iBAO5C;IAED,mBAAmB,IAAI,iBAAiB,CAWvC;CACF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
2
2
|
import { L1TokenPortalManager } from '@aztec/aztec.js/ethereum';
|
|
3
3
|
import { Fr } from '@aztec/aztec.js/fields';
|
|
4
|
-
import { deployL1Contract } from '@aztec/ethereum';
|
|
4
|
+
import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
|
|
5
5
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
6
6
|
import { TestERC20Abi, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts';
|
|
7
7
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
@@ -203,8 +203,8 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
|
|
|
203
203
|
async getL2ToL1MessageLeaf(withdrawAmount, callerOnL1 = EthAddress.ZERO) {
|
|
204
204
|
return await this.l1TokenPortalManager.getL2ToL1MessageLeaf(withdrawAmount, this.ethAccount, this.l2Bridge.address, callerOnL1);
|
|
205
205
|
}
|
|
206
|
-
withdrawFundsFromBridgeOnL1(amount,
|
|
207
|
-
return this.l1TokenPortalManager.withdrawFunds(amount, this.ethAccount,
|
|
206
|
+
withdrawFundsFromBridgeOnL1(amount, epochNumber, messageIndex, siblingPath) {
|
|
207
|
+
return this.l1TokenPortalManager.withdrawFunds(amount, this.ethAccount, epochNumber, messageIndex, siblingPath);
|
|
208
208
|
}
|
|
209
209
|
async transferToPrivateOnL2(shieldAmount) {
|
|
210
210
|
this.logger.info('Transferring to private on L2');
|
|
@@ -3,7 +3,7 @@ import { L1FeeJuicePortalManager, type L1TokenManager, type L2AmountClaim } from
|
|
|
3
3
|
import type { Logger } from '@aztec/aztec.js/log';
|
|
4
4
|
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
5
5
|
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
6
|
-
import type { ExtendedViemWalletClient } from '@aztec/ethereum';
|
|
6
|
+
import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
|
|
7
7
|
import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
|
|
8
8
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
9
9
|
export interface IGasBridgingTestHarness {
|
|
@@ -75,4 +75,4 @@ export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
|
|
|
75
75
|
bridgeFromL1ToL2(owner: AztecAddress, claimer: AztecAddress): Promise<void>;
|
|
76
76
|
private advanceL2Block;
|
|
77
77
|
}
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzX3BvcnRhbF90ZXN0X2hhcm5lc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGFyZWQvZ2FzX3BvcnRhbF90ZXN0X2hhcm5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsS0FBSyxjQUFjLEVBQUUsS0FBSyxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU1RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXRFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXRFLE1BQU0sV0FBVyx1QkFBdUI7SUFDdEMsb0JBQW9CLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDM0QsaUJBQWlCLENBQUMsS0FBSyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDL0QsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM1RSxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0IsaUJBQWlCLEVBQUUsVUFBVSxDQUFDO0NBQy9CO0FBRUQsTUFBTSxXQUFXLHlDQUF5QztJQUN4RCxTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLGNBQWMsQ0FBQyxFQUFFLGNBQWMsQ0FBQztJQUNoQyxRQUFRLEVBQUUsd0JBQXdCLENBQUM7SUFDbkMsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDbEI7QUFFRCxxQkFBYSxtQ0FBbUM7SUFDMUIsT0FBTyxDQUFDLE1BQU07SUFBbEMsT0FBTyxlQUEwRTtZQUVuRSxVQUFVO0lBNkJ4QixNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSx5Q0FBeUMsR0FBRyxPQUFPLENBQUMsc0JBQXNCLENBQUMsQ0FHaEc7Q0FDRjtBQUVEOzs7R0FHRztBQUNILHFCQUFhLHNCQUF1QixZQUFXLHVCQUF1QjtJQU0zRCxTQUFTLEVBQUUsU0FBUztJQUVwQixjQUFjLEVBQUUsY0FBYyxHQUFHLFNBQVM7SUFFMUMsTUFBTSxFQUFFLE1BQU07SUFFZCxNQUFNLEVBQUUsTUFBTTtJQUdkLFFBQVEsRUFBRSxnQkFBZ0I7SUFHMUIsVUFBVSxFQUFFLFVBQVU7SUFHdEIscUJBQXFCLEVBQUUsVUFBVTtJQUVqQyxpQkFBaUIsRUFBRSxVQUFVO0lBRTdCLHNCQUFzQixFQUFFLFVBQVU7SUFFbEMsUUFBUSxFQUFFLHdCQUF3QjtJQTFCM0MsU0FBZ0IsY0FBYyxFQUFFLGNBQWMsQ0FBQztJQUMvQyxTQUFnQixxQkFBcUIsRUFBRSx1QkFBdUIsQ0FBQztJQUUvRDtJQUNFLGlCQUFpQjtJQUNWLFNBQVMsRUFBRSxTQUFTO0lBQzNCLGlDQUFpQztJQUMxQixjQUFjLEVBQUUsY0FBYyxHQUFHLFNBQVM7SUFDakQsY0FBYztJQUNQLE1BQU0sRUFBRSxNQUFNO0lBQ3JCLGNBQWM7SUFDUCxNQUFNLEVBQUUsTUFBTTtJQUVyQixnQ0FBZ0M7SUFDekIsUUFBUSxFQUFFLGdCQUFnQjtJQUVqQyxvQ0FBb0M7SUFDN0IsVUFBVSxFQUFFLFVBQVU7SUFFN0Isc0JBQXNCO0lBQ2YscUJBQXFCLEVBQUUsVUFBVTtJQUN4Qyx5Q0FBeUM7SUFDbEMsaUJBQWlCLEVBQUUsVUFBVTtJQUNwQyxpQ0FBaUM7SUFDMUIsc0JBQXNCLEVBQUUsVUFBVTtJQUN6QyxxQ0FBcUM7SUFDOUIsUUFBUSxFQUFFLHdCQUF3QixFQVcxQztJQUVLLGNBQWMsQ0FBQyxFQUFFLEdBQUUsVUFBNEIsaUJBS3BEO0lBRUssb0JBQW9CLENBQUMsT0FBTyxFQUFFLFVBQVUsbUJBRTdDO0lBRUQsd0JBQXdCLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsWUFBWSwwQkFFckU7SUFFSyxzQ0FBc0MsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLGFBQWEsaUJBSTVHO0lBRUssb0JBQW9CLENBQUMsS0FBSyxFQUFFLFlBQVksZ0JBRTdDO0lBRUssdUJBQXVCLENBQUMsS0FBSyxFQUFFLFlBQVksRUFBRSxlQUFlLEVBQUUsTUFBTSxpQkFHekU7SUFFSyxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsWUFBWSwwQkFhMUM7SUFFSyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxZQUFZLGlCQU1oRTtZQUVhLGNBQWM7Q0FlN0IifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gas_portal_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/gas_portal_test_harness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE5G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"gas_portal_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/gas_portal_test_harness.ts"],"names":[],"mappings":"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"}
|
package/dest/shared/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { uniswapL1L2TestSuite
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
1
|
+
export { uniswapL1L2TestSuite } from './uniswap_l1_l2.js';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGFyZWQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sb0JBQW9CLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC"}
|
|
@@ -1,27 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
import { CheatCodes } from '@aztec/aztec/testing';
|
|
5
|
-
import { type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
|
|
6
|
-
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
7
|
-
/** Objects to be returned by the uniswap setup function */
|
|
8
|
-
export type UniswapSetupContext = {
|
|
9
|
-
/** Aztec Node instance */
|
|
10
|
-
aztecNode: AztecNode;
|
|
11
|
-
/** Logger instance named as the current test. */
|
|
12
|
-
logger: Logger;
|
|
13
|
-
/** The L1 wallet client, extended with public actions. */
|
|
14
|
-
l1Client: ExtendedViemWalletClient;
|
|
15
|
-
/** The wallet. */
|
|
16
|
-
wallet: TestWallet;
|
|
17
|
-
/** The owner address. */
|
|
18
|
-
ownerAddress: AztecAddress;
|
|
19
|
-
/** The sponsor wallet. */
|
|
20
|
-
sponsorAddress: AztecAddress;
|
|
21
|
-
/** */
|
|
22
|
-
deployL1ContractsValues: DeployL1ContractsReturnType;
|
|
23
|
-
/** Cheat codes instance. */
|
|
24
|
-
cheatCodes: CheatCodes;
|
|
25
|
-
};
|
|
26
|
-
export declare const uniswapL1L2TestSuite: (setup: () => Promise<UniswapSetupContext>, cleanup: () => Promise<void>, expectedForkBlockNumber?: number) => void;
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pc3dhcF9sMV9sMi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NoYXJlZC91bmlzd2FwX2wxX2wyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQWMsTUFBTSwyQkFBMkIsQ0FBQztBQUlyRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxFQUNMLEtBQUssMkJBQTJCLEVBQ2hDLEtBQUssd0JBQXdCLEVBSTlCLE1BQU0saUJBQWlCLENBQUM7QUFNekIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFpQjVELDJEQUEyRDtBQUMzRCxNQUFNLE1BQU0sbUJBQW1CLEdBQUc7SUFDaEMsMEJBQTBCO0lBQzFCLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsaURBQWlEO0lBQ2pELE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZiwwREFBMEQ7SUFDMUQsUUFBUSxFQUFFLHdCQUF3QixDQUFDO0lBQ25DLGtCQUFrQjtJQUNsQixNQUFNLEVBQUUsVUFBVSxDQUFDO0lBQ25CLHlCQUF5QjtJQUN6QixZQUFZLEVBQUUsWUFBWSxDQUFDO0lBQzNCLDBCQUEwQjtJQUMxQixjQUFjLEVBQUUsWUFBWSxDQUFDO0lBQzdCLE9BQU87SUFDUCx1QkFBdUIsRUFBRSwyQkFBMkIsQ0FBQztJQUNyRCw0QkFBNEI7SUFDNUIsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QixDQUFDO0FBRUYsZUFBTyxNQUFNLG9CQUFvQixxSEFtK0JoQyxDQUFDIn0=
|
|
1
|
+
import { type EndToEndContext } from '../fixtures/utils.js';
|
|
2
|
+
export declare const uniswapL1L2TestSuite: (setup: () => Promise<EndToEndContext>, cleanup: () => Promise<void>, expectedForkBlockNumber?: number) => void;
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pc3dhcF9sMV9sMi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NoYXJlZC91bmlzd2FwX2wxX2wyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXdCQSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQW1DLE1BQU0sc0JBQXNCLENBQUM7QUFZN0YsZUFBTyxNQUFNLG9CQUFvQixpSEF5K0JoQyxDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,sBAAsB,CAAC;AAY7F,eAAO,MAAM,oBAAoB,iHAy+BhC,CAAC"}
|