@aztec/end-to-end 0.0.1-commit.96dac018d → 0.0.1-commit.9a89641
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 +229 -14
- 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 +37 -50
- 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 +35 -50
- 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 +15 -1
- package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/benchmark.js +19 -0
- package/dest/bench/client_flows/client_flows_benchmark.d.ts +6 -6
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +65 -59
- 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 +102 -8
- 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/authwit_proxy.d.ts +3 -3
- package/dest/fixtures/authwit_proxy.d.ts.map +1 -1
- package/dest/fixtures/authwit_proxy.js +4 -0
- package/dest/fixtures/e2e_prover_test.d.ts +15 -11
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +60 -44
- package/dest/fixtures/fixtures.d.ts +79 -1
- package/dest/fixtures/fixtures.d.ts.map +1 -1
- package/dest/fixtures/fixtures.js +80 -0
- package/dest/fixtures/get_acvm_config.d.ts +1 -1
- package/dest/fixtures/get_acvm_config.d.ts.map +1 -1
- package/dest/fixtures/get_acvm_config.js +2 -2
- package/dest/fixtures/get_bb_config.d.ts +1 -1
- package/dest/fixtures/get_bb_config.d.ts.map +1 -1
- package/dest/fixtures/get_bb_config.js +6 -6
- package/dest/fixtures/ha_setup.d.ts +4 -4
- package/dest/fixtures/ha_setup.d.ts.map +1 -1
- package/dest/fixtures/ha_setup.js +5 -2
- 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/schnorr_hardcoded_account_contract.d.ts +25 -0
- package/dest/fixtures/schnorr_hardcoded_account_contract.d.ts.map +1 -0
- package/dest/fixtures/schnorr_hardcoded_account_contract.js +37 -0
- package/dest/fixtures/setup.d.ts +88 -45
- package/dest/fixtures/setup.d.ts.map +1 -1
- package/dest/fixtures/setup.js +297 -202
- package/dest/fixtures/setup_p2p_test.d.ts +10 -6
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +11 -11
- 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 +23 -6
- 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_rpc_client.d.ts +7 -0
- package/dest/forward-compatibility/wallet_rpc_client.d.ts.map +1 -0
- package/dest/forward-compatibility/wallet_rpc_client.js +15 -0
- package/dest/forward-compatibility/wallet_service.d.ts +3 -0
- package/dest/forward-compatibility/wallet_service.d.ts.map +1 -0
- package/dest/forward-compatibility/wallet_service.js +109 -0
- package/dest/install_legacy_contracts.d.cts +10 -0
- package/dest/install_legacy_contracts.d.cts.map +1 -0
- package/dest/legacy-jest-resolver.d.cts +3 -0
- package/dest/legacy-jest-resolver.d.cts.map +1 -0
- 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 +21 -11
- package/dest/p2p/p2p_network.d.ts.map +1 -0
- package/dest/{e2e_p2p → p2p}/p2p_network.js +95 -48
- 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 +45 -29
- 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 +6 -4
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +44 -32
- package/dest/shared/gas_portal_test_harness.d.ts +9 -6
- package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
- package/dest/shared/gas_portal_test_harness.js +28 -17
- package/dest/shared/jest_setup.js +32 -1
- 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 +55 -45
- package/dest/shared/wait_for_l1_to_l2_message.d.ts +13 -0
- package/dest/shared/wait_for_l1_to_l2_message.d.ts.map +1 -0
- package/dest/shared/wait_for_l1_to_l2_message.js +10 -0
- package/dest/simulators/lending_simulator.d.ts +10 -3
- package/dest/simulators/lending_simulator.d.ts.map +1 -1
- package/dest/simulators/lending_simulator.js +27 -15
- package/dest/simulators/token_simulator.d.ts +1 -1
- package/dest/simulators/token_simulator.d.ts.map +1 -1
- package/dest/simulators/token_simulator.js +2 -2
- 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/single-node/fees/fees_test.js +344 -0
- 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 +4 -2
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +93 -46
- package/dest/spartan/tx_metrics.d.ts +27 -4
- package/dest/spartan/tx_metrics.d.ts.map +1 -1
- package/dest/spartan/tx_metrics.js +106 -21
- package/dest/spartan/utils/config.d.ts +10 -30
- package/dest/spartan/utils/config.d.ts.map +1 -1
- package/dest/spartan/utils/config.js +3 -1
- package/dest/spartan/utils/index.d.ts +3 -1
- package/dest/spartan/utils/index.d.ts.map +1 -1
- package/dest/spartan/utils/index.js +4 -0
- package/dest/spartan/utils/nodes.js +3 -3
- package/dest/spartan/utils/pod_logs.d.ts +25 -0
- package/dest/spartan/utils/pod_logs.d.ts.map +1 -0
- package/dest/spartan/utils/pod_logs.js +74 -0
- package/dest/test-wallet/test_wallet.d.ts +47 -25
- package/dest/test-wallet/test_wallet.d.ts.map +1 -1
- package/dest/test-wallet/test_wallet.js +197 -91
- package/dest/test-wallet/utils.d.ts +38 -3
- package/dest/test-wallet/utils.d.ts.map +1 -1
- package/dest/test-wallet/utils.js +65 -10
- package/dest/test-wallet/wallet_worker_script.js +12 -4
- package/dest/test-wallet/worker_wallet.d.ts +9 -8
- package/dest/test-wallet/worker_wallet.d.ts.map +1 -1
- package/dest/test-wallet/worker_wallet.js +10 -4
- package/dest/test-wallet/worker_wallet_schema.d.ts +3 -273
- package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -1
- package/dest/test-wallet/worker_wallet_schema.js +15 -2
- package/package.json +50 -47
- 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 +42 -61
- package/src/{e2e_token_contract → automine/token}/token_contract_test.ts +41 -56
- package/src/automine/token/token_test_helpers.ts +138 -0
- package/src/bench/client_flows/benchmark.ts +21 -0
- package/src/bench/client_flows/client_flows_benchmark.ts +105 -70
- package/src/bench/client_flows/data_extractor.ts +1 -0
- package/src/bench/utils.ts +116 -7
- package/src/composed/ha/ha_full_setup.ts +466 -0
- package/src/fixtures/authwit_proxy.ts +4 -0
- package/src/fixtures/e2e_prover_test.ts +80 -64
- package/src/fixtures/fixtures.ts +100 -0
- package/src/fixtures/get_acvm_config.ts +2 -8
- package/src/fixtures/get_bb_config.ts +8 -8
- package/src/fixtures/ha_setup.ts +11 -5
- package/src/fixtures/index.ts +1 -0
- package/src/fixtures/schnorr_hardcoded_account_contract.ts +49 -0
- package/src/fixtures/setup.ts +379 -264
- package/src/fixtures/setup_p2p_test.ts +15 -11
- package/src/fixtures/standard_contracts_genesis.ts +28 -0
- package/src/fixtures/timing.ts +97 -0
- package/src/fixtures/token_utils.ts +40 -6
- package/src/fixtures/utils.ts +2 -3
- package/src/fixtures/wait_helpers.ts +333 -0
- package/src/forward-compatibility/wallet_rpc_client.ts +14 -0
- package/src/forward-compatibility/wallet_service.ts +106 -0
- package/src/guides/up_quick_start.sh +5 -2
- package/src/infra/README.md +12 -0
- package/src/install_legacy_contracts.cjs +75 -0
- package/src/legacy-jest-resolver.cjs +112 -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 +115 -66
- package/src/{e2e_p2p → p2p}/reqresp/utils.ts +56 -28
- package/src/p2p/shared.ts +329 -0
- package/src/shared/cross_chain_test_harness.ts +44 -21
- package/src/shared/gas_portal_test_harness.ts +35 -18
- package/src/shared/jest_setup.ts +36 -1
- package/src/shared/submit-transactions.ts +13 -8
- package/src/shared/timing_env.d.mts +39 -0
- package/src/shared/timing_env.mjs +363 -0
- package/src/shared/uniswap_l1_l2.ts +98 -54
- package/src/shared/wait_for_l1_to_l2_message.ts +23 -0
- package/src/simulators/lending_simulator.ts +33 -15
- package/src/simulators/token_simulator.ts +6 -2
- 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/single-node/fees/fees_test.ts +434 -0
- 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 +117 -45
- package/src/spartan/tx_metrics.ts +108 -24
- package/src/spartan/utils/config.ts +2 -0
- package/src/spartan/utils/index.ts +6 -0
- package/src/spartan/utils/nodes.ts +3 -3
- package/src/spartan/utils/pod_logs.ts +99 -0
- package/src/test-wallet/test_wallet.ts +227 -107
- package/src/test-wallet/utils.ts +104 -11
- package/src/test-wallet/wallet_worker_script.ts +11 -5
- package/src/test-wallet/worker_wallet.ts +19 -16
- package/src/test-wallet/worker_wallet_schema.ts +4 -3
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +0 -55
- 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 -47
- 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 -129
- 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 -50
- package/dest/e2e_epochs/epochs_test.d.ts +0 -102
- package/dest/e2e_epochs/epochs_test.d.ts.map +0 -1
- package/dest/e2e_epochs/epochs_test.js +0 -386
- package/dest/e2e_fees/bridging_race.notest.d.ts.map +0 -1
- package/dest/e2e_fees/fees_test.d.ts +0 -88
- package/dest/e2e_fees/fees_test.d.ts.map +0 -1
- package/dest/e2e_fees/fees_test.js +0 -248
- 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 -56
- 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 -136
- 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 -46
- package/dest/e2e_p2p/shared.d.ts.map +0 -1
- package/dest/e2e_p2p/shared.js +0 -181
- 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 -193
- package/src/e2e_deploy_contract/deploy_test.ts +0 -85
- package/src/e2e_epochs/epochs_test.ts +0 -487
- package/src/e2e_fees/fees_test.ts +0 -324
- package/src/e2e_l1_publisher/write_json.ts +0 -77
- package/src/e2e_nested_contract/nested_contract_test.ts +0 -73
- package/src/e2e_p2p/inactivity_slash_test.ts +0 -179
- package/src/e2e_p2p/shared.ts +0 -290
- /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,7 +1,7 @@
|
|
|
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
|
-
import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
|
|
5
5
|
import { BackendType, Barretenberg } from '@aztec/bb.js';
|
|
6
6
|
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
7
7
|
import { SecretValue } from '@aztec/foundation/config';
|
|
@@ -11,23 +11,29 @@ import { getGenesisValues } from '@aztec/world-state/testing';
|
|
|
11
11
|
import { getContract } from 'viem';
|
|
12
12
|
import { privateKeyToAddress } from 'viem/accounts';
|
|
13
13
|
import { TokenSimulator } from '../simulators/token_simulator.js';
|
|
14
|
+
import { SingleNodeTestContext } from '../single-node/single_node_test_context.js';
|
|
14
15
|
import { getACVMConfig } from './get_acvm_config.js';
|
|
15
16
|
import { getBBConfig } from './get_bb_config.js';
|
|
16
|
-
import {
|
|
17
|
+
import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, setupPXEAndGetWallet } from './setup.js';
|
|
18
|
+
import { getStandardContractGenesisNullifiers } from './standard_contracts_genesis.js';
|
|
17
19
|
/**
|
|
18
20
|
* Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
|
|
19
21
|
* However, we then setup a second PXE with a full prover instance.
|
|
20
22
|
* We configure this instance with all of the accounts and contracts.
|
|
21
23
|
* We then prove and verify transactions created via this full prover PXE.
|
|
22
|
-
|
|
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 {
|
|
23
30
|
static TOKEN_NAME = 'USDC';
|
|
24
31
|
static TOKEN_SYMBOL = 'USD';
|
|
25
32
|
static TOKEN_DECIMALS = 18n;
|
|
26
|
-
logger;
|
|
27
33
|
wallet;
|
|
28
34
|
provenWallet;
|
|
29
35
|
accounts = [];
|
|
30
|
-
|
|
36
|
+
fundedAccounts;
|
|
31
37
|
fakeProofsAsset;
|
|
32
38
|
fakeProofsAssetInstance;
|
|
33
39
|
tokenSim;
|
|
@@ -37,17 +43,21 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
37
43
|
provenComponents = [];
|
|
38
44
|
bbConfigCleanup;
|
|
39
45
|
acvmConfigCleanup;
|
|
40
|
-
circuitProofVerifier
|
|
46
|
+
/** Returns the proof verifier from the prover node (for test assertions). */ get circuitProofVerifier() {
|
|
47
|
+
return this.proverAztecNode?.getProofVerifier();
|
|
48
|
+
}
|
|
41
49
|
provenAsset;
|
|
42
|
-
context;
|
|
43
50
|
proverAztecNode;
|
|
44
51
|
simulatedProverAztecNode;
|
|
45
52
|
l1Contracts;
|
|
46
53
|
proverAddress;
|
|
54
|
+
testName;
|
|
47
55
|
minNumberOfTxsPerBlock;
|
|
48
56
|
coinbase;
|
|
49
57
|
realProofs;
|
|
50
58
|
constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
|
|
59
|
+
super();
|
|
60
|
+
this.testName = testName;
|
|
51
61
|
this.logger = createLogger(`e2e:full_prover_test:${testName}`);
|
|
52
62
|
this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
|
|
53
63
|
this.coinbase = coinbase;
|
|
@@ -56,50 +66,48 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
56
66
|
/**
|
|
57
67
|
* Applies base setup: deploys 2 accounts and token contract.
|
|
58
68
|
*/ async applyBaseSetup() {
|
|
59
|
-
this.logger.info('Applying base setup:
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
initialFundedAccounts: this.context.initialFundedAccounts
|
|
63
|
-
});
|
|
64
|
-
this.deployedAccounts = deployedAccounts;
|
|
65
|
-
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);
|
|
66
72
|
this.wallet = this.context.wallet;
|
|
67
|
-
|
|
68
|
-
|
|
73
|
+
for (const { secret, salt, signingKey } of this.fundedAccounts){
|
|
74
|
+
await this.wallet.createSchnorrInitializerlessAccount(secret, salt, signingKey);
|
|
75
|
+
}
|
|
69
76
|
this.logger.info('Applying base setup: deploying token contract');
|
|
70
77
|
const { contract: asset, instance } = await TokenContract.deploy(this.wallet, this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
|
|
71
|
-
from: this.accounts[0]
|
|
72
|
-
wait: {
|
|
73
|
-
returnReceipt: true
|
|
74
|
-
}
|
|
78
|
+
from: this.accounts[0]
|
|
75
79
|
});
|
|
76
80
|
this.logger.verbose(`Token deployed to ${asset.address}`);
|
|
77
81
|
this.fakeProofsAsset = asset;
|
|
78
82
|
this.fakeProofsAssetInstance = instance;
|
|
79
83
|
this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
|
|
80
84
|
this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallet, this.accounts[0], this.logger, this.accounts);
|
|
81
|
-
expect(await this.fakeProofsAsset.methods.get_admin().simulate({
|
|
85
|
+
expect((await this.fakeProofsAsset.methods.get_admin().simulate({
|
|
82
86
|
from: this.accounts[0]
|
|
83
|
-
})).toBe(this.accounts[0].toBigInt());
|
|
87
|
+
})).result).toBe(this.accounts[0].toBigInt());
|
|
84
88
|
}
|
|
85
|
-
async setup() {
|
|
89
|
+
async setup(opts = {}) {
|
|
86
90
|
this.logger.info('Setting up subsystems from fresh');
|
|
87
|
-
|
|
91
|
+
const context = await setup(0, {
|
|
92
|
+
...opts,
|
|
88
93
|
startProverNode: true,
|
|
89
94
|
coinbase: this.coinbase,
|
|
90
95
|
fundSponsoredFPC: true,
|
|
91
|
-
|
|
96
|
+
additionallyFundedAccounts: await generateSchnorrAccounts(2),
|
|
92
97
|
l1ContractsArgs: {
|
|
93
98
|
realVerifier: this.realProofs
|
|
94
99
|
}
|
|
95
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}`);
|
|
96
106
|
await this.applyBaseSetup();
|
|
97
107
|
await this.applyMint();
|
|
98
108
|
this.logger.info(`Enabling proving`, {
|
|
99
109
|
realProofs: this.realProofs
|
|
100
110
|
});
|
|
101
|
-
// We don't wish to mark as proven automatically, so we set the flag to false
|
|
102
|
-
this.context.watcher.setIsMarkingAsProven(false);
|
|
103
111
|
this.simulatedProverAztecNode = this.context.proverNode;
|
|
104
112
|
({ aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes } = this.context);
|
|
105
113
|
this.aztecNodeAdmin = this.context.aztecNodeService;
|
|
@@ -120,8 +128,6 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
120
128
|
await Barretenberg.initSingleton({
|
|
121
129
|
backend: BackendType.NativeUnixSocket
|
|
122
130
|
});
|
|
123
|
-
const verifier = await BBCircuitVerifier.new(bbConfig);
|
|
124
|
-
this.circuitProofVerifier = new QueuedIVCVerifier(bbConfig, verifier);
|
|
125
131
|
this.logger.debug(`Configuring the node for real proofs...`);
|
|
126
132
|
await this.aztecNodeAdmin.setConfig({
|
|
127
133
|
realProofs: true,
|
|
@@ -129,7 +135,6 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
129
135
|
});
|
|
130
136
|
} else {
|
|
131
137
|
this.logger.debug(`Configuring the node min txs per block ${this.minNumberOfTxsPerBlock}...`);
|
|
132
|
-
this.circuitProofVerifier = new TestCircuitVerifier();
|
|
133
138
|
await this.aztecNodeAdmin.setConfig({
|
|
134
139
|
minTxsPerBlock: this.minNumberOfTxsPerBlock
|
|
135
140
|
});
|
|
@@ -139,14 +144,16 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
139
144
|
this.logger.verbose(`Marking current block as proven`);
|
|
140
145
|
await this.context.cheatCodes.rollup.markAsProven();
|
|
141
146
|
this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
|
|
142
|
-
const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, {
|
|
147
|
+
const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(this.aztecNode, this.context.aztecNode, {
|
|
143
148
|
proverEnabled: this.realProofs
|
|
144
149
|
}, undefined, 'pxe-proven');
|
|
145
150
|
this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
|
|
146
151
|
await provenWallet.registerContract(this.fakeProofsAssetInstance, TokenContract.artifact);
|
|
147
152
|
for(let i = 0; i < 2; i++){
|
|
148
|
-
|
|
149
|
-
|
|
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);
|
|
150
157
|
}
|
|
151
158
|
const asset = TokenContract.at(this.fakeProofsAsset.address, provenWallet);
|
|
152
159
|
this.provenComponents.push({
|
|
@@ -168,7 +175,7 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
168
175
|
await this.mintFeeJuice(proverNodeSenderAddress);
|
|
169
176
|
this.logger.verbose('Starting prover node');
|
|
170
177
|
const sponsoredFPCAddress = await getSponsoredFPCAddress();
|
|
171
|
-
const {
|
|
178
|
+
const { genesis } = await getGenesisValues(this.context.additionallyFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), undefined, undefined, this.context.genesis.genesisTimestamp, await getStandardContractGenesisNullifiers());
|
|
172
179
|
const proverNodeConfig = {
|
|
173
180
|
...config,
|
|
174
181
|
enableProverNode: true,
|
|
@@ -187,12 +194,15 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
187
194
|
txGatheringIntervalMs: 1000,
|
|
188
195
|
txGatheringBatchSize: 10,
|
|
189
196
|
txGatheringMaxParallelRequestsPerNode: 100,
|
|
190
|
-
|
|
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,
|
|
191
201
|
proverNodeFailedEpochStore: undefined,
|
|
192
202
|
proverNodeEpochProvingDelayMs: undefined,
|
|
193
203
|
validatorPrivateKeys: new SecretValue([])
|
|
194
204
|
};
|
|
195
|
-
this.proverAztecNode = await
|
|
205
|
+
this.proverAztecNode = await createAztecNodeService(proverNodeConfig, {
|
|
196
206
|
dateProvider: this.context.dateProvider,
|
|
197
207
|
p2pClientDeps: {
|
|
198
208
|
rpcTxProviders: [
|
|
@@ -200,12 +210,16 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
200
210
|
]
|
|
201
211
|
}
|
|
202
212
|
}, {
|
|
203
|
-
|
|
213
|
+
genesis
|
|
204
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
|
+
];
|
|
205
220
|
this.logger.warn(`Proofs are now enabled`, {
|
|
206
221
|
realProofs: this.realProofs
|
|
207
222
|
});
|
|
208
|
-
return this;
|
|
209
223
|
}
|
|
210
224
|
async mintFeeJuice(recipient) {
|
|
211
225
|
const handlerAddress = this.context.deployL1ContractsValues.l1ContractAddresses.feeAssetHandlerAddress;
|
|
@@ -228,12 +242,14 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
228
242
|
for(let i = 0; i < this.provenComponents.length; i++){
|
|
229
243
|
await this.provenComponents[i].teardown();
|
|
230
244
|
}
|
|
231
|
-
//
|
|
245
|
+
// Stop the prover node before destroying the BB singleton it proves with.
|
|
232
246
|
await this.proverAztecNode.stop();
|
|
233
247
|
await Barretenberg.destroySingleton();
|
|
234
248
|
await this.bbConfigCleanup?.();
|
|
235
249
|
await this.acvmConfigCleanup?.();
|
|
236
|
-
|
|
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();
|
|
237
253
|
}
|
|
238
254
|
async applyMint() {
|
|
239
255
|
this.logger.info('Applying mint setup');
|
|
@@ -251,18 +267,18 @@ import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, publicD
|
|
|
251
267
|
this.logger.info(`Minting complete`);
|
|
252
268
|
const { fakeProofsAsset, accounts: [address], tokenSim } = this;
|
|
253
269
|
tokenSim.mintPublic(address, publicAmount);
|
|
254
|
-
const publicBalance = await fakeProofsAsset.methods.balance_of_public(address).simulate({
|
|
270
|
+
const { result: publicBalance } = await fakeProofsAsset.methods.balance_of_public(address).simulate({
|
|
255
271
|
from: address
|
|
256
272
|
});
|
|
257
273
|
this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
|
|
258
274
|
expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
|
|
259
275
|
tokenSim.mintPrivate(address, publicAmount);
|
|
260
|
-
const privateBalance = await fakeProofsAsset.methods.balance_of_private(address).simulate({
|
|
276
|
+
const { result: privateBalance } = await fakeProofsAsset.methods.balance_of_private(address).simulate({
|
|
261
277
|
from: address
|
|
262
278
|
});
|
|
263
279
|
this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
|
|
264
280
|
expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
|
|
265
|
-
const totalSupply = await fakeProofsAsset.methods.total_supply().simulate({
|
|
281
|
+
const { result: totalSupply } = await fakeProofsAsset.methods.total_supply().simulate({
|
|
266
282
|
from: address
|
|
267
283
|
});
|
|
268
284
|
this.logger.verbose(`Total supply: ${totalSupply}`);
|
|
@@ -1,4 +1,81 @@
|
|
|
1
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
2
|
+
import type { GasFees } from '@aztec/stdlib/gas';
|
|
1
3
|
export declare const METRICS_PORT = 4318;
|
|
4
|
+
/** Default fee padding applied to predicted min fees in e2e tests. */
|
|
5
|
+
export declare const DEFAULT_MIN_FEE_PADDING = 5;
|
|
6
|
+
/**
|
|
7
|
+
* Large fee padding for txs that may be mined significantly later than when they were created,
|
|
8
|
+
* such as cloned txs in throughput/capacity benchmarks, where fees may spike between creation and mining.
|
|
9
|
+
*/
|
|
10
|
+
export declare const LARGE_MIN_FEE_PADDING = 15;
|
|
11
|
+
/**
|
|
12
|
+
* Fee padding used by tests running under proposer pipelining. Under pipelining the fee-asset
|
|
13
|
+
* price modifier evolves faster across the build/publish gap, so client-set maxFeesPerGas (sized
|
|
14
|
+
* for the default 5x padding) was getting bumped past by the time the tx mined a few slots later.
|
|
15
|
+
* Observed worst case in CI: fee evolved ~20x between PXE snapshot and inclusion, exceeding even
|
|
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.
|
|
18
|
+
*/
|
|
19
|
+
export declare const PIPELINED_FEE_PADDING = 30;
|
|
20
|
+
/**
|
|
21
|
+
* Setup option preset that opts a test into proposer pipelining. Use with `setup()`:
|
|
22
|
+
*
|
|
23
|
+
* await setup(N, { ...PIPELINING_SETUP_OPTS, ...otherOpts });
|
|
24
|
+
*
|
|
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:
|
|
27
|
+
* - `inboxLag: 2` so the sequencer sources L1->L2 messages from checkpoint N-1 (already sealed),
|
|
28
|
+
* avoiding `L1ToL2MessagesNotReadyError` when building for slot N during slot N-1.
|
|
29
|
+
* - `minTxsPerBlock: 0` so empty checkpoints land even when a tx arrives late in the build window
|
|
30
|
+
* (otherwise the chain stalls on alternating slots).
|
|
31
|
+
* - `aztecSlotDuration: 12` / `ethereumSlotDuration: 4` so the pipelined cycle fits inside the
|
|
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.)
|
|
38
|
+
* - `walletMinFeePadding: PIPELINED_FEE_PADDING` (30x) to absorb the wider fee evolution window.
|
|
39
|
+
*/
|
|
40
|
+
export declare const PIPELINING_SETUP_OPTS: {
|
|
41
|
+
readonly inboxLag: 2;
|
|
42
|
+
readonly minTxsPerBlock: 0;
|
|
43
|
+
readonly aztecSlotDuration: 12;
|
|
44
|
+
readonly ethereumSlotDuration: 4;
|
|
45
|
+
readonly blockDurationMs: 3000;
|
|
46
|
+
readonly walletMinFeePadding: 30;
|
|
47
|
+
};
|
|
48
|
+
/**
|
|
49
|
+
* Setup option preset that opts a test into the deterministic AutomineSequencer path.
|
|
50
|
+
* Use only for single-sequencer tests that don't exercise block-building or consensus
|
|
51
|
+
* (e.g. e2e_token, e2e_amm, e2e_authwit). Not compatible with `p2p/*`,
|
|
52
|
+
* `multi-node/*`, `e2e_block_building`, or any multi-validator suite.
|
|
53
|
+
*
|
|
54
|
+
* await setup(N, { ...AUTOMINE_E2E_OPTS, ...otherOpts });
|
|
55
|
+
*
|
|
56
|
+
* The preset:
|
|
57
|
+
* - Swaps the production Sequencer for an AutomineSequencer that builds one block per
|
|
58
|
+
* submitted tx, publishes synchronously to L1, and owns all time control through a
|
|
59
|
+
* serial queue (see `sequencer-client/src/sequencer/automine/automine_sequencer.ts`).
|
|
60
|
+
* - Disables the validator client (the AutomineSequencer needs none).
|
|
61
|
+
* - Uses `inboxLag: 1` (synchronous) since the AutomineSequencer publishes one block per tx.
|
|
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.
|
|
66
|
+
*
|
|
67
|
+
* Requires `aztecTargetCommitteeSize: 0`, which is the e2e default at `setup.ts:317`.
|
|
68
|
+
*/
|
|
69
|
+
export declare const AUTOMINE_E2E_OPTS: {
|
|
70
|
+
readonly useAutomineSequencer: true;
|
|
71
|
+
readonly inboxLag: 1;
|
|
72
|
+
readonly minTxsPerBlock: 0;
|
|
73
|
+
readonly aztecSlotDuration: 12;
|
|
74
|
+
readonly ethereumSlotDuration: 4;
|
|
75
|
+
readonly walletMinFeePadding: 30;
|
|
76
|
+
};
|
|
77
|
+
/** Returns worst-case predicted min fees with padding applied, mirroring the BaseWallet pattern. */
|
|
78
|
+
export declare function getPaddedMaxFeesPerGas(node: AztecNode, padding?: number): Promise<GasFees>;
|
|
2
79
|
export declare const shouldCollectMetrics: () => 4318 | undefined;
|
|
3
80
|
/** Returns the boot node UDP port from environment variable or default value. */
|
|
4
81
|
export declare function getBootNodeUdpPort(): number;
|
|
@@ -7,6 +84,7 @@ export declare function getAnvilPort(): number;
|
|
|
7
84
|
export declare const TEST_PEER_CHECK_INTERVAL_MS = 1000;
|
|
8
85
|
export declare const TEST_MAX_PENDING_TX_POOL_COUNT = 10000;
|
|
9
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;
|
|
10
88
|
export declare const privateKey: Buffer<ArrayBuffer>;
|
|
11
89
|
export declare const privateKey2: Buffer<ArrayBuffer>;
|
|
12
90
|
export declare const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow";
|
|
@@ -16,4 +94,4 @@ export declare const DUPLICATE_NULLIFIER_ERROR: RegExp;
|
|
|
16
94
|
export declare const NO_L1_TO_L2_MSG_ERROR: RegExp;
|
|
17
95
|
export declare const STATIC_CALL_STATE_MODIFICATION_ERROR: RegExp;
|
|
18
96
|
export declare const STATIC_CONTEXT_ASSERTION_ERROR: RegExp;
|
|
19
|
-
//# 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,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,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;
|
|
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,4 +1,78 @@
|
|
|
1
|
+
import { TEST_FEE_PADDING } from '@aztec/aztec/testing';
|
|
1
2
|
export const METRICS_PORT = 4318;
|
|
3
|
+
/** Default fee padding applied to predicted min fees in e2e tests. */ export const DEFAULT_MIN_FEE_PADDING = 5;
|
|
4
|
+
/**
|
|
5
|
+
* Large fee padding for txs that may be mined significantly later than when they were created,
|
|
6
|
+
* such as cloned txs in throughput/capacity benchmarks, where fees may spike between creation and mining.
|
|
7
|
+
*/ export const LARGE_MIN_FEE_PADDING = 15;
|
|
8
|
+
/**
|
|
9
|
+
* Fee padding used by tests running under proposer pipelining. Under pipelining the fee-asset
|
|
10
|
+
* price modifier evolves faster across the build/publish gap, so client-set maxFeesPerGas (sized
|
|
11
|
+
* for the default 5x padding) was getting bumped past by the time the tx mined a few slots later.
|
|
12
|
+
* Observed worst case in CI: fee evolved ~20x between PXE snapshot and inclusion, exceeding even
|
|
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;
|
|
16
|
+
/**
|
|
17
|
+
* Setup option preset that opts a test into proposer pipelining. Use with `setup()`:
|
|
18
|
+
*
|
|
19
|
+
* await setup(N, { ...PIPELINING_SETUP_OPTS, ...otherOpts });
|
|
20
|
+
*
|
|
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:
|
|
23
|
+
* - `inboxLag: 2` so the sequencer sources L1->L2 messages from checkpoint N-1 (already sealed),
|
|
24
|
+
* avoiding `L1ToL2MessagesNotReadyError` when building for slot N during slot N-1.
|
|
25
|
+
* - `minTxsPerBlock: 0` so empty checkpoints land even when a tx arrives late in the build window
|
|
26
|
+
* (otherwise the chain stalls on alternating slots).
|
|
27
|
+
* - `aztecSlotDuration: 12` / `ethereumSlotDuration: 4` so the pipelined cycle fits inside the
|
|
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.)
|
|
34
|
+
* - `walletMinFeePadding: PIPELINED_FEE_PADDING` (30x) to absorb the wider fee evolution window.
|
|
35
|
+
*/ export const PIPELINING_SETUP_OPTS = {
|
|
36
|
+
inboxLag: 2,
|
|
37
|
+
minTxsPerBlock: 0,
|
|
38
|
+
aztecSlotDuration: 12,
|
|
39
|
+
ethereumSlotDuration: 4,
|
|
40
|
+
blockDurationMs: 3000,
|
|
41
|
+
walletMinFeePadding: PIPELINED_FEE_PADDING
|
|
42
|
+
};
|
|
43
|
+
/**
|
|
44
|
+
* Setup option preset that opts a test into the deterministic AutomineSequencer path.
|
|
45
|
+
* Use only for single-sequencer tests that don't exercise block-building or consensus
|
|
46
|
+
* (e.g. e2e_token, e2e_amm, e2e_authwit). Not compatible with `p2p/*`,
|
|
47
|
+
* `multi-node/*`, `e2e_block_building`, or any multi-validator suite.
|
|
48
|
+
*
|
|
49
|
+
* await setup(N, { ...AUTOMINE_E2E_OPTS, ...otherOpts });
|
|
50
|
+
*
|
|
51
|
+
* The preset:
|
|
52
|
+
* - Swaps the production Sequencer for an AutomineSequencer that builds one block per
|
|
53
|
+
* submitted tx, publishes synchronously to L1, and owns all time control through a
|
|
54
|
+
* serial queue (see `sequencer-client/src/sequencer/automine/automine_sequencer.ts`).
|
|
55
|
+
* - Disables the validator client (the AutomineSequencer needs none).
|
|
56
|
+
* - Uses `inboxLag: 1` (synchronous) since the AutomineSequencer publishes one block per tx.
|
|
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.
|
|
61
|
+
*
|
|
62
|
+
* Requires `aztecTargetCommitteeSize: 0`, which is the e2e default at `setup.ts:317`.
|
|
63
|
+
*/ export const AUTOMINE_E2E_OPTS = {
|
|
64
|
+
useAutomineSequencer: true,
|
|
65
|
+
inboxLag: 1,
|
|
66
|
+
minTxsPerBlock: 0,
|
|
67
|
+
aztecSlotDuration: 12,
|
|
68
|
+
ethereumSlotDuration: 4,
|
|
69
|
+
walletMinFeePadding: TEST_FEE_PADDING
|
|
70
|
+
};
|
|
71
|
+
/** Returns worst-case predicted min fees with padding applied, mirroring the BaseWallet pattern. */ export async function getPaddedMaxFeesPerGas(node, padding = DEFAULT_MIN_FEE_PADDING) {
|
|
72
|
+
const predicted = await node.getPredictedMinFees();
|
|
73
|
+
const worstCase = predicted.length > 0 ? predicted.reduce((worst, fees)=>fees.feePerL2Gas > worst.feePerL2Gas ? fees : worst) : await node.getCurrentMinFees();
|
|
74
|
+
return worstCase.mul(1 + padding);
|
|
75
|
+
}
|
|
2
76
|
export const shouldCollectMetrics = ()=>{
|
|
3
77
|
if (process.env.COLLECT_METRICS) {
|
|
4
78
|
return METRICS_PORT;
|
|
@@ -14,6 +88,12 @@ export const shouldCollectMetrics = ()=>{
|
|
|
14
88
|
export const TEST_PEER_CHECK_INTERVAL_MS = 1000;
|
|
15
89
|
export const TEST_MAX_PENDING_TX_POOL_COUNT = 10_000; // Number of max pending TXs ~ 1.56GB
|
|
16
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;
|
|
17
97
|
export const privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex');
|
|
18
98
|
export const privateKey2 = Buffer.from('59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex');
|
|
19
99
|
/// Common errors
|
|
@@ -5,4 +5,4 @@ export declare function getACVMConfig(logger: Logger): Promise<{
|
|
|
5
5
|
acvmBinaryPath: string;
|
|
6
6
|
cleanup: () => Promise<void>;
|
|
7
7
|
} | undefined>;
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2Fjdm1fY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZml4dHVyZXMvZ2V0X2Fjdm1fY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBT2xELE9BQU8sRUFBRSwwQ0FBMEMsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBS25HLHdCQUFzQixhQUFhLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQ3hEO0lBQ0Usb0JBQW9CLEVBQUUsTUFBTSxDQUFDO0lBQzdCLGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIsT0FBTyxFQUFFLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQzlCLEdBQ0QsU0FBUyxDQUNaLENBeUJBIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_acvm_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_acvm_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAOlD,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"get_acvm_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_acvm_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAOlD,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;AAKnG,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CACxD;IACE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,GACD,SAAS,CACZ,CAyBA"}
|
|
@@ -3,14 +3,14 @@ import { randomBytes } from '@aztec/foundation/crypto/random';
|
|
|
3
3
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
4
4
|
import { promises as fs } from 'fs';
|
|
5
5
|
export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
|
|
6
|
-
const {
|
|
6
|
+
const { TEMP_DIR = '/tmp', ACVM_BINARY_PATH = '', ACVM_WORKING_DIRECTORY = '', ACVM_FORCE_WASM = '' } = process.env;
|
|
7
7
|
// Determines if we have access to the acvm binary and a tmp folder for temp files
|
|
8
8
|
export async function getACVMConfig(logger) {
|
|
9
9
|
try {
|
|
10
10
|
if (parseBooleanEnv(ACVM_FORCE_WASM)) {
|
|
11
11
|
return undefined;
|
|
12
12
|
}
|
|
13
|
-
const acvmBinaryPath = ACVM_BINARY_PATH ? ACVM_BINARY_PATH : `../../
|
|
13
|
+
const acvmBinaryPath = ACVM_BINARY_PATH ? ACVM_BINARY_PATH : `../../labs-aztec-toolchain/bin/acvm`;
|
|
14
14
|
await fs.access(acvmBinaryPath, fs.constants.R_OK);
|
|
15
15
|
const tempWorkingDirectory = `${TEMP_DIR}/${randomBytes(4).toString('hex')}`;
|
|
16
16
|
const acvmWorkingDirectory = ACVM_WORKING_DIRECTORY ? ACVM_WORKING_DIRECTORY : `${tempWorkingDirectory}/acvm`;
|
|
@@ -3,4 +3,4 @@ import type { BBConfig } from '@aztec/bb-prover';
|
|
|
3
3
|
export declare const getBBConfig: (logger: Logger) => Promise<(BBConfig & {
|
|
4
4
|
cleanup: () => Promise<void>;
|
|
5
5
|
}) | undefined>;
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2JiX2NvbmZpZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZpeHR1cmVzL2dldF9iYl9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFtQmpELGVBQU8sTUFBTSxXQUFXOztlQXNDdkIsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_bb_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_bb_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"get_bb_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_bb_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAmBjD,eAAO,MAAM,WAAW;;eAsCvB,CAAC"}
|
|
@@ -3,10 +3,10 @@ import fs from 'node:fs/promises';
|
|
|
3
3
|
import { tmpdir } from 'node:os';
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import { fileURLToPath } from 'url';
|
|
6
|
-
const {
|
|
6
|
+
const { BB_BINARY_PATH, BB_SKIP_CLEANUP = '', TEMP_DIR = tmpdir(), BB_WORKING_DIRECTORY = '', BB_NUM_IVC_VERIFIERS = '8', BB_IVC_CONCURRENCY = '1', BB_CHONK_VERIFY_MAX_BATCH = '16', BB_CHONK_VERIFY_BATCH_CONCURRENCY = '6' } = process.env;
|
|
7
7
|
export const getBBConfig = async (logger)=>{
|
|
8
8
|
try {
|
|
9
|
-
const bbBinaryPath = BB_BINARY_PATH ?? path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../
|
|
9
|
+
const bbBinaryPath = BB_BINARY_PATH ?? path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../labs-aztec-toolchain/bin/bb-avm');
|
|
10
10
|
await fs.access(bbBinaryPath, fs.constants.R_OK);
|
|
11
11
|
let bbWorkingDirectory;
|
|
12
12
|
let directoryToCleanup;
|
|
@@ -24,15 +24,15 @@ export const getBBConfig = async (logger)=>{
|
|
|
24
24
|
'true'
|
|
25
25
|
].includes(BB_SKIP_CLEANUP);
|
|
26
26
|
const cleanup = bbSkipCleanup ? ()=>Promise.resolve() : ()=>tryRmDir(directoryToCleanup);
|
|
27
|
-
const numIvcVerifiers = Number(BB_NUM_IVC_VERIFIERS);
|
|
28
|
-
const ivcConcurrency = Number(BB_IVC_CONCURRENCY);
|
|
29
27
|
return {
|
|
30
28
|
bbSkipCleanup,
|
|
31
29
|
bbBinaryPath,
|
|
32
30
|
bbWorkingDirectory,
|
|
33
31
|
cleanup,
|
|
34
|
-
numConcurrentIVCVerifiers:
|
|
35
|
-
bbIVCConcurrency:
|
|
32
|
+
numConcurrentIVCVerifiers: Number(BB_NUM_IVC_VERIFIERS),
|
|
33
|
+
bbIVCConcurrency: Number(BB_IVC_CONCURRENCY),
|
|
34
|
+
bbChonkVerifyMaxBatch: Number(BB_CHONK_VERIFY_MAX_BATCH),
|
|
35
|
+
bbChonkVerifyConcurrency: Number(BB_CHONK_VERIFY_BATCH_CONCURRENCY)
|
|
36
36
|
};
|
|
37
37
|
} catch (err) {
|
|
38
38
|
logger.error(`Native BB not available, error: ${err}`);
|
|
@@ -7,15 +7,15 @@ import { Pool } from 'pg';
|
|
|
7
7
|
*/
|
|
8
8
|
export interface HADatabaseConfig {
|
|
9
9
|
/** PostgreSQL connection URL */
|
|
10
|
-
databaseUrl: string
|
|
10
|
+
databaseUrl: SecretValue<string>;
|
|
11
11
|
/** Node ID for HA coordination */
|
|
12
12
|
nodeId: string;
|
|
13
13
|
/** Enable HA signing */
|
|
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,MAAM,CAAC;
|
|
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"}
|
|
@@ -6,13 +6,13 @@ import { privateKeyToAccount } from 'viem/accounts';
|
|
|
6
6
|
/**
|
|
7
7
|
* Get database configuration from environment variables
|
|
8
8
|
*/ export function createHADatabaseConfig(nodeId) {
|
|
9
|
-
const databaseUrl = process.env.DATABASE_URL || 'postgresql://aztec:aztec@localhost:5432/aztec_ha_test';
|
|
9
|
+
const databaseUrl = new SecretValue(process.env.DATABASE_URL || 'postgresql://aztec:aztec@localhost:5432/aztec_ha_test');
|
|
10
10
|
return {
|
|
11
11
|
databaseUrl,
|
|
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"}
|