@aztec/end-to-end 0.0.1-commit.2f68f620 → 0.0.1-commit.321f6a9
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/README.md +215 -27
- package/dest/automine/automine_test_context.d.ts +85 -0
- package/dest/automine/automine_test_context.d.ts.map +1 -0
- package/dest/automine/automine_test_context.js +98 -0
- package/dest/automine/contracts/fixtures/storage_proof_fetcher.d.ts +2 -0
- package/dest/automine/contracts/fixtures/storage_proof_fetcher.d.ts.map +1 -0
- package/dest/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fixture.d.ts +1 -1
- package/dest/automine/contracts/fixtures/storage_proof_fixture.d.ts.map +1 -0
- package/dest/automine/delivery/interactive_handshake_responder.d.ts +48 -0
- package/dest/automine/delivery/interactive_handshake_responder.d.ts.map +1 -0
- package/dest/automine/delivery/interactive_handshake_responder.js +76 -0
- package/dest/automine/delivery/onchain_delivery_harness.d.ts +19 -0
- package/dest/automine/delivery/onchain_delivery_harness.d.ts.map +1 -0
- package/dest/automine/delivery/onchain_delivery_harness.js +141 -0
- package/dest/automine/token/blacklist_token_contract_test.d.ts +49 -0
- package/dest/automine/token/blacklist_token_contract_test.d.ts.map +1 -0
- package/dest/{e2e_blacklist_token_contract → automine/token}/blacklist_token_contract_test.js +18 -40
- package/dest/automine/token/token_contract_test.d.ts +40 -0
- package/dest/automine/token/token_contract_test.d.ts.map +1 -0
- package/dest/{e2e_token_contract → automine/token}/token_contract_test.js +22 -39
- package/dest/automine/token/token_test_helpers.d.ts +73 -0
- package/dest/automine/token/token_test_helpers.d.ts.map +1 -0
- package/dest/automine/token/token_test_helpers.js +97 -0
- package/dest/bench/client_flows/benchmark.d.ts +1 -1
- package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/benchmark.js +3 -1
- package/dest/bench/client_flows/client_flows_benchmark.d.ts +4 -4
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +31 -19
- package/dest/bench/client_flows/data_extractor.js +1 -0
- package/dest/bench/utils.d.ts +3 -3
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +95 -6
- package/dest/composed/ha/ha_full_setup.d.ts +77 -0
- package/dest/composed/ha/ha_full_setup.d.ts.map +1 -0
- package/dest/composed/ha/ha_full_setup.js +383 -0
- package/dest/composed/web3signer/multi_validator_keystore_utils.d.ts +12 -0
- package/dest/composed/web3signer/multi_validator_keystore_utils.d.ts.map +1 -0
- package/dest/fixtures/e2e_prover_test.d.ts +12 -9
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +48 -28
- package/dest/fixtures/fixtures.d.ts +19 -10
- package/dest/fixtures/fixtures.d.ts.map +1 -1
- package/dest/fixtures/fixtures.js +26 -11
- package/dest/fixtures/ha_setup.d.ts +3 -3
- package/dest/fixtures/ha_setup.d.ts.map +1 -1
- package/dest/fixtures/ha_setup.js +4 -1
- 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 +48 -42
- package/dest/fixtures/setup.d.ts.map +1 -1
- package/dest/fixtures/setup.js +194 -229
- package/dest/fixtures/setup_p2p_test.d.ts +1 -1
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +3 -3
- package/dest/fixtures/standard_contracts_genesis.d.ts +16 -0
- package/dest/fixtures/standard_contracts_genesis.d.ts.map +1 -0
- package/dest/fixtures/standard_contracts_genesis.js +25 -0
- package/dest/fixtures/timing.d.ts +42 -0
- package/dest/fixtures/timing.d.ts.map +1 -0
- package/dest/fixtures/timing.js +72 -0
- package/dest/fixtures/token_utils.d.ts +22 -4
- package/dest/fixtures/token_utils.d.ts.map +1 -1
- package/dest/fixtures/token_utils.js +21 -1
- package/dest/fixtures/utils.d.ts +2 -2
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +1 -1
- package/dest/fixtures/wait_helpers.d.ts +135 -0
- package/dest/fixtures/wait_helpers.d.ts.map +1 -0
- package/dest/fixtures/wait_helpers.js +154 -0
- package/dest/forward-compatibility/wallet_service.js +3 -3
- package/dest/multi-node/block-production/setup.d.ts +97 -0
- package/dest/multi-node/block-production/setup.d.ts.map +1 -0
- package/dest/multi-node/block-production/setup.js +158 -0
- package/dest/multi-node/governance/setup.d.ts +67 -0
- package/dest/multi-node/governance/setup.d.ts.map +1 -0
- package/dest/multi-node/governance/setup.js +126 -0
- package/dest/multi-node/multi_node_test_context.d.ts +212 -0
- package/dest/multi-node/multi_node_test_context.d.ts.map +1 -0
- package/dest/multi-node/multi_node_test_context.js +347 -0
- package/dest/multi-node/slashing/inactivity_setup.d.ts +27 -0
- package/dest/multi-node/slashing/inactivity_setup.d.ts.map +1 -0
- package/dest/multi-node/slashing/inactivity_setup.js +111 -0
- package/dest/multi-node/slashing/setup.d.ts +167 -0
- package/dest/multi-node/slashing/setup.d.ts.map +1 -0
- package/dest/multi-node/slashing/setup.js +275 -0
- package/dest/{e2e_p2p → p2p}/p2p_network.d.ts +10 -2
- package/dest/p2p/p2p_network.d.ts.map +1 -0
- package/dest/{e2e_p2p → p2p}/p2p_network.js +41 -16
- package/dest/p2p/reqresp/utils.d.ts +19 -0
- package/dest/p2p/reqresp/utils.d.ts.map +1 -0
- package/dest/{e2e_p2p → p2p}/reqresp/utils.js +4 -17
- package/dest/p2p/shared.d.ts +72 -0
- package/dest/p2p/shared.d.ts.map +1 -0
- package/dest/p2p/shared.js +212 -0
- package/dest/shared/cross_chain_test_harness.d.ts +3 -3
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +24 -16
- package/dest/shared/gas_portal_test_harness.d.ts +1 -1
- package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
- package/dest/shared/gas_portal_test_harness.js +8 -5
- package/dest/shared/submit-transactions.d.ts +1 -1
- package/dest/shared/submit-transactions.d.ts.map +1 -1
- package/dest/shared/submit-transactions.js +12 -5
- package/dest/shared/timing_env.d.js +5 -0
- package/dest/shared/timing_env.js +365 -0
- 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 +1 -6
- package/dest/shared/wait_for_l1_to_l2_message.js +1 -1
- package/dest/simulators/lending_simulator.js +1 -1
- package/dest/single-node/cross-chain/cross_chain_messaging_test.d.ts +75 -0
- package/dest/single-node/cross-chain/cross_chain_messaging_test.d.ts.map +1 -0
- package/dest/single-node/cross-chain/cross_chain_messaging_test.js +209 -0
- package/dest/single-node/cross-chain/message_test_helpers.d.ts +38 -0
- package/dest/single-node/cross-chain/message_test_helpers.d.ts.map +1 -0
- package/dest/single-node/cross-chain/message_test_helpers.js +70 -0
- package/dest/{e2e_fees → single-node/fees}/bridging_race.notest.d.ts +1 -1
- package/dest/single-node/fees/bridging_race.notest.d.ts.map +1 -0
- package/dest/{e2e_fees → single-node/fees}/bridging_race.notest.js +17 -4
- package/dest/single-node/fees/fees_test.d.ts +95 -0
- package/dest/single-node/fees/fees_test.d.ts.map +1 -0
- package/dest/{e2e_fees → single-node/fees}/fees_test.js +126 -60
- package/dest/single-node/l1-reorgs/setup.d.ts +42 -0
- package/dest/single-node/l1-reorgs/setup.d.ts.map +1 -0
- package/dest/single-node/l1-reorgs/setup.js +57 -0
- package/dest/single-node/partial-proofs/setup.d.ts +5 -0
- package/dest/single-node/partial-proofs/setup.d.ts.map +1 -0
- package/dest/single-node/partial-proofs/setup.js +5 -0
- package/dest/single-node/proving/setup.d.ts +5 -0
- package/dest/single-node/proving/setup.d.ts.map +1 -0
- package/dest/single-node/proving/setup.js +5 -0
- package/dest/single-node/recovery/setup.d.ts +5 -0
- package/dest/single-node/recovery/setup.d.ts.map +1 -0
- package/dest/single-node/recovery/setup.js +5 -0
- package/dest/single-node/setup.d.ts +49 -0
- package/dest/single-node/setup.d.ts.map +1 -0
- package/dest/single-node/setup.js +56 -0
- package/dest/single-node/single_node_test_context.d.ts +374 -0
- package/dest/single-node/single_node_test_context.d.ts.map +1 -0
- package/dest/single-node/single_node_test_context.js +847 -0
- package/dest/spartan/setup_test_wallets.d.ts +1 -1
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +19 -9
- package/dest/spartan/tx_metrics.d.ts +10 -1
- package/dest/spartan/tx_metrics.d.ts.map +1 -1
- package/dest/spartan/tx_metrics.js +32 -0
- package/dest/test-wallet/test_wallet.d.ts +23 -3
- package/dest/test-wallet/test_wallet.d.ts.map +1 -1
- package/dest/test-wallet/test_wallet.js +56 -9
- package/dest/test-wallet/utils.d.ts +36 -1
- package/dest/test-wallet/utils.d.ts.map +1 -1
- package/dest/test-wallet/utils.js +64 -4
- package/dest/test-wallet/wallet_worker_script.js +5 -2
- package/dest/test-wallet/worker_wallet.d.ts +5 -5
- package/dest/test-wallet/worker_wallet.d.ts.map +1 -1
- package/dest/test-wallet/worker_wallet.js +5 -3
- package/dest/test-wallet/worker_wallet_schema.d.ts +3 -159
- package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -1
- package/dest/test-wallet/worker_wallet_schema.js +2 -1
- package/package.json +41 -41
- package/src/automine/README.md +60 -0
- package/src/automine/automine_test_context.ts +153 -0
- package/src/automine/delivery/interactive_handshake_responder.ts +125 -0
- package/src/automine/delivery/onchain_delivery_harness.ts +213 -0
- package/src/{e2e_blacklist_token_contract → automine/token}/blacklist_token_contract_test.ts +20 -57
- package/src/{e2e_token_contract → automine/token}/token_contract_test.ts +24 -57
- package/src/automine/token/token_test_helpers.ts +138 -0
- package/src/bench/client_flows/benchmark.ts +3 -1
- package/src/bench/client_flows/client_flows_benchmark.ts +45 -26
- package/src/bench/client_flows/data_extractor.ts +1 -0
- package/src/bench/utils.ts +109 -6
- package/src/composed/ha/ha_full_setup.ts +466 -0
- package/src/fixtures/e2e_prover_test.ts +60 -47
- package/src/fixtures/fixtures.ts +28 -11
- package/src/fixtures/ha_setup.ts +7 -3
- package/src/fixtures/index.ts +1 -0
- package/src/fixtures/setup.ts +245 -290
- package/src/fixtures/setup_p2p_test.ts +3 -3
- package/src/fixtures/standard_contracts_genesis.ts +28 -0
- package/src/fixtures/timing.ts +97 -0
- package/src/fixtures/token_utils.ts +39 -4
- package/src/fixtures/utils.ts +0 -3
- package/src/fixtures/wait_helpers.ts +333 -0
- package/src/forward-compatibility/wallet_service.ts +6 -4
- package/src/guides/up_quick_start.sh +5 -0
- package/src/infra/README.md +12 -0
- package/src/multi-node/README.md +96 -0
- package/src/multi-node/block-production/setup.ts +272 -0
- package/src/multi-node/governance/setup.ts +172 -0
- package/src/multi-node/multi_node_test_context.ts +447 -0
- package/src/multi-node/slashing/inactivity_setup.ts +139 -0
- package/src/multi-node/slashing/setup.ts +433 -0
- package/src/p2p/README.md +78 -0
- package/src/{e2e_p2p → p2p}/p2p_network.ts +40 -13
- package/src/{e2e_p2p → p2p}/reqresp/utils.ts +5 -16
- package/src/p2p/shared.ts +329 -0
- package/src/shared/cross_chain_test_harness.ts +22 -13
- package/src/shared/gas_portal_test_harness.ts +13 -5
- package/src/shared/submit-transactions.ts +13 -5
- package/src/shared/timing_env.d.mts +39 -0
- package/src/shared/timing_env.mjs +363 -0
- package/src/shared/uniswap_l1_l2.ts +1 -8
- package/src/shared/wait_for_l1_to_l2_message.ts +1 -1
- package/src/simulators/lending_simulator.ts +1 -1
- package/src/single-node/README.md +66 -0
- package/src/single-node/cross-chain/cross_chain_messaging_test.ts +302 -0
- package/src/single-node/cross-chain/message_test_helpers.ts +125 -0
- package/src/{e2e_fees → single-node/fees}/bridging_race.notest.ts +19 -5
- package/src/{e2e_fees → single-node/fees}/fees_test.ts +143 -70
- package/src/single-node/l1-reorgs/setup.ts +93 -0
- package/src/single-node/partial-proofs/setup.ts +8 -0
- package/src/single-node/proving/setup.ts +15 -0
- package/src/single-node/recovery/setup.ts +8 -0
- package/src/single-node/setup.ts +63 -0
- package/src/single-node/single_node_test_context.ts +1058 -0
- package/src/spartan/setup_test_wallets.ts +24 -9
- package/src/spartan/tx_metrics.ts +26 -0
- package/src/test-wallet/test_wallet.ts +60 -10
- package/src/test-wallet/utils.ts +102 -5
- package/src/test-wallet/wallet_worker_script.ts +6 -3
- package/src/test-wallet/worker_wallet.ts +10 -12
- package/src/test-wallet/worker_wallet_schema.ts +3 -2
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +0 -56
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +0 -1
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +0 -58
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +0 -1
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +0 -161
- package/dest/e2e_deploy_contract/deploy_test.d.ts +0 -37
- package/dest/e2e_deploy_contract/deploy_test.d.ts.map +0 -1
- package/dest/e2e_deploy_contract/deploy_test.js +0 -51
- package/dest/e2e_epochs/epochs_test.d.ts +0 -125
- package/dest/e2e_epochs/epochs_test.d.ts.map +0 -1
- package/dest/e2e_epochs/epochs_test.js +0 -460
- package/dest/e2e_fees/bridging_race.notest.d.ts.map +0 -1
- package/dest/e2e_fees/fees_test.d.ts +0 -91
- package/dest/e2e_fees/fees_test.d.ts.map +0 -1
- package/dest/e2e_l1_publisher/write_json.d.ts +0 -11
- package/dest/e2e_l1_publisher/write_json.d.ts.map +0 -1
- package/dest/e2e_l1_publisher/write_json.js +0 -56
- package/dest/e2e_multi_validator/utils.d.ts +0 -12
- package/dest/e2e_multi_validator/utils.d.ts.map +0 -1
- package/dest/e2e_nested_contract/nested_contract_test.d.ts +0 -26
- package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +0 -1
- package/dest/e2e_nested_contract/nested_contract_test.js +0 -55
- package/dest/e2e_p2p/inactivity_slash_test.d.ts +0 -31
- package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +0 -1
- package/dest/e2e_p2p/inactivity_slash_test.js +0 -137
- package/dest/e2e_p2p/p2p_network.d.ts.map +0 -1
- package/dest/e2e_p2p/reqresp/utils.d.ts +0 -22
- package/dest/e2e_p2p/reqresp/utils.d.ts.map +0 -1
- package/dest/e2e_p2p/shared.d.ts +0 -75
- package/dest/e2e_p2p/shared.d.ts.map +0 -1
- package/dest/e2e_p2p/shared.js +0 -217
- package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts +0 -2
- package/dest/e2e_storage_proof/fixtures/storage_proof_fetcher.d.ts.map +0 -1
- package/dest/e2e_storage_proof/fixtures/storage_proof_fixture.d.ts.map +0 -1
- package/dest/e2e_token_contract/token_contract_test.d.ts +0 -44
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +0 -1
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +0 -231
- package/src/e2e_deploy_contract/deploy_test.ts +0 -86
- package/src/e2e_epochs/epochs_test.ts +0 -575
- package/src/e2e_l1_publisher/write_json.ts +0 -77
- package/src/e2e_nested_contract/nested_contract_test.ts +0 -77
- package/src/e2e_p2p/inactivity_slash_test.ts +0 -180
- package/src/e2e_p2p/shared.ts +0 -332
- /package/dest/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fetcher.js +0 -0
- /package/dest/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fixture.js +0 -0
- /package/dest/{e2e_multi_validator/utils.js → composed/web3signer/multi_validator_keystore_utils.js} +0 -0
- /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof.json +0 -0
- /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fetcher.ts +0 -0
- /package/src/{e2e_storage_proof → automine/contracts}/fixtures/storage_proof_fixture.ts +0 -0
- /package/src/{e2e_multi_validator/utils.ts → composed/web3signer/multi_validator_keystore_utils.ts} +0 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { generateSchnorrAccounts } from '@aztec/accounts/testing';
|
|
2
|
+
import { createAztecNodeService } from '@aztec/aztec-node';
|
|
2
3
|
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
3
4
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
4
5
|
import { BackendType, Barretenberg } from '@aztec/bb.js';
|
|
@@ -10,23 +11,29 @@ import { getGenesisValues } from '@aztec/world-state/testing';
|
|
|
10
11
|
import { getContract } from 'viem';
|
|
11
12
|
import { privateKeyToAddress } from 'viem/accounts';
|
|
12
13
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
14
|
+
import { SingleNodeTestContext } from '../single-node/single_node_test_context.js';
|
|
13
15
|
import { getACVMConfig } from './get_acvm_config.js';
|
|
14
16
|
import { getBBConfig } from './get_bb_config.js';
|
|
15
|
-
import {
|
|
17
|
+
import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWallet } from './setup.js';
|
|
18
|
+
import { getStandardContractGenesisNullifiers } from './standard_contracts_genesis.js';
|
|
16
19
|
/**
|
|
17
20
|
* Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
|
|
18
21
|
* However, we then setup a second PXE with a full prover instance.
|
|
19
22
|
* We configure this instance with all of the accounts and contracts.
|
|
20
23
|
* We then prove and verify transactions created via this full prover PXE.
|
|
21
|
-
|
|
24
|
+
*
|
|
25
|
+
* The real-prover sub-base of the single-node topology: extends {@link SingleNodeTestContext} so it
|
|
26
|
+
* reuses the base node tracking / chain monitor / teardown machinery, but builds its environment with
|
|
27
|
+
* the bespoke prover opts below (real BB, `realVerifier` L1, the snapshot/account + TokenSimulator
|
|
28
|
+
* harness, and a hand-built prover node) rather than the base's default fake-prover config.
|
|
29
|
+
*/ export class FullProverTest extends SingleNodeTestContext {
|
|
22
30
|
static TOKEN_NAME = 'USDC';
|
|
23
31
|
static TOKEN_SYMBOL = 'USD';
|
|
24
32
|
static TOKEN_DECIMALS = 18n;
|
|
25
|
-
logger;
|
|
26
33
|
wallet;
|
|
27
34
|
provenWallet;
|
|
28
35
|
accounts = [];
|
|
29
|
-
|
|
36
|
+
fundedAccounts;
|
|
30
37
|
fakeProofsAsset;
|
|
31
38
|
fakeProofsAssetInstance;
|
|
32
39
|
tokenSim;
|
|
@@ -40,15 +47,17 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
40
47
|
return this.proverAztecNode?.getProofVerifier();
|
|
41
48
|
}
|
|
42
49
|
provenAsset;
|
|
43
|
-
context;
|
|
44
50
|
proverAztecNode;
|
|
45
51
|
simulatedProverAztecNode;
|
|
46
52
|
l1Contracts;
|
|
47
53
|
proverAddress;
|
|
54
|
+
testName;
|
|
48
55
|
minNumberOfTxsPerBlock;
|
|
49
56
|
coinbase;
|
|
50
57
|
realProofs;
|
|
51
58
|
constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
|
|
59
|
+
super();
|
|
60
|
+
this.testName = testName;
|
|
52
61
|
this.logger = createLogger(`e2e:full_prover_test:${testName}`);
|
|
53
62
|
this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
|
|
54
63
|
this.coinbase = coinbase;
|
|
@@ -57,16 +66,13 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
57
66
|
/**
|
|
58
67
|
* Applies base setup: deploys 2 accounts and token contract.
|
|
59
68
|
*/ async applyBaseSetup() {
|
|
60
|
-
this.logger.info('Applying base setup:
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
initialFundedAccounts: this.context.initialFundedAccounts
|
|
64
|
-
});
|
|
65
|
-
this.deployedAccounts = deployedAccounts;
|
|
66
|
-
this.accounts = deployedAccounts.map((a)=>a.address);
|
|
69
|
+
this.logger.info('Applying base setup: registering funded accounts');
|
|
70
|
+
this.fundedAccounts = this.context.additionallyFundedAccounts;
|
|
71
|
+
this.accounts = this.fundedAccounts.map((a)=>a.address);
|
|
67
72
|
this.wallet = this.context.wallet;
|
|
68
|
-
|
|
69
|
-
|
|
73
|
+
for (const { secret, salt, signingKey } of this.fundedAccounts){
|
|
74
|
+
await this.wallet.createSchnorrInitializerlessAccount(secret, salt, signingKey);
|
|
75
|
+
}
|
|
70
76
|
this.logger.info('Applying base setup: deploying token contract');
|
|
71
77
|
const { contract: asset, instance } = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
|
|
72
78
|
from: this.accounts[0]
|
|
@@ -82,23 +88,26 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
82
88
|
}
|
|
83
89
|
async setup(opts = {}) {
|
|
84
90
|
this.logger.info('Setting up subsystems from fresh');
|
|
85
|
-
|
|
91
|
+
const context = await setup(0, {
|
|
86
92
|
...opts,
|
|
87
93
|
startProverNode: true,
|
|
88
94
|
coinbase: this.coinbase,
|
|
89
95
|
fundSponsoredFPC: true,
|
|
90
|
-
|
|
96
|
+
additionallyFundedAccounts: await generateSchnorrAccounts(2),
|
|
91
97
|
l1ContractsArgs: {
|
|
92
98
|
realVerifier: this.realProofs
|
|
93
99
|
}
|
|
94
100
|
});
|
|
101
|
+
// Reuse the base context machinery (rollup, epoch cache, chain monitor, node tracking, teardown)
|
|
102
|
+
// over the environment built above. Restore the FullProverTest-named logger afterwards, since
|
|
103
|
+
// hydrateFromContext repoints `this.logger` at the context logger.
|
|
104
|
+
await this.hydrateFromContext(context);
|
|
105
|
+
this.logger = createLogger(`e2e:full_prover_test:${this.testName}`);
|
|
95
106
|
await this.applyBaseSetup();
|
|
96
107
|
await this.applyMint();
|
|
97
108
|
this.logger.info(`Enabling proving`, {
|
|
98
109
|
realProofs: this.realProofs
|
|
99
110
|
});
|
|
100
|
-
// We don't wish to mark as proven automatically, so we set the flag to false
|
|
101
|
-
this.context.watcher.setIsMarkingAsProven(false);
|
|
102
111
|
this.simulatedProverAztecNode = this.context.proverNode;
|
|
103
112
|
({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes } = this.context);
|
|
104
113
|
this.aztecNodeAdmin = this.context.aztecNodeService;
|
|
@@ -135,14 +144,16 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
135
144
|
this.logger.verbose(`Marking current block as proven`);
|
|
136
145
|
await this.context.cheatCodes.rollup.markAsProven();
|
|
137
146
|
this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
|
|
138
|
-
const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, {
|
|
147
|
+
const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, this.context.aztecNode, {
|
|
139
148
|
proverEnabled: this.realProofs
|
|
140
149
|
}, undefined, 'pxe-proven');
|
|
141
150
|
this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
|
|
142
151
|
await provenWallet.registerContract(this.fakeProofsAssetInstance, TokenContract.artifact);
|
|
143
152
|
for(let i = 0; i < 2; i++){
|
|
144
|
-
|
|
145
|
-
|
|
153
|
+
// Mirror the initializerless funded accounts (created via createFundedAccounts) in both wallets so
|
|
154
|
+
// their addresses match the genesis-funded ones.
|
|
155
|
+
await provenWallet.createSchnorrInitializerlessAccount(this.fundedAccounts[i].secret, this.fundedAccounts[i].salt, this.fundedAccounts[i].signingKey);
|
|
156
|
+
await this.wallet.createSchnorrInitializerlessAccount(this.fundedAccounts[i].secret, this.fundedAccounts[i].salt, this.fundedAccounts[i].signingKey);
|
|
146
157
|
}
|
|
147
158
|
const asset = TokenContract.at(this.fakeProofsAsset.address, provenWallet);
|
|
148
159
|
this.provenComponents.push({
|
|
@@ -164,7 +175,7 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
164
175
|
await this.mintFeeJuice(proverNodeSenderAddress);
|
|
165
176
|
this.logger.verbose('Starting prover node');
|
|
166
177
|
const sponsoredFPCAddress = await getSponsoredFPCAddress();
|
|
167
|
-
const { genesis } = await getGenesisValues(this.context.
|
|
178
|
+
const { genesis } = await getGenesisValues(this.context.additionallyFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), undefined, undefined, this.context.genesis.genesisTimestamp, await getStandardContractGenesisNullifiers());
|
|
168
179
|
const proverNodeConfig = {
|
|
169
180
|
...config,
|
|
170
181
|
enableProverNode: true,
|
|
@@ -183,12 +194,15 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
183
194
|
txGatheringIntervalMs: 1000,
|
|
184
195
|
txGatheringBatchSize: 10,
|
|
185
196
|
txGatheringMaxParallelRequestsPerNode: 100,
|
|
186
|
-
|
|
197
|
+
// The test warps the L1 clock forward a full epoch via cheatcodes; the prover-node
|
|
198
|
+
// tracks L1 time, so an in-flight tx-gather would see its deadline jump into the
|
|
199
|
+
// past. Use a generous window so the deadline survives the warp.
|
|
200
|
+
txGatheringTimeoutMs: 10 * 60 * 1000,
|
|
187
201
|
proverNodeFailedEpochStore: undefined,
|
|
188
202
|
proverNodeEpochProvingDelayMs: undefined,
|
|
189
203
|
validatorPrivateKeys: new SecretValue([])
|
|
190
204
|
};
|
|
191
|
-
this.proverAztecNode = await
|
|
205
|
+
this.proverAztecNode = await createAztecNodeService(proverNodeConfig, {
|
|
192
206
|
dateProvider: this.context.dateProvider,
|
|
193
207
|
p2pClientDeps: {
|
|
194
208
|
rpcTxProviders: [
|
|
@@ -198,10 +212,14 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
198
212
|
}, {
|
|
199
213
|
genesis
|
|
200
214
|
});
|
|
215
|
+
// Track the real prover node so the base teardown stops it (the simulated one created by `setup`
|
|
216
|
+
// was already stopped above).
|
|
217
|
+
this.proverNodes = [
|
|
218
|
+
this.proverAztecNode
|
|
219
|
+
];
|
|
201
220
|
this.logger.warn(`Proofs are now enabled`, {
|
|
202
221
|
realProofs: this.realProofs
|
|
203
222
|
});
|
|
204
|
-
return this;
|
|
205
223
|
}
|
|
206
224
|
async mintFeeJuice(recipient) {
|
|
207
225
|
const handlerAddress = this.context.deployL1ContractsValues.l1ContractAddresses.feeAssetHandlerAddress;
|
|
@@ -224,12 +242,14 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
224
242
|
for(let i = 0; i < this.provenComponents.length; i++){
|
|
225
243
|
await this.provenComponents[i].teardown();
|
|
226
244
|
}
|
|
227
|
-
//
|
|
245
|
+
// Stop the prover node before destroying the BB singleton it proves with.
|
|
228
246
|
await this.proverAztecNode.stop();
|
|
229
247
|
await Barretenberg.destroySingleton();
|
|
230
248
|
await this.bbConfigCleanup?.();
|
|
231
249
|
await this.acvmConfigCleanup?.();
|
|
232
|
-
|
|
250
|
+
// Stops the chain monitor, the tracked nodes (main node + the already-stopped prover node, a
|
|
251
|
+
// safe no-op), and the context.
|
|
252
|
+
await super.teardown();
|
|
233
253
|
}
|
|
234
254
|
async applyMint() {
|
|
235
255
|
this.logger.info('Applying mint setup');
|
|
@@ -13,7 +13,8 @@ export declare const LARGE_MIN_FEE_PADDING = 15;
|
|
|
13
13
|
* price modifier evolves faster across the build/publish gap, so client-set maxFeesPerGas (sized
|
|
14
14
|
* for the default 5x padding) was getting bumped past by the time the tx mined a few slots later.
|
|
15
15
|
* Observed worst case in CI: fee evolved ~20x between PXE snapshot and inclusion, exceeding even
|
|
16
|
-
* LARGE_MIN_FEE_PADDING (15x).
|
|
16
|
+
* LARGE_MIN_FEE_PADDING (15x). Same multiplier and same class of problem as the published
|
|
17
|
+
* {@link TEST_FEE_PADDING}, re-exported under a name that captures the pipelining rationale.
|
|
17
18
|
*/
|
|
18
19
|
export declare const PIPELINED_FEE_PADDING = 30;
|
|
19
20
|
/**
|
|
@@ -21,13 +22,19 @@ export declare const PIPELINED_FEE_PADDING = 30;
|
|
|
21
22
|
*
|
|
22
23
|
* await setup(N, { ...PIPELINING_SETUP_OPTS, ...otherOpts });
|
|
23
24
|
*
|
|
24
|
-
* The preset
|
|
25
|
+
* The preset runs the production Sequencer with the always-enforced timetable at real (wall-clock)
|
|
26
|
+
* timing, yielding exactly 2 blocks per slot. It sets:
|
|
25
27
|
* - `inboxLag: 2` so the sequencer sources L1->L2 messages from checkpoint N-1 (already sealed),
|
|
26
28
|
* avoiding `L1ToL2MessagesNotReadyError` when building for slot N during slot N-1.
|
|
27
29
|
* - `minTxsPerBlock: 0` so empty checkpoints land even when a tx arrives late in the build window
|
|
28
30
|
* (otherwise the chain stalls on alternating slots).
|
|
29
31
|
* - `aztecSlotDuration: 12` / `ethereumSlotDuration: 4` so the pipelined cycle fits inside the
|
|
30
32
|
* default 300s Jest hook budget. Tests that depend on the env-default 72s/12s should override.
|
|
33
|
+
* - `blockDurationMs: 3000` to cut exactly 2 blocks per slot. With `ethereumSlotDuration < 8` the
|
|
34
|
+
* timing model normalizes to `init=0.5`, `assemble=0.5`, `P=0`, `minExec=1`, so
|
|
35
|
+
* `maxBlocks = floor((S - init - (assemble + 2P + D)) / D) = floor((12 - 0.5 - (0.5 + 0 + 3)) / 3)
|
|
36
|
+
* = floor(8/3) = 2`. (`blockDurationMs: 2000` would give 4 blocks/slot; 3000 also matches the
|
|
37
|
+
* production default.)
|
|
31
38
|
* - `walletMinFeePadding: PIPELINED_FEE_PADDING` (30x) to absorb the wider fee evolution window.
|
|
32
39
|
*/
|
|
33
40
|
export declare const PIPELINING_SETUP_OPTS: {
|
|
@@ -35,13 +42,14 @@ export declare const PIPELINING_SETUP_OPTS: {
|
|
|
35
42
|
readonly minTxsPerBlock: 0;
|
|
36
43
|
readonly aztecSlotDuration: 12;
|
|
37
44
|
readonly ethereumSlotDuration: 4;
|
|
45
|
+
readonly blockDurationMs: 3000;
|
|
38
46
|
readonly walletMinFeePadding: 30;
|
|
39
47
|
};
|
|
40
48
|
/**
|
|
41
49
|
* Setup option preset that opts a test into the deterministic AutomineSequencer path.
|
|
42
50
|
* Use only for single-sequencer tests that don't exercise block-building or consensus
|
|
43
|
-
* (e.g. e2e_token, e2e_amm, e2e_authwit). Not compatible with `
|
|
44
|
-
* `
|
|
51
|
+
* (e.g. e2e_token, e2e_amm, e2e_authwit). Not compatible with `p2p/*`,
|
|
52
|
+
* `multi-node/*`, `e2e_block_building`, or any multi-validator suite.
|
|
45
53
|
*
|
|
46
54
|
* await setup(N, { ...AUTOMINE_E2E_OPTS, ...otherOpts });
|
|
47
55
|
*
|
|
@@ -49,17 +57,17 @@ export declare const PIPELINING_SETUP_OPTS: {
|
|
|
49
57
|
* - Swaps the production Sequencer for an AutomineSequencer that builds one block per
|
|
50
58
|
* submitted tx, publishes synchronously to L1, and owns all time control through a
|
|
51
59
|
* serial queue (see `sequencer-client/src/sequencer/automine/automine_sequencer.ts`).
|
|
52
|
-
* - Disables the validator client
|
|
53
|
-
* neither).
|
|
60
|
+
* - Disables the validator client (the AutomineSequencer needs none).
|
|
54
61
|
* - Uses `inboxLag: 1` (synchronous) since the AutomineSequencer publishes one block per tx.
|
|
55
|
-
* -
|
|
56
|
-
* mines
|
|
62
|
+
* - Runs anvil at a 4s interval (`ethereumSlotDuration: 4`); at runtime the AutomineSequencer
|
|
63
|
+
* flips anvil into automine so each submitted tx mines its L1 block immediately. Initial L1
|
|
64
|
+
* contract deployment (which runs before the sequencer starts) is mined immediately too via the
|
|
65
|
+
* global `automineL1Setup` default in `setup()`, instead of stalling on the 4s interval.
|
|
57
66
|
*
|
|
58
67
|
* Requires `aztecTargetCommitteeSize: 0`, which is the e2e default at `setup.ts:317`.
|
|
59
68
|
*/
|
|
60
69
|
export declare const AUTOMINE_E2E_OPTS: {
|
|
61
70
|
readonly useAutomineSequencer: true;
|
|
62
|
-
readonly disableAnvilTestWatcher: true;
|
|
63
71
|
readonly inboxLag: 1;
|
|
64
72
|
readonly minTxsPerBlock: 0;
|
|
65
73
|
readonly aztecSlotDuration: 12;
|
|
@@ -76,6 +84,7 @@ export declare function getAnvilPort(): number;
|
|
|
76
84
|
export declare const TEST_PEER_CHECK_INTERVAL_MS = 1000;
|
|
77
85
|
export declare const TEST_MAX_PENDING_TX_POOL_COUNT = 10000;
|
|
78
86
|
export declare const MNEMONIC = "test test test test test test test test test test test junk";
|
|
87
|
+
export declare const L1_DIRECT_WRITE_ACCOUNT_INDEX = 1;
|
|
79
88
|
export declare const privateKey: Buffer<ArrayBuffer>;
|
|
80
89
|
export declare const privateKey2: Buffer<ArrayBuffer>;
|
|
81
90
|
export declare const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow";
|
|
@@ -85,4 +94,4 @@ export declare const DUPLICATE_NULLIFIER_ERROR: RegExp;
|
|
|
85
94
|
export declare const NO_L1_TO_L2_MSG_ERROR: RegExp;
|
|
86
95
|
export declare const STATIC_CALL_STATE_MODIFICATION_ERROR: RegExp;
|
|
87
96
|
export declare const STATIC_CONTEXT_ASSERTION_ERROR: RegExp;
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9maXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV0RCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVqRCxlQUFPLE1BQU0sWUFBWSxPQUFPLENBQUM7QUFFakMsc0VBQXNFO0FBQ3RFLGVBQU8sTUFBTSx1QkFBdUIsSUFBSSxDQUFDO0FBRXpDOzs7R0FHRztBQUNILGVBQU8sTUFBTSxxQkFBcUIsS0FBSyxDQUFDO0FBRXhDOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0scUJBQXFCLEtBQW1CLENBQUM7QUFFdEQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FtQkc7QUFDSCxlQUFPLE1BQU0scUJBQXFCOzs7Ozs7O0NBT3hCLENBQUM7QUFFWDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FvQkc7QUFDSCxlQUFPLE1BQU0saUJBQWlCOzs7Ozs7O0NBT3BCLENBQUM7QUFFWCxvR0FBb0c7QUFDcEcsd0JBQXNCLHNCQUFzQixDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxTQUEwQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FPakg7QUFFRCxlQUFPLE1BQU0sb0JBQW9CLHdCQUtoQyxDQUFDO0FBRUYsaUZBQWlGO0FBQ2pGLHdCQUFnQixrQkFBa0IsSUFBSSxNQUFNLENBRTNDO0FBRUQseUVBQXlFO0FBQ3pFLHdCQUFnQixZQUFZLElBQUksTUFBTSxDQUVyQztBQUVELGVBQU8sTUFBTSwyQkFBMkIsT0FBTyxDQUFDO0FBQ2hELGVBQU8sTUFBTSw4QkFBOEIsUUFBUyxDQUFDO0FBRXJELGVBQU8sTUFBTSxRQUFRLGdFQUFnRSxDQUFDO0FBT3RGLGVBQU8sTUFBTSw2QkFBNkIsSUFBSSxDQUFDO0FBRS9DLGVBQU8sTUFBTSxVQUFVLHFCQUF5RixDQUFDO0FBQ2pILGVBQU8sTUFBTSxXQUFXLHFCQUF5RixDQUFDO0FBR2xILGVBQU8sTUFBTSxvQkFBb0Isd0RBQXdELENBQUM7QUFDMUYsZUFBTyxNQUFNLG1CQUFtQixtREFBbUQsQ0FBQztBQUNwRixlQUFPLE1BQU0scUJBQXFCLCtFQUErRSxDQUFDO0FBRWxILGVBQU8sTUFBTSx5QkFBeUIsUUFBZ0MsQ0FBQztBQUN2RSxlQUFPLE1BQU0scUJBQXFCLFFBQ3dFLENBQUM7QUFDM0csZUFBTyxNQUFNLG9DQUFvQyxRQUEwQyxDQUFDO0FBQzVGLGVBQU8sTUFBTSw4QkFBOEIsUUFBa0UsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,sEAAsE;AACtE,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC;;;GAGG;AACH,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,KAAmB,CAAC;AAEtD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,qBAAqB;;;;;;;CAOxB,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,iBAAiB;;;;;;;CAOpB,CAAC;AAEX,oGAAoG;AACpG,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,SAA0B,GAAG,OAAO,CAAC,OAAO,CAAC,CAOjH;AAED,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,iFAAiF;AACjF,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,yEAAyE;AACzE,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,eAAO,MAAM,8BAA8B,QAAS,CAAC;AAErD,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AAOtF,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAE/C,eAAO,MAAM,UAAU,qBAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,qBAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,wDAAwD,CAAC;AAC1F,eAAO,MAAM,mBAAmB,mDAAmD,CAAC;AACpF,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AACvE,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAA0C,CAAC;AAC5F,eAAO,MAAM,8BAA8B,QAAkE,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TEST_FEE_PADDING } from '@aztec/aztec/testing';
|
|
1
2
|
export const METRICS_PORT = 4318;
|
|
2
3
|
/** Default fee padding applied to predicted min fees in e2e tests. */ export const DEFAULT_MIN_FEE_PADDING = 5;
|
|
3
4
|
/**
|
|
@@ -9,33 +10,41 @@ export const METRICS_PORT = 4318;
|
|
|
9
10
|
* price modifier evolves faster across the build/publish gap, so client-set maxFeesPerGas (sized
|
|
10
11
|
* for the default 5x padding) was getting bumped past by the time the tx mined a few slots later.
|
|
11
12
|
* Observed worst case in CI: fee evolved ~20x between PXE snapshot and inclusion, exceeding even
|
|
12
|
-
* LARGE_MIN_FEE_PADDING (15x).
|
|
13
|
-
|
|
13
|
+
* LARGE_MIN_FEE_PADDING (15x). Same multiplier and same class of problem as the published
|
|
14
|
+
* {@link TEST_FEE_PADDING}, re-exported under a name that captures the pipelining rationale.
|
|
15
|
+
*/ export const PIPELINED_FEE_PADDING = TEST_FEE_PADDING;
|
|
14
16
|
/**
|
|
15
17
|
* Setup option preset that opts a test into proposer pipelining. Use with `setup()`:
|
|
16
18
|
*
|
|
17
19
|
* await setup(N, { ...PIPELINING_SETUP_OPTS, ...otherOpts });
|
|
18
20
|
*
|
|
19
|
-
* The preset
|
|
21
|
+
* The preset runs the production Sequencer with the always-enforced timetable at real (wall-clock)
|
|
22
|
+
* timing, yielding exactly 2 blocks per slot. It sets:
|
|
20
23
|
* - `inboxLag: 2` so the sequencer sources L1->L2 messages from checkpoint N-1 (already sealed),
|
|
21
24
|
* avoiding `L1ToL2MessagesNotReadyError` when building for slot N during slot N-1.
|
|
22
25
|
* - `minTxsPerBlock: 0` so empty checkpoints land even when a tx arrives late in the build window
|
|
23
26
|
* (otherwise the chain stalls on alternating slots).
|
|
24
27
|
* - `aztecSlotDuration: 12` / `ethereumSlotDuration: 4` so the pipelined cycle fits inside the
|
|
25
28
|
* default 300s Jest hook budget. Tests that depend on the env-default 72s/12s should override.
|
|
29
|
+
* - `blockDurationMs: 3000` to cut exactly 2 blocks per slot. With `ethereumSlotDuration < 8` the
|
|
30
|
+
* timing model normalizes to `init=0.5`, `assemble=0.5`, `P=0`, `minExec=1`, so
|
|
31
|
+
* `maxBlocks = floor((S - init - (assemble + 2P + D)) / D) = floor((12 - 0.5 - (0.5 + 0 + 3)) / 3)
|
|
32
|
+
* = floor(8/3) = 2`. (`blockDurationMs: 2000` would give 4 blocks/slot; 3000 also matches the
|
|
33
|
+
* production default.)
|
|
26
34
|
* - `walletMinFeePadding: PIPELINED_FEE_PADDING` (30x) to absorb the wider fee evolution window.
|
|
27
35
|
*/ export const PIPELINING_SETUP_OPTS = {
|
|
28
36
|
inboxLag: 2,
|
|
29
37
|
minTxsPerBlock: 0,
|
|
30
38
|
aztecSlotDuration: 12,
|
|
31
39
|
ethereumSlotDuration: 4,
|
|
40
|
+
blockDurationMs: 3000,
|
|
32
41
|
walletMinFeePadding: PIPELINED_FEE_PADDING
|
|
33
42
|
};
|
|
34
43
|
/**
|
|
35
44
|
* Setup option preset that opts a test into the deterministic AutomineSequencer path.
|
|
36
45
|
* Use only for single-sequencer tests that don't exercise block-building or consensus
|
|
37
|
-
* (e.g. e2e_token, e2e_amm, e2e_authwit). Not compatible with `
|
|
38
|
-
* `
|
|
46
|
+
* (e.g. e2e_token, e2e_amm, e2e_authwit). Not compatible with `p2p/*`,
|
|
47
|
+
* `multi-node/*`, `e2e_block_building`, or any multi-validator suite.
|
|
39
48
|
*
|
|
40
49
|
* await setup(N, { ...AUTOMINE_E2E_OPTS, ...otherOpts });
|
|
41
50
|
*
|
|
@@ -43,21 +52,21 @@ export const METRICS_PORT = 4318;
|
|
|
43
52
|
* - Swaps the production Sequencer for an AutomineSequencer that builds one block per
|
|
44
53
|
* submitted tx, publishes synchronously to L1, and owns all time control through a
|
|
45
54
|
* serial queue (see `sequencer-client/src/sequencer/automine/automine_sequencer.ts`).
|
|
46
|
-
* - Disables the validator client
|
|
47
|
-
* neither).
|
|
55
|
+
* - Disables the validator client (the AutomineSequencer needs none).
|
|
48
56
|
* - Uses `inboxLag: 1` (synchronous) since the AutomineSequencer publishes one block per tx.
|
|
49
|
-
* -
|
|
50
|
-
* mines
|
|
57
|
+
* - Runs anvil at a 4s interval (`ethereumSlotDuration: 4`); at runtime the AutomineSequencer
|
|
58
|
+
* flips anvil into automine so each submitted tx mines its L1 block immediately. Initial L1
|
|
59
|
+
* contract deployment (which runs before the sequencer starts) is mined immediately too via the
|
|
60
|
+
* global `automineL1Setup` default in `setup()`, instead of stalling on the 4s interval.
|
|
51
61
|
*
|
|
52
62
|
* Requires `aztecTargetCommitteeSize: 0`, which is the e2e default at `setup.ts:317`.
|
|
53
63
|
*/ export const AUTOMINE_E2E_OPTS = {
|
|
54
64
|
useAutomineSequencer: true,
|
|
55
|
-
disableAnvilTestWatcher: true,
|
|
56
65
|
inboxLag: 1,
|
|
57
66
|
minTxsPerBlock: 0,
|
|
58
67
|
aztecSlotDuration: 12,
|
|
59
68
|
ethereumSlotDuration: 4,
|
|
60
|
-
walletMinFeePadding:
|
|
69
|
+
walletMinFeePadding: TEST_FEE_PADDING
|
|
61
70
|
};
|
|
62
71
|
/** Returns worst-case predicted min fees with padding applied, mirroring the BaseWallet pattern. */ export async function getPaddedMaxFeesPerGas(node, padding = DEFAULT_MIN_FEE_PADDING) {
|
|
63
72
|
const predicted = await node.getPredictedMinFees();
|
|
@@ -79,6 +88,12 @@ export const shouldCollectMetrics = ()=>{
|
|
|
79
88
|
export const TEST_PEER_CHECK_INTERVAL_MS = 1000;
|
|
80
89
|
export const TEST_MAX_PENDING_TX_POOL_COUNT = 10_000; // Number of max pending TXs ~ 1.56GB
|
|
81
90
|
export const MNEMONIC = 'test test test test test test test test test test test junk';
|
|
91
|
+
// Mnemonic account index for tests that issue direct L1 writes (e.g. bridging fee juice) while a
|
|
92
|
+
// sequencer is running. The deployer/sequencer publisher uses index 0, the prover index 2, and
|
|
93
|
+
// validators index 3+. Test-side viem writes and the publisher's l1-tx-utils track nonces
|
|
94
|
+
// independently, so sharing an account causes "replacement transaction underpriced" races; index 1
|
|
95
|
+
// is otherwise unused, so issuing those writes from it keeps them off the publisher's nonce stream.
|
|
96
|
+
export const L1_DIRECT_WRITE_ACCOUNT_INDEX = 1;
|
|
82
97
|
export const privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex');
|
|
83
98
|
export const privateKey2 = Buffer.from('59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex');
|
|
84
99
|
/// Common errors
|
|
@@ -14,8 +14,8 @@ export interface HADatabaseConfig {
|
|
|
14
14
|
haSigningEnabled: boolean;
|
|
15
15
|
/** Polling interval in ms */
|
|
16
16
|
pollingIntervalMs: number;
|
|
17
|
-
/**
|
|
18
|
-
|
|
17
|
+
/** How long to wait for a peer node's in-progress signing in ms */
|
|
18
|
+
peerSigningTimeoutMs: number;
|
|
19
19
|
/** Max stuck duties age in ms */
|
|
20
20
|
maxStuckDutiesAgeMs: number;
|
|
21
21
|
}
|
|
@@ -68,4 +68,4 @@ export declare function verifyNoDuplicateAttestations(attestationDuties: Array<{
|
|
|
68
68
|
nodeId: string;
|
|
69
69
|
completedAt: Date | undefined;
|
|
70
70
|
}>, logger?: Logger): Map<string, typeof attestationDuties>;
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFfc2V0dXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9oYV9zZXR1cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFdkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXZELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFHMUI7O0dBRUc7QUFDSCxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLGdDQUFnQztJQUNoQyxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2pDLGtDQUFrQztJQUNsQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2Ysd0JBQXdCO0lBQ3hCLGdCQUFnQixFQUFFLE9BQU8sQ0FBQztJQUMxQiw2QkFBNkI7SUFDN0IsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLG1FQUFtRTtJQUNuRSxvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0IsaUNBQWlDO0lBQ2pDLG1CQUFtQixFQUFFLE1BQU0sQ0FBQztDQUM3QjtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLENBYXZFO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IsZUFBZSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FpQjFFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FjbEY7QUFFRDs7R0FFRztBQUNILHdCQUFzQixrQkFBa0IsQ0FDdEMsSUFBSSxFQUFFLElBQUksRUFDVixJQUFJLEVBQUUsTUFBTSxFQUNaLFFBQVEsQ0FBQyxFQUFFLGFBQWEsR0FBRyxnQkFBZ0IsR0FBRyxpQkFBaUIsR0FBRyxlQUFlLEdBQ2hGLE9BQU8sQ0FDUixLQUFLLENBQUM7SUFDSixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFDekIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFNBQVMsRUFBRSxJQUFJLENBQUM7SUFDaEIsV0FBVyxFQUFFLElBQUksR0FBRyxTQUFTLENBQUM7Q0FDL0IsQ0FBQyxDQUNILENBd0JBO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0IsMkJBQTJCLENBQUMsV0FBVyxFQUFFLEtBQUssTUFBTSxFQUFFLEVBQUUsR0FBRyxNQUFNLEVBQUUsQ0FLbEY7QUFFRDs7R0FFRztBQUNILHdCQUFnQixzQ0FBc0MsQ0FBQyxtQkFBbUIsRUFBRSxLQUFLLE1BQU0sRUFBRSxFQUFFLEdBQUcsS0FBSyxDQUFDO0lBQ2xHLFFBQVEsRUFBRSxVQUFVLENBQUM7SUFDckIsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixVQUFVLEVBQUUsS0FBSyxNQUFNLEVBQUUsQ0FBQztJQUMxQixjQUFjLEVBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0NBQ3JDLENBQUMsQ0FVRDtBQUVEOzs7R0FHRztBQUNILHdCQUFnQiw2QkFBNkIsQ0FDM0MsaUJBQWlCLEVBQUUsS0FBSyxDQUFDO0lBQ3ZCLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6QixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsV0FBVyxFQUFFLElBQUksR0FBRyxTQUFTLENBQUM7Q0FDL0IsQ0FBQyxFQUNGLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxHQUFHLENBQUMsTUFBTSxFQUFFLE9BQU8saUJBQWlCLENBQUMsQ0FtQnZDIn0=
|
|
@@ -1 +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,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,6BAA6B;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,
|
|
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,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,6BAA6B;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mEAAmE;IACnE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iCAAiC;IACjC,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAavE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAiB1E;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclF;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"}
|
|
@@ -12,7 +12,7 @@ import { privateKeyToAccount } from 'viem/accounts';
|
|
|
12
12
|
nodeId,
|
|
13
13
|
haSigningEnabled: true,
|
|
14
14
|
pollingIntervalMs: 100,
|
|
15
|
-
|
|
15
|
+
peerSigningTimeoutMs: 3000,
|
|
16
16
|
maxStuckDutiesAgeMs: 72000
|
|
17
17
|
};
|
|
18
18
|
}
|
|
@@ -28,6 +28,9 @@ import { privateKeyToAccount } from 'viem/accounts';
|
|
|
28
28
|
const pool = new Pool({
|
|
29
29
|
connectionString: databaseUrl
|
|
30
30
|
});
|
|
31
|
+
// pg-pool re-emits idle-client errors on the pool; with no listener the emit throws - in production this crashes
|
|
32
|
+
// the validator process.
|
|
33
|
+
pool.on('error', (err)=>logger?.warn(`HA database pool error: ${err.message}`));
|
|
31
34
|
logger?.info('Connected to HA database (migrations should already be applied)');
|
|
32
35
|
return pool;
|
|
33
36
|
} catch (error) {
|
package/dest/fixtures/index.d.ts
CHANGED
|
@@ -3,5 +3,6 @@ export * from './ha_setup.js';
|
|
|
3
3
|
export * from './logging.js';
|
|
4
4
|
export * from './utils.js';
|
|
5
5
|
export * from './token_utils.js';
|
|
6
|
+
export * from './wait_helpers.js';
|
|
6
7
|
export * from './with_telemetry_utils.js';
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYywyQkFBMkIsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fixtures/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fixtures/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC"}
|