@aztec/end-to-end 0.0.1-commit.24de95ac → 0.0.1-commit.3469e52
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 +3 -2
- package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/benchmark.js +21 -1
- package/dest/bench/client_flows/client_flows_benchmark.d.ts +21 -15
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +116 -121
- package/dest/bench/client_flows/config.d.ts +1 -1
- package/dest/bench/client_flows/data_extractor.d.ts +1 -1
- package/dest/bench/client_flows/data_extractor.js +7 -27
- 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_blacklist_token_contract/blacklist_token_contract_test.d.ts +6 -7
- 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 +98 -113
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +19 -13
- 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 +91 -70
- package/dest/e2e_deploy_contract/deploy_test.d.ts +5 -4
- package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
- package/dest/e2e_deploy_contract/deploy_test.js +18 -13
- 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 +19 -16
- package/dest/e2e_fees/bridging_race.notest.d.ts +1 -1
- package/dest/e2e_fees/bridging_race.notest.js +4 -6
- package/dest/e2e_fees/fees_test.d.ts +20 -16
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +127 -139
- package/dest/e2e_l1_publisher/write_json.d.ts +3 -3
- package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
- package/dest/e2e_l1_publisher/write_json.js +23 -18
- package/dest/e2e_multi_validator/utils.d.ts +1 -1
- package/dest/e2e_multi_validator/utils.js +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.d.ts +6 -9
- package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.js +32 -39
- package/dest/e2e_p2p/inactivity_slash_test.d.ts +3 -3
- package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
- package/dest/e2e_p2p/inactivity_slash_test.js +7 -6
- package/dest/e2e_p2p/p2p_network.d.ts +225 -18
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +117 -110
- package/dest/e2e_p2p/shared.d.ts +6 -6
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +6 -5
- package/dest/e2e_token_contract/token_contract_test.d.ts +16 -9
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/e2e_token_contract/token_contract_test.js +90 -92
- package/dest/fixtures/e2e_prover_test.d.ts +12 -18
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +98 -109
- 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.d.ts +1 -1
- package/dest/fixtures/get_acvm_config.js +1 -1
- package/dest/fixtures/get_bb_config.d.ts +1 -1
- package/dest/fixtures/get_bb_config.d.ts.map +1 -1
- package/dest/fixtures/index.d.ts +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/logging.d.ts +1 -1
- package/dest/fixtures/setup.d.ts +216 -0
- package/dest/fixtures/setup.d.ts.map +1 -0
- package/dest/fixtures/setup.js +684 -0
- package/dest/fixtures/setup_p2p_test.d.ts +4 -4
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +18 -10
- package/dest/fixtures/token_utils.d.ts +5 -2
- package/dest/fixtures/token_utils.d.ts.map +1 -1
- package/dest/fixtures/token_utils.js +7 -4
- package/dest/fixtures/utils.d.ts +5 -192
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +4 -648
- package/dest/fixtures/web3signer.d.ts +1 -1
- 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/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 +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/gas_portal_test_harness.js +1 -1
- 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/submit-transactions.d.ts +1 -1
- package/dest/shared/submit-transactions.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/index.d.ts +1 -1
- 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 +5 -3
- package/dest/simulators/token_simulator.d.ts +1 -1
- package/dest/simulators/token_simulator.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.d.ts +8 -5
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +45 -10
- package/dest/spartan/tx_metrics.d.ts +52 -0
- package/dest/spartan/tx_metrics.d.ts.map +1 -0
- package/dest/spartan/tx_metrics.js +248 -0
- package/dest/spartan/utils.d.ts +66 -24
- package/dest/spartan/utils.d.ts.map +1 -1
- package/dest/spartan/utils.js +326 -133
- package/package.json +43 -40
- package/src/bench/client_flows/benchmark.ts +24 -2
- package/src/bench/client_flows/client_flows_benchmark.ts +157 -162
- package/src/bench/client_flows/data_extractor.ts +6 -28
- package/src/bench/utils.ts +22 -14
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +107 -142
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +140 -124
- package/src/e2e_deploy_contract/deploy_test.ts +22 -15
- package/src/e2e_epochs/epochs_test.ts +39 -25
- package/src/e2e_fees/bridging_race.notest.ts +4 -7
- package/src/e2e_fees/fees_test.ts +180 -215
- package/src/e2e_l1_publisher/write_json.ts +26 -20
- package/src/e2e_multi_validator/utils.ts +1 -1
- package/src/e2e_nested_contract/nested_contract_test.ts +35 -55
- package/src/e2e_p2p/inactivity_slash_test.ts +10 -9
- package/src/e2e_p2p/p2p_network.ts +175 -180
- package/src/e2e_p2p/shared.ts +15 -7
- package/src/e2e_token_contract/token_contract_test.ts +105 -118
- package/src/fixtures/e2e_prover_test.ts +120 -153
- 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.ts +1010 -0
- package/src/fixtures/setup_p2p_test.ts +23 -9
- package/src/fixtures/token_utils.ts +4 -4
- package/src/fixtures/utils.ts +27 -947
- package/src/fixtures/web3signer.ts +1 -1
- package/src/fixtures/with_telemetry_utils.ts +2 -2
- package/src/guides/up_quick_start.sh +1 -1
- package/src/quality_of_service/{alert_checker.ts → grafana_client.ts} +1 -1
- package/src/quality_of_service/prometheus_client.ts +113 -0
- package/src/shared/cross_chain_test_harness.ts +6 -9
- package/src/shared/gas_portal_test_harness.ts +2 -2
- package/src/shared/index.ts +1 -1
- package/src/shared/uniswap_l1_l2.ts +53 -67
- package/src/simulators/lending_simulator.ts +6 -4
- package/src/spartan/DEVELOP.md +7 -0
- package/src/spartan/setup_test_wallets.ts +56 -13
- package/src/spartan/tx_metrics.ts +231 -0
- package/src/spartan/utils.ts +379 -75
- 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 -95
- package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
- package/dest/fixtures/snapshot_manager.js +0 -505
- 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/src/fixtures/snapshot_manager.ts +0 -665
package/dest/bench/utils.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { type SentTx, type WaitOpts } from '@aztec/aztec.js/contracts';
|
|
2
2
|
import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
|
|
3
|
-
import type {
|
|
3
|
+
import type { MetricDefinition } from '@aztec/telemetry-client';
|
|
4
4
|
import type { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
|
|
5
5
|
import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
|
|
6
6
|
/**
|
|
7
7
|
* Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
|
|
8
8
|
*/
|
|
9
9
|
export declare function benchmarkSetup(opts: Partial<SetupOptions> & {
|
|
10
|
-
/** What metrics to export */ metrics: (
|
|
10
|
+
/** What metrics to export */ metrics: (MetricDefinition | MetricFilter)[];
|
|
11
11
|
/** Where to output the benchmark data (defaults to BENCH_OUTPUT or bench.json) */
|
|
12
12
|
benchOutput?: string;
|
|
13
13
|
}): Promise<{
|
|
@@ -17,7 +17,7 @@ export declare function benchmarkSetup(opts: Partial<SetupOptions> & {
|
|
|
17
17
|
sequencer: import("@aztec/sequencer-client").SequencerClient;
|
|
18
18
|
}>;
|
|
19
19
|
type MetricFilter = {
|
|
20
|
-
source:
|
|
20
|
+
source: MetricDefinition;
|
|
21
21
|
transform: (value: number) => number;
|
|
22
22
|
name: string;
|
|
23
23
|
unit?: string;
|
|
@@ -38,7 +38,7 @@ export type GithubActionBenchmarkResult = {
|
|
|
38
38
|
* @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
|
|
39
39
|
* @returns Array of sent txs.
|
|
40
40
|
*/
|
|
41
|
-
export declare function sendTxs(txCount: number, context: EndToEndContext, contract: BenchmarkingContract, heavyPublicCompute?: boolean): SentTx[]
|
|
41
|
+
export declare function sendTxs(txCount: number, context: EndToEndContext, contract: BenchmarkingContract, heavyPublicCompute?: boolean): Promise<SentTx[]>;
|
|
42
42
|
export declare function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpts?: WaitOpts): Promise<void>;
|
|
43
43
|
export {};
|
|
44
|
-
//# sourceMappingURL=
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iZW5jaC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQWEsS0FBSyxNQUFNLEVBQUUsS0FBSyxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVsRixPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUNsRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUE0Qyx3QkFBd0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBS3hILE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxLQUFLLFlBQVksRUFBUyxNQUFNLHNCQUFzQixDQUFDO0FBRXRGOztHQUVHO0FBQ0gsd0JBQXNCLGNBQWMsQ0FDbEMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxZQUFZLENBQUMsR0FBRztJQUM1Qiw2QkFBNkIsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxnQkFBZ0IsR0FBRyxZQUFZLENBQUMsRUFBRSxDQUFDO0lBQzNFLGtGQUFrRjtJQUNsRixXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDdEI7Ozs7O0dBeUJGO0FBRUQsS0FBSyxZQUFZLEdBQUc7SUFDbEIsTUFBTSxFQUFFLGdCQUFnQixDQUFDO0lBQ3pCLFNBQVMsRUFBRSxDQUFDLEtBQUssRUFBRSxNQUFNLEtBQUssTUFBTSxDQUFDO0lBQ3JDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDZixDQUFDO0FBR0YsTUFBTSxNQUFNLDJCQUEyQixHQUFHO0lBQ3hDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNoQixDQUFDO0FBb0VGOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLE9BQU8sQ0FDM0IsT0FBTyxFQUFFLE1BQU0sRUFDZixPQUFPLEVBQUUsZUFBZSxFQUN4QixRQUFRLEVBQUUsb0JBQW9CLEVBQzlCLGtCQUFrQixHQUFFLE9BQWUsR0FDbEMsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBTW5CO0FBRUQsd0JBQXNCLE9BQU8sQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxVQUFVLENBQUMsRUFBRSxRQUFRLGlCQUkzRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAKxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,gBAAgB,GAAG,YAAY,CAAC,EAAE,CAAC;IAC3E,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAyBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAoEF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F"}
|
package/dest/bench/utils.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
1
2
|
import { BatchCall } from '@aztec/aztec.js/contracts';
|
|
2
3
|
import { mean, stdDev, times } from '@aztec/foundation/collection';
|
|
3
4
|
import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
|
|
@@ -45,17 +46,20 @@ import { setup } from '../fixtures/utils.js';
|
|
|
45
46
|
sequencer
|
|
46
47
|
};
|
|
47
48
|
}
|
|
49
|
+
function isMetricDefinition(f) {
|
|
50
|
+
return 'description' in f;
|
|
51
|
+
}
|
|
48
52
|
function formatMetricsForGithubBenchmarkAction(data, filter) {
|
|
49
|
-
const allFilters = filter.map((f)=>
|
|
50
|
-
name: f,
|
|
53
|
+
const allFilters = filter.map((f)=>isMetricDefinition(f) ? {
|
|
54
|
+
name: f.name,
|
|
51
55
|
source: f,
|
|
52
56
|
transform: (x)=>x,
|
|
53
|
-
unit:
|
|
57
|
+
unit: f.unit
|
|
54
58
|
} : f);
|
|
55
59
|
return data.flatMap((meter)=>{
|
|
56
|
-
return meter.metrics.filter((metric)=>allFilters.map((f)=>f.source).includes(metric.name)).map((metric)=>[
|
|
60
|
+
return meter.metrics.filter((metric)=>allFilters.map((f)=>f.source.name).includes(metric.name)).map((metric)=>[
|
|
57
61
|
metric,
|
|
58
|
-
allFilters.find((f)=>f.source === metric.name)
|
|
62
|
+
allFilters.find((f)=>f.source.name === metric.name)
|
|
59
63
|
]).map(([metric, filter])=>({
|
|
60
64
|
name: `${meter.name}/${filter.name}`,
|
|
61
65
|
unit: filter.unit ?? metric.unit ?? 'unknown',
|
|
@@ -91,16 +95,19 @@ function getMetricValues(points) {
|
|
|
91
95
|
* @param contract - Benchmarking contract.
|
|
92
96
|
* @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
|
|
93
97
|
* @returns A BatchCall instance.
|
|
94
|
-
*/ function makeCall(index, context, contract, heavyPublicCompute) {
|
|
95
|
-
const [owner] = context.accounts;
|
|
98
|
+
*/ async function makeCall(index, context, contract, heavyPublicCompute) {
|
|
96
99
|
if (heavyPublicCompute) {
|
|
97
100
|
return new BatchCall(context.wallet, [
|
|
98
101
|
contract.methods.sha256_hash_1024(randomBytesAsBigInts(1024))
|
|
99
102
|
]);
|
|
100
103
|
} else {
|
|
104
|
+
// We use random address for the new note owner because we can emit at most UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN
|
|
105
|
+
// logs for a given sender-recipient-contract tuple.
|
|
106
|
+
const ownerOfNewNote = await AztecAddress.random();
|
|
107
|
+
const [ownerOfBalance] = context.accounts;
|
|
101
108
|
return new BatchCall(context.wallet, [
|
|
102
|
-
contract.methods.create_note(
|
|
103
|
-
contract.methods.increment_balance(
|
|
109
|
+
contract.methods.create_note(ownerOfNewNote, index + 1),
|
|
110
|
+
contract.methods.increment_balance(ownerOfBalance, index + 1)
|
|
104
111
|
]);
|
|
105
112
|
}
|
|
106
113
|
}
|
|
@@ -112,8 +119,8 @@ function getMetricValues(points) {
|
|
|
112
119
|
* @param contract - Target contract.
|
|
113
120
|
* @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
|
|
114
121
|
* @returns Array of sent txs.
|
|
115
|
-
*/ export function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
|
|
116
|
-
const calls = times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute));
|
|
122
|
+
*/ export async function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
|
|
123
|
+
const calls = await Promise.all(times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute)));
|
|
117
124
|
context.logger.info(`Creating ${txCount} txs`);
|
|
118
125
|
const [from] = context.accounts;
|
|
119
126
|
context.logger.info(`Sending ${txCount} txs`);
|
|
@@ -8,7 +8,7 @@ import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist'
|
|
|
8
8
|
import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
|
|
9
9
|
import type { SequencerClient } from '@aztec/sequencer-client';
|
|
10
10
|
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
11
|
-
import { type
|
|
11
|
+
import { type EndToEndContext } from '../fixtures/setup.js';
|
|
12
12
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
13
13
|
export declare class Role {
|
|
14
14
|
private isAdmin;
|
|
@@ -25,7 +25,7 @@ export declare class Role {
|
|
|
25
25
|
}
|
|
26
26
|
export declare class BlacklistTokenContractTest {
|
|
27
27
|
static CHANGE_ROLES_DELAY: number;
|
|
28
|
-
|
|
28
|
+
context: EndToEndContext;
|
|
29
29
|
logger: Logger;
|
|
30
30
|
wallet: TestWallet;
|
|
31
31
|
asset: TokenBlacklistContract;
|
|
@@ -40,15 +40,14 @@ export declare class BlacklistTokenContractTest {
|
|
|
40
40
|
constructor(testName: string);
|
|
41
41
|
crossTimestampOfChange(): Promise<void>;
|
|
42
42
|
/**
|
|
43
|
-
*
|
|
43
|
+
* Applies base setup:
|
|
44
44
|
* 1. Add 3 accounts.
|
|
45
45
|
* 2. Publicly deploy accounts, deploy token contract and a "bad account".
|
|
46
46
|
*/
|
|
47
|
-
|
|
47
|
+
applyBaseSetup(): Promise<void>;
|
|
48
48
|
setup(): Promise<void>;
|
|
49
|
-
snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
|
|
50
49
|
teardown(): Promise<void>;
|
|
51
50
|
addPendingShieldNoteToPXE(contract: TokenBlacklistContract, recipient: AztecAddress, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
|
|
52
|
-
|
|
51
|
+
applyMint(): Promise<void>;
|
|
53
52
|
}
|
|
54
|
-
//# sourceMappingURL=
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0L2JsYWNrbGlzdF90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXZELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBeUQsTUFBTSxzQkFBc0IsQ0FBQztBQUNuSCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEUscUJBQWEsSUFBSTtJQUNmLE9BQU8sQ0FBQyxPQUFPLENBQVM7SUFDeEIsT0FBTyxDQUFDLFFBQVEsQ0FBUztJQUN6QixPQUFPLENBQUMsYUFBYSxDQUFTO0lBRTlCLFNBQVMsU0FHUjtJQUVELFVBQVUsU0FHVDtJQUVELGVBQWUsU0FHZDtJQUVELFlBQVk7Ozs7TUFJWDtDQUNGO0FBRUQscUJBQWEsMEJBQTBCO0lBRXJDLE1BQU0sQ0FBQyxrQkFBa0IsU0FBUztJQUVsQyxPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsRUFBRyxlQUFlLENBQUM7SUFDNUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsa0JBQWtCLEVBQUcsWUFBWSxDQUFDO0lBRWxDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFFM0I7SUFFSyxzQkFBc0Isa0JBTTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGNBQWMsa0JBaURuQjtJQUVLLEtBQUssa0JBT1Y7SUFFSyxRQUFRLGtCQUViO0lBRUsseUJBQXlCLENBQzdCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFlBQVksRUFDdkIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUNkLE1BQU0sRUFBRSxNQUFNLGlCQWNmO0lBRUssU0FBUyxrQkFzRGQ7Q0FDRiJ9
|
|
@@ -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":"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,
|
|
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,kBAsDd;CACF"}
|
|
@@ -4,9 +4,8 @@ import { createLogger } from '@aztec/aztec.js/log';
|
|
|
4
4
|
import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
|
|
5
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;
|
|
@@ -36,7 +35,7 @@ export class Role {
|
|
|
36
35
|
export class BlacklistTokenContractTest {
|
|
37
36
|
// This value MUST match the same value that we have in the contract
|
|
38
37
|
static CHANGE_ROLES_DELAY = 86400;
|
|
39
|
-
|
|
38
|
+
context;
|
|
40
39
|
logger;
|
|
41
40
|
wallet;
|
|
42
41
|
asset;
|
|
@@ -50,136 +49,122 @@ export class BlacklistTokenContractTest {
|
|
|
50
49
|
blacklistedAddress;
|
|
51
50
|
constructor(testName){
|
|
52
51
|
this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
|
|
53
|
-
this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
|
|
54
52
|
}
|
|
55
53
|
async crossTimestampOfChange() {
|
|
56
54
|
await this.cheatCodes.warpL2TimeAtLeastBy(this.sequencer, this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
|
|
57
55
|
}
|
|
58
56
|
/**
|
|
59
|
-
*
|
|
57
|
+
* Applies base setup:
|
|
60
58
|
* 1. Add 3 accounts.
|
|
61
59
|
* 2. Publicly deploy accounts, deploy token contract and a "bad account".
|
|
62
|
-
*/ async
|
|
60
|
+
*/ async applyBaseSetup() {
|
|
63
61
|
// Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
|
|
64
62
|
jest.setTimeout(120_000);
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
this.
|
|
68
|
-
this.
|
|
69
|
-
this.wallet = wallet;
|
|
70
|
-
this.adminAddress = deployedAccounts[0].address;
|
|
71
|
-
this.otherAddress = deployedAccounts[1].address;
|
|
72
|
-
this.blacklistedAddress = deployedAccounts[2].address;
|
|
73
|
-
return Promise.resolve();
|
|
74
|
-
});
|
|
75
|
-
await this.snapshotManager.snapshot('e2e_blacklist_token_contract', async ()=>{
|
|
76
|
-
// Create the token contract state.
|
|
77
|
-
// Move this account thing to addAccounts above?
|
|
78
|
-
this.logger.verbose(`Public deploy accounts...`);
|
|
79
|
-
await publicDeployAccounts(this.wallet, [
|
|
80
|
-
this.adminAddress,
|
|
81
|
-
this.otherAddress,
|
|
82
|
-
this.blacklistedAddress
|
|
83
|
-
]);
|
|
84
|
-
this.logger.verbose(`Deploying TokenContract...`);
|
|
85
|
-
this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
|
|
86
|
-
from: this.adminAddress
|
|
87
|
-
}).deployed();
|
|
88
|
-
this.logger.verbose(`Token deployed to ${this.asset.address}`);
|
|
89
|
-
this.logger.verbose(`Deploying bad account...`);
|
|
90
|
-
this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
|
|
91
|
-
from: this.adminAddress
|
|
92
|
-
}).deployed();
|
|
93
|
-
this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
|
|
94
|
-
await this.crossTimestampOfChange();
|
|
95
|
-
return {
|
|
96
|
-
tokenContractAddress: this.asset.address,
|
|
97
|
-
badAccountAddress: this.badAccount.address
|
|
98
|
-
};
|
|
99
|
-
}, async ({ tokenContractAddress, badAccountAddress })=>{
|
|
100
|
-
// Restore the token contract state.
|
|
101
|
-
this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallet);
|
|
102
|
-
this.logger.verbose(`Token contract address: ${this.asset.address}`);
|
|
103
|
-
this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
|
|
104
|
-
this.adminAddress,
|
|
105
|
-
this.otherAddress,
|
|
106
|
-
this.blacklistedAddress
|
|
107
|
-
]);
|
|
108
|
-
this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallet);
|
|
109
|
-
this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
|
|
110
|
-
expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
|
|
111
|
-
from: this.adminAddress
|
|
112
|
-
})).toEqual(new Role().withAdmin().toNoirStruct());
|
|
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
|
|
113
67
|
});
|
|
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
|
|
86
|
+
}).deployed();
|
|
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
|
+
}).deployed();
|
|
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());
|
|
114
102
|
}
|
|
115
103
|
async setup() {
|
|
116
|
-
|
|
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();
|
|
117
110
|
}
|
|
118
|
-
snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
|
|
119
111
|
async teardown() {
|
|
120
|
-
await this.
|
|
112
|
+
await teardown(this.context);
|
|
121
113
|
}
|
|
122
114
|
async addPendingShieldNoteToPXE(contract, recipient, amount, secretHash, txHash) {
|
|
123
115
|
const txEffects = await this.aztecNode.getTxEffect(txHash);
|
|
124
|
-
await contract.methods.
|
|
116
|
+
await contract.methods.process_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
|
|
125
117
|
from: recipient
|
|
126
118
|
});
|
|
127
119
|
}
|
|
128
|
-
async
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
});
|
|
175
|
-
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
176
|
-
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
|
|
177
|
-
const totalSupply = await asset.methods.total_supply().simulate({
|
|
178
|
-
from: this.adminAddress
|
|
179
|
-
});
|
|
180
|
-
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
181
|
-
expect(totalSupply).toEqual(tokenSim.totalSupply);
|
|
182
|
-
return Promise.resolve();
|
|
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
|
+
}).wait();
|
|
128
|
+
const blacklistRole = new Role().withBlacklisted();
|
|
129
|
+
await this.asset.methods.update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct()).send({
|
|
130
|
+
from: this.adminAddress
|
|
131
|
+
}).wait();
|
|
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
|
+
}).wait();
|
|
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
|
+
}).wait();
|
|
146
|
+
await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
|
|
147
|
+
const txClaim = asset.methods.redeem_shield(this.adminAddress, amount, secret).send({
|
|
148
|
+
from: this.adminAddress
|
|
149
|
+
});
|
|
150
|
+
await txClaim.wait();
|
|
151
|
+
this.logger.verbose(`Minting complete.`);
|
|
152
|
+
tokenSim.mintPublic(this.adminAddress, amount);
|
|
153
|
+
const publicBalance = await asset.methods.balance_of_public(this.adminAddress).simulate({
|
|
154
|
+
from: this.adminAddress
|
|
155
|
+
});
|
|
156
|
+
this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
|
|
157
|
+
expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
|
|
158
|
+
tokenSim.mintPrivate(this.adminAddress, amount);
|
|
159
|
+
const privateBalance = await asset.methods.balance_of_private(this.adminAddress).simulate({
|
|
160
|
+
from: this.adminAddress
|
|
161
|
+
});
|
|
162
|
+
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
163
|
+
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
|
|
164
|
+
const totalSupply = await asset.methods.total_supply().simulate({
|
|
165
|
+
from: this.adminAddress
|
|
183
166
|
});
|
|
167
|
+
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
168
|
+
expect(totalSupply).toEqual(tokenSim.totalSupply);
|
|
184
169
|
}
|
|
185
170
|
}
|
|
@@ -2,22 +2,27 @@ import type { AztecNodeConfig } from '@aztec/aztec-node';
|
|
|
2
2
|
import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
|
|
3
3
|
import { type Logger } from '@aztec/aztec.js/log';
|
|
4
4
|
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
5
|
+
import type { TxReceipt } from '@aztec/aztec.js/tx';
|
|
5
6
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
6
|
-
import {
|
|
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';
|
|
7
11
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
8
12
|
import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
|
|
9
13
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
10
14
|
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
11
|
-
import { type
|
|
12
|
-
import type { SetupOptions } from '../fixtures/utils.js';
|
|
15
|
+
import { type EndToEndContext, type SetupOptions } from '../fixtures/setup.js';
|
|
13
16
|
import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
|
|
14
17
|
export declare class CrossChainMessagingTest {
|
|
15
|
-
private
|
|
18
|
+
private requireEpochProven;
|
|
19
|
+
private setupOptions;
|
|
20
|
+
private deployL1ContractsArgs;
|
|
16
21
|
logger: Logger;
|
|
22
|
+
context: EndToEndContext;
|
|
17
23
|
aztecNode: AztecNode;
|
|
18
24
|
aztecNodeConfig: AztecNodeConfig;
|
|
19
25
|
aztecNodeAdmin: AztecNodeAdmin;
|
|
20
|
-
ctx: SubsystemsContext;
|
|
21
26
|
l1Client: ExtendedViemWalletClient | undefined;
|
|
22
27
|
wallet: TestWallet;
|
|
23
28
|
ownerAddress: AztecAddress;
|
|
@@ -27,15 +32,16 @@ export declare class CrossChainMessagingTest {
|
|
|
27
32
|
ethAccount: EthAddress;
|
|
28
33
|
l2Token: TokenContract;
|
|
29
34
|
l2Bridge: TokenBridgeContract;
|
|
30
|
-
|
|
31
|
-
|
|
35
|
+
rollup: RollupContract;
|
|
36
|
+
inbox: InboxContract;
|
|
37
|
+
outbox: OutboxContract;
|
|
32
38
|
cheatCodes: CheatCodes;
|
|
33
|
-
deployL1ContractsValues:
|
|
34
|
-
constructor(testName: string, opts?: SetupOptions, deployL1ContractsArgs?: Partial<
|
|
35
|
-
assumeProven(): Promise<void>;
|
|
39
|
+
deployL1ContractsValues: DeployAztecL1ContractsReturnType;
|
|
40
|
+
constructor(testName: string, opts?: SetupOptions, deployL1ContractsArgs?: Partial<DeployAztecL1ContractsArgs>);
|
|
36
41
|
setup(): Promise<void>;
|
|
37
|
-
|
|
42
|
+
advanceToEpochProven(l2TxReceipt: TxReceipt): Promise<EpochNumber>;
|
|
43
|
+
catchUpProvenChain(): Promise<void>;
|
|
38
44
|
teardown(): Promise<void>;
|
|
39
|
-
|
|
45
|
+
applyBaseSetup(): Promise<void>;
|
|
40
46
|
}
|
|
41
|
-
//# sourceMappingURL=
|
|
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":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
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"}
|