@aztec/end-to-end 0.0.1-commit.7d4e6cd → 0.0.1-commit.858058eac
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 +13 -14
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +118 -133
- package/dest/bench/client_flows/config.d.ts +2 -2
- package/dest/bench/client_flows/config.d.ts.map +1 -1
- package/dest/bench/client_flows/config.js +18 -0
- package/dest/bench/utils.d.ts +6 -5
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +9 -7
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +7 -8
- 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 +96 -112
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +7 -8
- 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 +68 -64
- 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 +7 -1
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +39 -11
- package/dest/e2e_fees/bridging_race.notest.js +3 -5
- package/dest/e2e_fees/fees_test.d.ts +14 -14
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +122 -140
- package/dest/e2e_l1_publisher/write_json.d.ts +4 -3
- package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
- package/dest/e2e_l1_publisher/write_json.js +14 -13
- 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 +31 -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 +3 -3
- package/dest/e2e_p2p/p2p_network.d.ts +8 -7
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +110 -103
- 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 +6 -6
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +14 -17
- package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +2 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +1 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.js +184 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts +18 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +1 -0
- package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.js +120 -0
- package/dest/e2e_token_contract/token_contract_test.d.ts +17 -10
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/e2e_token_contract/token_contract_test.js +89 -91
- package/dest/fixtures/e2e_prover_test.d.ts +9 -15
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +85 -93
- package/dest/fixtures/ha_setup.d.ts +71 -0
- package/dest/fixtures/ha_setup.d.ts.map +1 -0
- package/dest/fixtures/ha_setup.js +114 -0
- package/dest/fixtures/index.d.ts +2 -1
- package/dest/fixtures/index.d.ts.map +1 -1
- package/dest/fixtures/index.js +1 -0
- package/dest/fixtures/setup.d.ts +218 -0
- package/dest/fixtures/setup.d.ts.map +1 -0
- package/dest/fixtures/setup.js +631 -0
- package/dest/fixtures/setup_p2p_test.d.ts +12 -8
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +29 -21
- package/dest/fixtures/token_utils.d.ts +1 -1
- 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 -191
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +4 -615
- 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 +14 -4
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +11 -11
- package/dest/shared/gas_portal_test_harness.d.ts +11 -1
- 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/submit-transactions.d.ts +4 -4
- package/dest/shared/submit-transactions.d.ts.map +1 -1
- package/dest/shared/submit-transactions.js +9 -11
- package/dest/shared/uniswap_l1_l2.d.ts +1 -1
- package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
- package/dest/shared/uniswap_l1_l2.js +20 -18
- package/dest/simulators/lending_simulator.d.ts +5 -1
- package/dest/simulators/lending_simulator.d.ts.map +1 -1
- package/dest/simulators/lending_simulator.js +2 -2
- package/dest/spartan/setup_test_wallets.d.ts +2 -2
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +64 -35
- package/dest/spartan/tx_metrics.d.ts +51 -2
- package/dest/spartan/tx_metrics.d.ts.map +1 -1
- package/dest/spartan/tx_metrics.js +333 -6
- 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 +39 -0
- package/dest/spartan/utils/config.d.ts.map +1 -0
- package/dest/spartan/utils/config.js +21 -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 +30 -0
- package/dest/spartan/utils/scripts.d.ts.map +1 -0
- package/dest/spartan/utils/scripts.js +81 -0
- package/dest/spartan/utils.d.ts +2 -253
- package/dest/spartan/utils.d.ts.map +1 -1
- package/dest/spartan/utils.js +1 -892
- package/dest/test-wallet/test_wallet.d.ts +82 -0
- package/dest/test-wallet/test_wallet.d.ts.map +1 -0
- package/dest/test-wallet/test_wallet.js +213 -0
- package/dest/test-wallet/utils.d.ts +41 -0
- package/dest/test-wallet/utils.d.ts.map +1 -0
- package/dest/test-wallet/utils.js +71 -0
- package/package.json +44 -39
- package/src/bench/client_flows/benchmark.ts +24 -2
- package/src/bench/client_flows/client_flows_benchmark.ts +138 -204
- package/src/bench/client_flows/config.ts +9 -1
- package/src/bench/utils.ts +10 -8
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +105 -143
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +103 -111
- package/src/e2e_deploy_contract/deploy_test.ts +22 -15
- package/src/e2e_epochs/epochs_test.ts +72 -36
- package/src/e2e_fees/bridging_race.notest.ts +4 -10
- package/src/e2e_fees/fees_test.ts +171 -217
- package/src/e2e_l1_publisher/write_json.ts +16 -13
- package/src/e2e_nested_contract/nested_contract_test.ts +33 -56
- package/src/e2e_p2p/inactivity_slash_test.ts +3 -3
- package/src/e2e_p2p/p2p_network.ts +172 -168
- package/src/e2e_p2p/reqresp/utils.ts +207 -0
- package/src/e2e_p2p/shared.ts +22 -22
- package/src/e2e_storage_proof/fixtures/storage_proof.json +915 -0
- package/src/e2e_storage_proof/fixtures/storage_proof_fetcher.ts +190 -0
- package/src/e2e_storage_proof/fixtures/storage_proof_fixture.ts +173 -0
- package/src/e2e_token_contract/token_contract_test.ts +104 -119
- package/src/fixtures/dumps/epoch_proof_result.json +1 -1
- package/src/fixtures/e2e_prover_test.ts +98 -132
- package/src/fixtures/ha_setup.ts +184 -0
- package/src/fixtures/index.ts +1 -0
- package/src/fixtures/setup.ts +933 -0
- package/src/fixtures/setup_p2p_test.ts +31 -27
- package/src/fixtures/token_utils.ts +6 -5
- package/src/fixtures/utils.ts +27 -901
- package/src/quality_of_service/prometheus_client.ts +113 -0
- package/src/shared/cross_chain_test_harness.ts +13 -27
- package/src/shared/gas_portal_test_harness.ts +1 -1
- package/src/shared/submit-transactions.ts +11 -16
- package/src/shared/uniswap_l1_l2.ts +21 -30
- package/src/simulators/lending_simulator.ts +2 -2
- package/src/spartan/setup_test_wallets.ts +75 -25
- package/src/spartan/tx_metrics.ts +255 -9
- 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 +27 -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 +99 -0
- package/src/spartan/utils.ts +1 -1158
- package/src/test-wallet/test_wallet.ts +296 -0
- package/src/test-wallet/utils.ts +112 -0
- package/dest/fixtures/snapshot_manager.d.ts +0 -93
- package/dest/fixtures/snapshot_manager.d.ts.map +0 -1
- package/dest/fixtures/snapshot_manager.js +0 -488
- package/src/fixtures/snapshot_manager.ts +0 -646
|
@@ -2,16 +2,17 @@ import { createLogger } from '@aztec/aztec.js/log';
|
|
|
2
2
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
3
3
|
import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
|
|
4
4
|
import { jest } from '@jest/globals';
|
|
5
|
-
import {
|
|
5
|
+
import { deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
|
|
6
6
|
import { mintTokensToPrivate } from '../fixtures/token_utils.js';
|
|
7
7
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
8
|
-
const {
|
|
8
|
+
const { METRICS_PORT: metricsPort } = process.env;
|
|
9
9
|
export class TokenContractTest {
|
|
10
10
|
static TOKEN_NAME = 'USDC';
|
|
11
11
|
static TOKEN_SYMBOL = 'USD';
|
|
12
12
|
static TOKEN_DECIMALS = 18n;
|
|
13
|
-
|
|
13
|
+
context;
|
|
14
14
|
logger;
|
|
15
|
+
metricsPort;
|
|
15
16
|
asset;
|
|
16
17
|
tokenSim;
|
|
17
18
|
node;
|
|
@@ -20,107 +21,104 @@ export class TokenContractTest {
|
|
|
20
21
|
adminAddress;
|
|
21
22
|
account1Address;
|
|
22
23
|
account2Address;
|
|
24
|
+
shouldApplyBaseSetup = false;
|
|
25
|
+
shouldApplyMint = false;
|
|
23
26
|
constructor(testName){
|
|
24
27
|
this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
|
|
25
|
-
this.
|
|
26
|
-
|
|
27
|
-
|
|
28
|
+
this.metricsPort = metricsPort ? parseInt(metricsPort) : undefined;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Registers that base setup should be applied during setup().
|
|
32
|
+
* Call this before setup() to deploy 3 accounts, publicly deploy accounts, token contract and a "bad account".
|
|
33
|
+
*/ applyBaseSnapshots() {
|
|
34
|
+
this.shouldApplyBaseSetup = true;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Registers that mint should be applied during setup().
|
|
38
|
+
* Call this before setup() to mint tokens to the admin account.
|
|
39
|
+
*/ applyMintSnapshot() {
|
|
40
|
+
this.shouldApplyMint = true;
|
|
28
41
|
}
|
|
29
42
|
/**
|
|
30
|
-
*
|
|
31
|
-
|
|
32
|
-
* 2. Publicly deploy accounts, deploy token contract and a "bad account".
|
|
33
|
-
*/ async applyBaseSnapshots() {
|
|
43
|
+
* Applies base setup: deploys 3 accounts, publicly deploys accounts, token contract and a "bad account".
|
|
44
|
+
*/ async applyBaseSetup() {
|
|
34
45
|
// Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
|
|
35
46
|
jest.setTimeout(120_000);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
this.wallet
|
|
39
|
-
|
|
40
|
-
return Promise.resolve();
|
|
47
|
+
this.logger.info('Applying base setup - deploying 3 accounts');
|
|
48
|
+
const { deployedAccounts } = await deployAccounts(3, this.logger)({
|
|
49
|
+
wallet: this.context.wallet,
|
|
50
|
+
initialFundedAccounts: this.context.initialFundedAccounts
|
|
41
51
|
});
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
this.logger.verbose(`Token deployed to ${asset.address}`);
|
|
55
|
-
this.logger.verbose(`Deploying bad account...`);
|
|
56
|
-
this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
|
|
57
|
-
from: this.adminAddress
|
|
58
|
-
}).deployed();
|
|
59
|
-
this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
|
|
60
|
-
return {
|
|
61
|
-
tokenContractAddress: asset.address,
|
|
62
|
-
badAccountAddress: this.badAccount.address
|
|
63
|
-
};
|
|
64
|
-
}, async ({ tokenContractAddress, badAccountAddress })=>{
|
|
65
|
-
// Restore the token contract state.
|
|
66
|
-
this.asset = TokenContract.at(tokenContractAddress, this.wallet);
|
|
67
|
-
this.logger.verbose(`Token contract address: ${this.asset.address}`);
|
|
68
|
-
this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
|
|
69
|
-
this.adminAddress,
|
|
70
|
-
this.account1Address
|
|
71
|
-
]);
|
|
72
|
-
this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
|
|
73
|
-
this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
|
|
74
|
-
expect(await this.asset.methods.get_admin().simulate({
|
|
75
|
-
from: this.adminAddress
|
|
76
|
-
})).toBe(this.adminAddress.toBigInt());
|
|
52
|
+
this.node = this.context.aztecNodeService;
|
|
53
|
+
this.wallet = this.context.wallet;
|
|
54
|
+
[this.adminAddress, this.account1Address, this.account2Address] = deployedAccounts.map((acc)=>acc.address);
|
|
55
|
+
this.logger.info('Applying base setup - deploying token contract');
|
|
56
|
+
this.logger.verbose(`Public deploy accounts...`);
|
|
57
|
+
await publicDeployAccounts(this.wallet, [
|
|
58
|
+
this.adminAddress,
|
|
59
|
+
this.account1Address
|
|
60
|
+
]);
|
|
61
|
+
this.logger.verbose(`Deploying TokenContract...`);
|
|
62
|
+
this.asset = await TokenContract.deploy(this.wallet, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
|
|
63
|
+
from: this.adminAddress
|
|
77
64
|
});
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
65
|
+
this.logger.verbose(`Token deployed to ${this.asset.address}`);
|
|
66
|
+
this.logger.verbose(`Deploying bad account...`);
|
|
67
|
+
this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
|
|
68
|
+
from: this.adminAddress
|
|
69
|
+
});
|
|
70
|
+
this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
|
|
71
|
+
this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
|
|
72
|
+
this.adminAddress,
|
|
73
|
+
this.account1Address
|
|
74
|
+
]);
|
|
75
|
+
expect(await this.asset.methods.get_admin().simulate({
|
|
76
|
+
from: this.adminAddress
|
|
77
|
+
})).toBe(this.adminAddress.toBigInt());
|
|
82
78
|
}
|
|
83
79
|
async setup() {
|
|
84
|
-
await
|
|
80
|
+
this.context = await setup(0, {
|
|
81
|
+
metricsPort: this.metricsPort,
|
|
82
|
+
fundSponsoredFPC: true,
|
|
83
|
+
skipAccountDeployment: true
|
|
84
|
+
});
|
|
85
|
+
if (this.shouldApplyBaseSetup) {
|
|
86
|
+
await this.applyBaseSetup();
|
|
87
|
+
}
|
|
88
|
+
if (this.shouldApplyMint) {
|
|
89
|
+
await this.applyMint();
|
|
90
|
+
}
|
|
85
91
|
}
|
|
86
|
-
snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
|
|
87
92
|
async teardown() {
|
|
88
|
-
await this.
|
|
93
|
+
await teardown(this.context);
|
|
89
94
|
}
|
|
90
|
-
async
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
from: adminAddress
|
|
115
|
-
});
|
|
116
|
-
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
117
|
-
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
|
|
118
|
-
const totalSupply = await asset.methods.total_supply().simulate({
|
|
119
|
-
from: adminAddress
|
|
120
|
-
});
|
|
121
|
-
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
122
|
-
expect(totalSupply).toEqual(tokenSim.totalSupply);
|
|
123
|
-
return Promise.resolve();
|
|
95
|
+
async applyMint() {
|
|
96
|
+
this.logger.info('Applying mint setup');
|
|
97
|
+
const { asset, adminAddress, tokenSim } = this;
|
|
98
|
+
const amount = 10000n;
|
|
99
|
+
this.logger.verbose(`Minting ${amount} publicly...`);
|
|
100
|
+
await asset.methods.mint_to_public(adminAddress, amount).send({
|
|
101
|
+
from: adminAddress
|
|
102
|
+
});
|
|
103
|
+
tokenSim.mintPublic(adminAddress, amount);
|
|
104
|
+
const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
|
|
105
|
+
from: adminAddress
|
|
106
|
+
});
|
|
107
|
+
this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
|
|
108
|
+
expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
|
|
109
|
+
this.logger.verbose(`Minting ${amount} privately...`);
|
|
110
|
+
await mintTokensToPrivate(asset, adminAddress, adminAddress, amount);
|
|
111
|
+
tokenSim.mintPrivate(adminAddress, amount);
|
|
112
|
+
const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
|
|
113
|
+
from: adminAddress
|
|
114
|
+
});
|
|
115
|
+
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
116
|
+
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
|
|
117
|
+
const totalSupply = await asset.methods.total_supply().simulate({
|
|
118
|
+
from: adminAddress
|
|
124
119
|
});
|
|
120
|
+
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
121
|
+
expect(totalSupply).toEqual(tokenSim.totalSupply);
|
|
122
|
+
this.logger.verbose(`Minting complete.`);
|
|
125
123
|
}
|
|
126
124
|
}
|
|
@@ -8,9 +8,9 @@ import type { DeployAztecL1ContractsReturnType } from '@aztec/ethereum/deploy-az
|
|
|
8
8
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
9
9
|
import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
10
10
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
11
|
-
import { TestWallet } from '@aztec/test-wallet/server';
|
|
12
11
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
13
|
-
import {
|
|
12
|
+
import { TestWallet } from '../test-wallet/test_wallet.js';
|
|
13
|
+
import { type EndToEndContext } from './setup.js';
|
|
14
14
|
/**
|
|
15
15
|
* Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
|
|
16
16
|
* However, we then setup a second PXE with a full prover instance.
|
|
@@ -18,12 +18,9 @@ import { type SubsystemsContext } from './snapshot_manager.js';
|
|
|
18
18
|
* We then prove and verify transactions created via this full prover PXE.
|
|
19
19
|
*/
|
|
20
20
|
export declare class FullProverTest {
|
|
21
|
-
private minNumberOfTxsPerBlock;
|
|
22
|
-
private realProofs;
|
|
23
21
|
static TOKEN_NAME: string;
|
|
24
22
|
static TOKEN_SYMBOL: string;
|
|
25
23
|
static TOKEN_DECIMALS: bigint;
|
|
26
|
-
private snapshotManager;
|
|
27
24
|
logger: Logger;
|
|
28
25
|
wallet: TestWallet;
|
|
29
26
|
provenWallet: TestWallet;
|
|
@@ -40,22 +37,19 @@ export declare class FullProverTest {
|
|
|
40
37
|
private acvmConfigCleanup?;
|
|
41
38
|
circuitProofVerifier?: ClientProtocolCircuitVerifier;
|
|
42
39
|
provenAsset: TokenContract;
|
|
43
|
-
|
|
40
|
+
context: EndToEndContext;
|
|
44
41
|
private proverNode;
|
|
45
42
|
private simulatedProverNode;
|
|
46
43
|
l1Contracts: DeployAztecL1ContractsReturnType;
|
|
47
44
|
proverAddress: EthAddress;
|
|
45
|
+
private minNumberOfTxsPerBlock;
|
|
46
|
+
private coinbase;
|
|
47
|
+
private realProofs;
|
|
48
48
|
constructor(testName: string, minNumberOfTxsPerBlock: number, coinbase: EthAddress, realProofs?: boolean);
|
|
49
|
-
|
|
50
|
-
* Adds two state shifts to snapshot manager.
|
|
51
|
-
* 1. Add 2 accounts.
|
|
52
|
-
* 2. Publicly deploy accounts, deploy token contract
|
|
53
|
-
*/
|
|
54
|
-
applyBaseSnapshots(): Promise<void>;
|
|
49
|
+
private applyBaseSetup;
|
|
55
50
|
setup(): Promise<this>;
|
|
56
51
|
private mintFeeJuice;
|
|
57
|
-
snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
|
|
58
52
|
teardown(): Promise<void>;
|
|
59
|
-
|
|
53
|
+
private applyMint;
|
|
60
54
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZTJlX3Byb3Zlcl90ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZTJlX3Byb3Zlcl90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFFTCxLQUFLLDZCQUE2QixFQUduQyxNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFJbEcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNdEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUczRCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBUXJCLE1BQU0sWUFBWSxDQUFDO0FBT3BCOzs7OztHQUtHO0FBRUgscUJBQWEsY0FBYztJQUN6QixNQUFNLENBQUMsVUFBVSxTQUFVO0lBQzNCLE1BQU0sQ0FBQyxZQUFZLFNBQVM7SUFDNUIsTUFBTSxDQUFDLGNBQWMsU0FBTztJQUM1QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsTUFBTSxFQUFHLFVBQVUsQ0FBQztJQUNwQixZQUFZLEVBQUcsVUFBVSxDQUFDO0lBQzFCLFFBQVEsRUFBRSxZQUFZLEVBQUUsQ0FBTTtJQUM5QixnQkFBZ0IsRUFBRyxrQkFBa0IsRUFBRSxDQUFDO0lBQ3hDLGVBQWUsRUFBRyxhQUFhLENBQUM7SUFDaEMsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFDdEQsUUFBUSxFQUFHLGNBQWMsQ0FBQztJQUMxQixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFDaEMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLENBQUMsZ0JBQWdCLENBQXFCO0lBQzdDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBc0I7SUFDOUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQXNCO0lBQ2hELG9CQUFvQixDQUFDLEVBQUUsNkJBQTZCLENBQUM7SUFDckQsV0FBVyxFQUFHLGFBQWEsQ0FBQztJQUM1QixPQUFPLEVBQUcsZUFBZSxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxVQUFVLENBQWM7SUFDaEMsT0FBTyxDQUFDLG1CQUFtQixDQUFjO0lBQ2xDLFdBQVcsRUFBRyxnQ0FBZ0MsQ0FBQztJQUMvQyxhQUFhLEVBQUcsVUFBVSxDQUFDO0lBQ2xDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBUztJQUN2QyxPQUFPLENBQUMsUUFBUSxDQUFhO0lBQzdCLE9BQU8sQ0FBQyxVQUFVLENBQVU7SUFFNUIsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLFVBQVUsVUFBTyxFQUtwRztZQUthLGNBQWM7SUFxQ3RCLEtBQUssa0JBZ0pWO1lBRWEsWUFBWTtJQVNwQixRQUFRLGtCQWNiO1lBRWEsU0FBUztDQWtDeEIifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,2CAA2C,CAAC;AAIlG,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EACL,KAAK,eAAe,EAQrB,MAAM,YAAY,CAAC;AAOpB;;;;;GAKG;AAEH,qBAAa,cAAc;IACzB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,UAAU,CAAC;IAC1B,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,gBAAgB,EAAG,kBAAkB,EAAE,CAAC;IACxC,eAAe,EAAG,aAAa,CAAC;IAChC,uBAAuB,EAAG,2BAA2B,CAAC;IACtD,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,WAAW,EAAG,aAAa,CAAC;IAC5B,OAAO,EAAG,eAAe,CAAC;IAC1B,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,gCAAgC,CAAC;IAC/C,aAAa,EAAG,UAAU,CAAC;IAClC,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,UAAU,CAAU;IAE5B,YAAY,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,UAAO,EAKpG;YAKa,cAAc;IAqCtB,KAAK,kBAgJV;YAEa,YAAY;IASpB,QAAQ,kBAcb;YAEa,SAAS;CAkCxB"}
|
|
@@ -15,25 +15,20 @@ import { privateKeyToAddress } from 'viem/accounts';
|
|
|
15
15
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
16
16
|
import { getACVMConfig } from './get_acvm_config.js';
|
|
17
17
|
import { getBBConfig } from './get_bb_config.js';
|
|
18
|
-
import {
|
|
19
|
-
import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEAndGetWallet } from './utils.js';
|
|
20
|
-
const { E2E_DATA_PATH: dataPath } = process.env;
|
|
18
|
+
import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicDeployAccounts, setup, setupPXEAndGetWallet, teardown } from './setup.js';
|
|
21
19
|
/**
|
|
22
20
|
* Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
|
|
23
21
|
* However, we then setup a second PXE with a full prover instance.
|
|
24
22
|
* We configure this instance with all of the accounts and contracts.
|
|
25
23
|
* We then prove and verify transactions created via this full prover PXE.
|
|
26
24
|
*/ export class FullProverTest {
|
|
27
|
-
minNumberOfTxsPerBlock;
|
|
28
|
-
realProofs;
|
|
29
25
|
static TOKEN_NAME = 'USDC';
|
|
30
26
|
static TOKEN_SYMBOL = 'USD';
|
|
31
27
|
static TOKEN_DECIMALS = 18n;
|
|
32
|
-
snapshotManager;
|
|
33
28
|
logger;
|
|
34
29
|
wallet;
|
|
35
30
|
provenWallet;
|
|
36
|
-
accounts;
|
|
31
|
+
accounts = [];
|
|
37
32
|
deployedAccounts;
|
|
38
33
|
fakeProofsAsset;
|
|
39
34
|
fakeProofsAssetInstance;
|
|
@@ -41,7 +36,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
41
36
|
aztecNode;
|
|
42
37
|
aztecNodeAdmin;
|
|
43
38
|
cheatCodes;
|
|
44
|
-
provenComponents;
|
|
39
|
+
provenComponents = [];
|
|
45
40
|
bbConfigCleanup;
|
|
46
41
|
acvmConfigCleanup;
|
|
47
42
|
circuitProofVerifier;
|
|
@@ -51,63 +46,65 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
51
46
|
simulatedProverNode;
|
|
52
47
|
l1Contracts;
|
|
53
48
|
proverAddress;
|
|
49
|
+
minNumberOfTxsPerBlock;
|
|
50
|
+
coinbase;
|
|
51
|
+
realProofs;
|
|
54
52
|
constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
|
|
53
|
+
this.logger = createLogger(`e2e:full_prover_test:${testName}`);
|
|
55
54
|
this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
|
|
55
|
+
this.coinbase = coinbase;
|
|
56
56
|
this.realProofs = realProofs;
|
|
57
|
-
this.accounts = [];
|
|
58
|
-
this.provenComponents = [];
|
|
59
|
-
this.snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
|
|
60
|
-
this.logger = createLogger(`e2e:full_prover_test:${testName}`);
|
|
61
|
-
this.snapshotManager = createSnapshotManager(`full_prover_integration/${testName}`, dataPath, {
|
|
62
|
-
startProverNode: true,
|
|
63
|
-
coinbase
|
|
64
|
-
}, {
|
|
65
|
-
realVerifier: realProofs
|
|
66
|
-
});
|
|
67
57
|
}
|
|
68
58
|
/**
|
|
69
|
-
*
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
this.
|
|
75
|
-
this.accounts = deployedAccounts.map((a)=>a.address);
|
|
76
|
-
this.wallet = wallet;
|
|
77
|
-
return Promise.resolve();
|
|
59
|
+
* Applies base setup: deploys 2 accounts and token contract.
|
|
60
|
+
*/ async applyBaseSetup() {
|
|
61
|
+
this.logger.info('Applying base setup: deploying accounts');
|
|
62
|
+
const { deployedAccounts } = await deployAccounts(2, this.logger)({
|
|
63
|
+
wallet: this.context.wallet,
|
|
64
|
+
initialFundedAccounts: this.context.initialFundedAccounts
|
|
78
65
|
});
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
tokenContractAddress: asset.address,
|
|
91
|
-
tokenContractInstance: instance
|
|
92
|
-
};
|
|
93
|
-
}, async ({ tokenContractAddress, tokenContractInstance })=>{
|
|
94
|
-
// Restore the token contract state.
|
|
95
|
-
this.fakeProofsAsset = TokenContract.at(tokenContractAddress, this.wallet);
|
|
96
|
-
this.fakeProofsAssetInstance = tokenContractInstance;
|
|
97
|
-
this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
|
|
98
|
-
this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
|
|
99
|
-
expect(await this.fakeProofsAsset.methods.get_admin().simulate({
|
|
100
|
-
from: this.accounts[0]
|
|
101
|
-
})).toBe(this.accounts[0].toBigInt());
|
|
66
|
+
this.deployedAccounts = deployedAccounts;
|
|
67
|
+
this.accounts = deployedAccounts.map((a)=>a.address);
|
|
68
|
+
this.wallet = this.context.wallet;
|
|
69
|
+
this.logger.info('Applying base setup: publicly deploying accounts');
|
|
70
|
+
await publicDeployAccounts(this.wallet, this.accounts.slice(0, 2));
|
|
71
|
+
this.logger.info('Applying base setup: deploying token contract');
|
|
72
|
+
const { contract: asset, instance } = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
|
|
73
|
+
from: this.accounts[0],
|
|
74
|
+
wait: {
|
|
75
|
+
returnReceipt: true
|
|
76
|
+
}
|
|
102
77
|
});
|
|
78
|
+
this.logger.verbose(`Token deployed to ${asset.address}`);
|
|
79
|
+
this.fakeProofsAsset = asset;
|
|
80
|
+
this.fakeProofsAssetInstance = instance;
|
|
81
|
+
this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
|
|
82
|
+
this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
|
|
83
|
+
expect(await this.fakeProofsAsset.methods.get_admin().simulate({
|
|
84
|
+
from: this.accounts[0]
|
|
85
|
+
})).toBe(this.accounts[0].toBigInt());
|
|
103
86
|
}
|
|
104
87
|
async setup() {
|
|
105
|
-
this.
|
|
88
|
+
this.logger.info('Setting up subsystems from fresh');
|
|
89
|
+
this.context = await setup(0, {
|
|
90
|
+
startProverNode: true,
|
|
91
|
+
coinbase: this.coinbase,
|
|
92
|
+
fundSponsoredFPC: true,
|
|
93
|
+
skipAccountDeployment: true,
|
|
94
|
+
l1ContractsArgs: {
|
|
95
|
+
realVerifier: this.realProofs
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
await this.applyBaseSetup();
|
|
99
|
+
await this.applyMint();
|
|
100
|
+
this.logger.info(`Enabling proving`, {
|
|
101
|
+
realProofs: this.realProofs
|
|
102
|
+
});
|
|
106
103
|
// We don't wish to mark as proven automatically, so we set the flag to false
|
|
107
104
|
this.context.watcher.setIsMarkingAsProven(false);
|
|
108
105
|
this.simulatedProverNode = this.context.proverNode;
|
|
109
106
|
({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes } = this.context);
|
|
110
|
-
this.aztecNodeAdmin = this.context.
|
|
107
|
+
this.aztecNodeAdmin = this.context.aztecNodeService;
|
|
111
108
|
const config = this.context.aztecNodeConfig;
|
|
112
109
|
const blobClient = await createBlobClientWithFileStores(config, this.logger);
|
|
113
110
|
// Configure a full prover PXE
|
|
@@ -147,7 +144,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
147
144
|
this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
|
|
148
145
|
const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, {
|
|
149
146
|
proverEnabled: this.realProofs
|
|
150
|
-
}, undefined,
|
|
147
|
+
}, undefined, 'pxe-proven');
|
|
151
148
|
this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
|
|
152
149
|
await provenWallet.registerContract(this.fakeProofsAssetInstance, TokenContract.artifact);
|
|
153
150
|
for(let i = 0; i < 2; i++){
|
|
@@ -212,7 +209,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
212
209
|
prefilledPublicData
|
|
213
210
|
});
|
|
214
211
|
await this.proverNode.start();
|
|
215
|
-
this.logger.warn(`Proofs are now enabled
|
|
212
|
+
this.logger.warn(`Proofs are now enabled`, {
|
|
213
|
+
realProofs: this.realProofs
|
|
214
|
+
});
|
|
216
215
|
return this;
|
|
217
216
|
}
|
|
218
217
|
async mintFeeJuice(recipient) {
|
|
@@ -231,9 +230,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
231
230
|
hash
|
|
232
231
|
});
|
|
233
232
|
}
|
|
234
|
-
snapshot;
|
|
235
233
|
async teardown() {
|
|
236
|
-
await this.snapshotManager.teardown();
|
|
237
234
|
// Cleanup related to the full prover PXEs
|
|
238
235
|
for(let i = 0; i < this.provenComponents.length; i++){
|
|
239
236
|
await this.provenComponents[i].teardown();
|
|
@@ -243,44 +240,39 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
243
240
|
await Barretenberg.destroySingleton();
|
|
244
241
|
await this.bbConfigCleanup?.();
|
|
245
242
|
await this.acvmConfigCleanup?.();
|
|
243
|
+
await teardown(this.context);
|
|
246
244
|
}
|
|
247
|
-
async
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
277
|
-
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
|
|
278
|
-
const totalSupply = await asset.methods.total_supply().simulate({
|
|
279
|
-
from: address
|
|
280
|
-
});
|
|
281
|
-
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
282
|
-
expect(totalSupply).toEqual(tokenSim.totalSupply);
|
|
283
|
-
return Promise.resolve();
|
|
245
|
+
async applyMint() {
|
|
246
|
+
this.logger.info('Applying mint setup');
|
|
247
|
+
const { fakeProofsAsset: asset, accounts } = this;
|
|
248
|
+
const privateAmount = 10000n;
|
|
249
|
+
const publicAmount = 10000n;
|
|
250
|
+
this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
|
|
251
|
+
await asset.methods.mint_to_public(accounts[0], privateAmount + publicAmount).send({
|
|
252
|
+
from: accounts[0]
|
|
253
|
+
});
|
|
254
|
+
this.logger.verbose(`Transferring ${privateAmount} to private...`);
|
|
255
|
+
await asset.methods.transfer_to_private(accounts[0], privateAmount).send({
|
|
256
|
+
from: accounts[0]
|
|
257
|
+
});
|
|
258
|
+
this.logger.info(`Minting complete`);
|
|
259
|
+
const { fakeProofsAsset, accounts: [address], tokenSim } = this;
|
|
260
|
+
tokenSim.mintPublic(address, publicAmount);
|
|
261
|
+
const publicBalance = await fakeProofsAsset.methods.balance_of_public(address).simulate({
|
|
262
|
+
from: address
|
|
263
|
+
});
|
|
264
|
+
this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
|
|
265
|
+
expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
|
|
266
|
+
tokenSim.mintPrivate(address, publicAmount);
|
|
267
|
+
const privateBalance = await fakeProofsAsset.methods.balance_of_private(address).simulate({
|
|
268
|
+
from: address
|
|
269
|
+
});
|
|
270
|
+
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
271
|
+
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
|
|
272
|
+
const totalSupply = await fakeProofsAsset.methods.total_supply().simulate({
|
|
273
|
+
from: address
|
|
284
274
|
});
|
|
275
|
+
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
276
|
+
expect(totalSupply).toEqual(tokenSim.totalSupply);
|
|
285
277
|
}
|
|
286
278
|
}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
3
|
+
import { SecretValue } from '@aztec/foundation/config';
|
|
4
|
+
import { Pool } from 'pg';
|
|
5
|
+
/**
|
|
6
|
+
* Configuration for HA database connection
|
|
7
|
+
*/
|
|
8
|
+
export interface HADatabaseConfig {
|
|
9
|
+
/** PostgreSQL connection URL */
|
|
10
|
+
databaseUrl: string;
|
|
11
|
+
/** Node ID for HA coordination */
|
|
12
|
+
nodeId: string;
|
|
13
|
+
/** Enable HA signing */
|
|
14
|
+
haSigningEnabled: boolean;
|
|
15
|
+
/** Polling interval in ms */
|
|
16
|
+
pollingIntervalMs: number;
|
|
17
|
+
/** Signing timeout in ms */
|
|
18
|
+
signingTimeoutMs: number;
|
|
19
|
+
/** Max stuck duties age in ms */
|
|
20
|
+
maxStuckDutiesAgeMs: number;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Get database configuration from environment variables
|
|
24
|
+
*/
|
|
25
|
+
export declare function createHADatabaseConfig(nodeId: string): HADatabaseConfig;
|
|
26
|
+
/**
|
|
27
|
+
* Setup PostgreSQL database connection pool for HA tests
|
|
28
|
+
*
|
|
29
|
+
* Note: Database migrations should be run separately before starting tests,
|
|
30
|
+
* either via docker-compose entrypoint or manually with: aztec migrate-ha-db up
|
|
31
|
+
*/
|
|
32
|
+
export declare function setupHADatabase(databaseUrl: string, logger?: Logger): Pool;
|
|
33
|
+
/**
|
|
34
|
+
* Clean up HA database - drop all tables
|
|
35
|
+
* Use this between tests to ensure clean state
|
|
36
|
+
*/
|
|
37
|
+
export declare function cleanupHADatabase(pool: Pool, logger?: Logger): Promise<void>;
|
|
38
|
+
/**
|
|
39
|
+
* Query validator duties from the database
|
|
40
|
+
*/
|
|
41
|
+
export declare function getValidatorDuties(pool: Pool, slot: bigint, dutyType?: 'ATTESTATION' | 'BLOCK_PROPOSAL' | 'GOVERNANCE_VOTE' | 'SLASHING_VOTE'): Promise<Array<{
|
|
42
|
+
slot: string;
|
|
43
|
+
dutyType: string;
|
|
44
|
+
validatorAddress: string;
|
|
45
|
+
nodeId: string;
|
|
46
|
+
startedAt: Date;
|
|
47
|
+
completedAt: Date | undefined;
|
|
48
|
+
}>>;
|
|
49
|
+
/**
|
|
50
|
+
* Convert private keys to Ethereum addresses
|
|
51
|
+
*/
|
|
52
|
+
export declare function getAddressesFromPrivateKeys(privateKeys: `0x${string}`[]): string[];
|
|
53
|
+
/**
|
|
54
|
+
* Create initial validators from private keys for L1 contract deployment
|
|
55
|
+
*/
|
|
56
|
+
export declare function createInitialValidatorsFromPrivateKeys(attesterPrivateKeys: `0x${string}`[]): Array<{
|
|
57
|
+
attester: EthAddress;
|
|
58
|
+
withdrawer: EthAddress;
|
|
59
|
+
privateKey: `0x${string}`;
|
|
60
|
+
bn254SecretKey: SecretValue<bigint>;
|
|
61
|
+
}>;
|
|
62
|
+
/**
|
|
63
|
+
* Verify no duplicate attestations per validator (HA coordination check)
|
|
64
|
+
* Groups duties by validator address and verifies each validator attested exactly once
|
|
65
|
+
*/
|
|
66
|
+
export declare function verifyNoDuplicateAttestations(attestationDuties: Array<{
|
|
67
|
+
validatorAddress: string;
|
|
68
|
+
nodeId: string;
|
|
69
|
+
completedAt: Date | undefined;
|
|
70
|
+
}>, logger?: Logger): Map<string, typeof attestationDuties>;
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFfc2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9oYV9zZXR1cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFdkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXZELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFHMUI7O0dBRUc7QUFDSCxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLGdDQUFnQztJQUNoQyxXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLGtDQUFrQztJQUNsQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2Ysd0JBQXdCO0lBQ3hCLGdCQUFnQixFQUFFLE9BQU8sQ0FBQztJQUMxQiw2QkFBNkI7SUFDN0IsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLDRCQUE0QjtJQUM1QixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFDekIsaUNBQWlDO0lBQ2pDLG1CQUFtQixFQUFFLE1BQU0sQ0FBQztDQUM3QjtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLENBV3ZFO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IsZUFBZSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FhMUU7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsaUJBQWlCLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVlsRjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUN0QyxJQUFJLEVBQUUsSUFBSSxFQUNWLElBQUksRUFBRSxNQUFNLEVBQ1osUUFBUSxDQUFDLEVBQUUsYUFBYSxHQUFHLGdCQUFnQixHQUFHLGlCQUFpQixHQUFHLGVBQWUsR0FDaEYsT0FBTyxDQUNSLEtBQUssQ0FBQztJQUNKLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsU0FBUyxFQUFFLElBQUksQ0FBQztJQUNoQixXQUFXLEVBQUUsSUFBSSxHQUFHLFNBQVMsQ0FBQztDQUMvQixDQUFDLENBQ0gsQ0F3QkE7QUFFRDs7R0FFRztBQUNILHdCQUFnQiwyQkFBMkIsQ0FBQyxXQUFXLEVBQUUsS0FBSyxNQUFNLEVBQUUsRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUtsRjtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLHNDQUFzQyxDQUFDLG1CQUFtQixFQUFFLEtBQUssTUFBTSxFQUFFLEVBQUUsR0FBRyxLQUFLLENBQUM7SUFDbEcsUUFBUSxFQUFFLFVBQVUsQ0FBQztJQUNyQixVQUFVLEVBQUUsVUFBVSxDQUFDO0lBQ3ZCLFVBQVUsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO0lBQzFCLGNBQWMsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7Q0FDckMsQ0FBQyxDQVVEO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLDZCQUE2QixDQUMzQyxpQkFBaUIsRUFBRSxLQUFLLENBQUM7SUFDdkIsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixXQUFXLEVBQUUsSUFBSSxHQUFHLFNBQVMsQ0FBQztDQUMvQixDQUFDLEVBQ0YsTUFBTSxDQUFDLEVBQUUsTUFBTSxHQUNkLEdBQUcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxpQkFBaUIsQ0FBQyxDQW1CdkMifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ha_setup.d.ts","sourceRoot":"","sources":["../../src/fixtures/ha_setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAG1B;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gCAAgC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,6BAA6B;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,4BAA4B;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iCAAiC;IACjC,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAWvE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAa1E;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYlF;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,aAAa,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,eAAe,GAChF,OAAO,CACR,KAAK,CAAC;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,WAAW,EAAE,IAAI,GAAG,SAAS,CAAC;CAC/B,CAAC,CACH,CAwBA;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,CAKlF;AAED;;GAEG;AACH,wBAAgB,sCAAsC,CAAC,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,GAAG,KAAK,CAAC;IAClG,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,KAAK,MAAM,EAAE,CAAC;IAC1B,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACrC,CAAC,CAUD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,iBAAiB,EAAE,KAAK,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,IAAI,GAAG,SAAS,CAAC;CAC/B,CAAC,EACF,MAAM,CAAC,EAAE,MAAM,GACd,GAAG,CAAC,MAAM,EAAE,OAAO,iBAAiB,CAAC,CAmBvC"}
|