@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.023c3e5
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/benchmark.d.ts +62 -0
- package/dest/bench/client_flows/benchmark.d.ts.map +1 -0
- package/dest/bench/client_flows/benchmark.js +281 -0
- package/dest/bench/client_flows/client_flows_benchmark.d.ts +79 -0
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -0
- package/dest/bench/client_flows/client_flows_benchmark.js +321 -0
- package/dest/bench/client_flows/config.d.ts +14 -0
- package/dest/bench/client_flows/config.d.ts.map +1 -0
- package/dest/bench/client_flows/config.js +106 -0
- package/dest/bench/client_flows/data_extractor.d.ts +2 -0
- package/dest/bench/client_flows/data_extractor.d.ts.map +1 -0
- package/dest/bench/client_flows/data_extractor.js +79 -0
- package/dest/bench/utils.d.ts +16 -41
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +41 -72
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +26 -19
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +114 -102
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +32 -32
- 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 +104 -104
- package/dest/e2e_deploy_contract/deploy_test.d.ts +19 -10
- package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
- package/dest/e2e_deploy_contract/deploy_test.js +26 -27
- package/dest/e2e_epochs/epochs_test.d.ts +71 -22
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +260 -54
- package/dest/e2e_fees/bridging_race.notest.d.ts +2 -0
- package/dest/e2e_fees/bridging_race.notest.d.ts.map +1 -0
- package/dest/e2e_fees/bridging_race.notest.js +61 -0
- package/dest/e2e_fees/fees_test.d.ts +38 -23
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +162 -183
- package/dest/e2e_l1_publisher/write_json.d.ts +11 -0
- package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -0
- package/dest/e2e_l1_publisher/write_json.js +56 -0
- package/dest/e2e_multi_validator/utils.d.ts +12 -0
- package/dest/e2e_multi_validator/utils.d.ts.map +1 -0
- package/dest/e2e_multi_validator/utils.js +214 -0
- package/dest/e2e_nested_contract/nested_contract_test.d.ts +15 -15
- package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.js +37 -41
- package/dest/e2e_p2p/inactivity_slash_test.d.ts +31 -0
- package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -0
- package/dest/e2e_p2p/inactivity_slash_test.js +136 -0
- package/dest/e2e_p2p/p2p_network.d.ts +281 -27
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +237 -175
- package/dest/e2e_p2p/reqresp/utils.d.ts +22 -0
- package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -0
- package/dest/e2e_p2p/reqresp/utils.js +153 -0
- package/dest/e2e_p2p/shared.d.ts +44 -8
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +165 -27
- package/dest/e2e_token_contract/token_contract_test.d.ts +27 -14
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/e2e_token_contract/token_contract_test.js +96 -74
- package/dest/fixtures/e2e_prover_test.d.ts +55 -0
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -0
- package/dest/fixtures/e2e_prover_test.js +278 -0
- package/dest/fixtures/fixtures.d.ts +6 -8
- package/dest/fixtures/fixtures.d.ts.map +1 -1
- package/dest/fixtures/fixtures.js +5 -5
- package/dest/fixtures/get_acvm_config.d.ts +2 -2
- package/dest/fixtures/get_acvm_config.d.ts.map +1 -1
- package/dest/fixtures/get_acvm_config.js +3 -15
- package/dest/fixtures/get_bb_config.d.ts +2 -2
- package/dest/fixtures/get_bb_config.d.ts.map +1 -1
- package/dest/fixtures/get_bb_config.js +10 -17
- package/dest/fixtures/index.d.ts +1 -1
- package/dest/fixtures/l1_to_l2_messaging.d.ts +11 -7
- package/dest/fixtures/l1_to_l2_messaging.d.ts.map +1 -1
- package/dest/fixtures/l1_to_l2_messaging.js +45 -19
- package/dest/fixtures/logging.d.ts +1 -1
- package/dest/fixtures/setup.d.ts +218 -0
- package/dest/fixtures/setup.d.ts.map +1 -0
- package/dest/fixtures/setup.js +695 -0
- package/dest/fixtures/setup_p2p_test.d.ts +15 -15
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +96 -31
- package/dest/fixtures/token_utils.d.ts +10 -4
- package/dest/fixtures/token_utils.d.ts.map +1 -1
- package/dest/fixtures/token_utils.js +31 -12
- package/dest/fixtures/utils.d.ts +5 -153
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +4 -552
- package/dest/fixtures/web3signer.d.ts +5 -0
- package/dest/fixtures/web3signer.d.ts.map +1 -0
- package/dest/fixtures/web3signer.js +53 -0
- 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/index.d.ts +1 -1
- 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/quality_of_service/prometheus_client.d.ts +38 -0
- package/dest/quality_of_service/prometheus_client.d.ts.map +1 -0
- package/dest/quality_of_service/prometheus_client.js +67 -0
- package/dest/shared/cross_chain_test_harness.d.ts +44 -27
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +105 -51
- package/dest/shared/gas_portal_test_harness.d.ts +33 -25
- package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
- package/dest/shared/gas_portal_test_harness.js +51 -30
- package/dest/shared/index.d.ts +2 -2
- package/dest/shared/index.d.ts.map +1 -1
- package/dest/shared/jest_setup.d.ts +1 -1
- package/dest/shared/jest_setup.js +1 -1
- package/dest/shared/submit-transactions.d.ts +6 -4
- package/dest/shared/submit-transactions.d.ts.map +1 -1
- package/dest/shared/submit-transactions.js +15 -16
- package/dest/shared/uniswap_l1_l2.d.ts +3 -25
- package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
- package/dest/shared/uniswap_l1_l2.js +176 -126
- package/dest/simulators/index.d.ts +1 -1
- package/dest/simulators/lending_simulator.d.ts +7 -7
- package/dest/simulators/lending_simulator.d.ts.map +1 -1
- package/dest/simulators/lending_simulator.js +17 -18
- package/dest/simulators/token_simulator.d.ts +6 -3
- package/dest/simulators/token_simulator.d.ts.map +1 -1
- package/dest/simulators/token_simulator.js +16 -13
- package/dest/spartan/setup_test_wallets.d.ts +27 -11
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +233 -62
- package/dest/spartan/tx_metrics.d.ts +88 -0
- package/dest/spartan/tx_metrics.d.ts.map +1 -0
- package/dest/spartan/tx_metrics.js +422 -0
- package/dest/spartan/utils/bot.d.ts +27 -0
- package/dest/spartan/utils/bot.d.ts.map +1 -0
- package/dest/spartan/utils/bot.js +141 -0
- package/dest/spartan/utils/chaos.d.ts +79 -0
- package/dest/spartan/utils/chaos.d.ts.map +1 -0
- package/dest/spartan/utils/chaos.js +142 -0
- package/dest/spartan/utils/clients.d.ts +39 -0
- package/dest/spartan/utils/clients.d.ts.map +1 -0
- package/dest/spartan/utils/clients.js +90 -0
- package/dest/spartan/utils/config.d.ts +36 -0
- package/dest/spartan/utils/config.d.ts.map +1 -0
- package/dest/spartan/utils/config.js +20 -0
- package/dest/spartan/utils/health.d.ts +63 -0
- package/dest/spartan/utils/health.d.ts.map +1 -0
- package/dest/spartan/utils/health.js +202 -0
- package/dest/spartan/utils/helm.d.ts +15 -0
- package/dest/spartan/utils/helm.d.ts.map +1 -0
- package/dest/spartan/utils/helm.js +47 -0
- package/dest/spartan/utils/index.d.ts +9 -0
- package/dest/spartan/utils/index.d.ts.map +1 -0
- package/dest/spartan/utils/index.js +18 -0
- package/dest/spartan/utils/k8s.d.ts +126 -0
- package/dest/spartan/utils/k8s.d.ts.map +1 -0
- package/dest/spartan/utils/k8s.js +375 -0
- package/dest/spartan/utils/nodes.d.ts +41 -0
- package/dest/spartan/utils/nodes.d.ts.map +1 -0
- package/dest/spartan/utils/nodes.js +461 -0
- package/dest/spartan/utils/scripts.d.ts +16 -0
- package/dest/spartan/utils/scripts.d.ts.map +1 -0
- package/dest/spartan/utils/scripts.js +66 -0
- package/dest/spartan/utils.d.ts +2 -415
- package/dest/spartan/utils.d.ts.map +1 -1
- package/dest/spartan/utils.js +1 -445
- package/package.json +66 -58
- package/src/bench/client_flows/benchmark.ts +363 -0
- package/src/bench/client_flows/client_flows_benchmark.ts +384 -0
- package/src/bench/client_flows/config.ts +61 -0
- package/src/bench/client_flows/data_extractor.ts +89 -0
- package/src/bench/utils.ts +41 -85
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +134 -169
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +156 -182
- package/src/e2e_deploy_contract/deploy_test.ts +40 -48
- package/src/e2e_epochs/epochs_test.ts +341 -81
- package/src/e2e_fees/bridging_race.notest.ts +74 -0
- package/src/e2e_fees/fees_test.ts +220 -258
- package/src/e2e_l1_publisher/write_json.ts +77 -0
- package/src/e2e_multi_validator/utils.ts +258 -0
- package/src/e2e_nested_contract/nested_contract_test.ts +46 -59
- package/src/e2e_p2p/inactivity_slash_test.ts +179 -0
- package/src/e2e_p2p/p2p_network.ts +341 -234
- package/src/e2e_p2p/reqresp/utils.ts +207 -0
- package/src/e2e_p2p/shared.ts +260 -39
- package/src/e2e_token_contract/token_contract_test.ts +115 -126
- package/src/fixtures/dumps/epoch_proof_result.json +1 -1
- package/src/fixtures/e2e_prover_test.ts +336 -0
- package/src/fixtures/fixtures.ts +5 -7
- package/src/fixtures/get_acvm_config.ts +4 -12
- package/src/fixtures/get_bb_config.ts +18 -13
- package/src/fixtures/l1_to_l2_messaging.ts +56 -24
- package/src/fixtures/setup.ts +1017 -0
- package/src/fixtures/setup_p2p_test.ts +133 -50
- package/src/fixtures/token_utils.ts +33 -15
- package/src/fixtures/utils.ts +27 -820
- package/src/fixtures/web3signer.ts +63 -0
- package/src/fixtures/with_telemetry_utils.ts +2 -2
- package/src/guides/up_quick_start.sh +7 -15
- package/src/quality_of_service/{alert_checker.ts → grafana_client.ts} +2 -2
- package/src/quality_of_service/prometheus_client.ts +113 -0
- package/src/shared/cross_chain_test_harness.ts +103 -91
- package/src/shared/gas_portal_test_harness.ts +59 -50
- package/src/shared/index.ts +1 -1
- package/src/shared/jest_setup.ts +1 -1
- package/src/shared/submit-transactions.ts +18 -20
- package/src/shared/uniswap_l1_l2.ts +197 -221
- package/src/simulators/lending_simulator.ts +16 -17
- package/src/simulators/token_simulator.ts +21 -13
- package/src/spartan/DEVELOP.md +128 -0
- package/src/spartan/setup_test_wallets.ts +308 -95
- package/src/spartan/tx_metrics.ts +376 -0
- package/src/spartan/utils/bot.ts +185 -0
- package/src/spartan/utils/chaos.ts +253 -0
- package/src/spartan/utils/clients.ts +100 -0
- package/src/spartan/utils/config.ts +26 -0
- package/src/spartan/utils/health.ts +255 -0
- package/src/spartan/utils/helm.ts +84 -0
- package/src/spartan/utils/index.ts +64 -0
- package/src/spartan/utils/k8s.ts +527 -0
- package/src/spartan/utils/nodes.ts +538 -0
- package/src/spartan/utils/scripts.ts +63 -0
- package/src/spartan/utils.ts +1 -582
- package/dest/e2e_prover/e2e_prover_test.d.ts +0 -56
- package/dest/e2e_prover/e2e_prover_test.d.ts.map +0 -1
- package/dest/e2e_prover/e2e_prover_test.js +0 -291
- package/dest/fixtures/setup_l1_contracts.d.ts +0 -6
- package/dest/fixtures/setup_l1_contracts.d.ts.map +0 -1
- package/dest/fixtures/setup_l1_contracts.js +0 -17
- package/dest/fixtures/snapshot_manager.d.ts +0 -87
- package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
- package/dest/fixtures/snapshot_manager.js +0 -479
- package/dest/quality_of_service/alert_checker.d.ts +0 -41
- package/dest/quality_of_service/alert_checker.d.ts.map +0 -1
- package/dest/sample-dapp/connect.js +0 -12
- package/dest/sample-dapp/contracts.js +0 -10
- package/dest/sample-dapp/deploy.js +0 -35
- package/dest/sample-dapp/index.js +0 -98
- package/src/e2e_prover/e2e_prover_test.ts +0 -418
- package/src/fixtures/setup_l1_contracts.ts +0 -27
- package/src/fixtures/snapshot_manager.ts +0 -617
- package/src/sample-dapp/connect.mjs +0 -16
- package/src/sample-dapp/contracts.mjs +0 -14
- package/src/sample-dapp/deploy.mjs +0 -40
- package/src/sample-dapp/index.mjs +0 -128
package/dest/bench/utils.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { writeFileSync } from 'fs';
|
|
7
|
-
import
|
|
8
|
-
import { globSync } from 'glob';
|
|
9
|
-
import { join } from 'path';
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { BatchCall, NO_WAIT } from '@aztec/aztec.js/contracts';
|
|
3
|
+
import { waitForTx } from '@aztec/aztec.js/node';
|
|
4
|
+
import { mean, stdDev, times } from '@aztec/foundation/collection';
|
|
5
|
+
import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
|
|
6
|
+
import { mkdirSync, writeFileSync } from 'fs';
|
|
7
|
+
import path from 'path';
|
|
10
8
|
import { setup } from '../fixtures/utils.js';
|
|
11
9
|
/**
|
|
12
10
|
* Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
|
|
@@ -17,7 +15,10 @@ import { setup } from '../fixtures/utils.js';
|
|
|
17
15
|
benchmark: true
|
|
18
16
|
}
|
|
19
17
|
});
|
|
20
|
-
const
|
|
18
|
+
const defaultAccountAddress = context.accounts[0];
|
|
19
|
+
const contract = await BenchmarkingContract.deploy(context.wallet).send({
|
|
20
|
+
from: defaultAccountAddress
|
|
21
|
+
});
|
|
21
22
|
context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
|
|
22
23
|
const sequencer = context.aztecNode.getSequencer();
|
|
23
24
|
const telemetry = context.telemetryClient;
|
|
@@ -28,7 +29,13 @@ import { setup } from '../fixtures/utils.js';
|
|
|
28
29
|
await telemetry.flush();
|
|
29
30
|
const data = telemetry.getMeters();
|
|
30
31
|
const formatted = formatMetricsForGithubBenchmarkAction(data, opts.metrics);
|
|
32
|
+
if (formatted.length === 0) {
|
|
33
|
+
throw new Error(`No benchmark data generated. Please review your test setup.`);
|
|
34
|
+
}
|
|
31
35
|
const benchOutput = opts.benchOutput ?? process.env.BENCH_OUTPUT ?? 'bench.json';
|
|
36
|
+
mkdirSync(path.dirname(benchOutput), {
|
|
37
|
+
recursive: true
|
|
38
|
+
});
|
|
32
39
|
writeFileSync(benchOutput, JSON.stringify(formatted));
|
|
33
40
|
context.logger.info(`Wrote ${data.length} metrics to ${benchOutput}`);
|
|
34
41
|
await origTeardown();
|
|
@@ -40,17 +47,20 @@ import { setup } from '../fixtures/utils.js';
|
|
|
40
47
|
sequencer
|
|
41
48
|
};
|
|
42
49
|
}
|
|
50
|
+
function isMetricDefinition(f) {
|
|
51
|
+
return 'description' in f;
|
|
52
|
+
}
|
|
43
53
|
function formatMetricsForGithubBenchmarkAction(data, filter) {
|
|
44
|
-
const allFilters = filter.map((f)=>
|
|
45
|
-
name: f,
|
|
54
|
+
const allFilters = filter.map((f)=>isMetricDefinition(f) ? {
|
|
55
|
+
name: f.name,
|
|
46
56
|
source: f,
|
|
47
57
|
transform: (x)=>x,
|
|
48
|
-
unit:
|
|
58
|
+
unit: f.unit
|
|
49
59
|
} : f);
|
|
50
60
|
return data.flatMap((meter)=>{
|
|
51
|
-
return meter.metrics.filter((metric)=>allFilters.map((f)=>f.source).includes(metric.name)).map((metric)=>[
|
|
61
|
+
return meter.metrics.filter((metric)=>allFilters.map((f)=>f.source.name).includes(metric.name)).map((metric)=>[
|
|
52
62
|
metric,
|
|
53
|
-
allFilters.find((f)=>f.source === metric.name)
|
|
63
|
+
allFilters.find((f)=>f.source.name === metric.name)
|
|
54
64
|
]).map(([metric, filter])=>({
|
|
55
65
|
name: `${meter.name}/${filter.name}`,
|
|
56
66
|
unit: filter.unit ?? metric.unit ?? 'unknown',
|
|
@@ -76,28 +86,6 @@ function getMetricValues(points) {
|
|
|
76
86
|
};
|
|
77
87
|
}
|
|
78
88
|
}
|
|
79
|
-
/**
|
|
80
|
-
* Creates and returns a directory with the current job name and a random number.
|
|
81
|
-
* @param index - Index to merge into the dir path.
|
|
82
|
-
* @returns A path to a created dir.
|
|
83
|
-
*/ export function makeDataDirectory(index) {
|
|
84
|
-
const testName = expect.getState().currentTestName.split(' ')[0].replaceAll('/', '_');
|
|
85
|
-
const db = join('data', testName, index.toString(), `${randomInt(99)}`);
|
|
86
|
-
mkdirpSync(db);
|
|
87
|
-
return db;
|
|
88
|
-
}
|
|
89
|
-
/**
|
|
90
|
-
* Returns the size in disk of a folder.
|
|
91
|
-
* @param path - Path to the folder.
|
|
92
|
-
* @returns Size in bytes.
|
|
93
|
-
*/ export function getFolderSize(path) {
|
|
94
|
-
return globSync('**', {
|
|
95
|
-
stat: true,
|
|
96
|
-
cwd: path,
|
|
97
|
-
nodir: true,
|
|
98
|
-
withFileTypes: true
|
|
99
|
-
}).reduce((accum, file)=>accum + file.size, 0);
|
|
100
|
-
}
|
|
101
89
|
/**
|
|
102
90
|
* Returns a call to the benchmark contract. Each call has a private execution (account entrypoint),
|
|
103
91
|
* a nested private call (create_note), a public call (increment_balance), and a nested public
|
|
@@ -108,17 +96,19 @@ function getMetricValues(points) {
|
|
|
108
96
|
* @param contract - Benchmarking contract.
|
|
109
97
|
* @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
|
|
110
98
|
* @returns A BatchCall instance.
|
|
111
|
-
*/
|
|
112
|
-
const owner = context.wallet.getAddress();
|
|
113
|
-
const sender = owner;
|
|
99
|
+
*/ async function makeCall(index, context, contract, heavyPublicCompute) {
|
|
114
100
|
if (heavyPublicCompute) {
|
|
115
101
|
return new BatchCall(context.wallet, [
|
|
116
|
-
|
|
102
|
+
contract.methods.sha256_hash_1024(randomBytesAsBigInts(1024))
|
|
117
103
|
]);
|
|
118
104
|
} else {
|
|
105
|
+
// We use random address for the new note owner because we can emit at most UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN
|
|
106
|
+
// logs for a given sender-recipient-contract tuple.
|
|
107
|
+
const ownerOfNewNote = await AztecAddress.random();
|
|
108
|
+
const [ownerOfBalance] = context.accounts;
|
|
119
109
|
return new BatchCall(context.wallet, [
|
|
120
|
-
|
|
121
|
-
|
|
110
|
+
contract.methods.create_note(ownerOfNewNote, index + 1),
|
|
111
|
+
contract.methods.increment_balance(ownerOfBalance, index + 1)
|
|
122
112
|
]);
|
|
123
113
|
}
|
|
124
114
|
}
|
|
@@ -131,40 +121,19 @@ function getMetricValues(points) {
|
|
|
131
121
|
* @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
|
|
132
122
|
* @returns Array of sent txs.
|
|
133
123
|
*/ export async function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
|
|
134
|
-
const calls = await
|
|
124
|
+
const calls = await Promise.all(times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute)));
|
|
135
125
|
context.logger.info(`Creating ${txCount} txs`);
|
|
136
|
-
const
|
|
137
|
-
skipPublicSimulation: true
|
|
138
|
-
})));
|
|
126
|
+
const [from] = context.accounts;
|
|
139
127
|
context.logger.info(`Sending ${txCount} txs`);
|
|
140
|
-
return
|
|
128
|
+
return Promise.all(calls.map((call)=>call.send({
|
|
129
|
+
from,
|
|
130
|
+
wait: NO_WAIT
|
|
131
|
+
})));
|
|
141
132
|
}
|
|
142
133
|
export async function waitTxs(txs, context, txWaitOpts) {
|
|
143
134
|
context.logger.info(`Awaiting ${txs.length} txs to be mined`);
|
|
144
|
-
await Promise.all(txs.map((
|
|
145
|
-
context.logger.info(
|
|
146
|
-
}
|
|
147
|
-
/**
|
|
148
|
-
* Creates a new PXE
|
|
149
|
-
* @param node - Node to connect the pxe to.
|
|
150
|
-
* @param contract - Benchmark contract to add to the pxe.
|
|
151
|
-
* @param startingBlock - First l2 block to process.
|
|
152
|
-
* @returns The new PXE.
|
|
153
|
-
*/ export async function createNewPXE(node, contract, startingBlock = INITIAL_L2_BLOCK_NUM) {
|
|
154
|
-
const l1Contracts = await node.getL1ContractAddresses();
|
|
155
|
-
const { l1ChainId, protocolVersion } = await node.getNodeInfo();
|
|
156
|
-
const pxeConfig = {
|
|
157
|
-
l2StartingBlock: startingBlock,
|
|
158
|
-
l2BlockPollingIntervalMS: 100,
|
|
159
|
-
dataDirectory: undefined,
|
|
160
|
-
dataStoreMapSizeKB: 1024 * 1024,
|
|
161
|
-
l1Contracts,
|
|
162
|
-
l1ChainId,
|
|
163
|
-
version: protocolVersion
|
|
164
|
-
};
|
|
165
|
-
const pxe = await createPXEService(node, pxeConfig);
|
|
166
|
-
await pxe.registerContract(contract);
|
|
167
|
-
return pxe;
|
|
135
|
+
await Promise.all(txs.map((txHash)=>waitForTx(context.aztecNode, txHash, txWaitOpts)));
|
|
136
|
+
context.logger.info(`${txs.length} txs have been mined`);
|
|
168
137
|
}
|
|
169
138
|
function randomBytesAsBigInts(length) {
|
|
170
139
|
return [
|
|
@@ -1,7 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
3
|
+
import { type Logger } from '@aztec/aztec.js/log';
|
|
4
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
5
|
+
import type { TxHash } from '@aztec/aztec.js/tx';
|
|
6
|
+
import type { CheatCodes } from '@aztec/aztec/testing';
|
|
3
7
|
import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
|
|
4
|
-
import {
|
|
8
|
+
import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
|
|
9
|
+
import type { SequencerClient } from '@aztec/sequencer-client';
|
|
10
|
+
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
11
|
+
import { type EndToEndContext } from '../fixtures/setup.js';
|
|
5
12
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
6
13
|
export declare class Role {
|
|
7
14
|
private isAdmin;
|
|
@@ -17,30 +24,30 @@ export declare class Role {
|
|
|
17
24
|
};
|
|
18
25
|
}
|
|
19
26
|
export declare class BlacklistTokenContractTest {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
private snapshotManager;
|
|
27
|
+
static CHANGE_ROLES_DELAY: number;
|
|
28
|
+
context: EndToEndContext;
|
|
23
29
|
logger: Logger;
|
|
24
|
-
|
|
25
|
-
accounts: CompleteAddress[];
|
|
30
|
+
wallet: TestWallet;
|
|
26
31
|
asset: TokenBlacklistContract;
|
|
27
32
|
tokenSim: TokenSimulator;
|
|
28
|
-
badAccount:
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
33
|
+
badAccount: InvalidAccountContract;
|
|
34
|
+
cheatCodes: CheatCodes;
|
|
35
|
+
sequencer: SequencerClient;
|
|
36
|
+
aztecNode: AztecNode;
|
|
37
|
+
adminAddress: AztecAddress;
|
|
38
|
+
otherAddress: AztecAddress;
|
|
39
|
+
blacklistedAddress: AztecAddress;
|
|
32
40
|
constructor(testName: string);
|
|
33
|
-
|
|
41
|
+
crossTimestampOfChange(): Promise<void>;
|
|
34
42
|
/**
|
|
35
|
-
*
|
|
43
|
+
* Applies base setup:
|
|
36
44
|
* 1. Add 3 accounts.
|
|
37
45
|
* 2. Publicly deploy accounts, deploy token contract and a "bad account".
|
|
38
46
|
*/
|
|
39
|
-
|
|
47
|
+
applyBaseSetup(): Promise<void>;
|
|
40
48
|
setup(): Promise<void>;
|
|
41
|
-
snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
|
|
42
49
|
teardown(): Promise<void>;
|
|
43
|
-
addPendingShieldNoteToPXE(contract: TokenBlacklistContract,
|
|
44
|
-
|
|
50
|
+
addPendingShieldNoteToPXE(contract: TokenBlacklistContract, recipient: AztecAddress, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
|
|
51
|
+
applyMint(): Promise<void>;
|
|
45
52
|
}
|
|
46
|
-
//# sourceMappingURL=
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0L2JsYWNrbGlzdF90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXZELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUNuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEUscUJBQWEsSUFBSTtJQUNmLE9BQU8sQ0FBQyxPQUFPLENBQVM7SUFDeEIsT0FBTyxDQUFDLFFBQVEsQ0FBUztJQUN6QixPQUFPLENBQUMsYUFBYSxDQUFTO0lBRTlCLFNBQVMsU0FHUjtJQUVELFVBQVUsU0FHVDtJQUVELGVBQWUsU0FHZDtJQUVELFlBQVk7Ozs7TUFJWDtDQUNGO0FBRUQscUJBQWEsMEJBQTBCO0lBRXJDLE1BQU0sQ0FBQyxrQkFBa0IsU0FBUztJQUVsQyxPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsRUFBRyxlQUFlLENBQUM7SUFDNUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsa0JBQWtCLEVBQUcsWUFBWSxDQUFDO0lBRWxDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFFM0I7SUFFSyxzQkFBc0Isa0JBTTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGNBQWMsa0JBaURuQjtJQUVLLEtBQUssa0JBT1Y7SUFFSyxRQUFRLGtCQUViO0lBRUsseUJBQXlCLENBQzdCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFlBQVksRUFDdkIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUNkLE1BQU0sRUFBRSxNQUFNLGlCQWNmO0lBRUssU0FBUyxrQkFtRGQ7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,EAAE,KAAK,eAAe,EAAyD,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS,SAGR;IAED,UAAU,SAGT;IAED,eAAe,SAGd;IAED,YAAY;;;;MAIX;CACF;AAED,qBAAa,0BAA0B;IAErC,MAAM,CAAC,kBAAkB,SAAS;IAElC,OAAO,EAAG,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,EAAG,eAAe,CAAC;IAC5B,SAAS,EAAG,SAAS,CAAC;IAEtB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,kBAAkB,EAAG,YAAY,CAAC;IAElC,YAAY,QAAQ,EAAE,MAAM,EAE3B;IAEK,sBAAsB,kBAM3B;IAED;;;;OAIG;IACG,cAAc,kBAiDnB;IAEK,KAAK,kBAOV;IAEK,QAAQ,kBAEb;IAEK,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM,iBAcf;IAEK,SAAS,kBAmDd;CACF"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Fr
|
|
3
|
-
import {
|
|
4
|
-
import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
|
|
1
|
+
import { computeSecretHash } from '@aztec/aztec.js/crypto';
|
|
2
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
3
|
+
import { createLogger } from '@aztec/aztec.js/log';
|
|
5
4
|
import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
|
|
5
|
+
import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
|
|
6
6
|
import { jest } from '@jest/globals';
|
|
7
|
-
import {
|
|
7
|
+
import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
|
|
8
8
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
9
|
-
const { E2E_DATA_PATH: dataPath } = process.env;
|
|
10
9
|
export class Role {
|
|
11
10
|
isAdmin = false;
|
|
12
11
|
isMinter = false;
|
|
@@ -34,124 +33,137 @@ export class Role {
|
|
|
34
33
|
}
|
|
35
34
|
}
|
|
36
35
|
export class BlacklistTokenContractTest {
|
|
37
|
-
// A low delay is really poor ux, but we need to keep it low for the tests to run "quickly".
|
|
38
36
|
// This value MUST match the same value that we have in the contract
|
|
39
|
-
static
|
|
40
|
-
|
|
37
|
+
static CHANGE_ROLES_DELAY = 86400;
|
|
38
|
+
context;
|
|
41
39
|
logger;
|
|
42
|
-
|
|
43
|
-
accounts = [];
|
|
40
|
+
wallet;
|
|
44
41
|
asset;
|
|
45
42
|
tokenSim;
|
|
46
43
|
badAccount;
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
44
|
+
cheatCodes;
|
|
45
|
+
sequencer;
|
|
46
|
+
aztecNode;
|
|
47
|
+
adminAddress;
|
|
48
|
+
otherAddress;
|
|
49
|
+
blacklistedAddress;
|
|
50
50
|
constructor(testName){
|
|
51
51
|
this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
|
|
52
|
-
this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
|
|
53
52
|
}
|
|
54
|
-
async
|
|
55
|
-
|
|
56
|
-
await this.asset.methods.get_roles(this.admin.getAddress()).send().wait();
|
|
57
|
-
}
|
|
53
|
+
async crossTimestampOfChange() {
|
|
54
|
+
await this.cheatCodes.warpL2TimeAtLeastBy(this.sequencer, this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
|
|
58
55
|
}
|
|
59
56
|
/**
|
|
60
|
-
*
|
|
57
|
+
* Applies base setup:
|
|
61
58
|
* 1. Add 3 accounts.
|
|
62
59
|
* 2. Publicly deploy accounts, deploy token contract and a "bad account".
|
|
63
|
-
*/ async
|
|
60
|
+
*/ async applyBaseSetup() {
|
|
64
61
|
// Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
|
|
65
62
|
jest.setTimeout(120_000);
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
this.blacklisted = this.wallets[2];
|
|
71
|
-
this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
|
|
63
|
+
this.logger.info('Deploying 3 accounts');
|
|
64
|
+
const { deployedAccounts } = await deployAccounts(3, this.logger)({
|
|
65
|
+
wallet: this.context.wallet,
|
|
66
|
+
initialFundedAccounts: this.context.initialFundedAccounts
|
|
72
67
|
});
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallets[0]);
|
|
92
|
-
this.logger.verbose(`Token contract address: ${this.asset.address}`);
|
|
93
|
-
this.tokenSim = new TokenSimulator(this.asset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
|
|
94
|
-
this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
|
|
95
|
-
this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
|
|
96
|
-
expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(new Role().withAdmin().toNoirStruct());
|
|
68
|
+
this.cheatCodes = this.context.cheatCodes;
|
|
69
|
+
this.aztecNode = this.context.aztecNodeService;
|
|
70
|
+
this.sequencer = this.context.sequencer;
|
|
71
|
+
this.wallet = this.context.wallet;
|
|
72
|
+
this.adminAddress = deployedAccounts[0].address;
|
|
73
|
+
this.otherAddress = deployedAccounts[1].address;
|
|
74
|
+
this.blacklistedAddress = deployedAccounts[2].address;
|
|
75
|
+
this.logger.info('Setting up blacklist token contract');
|
|
76
|
+
// Create the token contract state.
|
|
77
|
+
this.logger.verbose(`Public deploy accounts...`);
|
|
78
|
+
await publicDeployAccounts(this.wallet, [
|
|
79
|
+
this.adminAddress,
|
|
80
|
+
this.otherAddress,
|
|
81
|
+
this.blacklistedAddress
|
|
82
|
+
]);
|
|
83
|
+
this.logger.verbose(`Deploying TokenContract...`);
|
|
84
|
+
this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
|
|
85
|
+
from: this.adminAddress
|
|
97
86
|
});
|
|
87
|
+
this.logger.verbose(`Token deployed to ${this.asset.address}`);
|
|
88
|
+
this.logger.verbose(`Deploying bad account...`);
|
|
89
|
+
this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
|
|
90
|
+
from: this.adminAddress
|
|
91
|
+
});
|
|
92
|
+
this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
|
|
93
|
+
await this.crossTimestampOfChange();
|
|
94
|
+
this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
|
|
95
|
+
this.adminAddress,
|
|
96
|
+
this.otherAddress,
|
|
97
|
+
this.blacklistedAddress
|
|
98
|
+
]);
|
|
99
|
+
expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
|
|
100
|
+
from: this.adminAddress
|
|
101
|
+
})).toEqual(new Role().withAdmin().toNoirStruct());
|
|
98
102
|
}
|
|
99
103
|
async setup() {
|
|
100
|
-
|
|
104
|
+
this.logger.info('Setting up fresh context');
|
|
105
|
+
this.context = await setup(0, {
|
|
106
|
+
fundSponsoredFPC: true,
|
|
107
|
+
skipAccountDeployment: true
|
|
108
|
+
});
|
|
109
|
+
await this.applyBaseSetup();
|
|
101
110
|
}
|
|
102
|
-
snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
|
|
103
111
|
async teardown() {
|
|
104
|
-
await this.
|
|
112
|
+
await teardown(this.context);
|
|
105
113
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
};
|
|
111
|
-
}
|
|
112
|
-
async addPendingShieldNoteToPXE(contract, wallet, amount, secretHash, txHash) {
|
|
113
|
-
const txEffects = await wallet.getTxEffect(txHash);
|
|
114
|
-
await contract.methods.deliver_transparent_note(contract.address, amount, secretHash, txHash.hash, this.#toBoundedVec(txEffects.data.noteHashes, MAX_NOTE_HASHES_PER_TX), txEffects.data.nullifiers[0], wallet.getAddress()).simulate();
|
|
114
|
+
async addPendingShieldNoteToPXE(contract, recipient, amount, secretHash, txHash) {
|
|
115
|
+
const txEffects = await this.aztecNode.getTxEffect(txHash);
|
|
116
|
+
await contract.methods.process_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
|
|
117
|
+
from: recipient
|
|
118
|
+
});
|
|
115
119
|
}
|
|
116
|
-
async
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
this.
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
this.
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
120
|
+
async applyMint() {
|
|
121
|
+
this.logger.info('Applying mint setup');
|
|
122
|
+
const { asset, tokenSim } = this;
|
|
123
|
+
const amount = 10000n;
|
|
124
|
+
const adminMinterRole = new Role().withAdmin().withMinter();
|
|
125
|
+
await this.asset.methods.update_roles(this.adminAddress, adminMinterRole.toNoirStruct()).send({
|
|
126
|
+
from: this.adminAddress
|
|
127
|
+
});
|
|
128
|
+
const blacklistRole = new Role().withBlacklisted();
|
|
129
|
+
await this.asset.methods.update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct()).send({
|
|
130
|
+
from: this.adminAddress
|
|
131
|
+
});
|
|
132
|
+
await this.crossTimestampOfChange();
|
|
133
|
+
expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
|
|
134
|
+
from: this.adminAddress
|
|
135
|
+
})).toEqual(adminMinterRole.toNoirStruct());
|
|
136
|
+
this.logger.verbose(`Minting ${amount} publicly...`);
|
|
137
|
+
await asset.methods.mint_public(this.adminAddress, amount).send({
|
|
138
|
+
from: this.adminAddress
|
|
139
|
+
});
|
|
140
|
+
this.logger.verbose(`Minting ${amount} privately...`);
|
|
141
|
+
const secret = Fr.random();
|
|
142
|
+
const secretHash = await computeSecretHash(secret);
|
|
143
|
+
const receipt = await asset.methods.mint_private(amount, secretHash).send({
|
|
144
|
+
from: this.adminAddress
|
|
145
|
+
});
|
|
146
|
+
await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
|
|
147
|
+
await asset.methods.redeem_shield(this.adminAddress, amount, secret).send({
|
|
148
|
+
from: this.adminAddress
|
|
149
|
+
});
|
|
150
|
+
this.logger.verbose(`Minting complete.`);
|
|
151
|
+
tokenSim.mintPublic(this.adminAddress, amount);
|
|
152
|
+
const publicBalance = await asset.methods.balance_of_public(this.adminAddress).simulate({
|
|
153
|
+
from: this.adminAddress
|
|
154
|
+
});
|
|
155
|
+
this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
|
|
156
|
+
expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
|
|
157
|
+
tokenSim.mintPrivate(this.adminAddress, amount);
|
|
158
|
+
const privateBalance = await asset.methods.balance_of_private(this.adminAddress).simulate({
|
|
159
|
+
from: this.adminAddress
|
|
160
|
+
});
|
|
161
|
+
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
162
|
+
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
|
|
163
|
+
const totalSupply = await asset.methods.total_supply().simulate({
|
|
164
|
+
from: this.adminAddress
|
|
155
165
|
});
|
|
166
|
+
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
167
|
+
expect(totalSupply).toEqual(tokenSim.totalSupply);
|
|
156
168
|
}
|
|
157
169
|
}
|
|
@@ -1,47 +1,47 @@
|
|
|
1
1
|
import type { AztecNodeConfig } from '@aztec/aztec-node';
|
|
2
|
-
import {
|
|
3
|
-
import { type
|
|
2
|
+
import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
|
|
3
|
+
import { type Logger } from '@aztec/aztec.js/log';
|
|
4
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
5
|
+
import type { TxReceipt } from '@aztec/aztec.js/tx';
|
|
6
|
+
import { CheatCodes } from '@aztec/aztec/testing';
|
|
7
|
+
import { InboxContract, OutboxContract, RollupContract } from '@aztec/ethereum/contracts';
|
|
8
|
+
import type { DeployAztecL1ContractsArgs, DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-aztec-l1-contracts';
|
|
9
|
+
import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
|
|
10
|
+
import { EpochNumber } from '@aztec/foundation/branded-types';
|
|
4
11
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
5
12
|
import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
|
|
6
|
-
import {
|
|
13
|
+
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
14
|
+
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
15
|
+
import { type EndToEndContext, type SetupOptions } from '../fixtures/setup.js';
|
|
7
16
|
import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
|
|
8
17
|
export declare class CrossChainMessagingTest {
|
|
9
|
-
private
|
|
18
|
+
private requireEpochProven;
|
|
19
|
+
private setupOptions;
|
|
20
|
+
private deployL1ContractsArgs;
|
|
10
21
|
logger: Logger;
|
|
11
|
-
|
|
12
|
-
accounts: CompleteAddress[];
|
|
22
|
+
context: EndToEndContext;
|
|
13
23
|
aztecNode: AztecNode;
|
|
14
|
-
pxe: PXE;
|
|
15
24
|
aztecNodeConfig: AztecNodeConfig;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
25
|
+
aztecNodeAdmin: AztecNodeAdmin;
|
|
26
|
+
l1Client: ExtendedViemWalletClient | undefined;
|
|
27
|
+
wallet: TestWallet;
|
|
28
|
+
ownerAddress: AztecAddress;
|
|
29
|
+
user1Address: AztecAddress;
|
|
30
|
+
user2Address: AztecAddress;
|
|
19
31
|
crossChainTestHarness: CrossChainTestHarness;
|
|
20
32
|
ethAccount: EthAddress;
|
|
21
|
-
ownerAddress: AztecAddress;
|
|
22
33
|
l2Token: TokenContract;
|
|
23
34
|
l2Bridge: TokenBridgeContract;
|
|
24
|
-
rollup:
|
|
25
|
-
inbox:
|
|
26
|
-
outbox:
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
35
|
+
rollup: RollupContract;
|
|
36
|
+
inbox: InboxContract;
|
|
37
|
+
outbox: OutboxContract;
|
|
38
|
+
cheatCodes: CheatCodes;
|
|
39
|
+
deployL1ContractsValues: DeployAztecL1ContractsReturnType;
|
|
40
|
+
constructor(testName: string, opts?: SetupOptions, deployL1ContractsArgs?: Partial<DeployAztecL1ContractsArgs>);
|
|
30
41
|
setup(): Promise<void>;
|
|
31
|
-
|
|
42
|
+
advanceToEpochProven(l2TxReceipt: TxReceipt): Promise<EpochNumber>;
|
|
43
|
+
catchUpProvenChain(): Promise<void>;
|
|
32
44
|
teardown(): Promise<void>;
|
|
33
|
-
|
|
34
|
-
toCrossChainContext(): CrossChainContext;
|
|
45
|
+
applyBaseSetup(): Promise<void>;
|
|
35
46
|
}
|
|
36
|
-
|
|
37
|
-
l2Token: AztecAddress;
|
|
38
|
-
l2Bridge: AztecAddress;
|
|
39
|
-
tokenPortal: EthAddress;
|
|
40
|
-
underlying: EthAddress;
|
|
41
|
-
ethAccount: EthAddress;
|
|
42
|
-
ownerAddress: AztecAddress;
|
|
43
|
-
inbox: EthAddress;
|
|
44
|
-
outbox: EthAddress;
|
|
45
|
-
};
|
|
46
|
-
export {};
|
|
47
|
-
//# sourceMappingURL=cross_chain_messaging_test.d.ts.map
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fbWVzc2FnaW5nX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfY3Jvc3NfY2hhaW5fbWVzc2FnaW5nL2Nyb3NzX2NoYWluX21lc3NhZ2luZ190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFDViwwQkFBMEIsRUFDMUIsZ0NBQWdDLEVBQ2pDLE1BQU0sMkNBQTJDLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN0RSxPQUFPLEVBQW9CLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2hGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUc1RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssWUFBWSxFQUtsQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRTlFLHFCQUFhLHVCQUF1QjtJQUNsQyxPQUFPLENBQUMsa0JBQWtCLENBQVU7SUFDcEMsT0FBTyxDQUFDLFlBQVksQ0FBZTtJQUNuQyxPQUFPLENBQUMscUJBQXFCLENBQXNDO0lBQ25FLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsZUFBZSxFQUFHLGVBQWUsQ0FBQztJQUNsQyxjQUFjLEVBQUcsY0FBYyxDQUFDO0lBRWhDLFFBQVEsRUFBRyx3QkFBd0IsR0FBRyxTQUFTLENBQUM7SUFFaEQsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixxQkFBcUIsRUFBRyxxQkFBcUIsQ0FBQztJQUM5QyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLE9BQU8sRUFBRyxhQUFhLENBQUM7SUFDeEIsUUFBUSxFQUFHLG1CQUFtQixDQUFDO0lBRS9CLE1BQU0sRUFBRyxjQUFjLENBQUM7SUFDeEIsS0FBSyxFQUFHLGFBQWEsQ0FBQztJQUN0QixNQUFNLEVBQUcsY0FBYyxDQUFDO0lBQ3hCLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFFeEIsdUJBQXVCLEVBQUcsZ0NBQWdDLENBQUM7SUFFM0QsWUFDRSxRQUFRLEVBQUUsTUFBTSxFQUNoQixJQUFJLEdBQUUsWUFBaUIsRUFDdkIscUJBQXFCLEdBQUUsT0FBTyxDQUFDLDBCQUEwQixDQUFNLEVBU2hFO0lBRUssS0FBSyxrQkFTVjtJQUVLLG9CQUFvQixDQUFDLFdBQVcsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQVV2RTtJQUVLLGtCQUFrQixrQkFLdkI7SUFFSyxRQUFRLGtCQUViO0lBRUssY0FBYyxrQkFrRm5CO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,KAAK,EACV,0BAA0B,EAC1B,gCAAgC,EACjC,MAAM,2CAA2C,CAAC;AAEnD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAoB,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGhF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG5D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAKlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,qBAAqB,CAAsC;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,eAAe,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAEhC,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,MAAM,EAAG,cAAc,CAAC;IACxB,KAAK,EAAG,aAAa,CAAC;IACtB,MAAM,EAAG,cAAc,CAAC;IACxB,UAAU,EAAG,UAAU,CAAC;IAExB,uBAAuB,EAAG,gCAAgC,CAAC;IAE3D,YACE,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,YAAiB,EACvB,qBAAqB,GAAE,OAAO,CAAC,0BAA0B,CAAM,EAShE;IAEK,KAAK,kBASV;IAEK,oBAAoB,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAUvE;IAEK,kBAAkB,kBAKvB;IAEK,QAAQ,kBAEb;IAEK,cAAc,kBAkFnB;CACF"}
|