@aztec/end-to-end 3.0.0-nightly.20251022 → 3.0.0-nightly.20251024
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/bench/client_flows/benchmark.d.ts +3 -2
- package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.d.ts +7 -2
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +4 -1
- package/dest/bench/utils.d.ts +2 -2
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +5 -6
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +5 -1
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map +1 -1
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js +3 -1
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +3 -1
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map +1 -1
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +2 -1
- package/dest/e2e_deploy_contract/deploy_test.d.ts +8 -1
- package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
- package/dest/e2e_deploy_contract/deploy_test.js +3 -1
- package/dest/e2e_epochs/epochs_test.d.ts +3 -1
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +6 -1
- package/dest/e2e_fees/bridging_race.notest.js +2 -1
- package/dest/e2e_fees/fees_test.d.ts +3 -1
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +2 -1
- package/dest/e2e_l1_publisher/write_json.d.ts +3 -1
- package/dest/e2e_l1_publisher/write_json.d.ts.map +1 -1
- package/dest/e2e_l1_publisher/write_json.js +2 -2
- package/dest/e2e_multi_validator/utils.d.ts +1 -1
- package/dest/e2e_multi_validator/utils.d.ts.map +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.d.ts +4 -1
- package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.js +1 -1
- package/dest/e2e_p2p/inactivity_slash_test.d.ts +2 -2
- package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.d.ts +1 -1
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +2 -1
- package/dest/e2e_p2p/shared.d.ts +5 -2
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +6 -3
- package/dest/e2e_token_contract/token_contract_test.d.ts +3 -1
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/e2e_token_contract/token_contract_test.js +1 -1
- package/dest/fixtures/e2e_prover_test.d.ts +5 -2
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +20 -20
- 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_bb_config.d.ts +1 -1
- package/dest/fixtures/get_bb_config.d.ts.map +1 -1
- package/dest/fixtures/get_bb_config.js +1 -1
- package/dest/fixtures/setup_l1_contracts.d.ts +1 -1
- package/dest/fixtures/setup_l1_contracts.d.ts.map +1 -1
- package/dest/fixtures/snapshot_manager.d.ts +4 -1
- package/dest/fixtures/snapshot_manager.d.ts.map +1 -1
- package/dest/fixtures/snapshot_manager.js +3 -1
- package/dest/fixtures/token_utils.d.ts +3 -1
- package/dest/fixtures/token_utils.d.ts.map +1 -1
- package/dest/fixtures/token_utils.js +1 -1
- package/dest/fixtures/utils.d.ts +5 -1
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +4 -1
- package/dest/fixtures/web3signer.d.ts.map +1 -1
- package/dest/fixtures/web3signer.js +2 -1
- package/dest/quality_of_service/alert_checker.d.ts +1 -1
- package/dest/quality_of_service/alert_checker.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.d.ts +11 -1
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +4 -1
- package/dest/shared/gas_portal_test_harness.d.ts +5 -1
- package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
- package/dest/shared/gas_portal_test_harness.js +4 -1
- package/dest/shared/jest_setup.js +1 -1
- package/dest/shared/submit-transactions.d.ts +3 -1
- package/dest/shared/submit-transactions.d.ts.map +1 -1
- package/dest/shared/submit-transactions.js +2 -1
- package/dest/shared/uniswap_l1_l2.d.ts +3 -1
- package/dest/shared/uniswap_l1_l2.d.ts.map +1 -1
- package/dest/shared/uniswap_l1_l2.js +6 -3
- package/dest/simulators/lending_simulator.d.ts +2 -1
- package/dest/simulators/lending_simulator.d.ts.map +1 -1
- package/dest/simulators/lending_simulator.js +2 -1
- package/dest/simulators/token_simulator.d.ts +3 -1
- package/dest/simulators/token_simulator.d.ts.map +1 -1
- package/dest/simulators/token_simulator.js +1 -1
- package/dest/spartan/setup_test_wallets.d.ts +5 -2
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +14 -5
- package/dest/spartan/utils.d.ts.map +1 -1
- package/dest/spartan/utils.js +2 -1
- package/package.json +37 -37
- package/src/bench/client_flows/benchmark.ts +5 -5
- package/src/bench/client_flows/client_flows_benchmark.ts +6 -11
- package/src/bench/client_flows/data_extractor.ts +1 -1
- package/src/bench/utils.ts +4 -5
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +6 -9
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +3 -1
- package/src/e2e_deploy_contract/deploy_test.ts +8 -12
- package/src/e2e_epochs/epochs_test.ts +8 -10
- package/src/e2e_fees/bridging_race.notest.ts +3 -1
- package/src/e2e_fees/fees_test.ts +4 -1
- package/src/e2e_l1_publisher/write_json.ts +5 -3
- package/src/e2e_multi_validator/utils.ts +1 -1
- package/src/e2e_nested_contract/nested_contract_test.ts +4 -1
- package/src/e2e_p2p/inactivity_slash_test.ts +1 -1
- package/src/e2e_p2p/p2p_network.ts +2 -1
- package/src/e2e_p2p/shared.ts +11 -13
- package/src/e2e_token_contract/token_contract_test.ts +3 -1
- package/src/fixtures/e2e_prover_test.ts +28 -26
- package/src/fixtures/get_acvm_config.ts +1 -1
- package/src/fixtures/get_bb_config.ts +2 -1
- package/src/fixtures/setup_l1_contracts.ts +1 -1
- package/src/fixtures/snapshot_manager.ts +6 -11
- package/src/fixtures/token_utils.ts +4 -1
- package/src/fixtures/utils.ts +6 -12
- package/src/fixtures/web3signer.ts +2 -1
- package/src/quality_of_service/alert_checker.ts +1 -1
- package/src/shared/cross_chain_test_harness.ts +12 -12
- package/src/shared/gas_portal_test_harness.ts +7 -12
- package/src/shared/jest_setup.ts +1 -1
- package/src/shared/submit-transactions.ts +5 -1
- package/src/shared/uniswap_l1_l2.ts +8 -10
- package/src/simulators/lending_simulator.ts +2 -1
- package/src/simulators/token_simulator.ts +4 -1
- package/src/spartan/setup_test_wallets.ts +20 -18
- package/src/spartan/utils.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"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"}
|
package/dest/spartan/utils.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { createLogger
|
|
1
|
+
import { createLogger } from '@aztec/aztec.js/log';
|
|
2
2
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
3
3
|
import { schemas } from '@aztec/foundation/schemas';
|
|
4
|
+
import { sleep } from '@aztec/foundation/sleep';
|
|
4
5
|
import { createAztecNodeAdminClient, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
|
|
5
6
|
import { exec, execSync, spawn } from 'child_process';
|
|
6
7
|
import path from 'path';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "3.0.0-nightly.
|
|
3
|
+
"version": "3.0.0-nightly.20251024",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,42 +25,42 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "3.0.0-nightly.
|
|
29
|
-
"@aztec/archiver": "3.0.0-nightly.
|
|
30
|
-
"@aztec/aztec": "3.0.0-nightly.
|
|
31
|
-
"@aztec/aztec-node": "3.0.0-nightly.
|
|
32
|
-
"@aztec/aztec.js": "3.0.0-nightly.
|
|
33
|
-
"@aztec/bb-prover": "3.0.0-nightly.
|
|
34
|
-
"@aztec/blob-lib": "3.0.0-nightly.
|
|
35
|
-
"@aztec/blob-sink": "3.0.0-nightly.
|
|
36
|
-
"@aztec/bot": "3.0.0-nightly.
|
|
37
|
-
"@aztec/cli": "3.0.0-nightly.
|
|
38
|
-
"@aztec/constants": "3.0.0-nightly.
|
|
39
|
-
"@aztec/entrypoints": "3.0.0-nightly.
|
|
40
|
-
"@aztec/epoch-cache": "3.0.0-nightly.
|
|
41
|
-
"@aztec/ethereum": "3.0.0-nightly.
|
|
42
|
-
"@aztec/foundation": "3.0.0-nightly.
|
|
43
|
-
"@aztec/kv-store": "3.0.0-nightly.
|
|
44
|
-
"@aztec/l1-artifacts": "3.0.0-nightly.
|
|
45
|
-
"@aztec/merkle-tree": "3.0.0-nightly.
|
|
46
|
-
"@aztec/node-keystore": "3.0.0-nightly.
|
|
47
|
-
"@aztec/noir-contracts.js": "3.0.0-nightly.
|
|
48
|
-
"@aztec/noir-noirc_abi": "3.0.0-nightly.
|
|
49
|
-
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.
|
|
50
|
-
"@aztec/noir-test-contracts.js": "3.0.0-nightly.
|
|
51
|
-
"@aztec/p2p": "3.0.0-nightly.
|
|
52
|
-
"@aztec/protocol-contracts": "3.0.0-nightly.
|
|
53
|
-
"@aztec/prover-client": "3.0.0-nightly.
|
|
54
|
-
"@aztec/prover-node": "3.0.0-nightly.
|
|
55
|
-
"@aztec/pxe": "3.0.0-nightly.
|
|
56
|
-
"@aztec/sequencer-client": "3.0.0-nightly.
|
|
57
|
-
"@aztec/simulator": "3.0.0-nightly.
|
|
58
|
-
"@aztec/slasher": "3.0.0-nightly.
|
|
59
|
-
"@aztec/stdlib": "3.0.0-nightly.
|
|
60
|
-
"@aztec/telemetry-client": "3.0.0-nightly.
|
|
61
|
-
"@aztec/test-wallet": "3.0.0-nightly.
|
|
62
|
-
"@aztec/validator-client": "3.0.0-nightly.
|
|
63
|
-
"@aztec/world-state": "3.0.0-nightly.
|
|
28
|
+
"@aztec/accounts": "3.0.0-nightly.20251024",
|
|
29
|
+
"@aztec/archiver": "3.0.0-nightly.20251024",
|
|
30
|
+
"@aztec/aztec": "3.0.0-nightly.20251024",
|
|
31
|
+
"@aztec/aztec-node": "3.0.0-nightly.20251024",
|
|
32
|
+
"@aztec/aztec.js": "3.0.0-nightly.20251024",
|
|
33
|
+
"@aztec/bb-prover": "3.0.0-nightly.20251024",
|
|
34
|
+
"@aztec/blob-lib": "3.0.0-nightly.20251024",
|
|
35
|
+
"@aztec/blob-sink": "3.0.0-nightly.20251024",
|
|
36
|
+
"@aztec/bot": "3.0.0-nightly.20251024",
|
|
37
|
+
"@aztec/cli": "3.0.0-nightly.20251024",
|
|
38
|
+
"@aztec/constants": "3.0.0-nightly.20251024",
|
|
39
|
+
"@aztec/entrypoints": "3.0.0-nightly.20251024",
|
|
40
|
+
"@aztec/epoch-cache": "3.0.0-nightly.20251024",
|
|
41
|
+
"@aztec/ethereum": "3.0.0-nightly.20251024",
|
|
42
|
+
"@aztec/foundation": "3.0.0-nightly.20251024",
|
|
43
|
+
"@aztec/kv-store": "3.0.0-nightly.20251024",
|
|
44
|
+
"@aztec/l1-artifacts": "3.0.0-nightly.20251024",
|
|
45
|
+
"@aztec/merkle-tree": "3.0.0-nightly.20251024",
|
|
46
|
+
"@aztec/node-keystore": "3.0.0-nightly.20251024",
|
|
47
|
+
"@aztec/noir-contracts.js": "3.0.0-nightly.20251024",
|
|
48
|
+
"@aztec/noir-noirc_abi": "3.0.0-nightly.20251024",
|
|
49
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251024",
|
|
50
|
+
"@aztec/noir-test-contracts.js": "3.0.0-nightly.20251024",
|
|
51
|
+
"@aztec/p2p": "3.0.0-nightly.20251024",
|
|
52
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251024",
|
|
53
|
+
"@aztec/prover-client": "3.0.0-nightly.20251024",
|
|
54
|
+
"@aztec/prover-node": "3.0.0-nightly.20251024",
|
|
55
|
+
"@aztec/pxe": "3.0.0-nightly.20251024",
|
|
56
|
+
"@aztec/sequencer-client": "3.0.0-nightly.20251024",
|
|
57
|
+
"@aztec/simulator": "3.0.0-nightly.20251024",
|
|
58
|
+
"@aztec/slasher": "3.0.0-nightly.20251024",
|
|
59
|
+
"@aztec/stdlib": "3.0.0-nightly.20251024",
|
|
60
|
+
"@aztec/telemetry-client": "3.0.0-nightly.20251024",
|
|
61
|
+
"@aztec/test-wallet": "3.0.0-nightly.20251024",
|
|
62
|
+
"@aztec/validator-client": "3.0.0-nightly.20251024",
|
|
63
|
+
"@aztec/world-state": "3.0.0-nightly.20251024",
|
|
64
64
|
"@iarna/toml": "^2.2.5",
|
|
65
65
|
"@jest/globals": "^30.0.0",
|
|
66
66
|
"@noble/curves": "=1.0.0",
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {
|
|
2
2
|
ContractFunctionInteraction,
|
|
3
3
|
DeployMethod,
|
|
4
|
-
DeployOptions,
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
} from '@aztec/aztec.js';
|
|
4
|
+
type DeployOptions,
|
|
5
|
+
type ProfileInteractionOptions,
|
|
6
|
+
} from '@aztec/aztec.js/contracts';
|
|
7
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
8
8
|
import { createLogger } from '@aztec/foundation/log';
|
|
9
9
|
import { type PrivateExecutionStep, serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
|
|
10
10
|
import type { ProvingStats, ProvingTimings, SimulationStats, SimulationTimings } from '@aztec/stdlib/tx';
|
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
PrivateFeePaymentMethod,
|
|
8
|
-
SponsoredFeePaymentMethod,
|
|
9
|
-
type Wallet,
|
|
10
|
-
createLogger,
|
|
11
|
-
} from '@aztec/aztec.js';
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
|
|
3
|
+
import { type FeePaymentMethod, PrivateFeePaymentMethod, SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee';
|
|
4
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
5
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
6
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
12
7
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
13
8
|
import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
|
|
14
9
|
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Logger } from '@aztec/aztec.js';
|
|
1
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
2
2
|
import { BBNativePrivateKernelProver } from '@aztec/bb-prover/client/native';
|
|
3
3
|
import { BBWASMBundlePrivateKernelProver } from '@aztec/bb-prover/client/wasm/bundle';
|
|
4
4
|
import { createLogger, logger } from '@aztec/foundation/log';
|
package/src/bench/utils.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AztecNodeService } from '@aztec/aztec-node';
|
|
2
|
-
import { BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js';
|
|
2
|
+
import { BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js/contracts';
|
|
3
3
|
import { mean, stdDev, times } from '@aztec/foundation/collection';
|
|
4
4
|
import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
|
|
5
5
|
import type { MetricsType } from '@aztec/telemetry-client';
|
|
@@ -129,18 +129,17 @@ function makeCall(
|
|
|
129
129
|
* @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
|
|
130
130
|
* @returns Array of sent txs.
|
|
131
131
|
*/
|
|
132
|
-
export
|
|
132
|
+
export function sendTxs(
|
|
133
133
|
txCount: number,
|
|
134
134
|
context: EndToEndContext,
|
|
135
135
|
contract: BenchmarkingContract,
|
|
136
136
|
heavyPublicCompute: boolean = false,
|
|
137
|
-
):
|
|
137
|
+
): SentTx[] {
|
|
138
138
|
const calls = times(txCount, index => makeCall(index, context, contract, heavyPublicCompute));
|
|
139
139
|
context.logger.info(`Creating ${txCount} txs`);
|
|
140
140
|
const [from] = context.accounts;
|
|
141
|
-
const provenTxs = await Promise.all(calls.map(call => call.prove({ from })));
|
|
142
141
|
context.logger.info(`Sending ${txCount} txs`);
|
|
143
|
-
return
|
|
142
|
+
return calls.map(call => call.send({ from }));
|
|
144
143
|
}
|
|
145
144
|
|
|
146
145
|
export async function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpts?: WaitOpts) {
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
computeSecretHash,
|
|
8
|
-
createLogger,
|
|
9
|
-
} from '@aztec/aztec.js';
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { computeSecretHash } from '@aztec/aztec.js/crypto';
|
|
3
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
4
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
5
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
6
|
+
import type { TxHash } from '@aztec/aztec.js/tx';
|
|
10
7
|
import type { CheatCodes } from '@aztec/aztec/testing';
|
|
11
8
|
import type { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
12
9
|
import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { AztecNodeConfig } from '@aztec/aztec-node';
|
|
2
|
-
import { AztecAddress,
|
|
2
|
+
import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
|
|
3
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
4
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
3
5
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
4
6
|
import {
|
|
5
7
|
type DeployL1ContractsArgs,
|
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
type Wallet,
|
|
10
|
-
createLogger,
|
|
11
|
-
getContractInstanceFromInstantiationParams,
|
|
12
|
-
} from '@aztec/aztec.js';
|
|
1
|
+
import type { ContractArtifact } from '@aztec/aztec.js/abi';
|
|
2
|
+
import type { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
3
|
+
import { type ContractBase, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
|
|
4
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
5
|
+
import type { PublicKeys } from '@aztec/aztec.js/keys';
|
|
6
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
7
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
8
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
13
9
|
import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
|
|
14
10
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
15
11
|
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
getTimestampRangeForEpoch,
|
|
9
|
-
retryUntil,
|
|
10
|
-
sleep,
|
|
11
|
-
} from '@aztec/aztec.js';
|
|
2
|
+
import { getTimestampRangeForEpoch } from '@aztec/aztec.js/block';
|
|
3
|
+
import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
|
|
4
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
5
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
6
|
+
import { MerkleTreeId } from '@aztec/aztec.js/trees';
|
|
7
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
12
8
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
13
9
|
import { DefaultL1ContractsConfig, type ExtendedViemWalletClient, createExtendedL1Client } from '@aztec/ethereum';
|
|
14
10
|
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
@@ -16,6 +12,8 @@ import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp, withD
|
|
|
16
12
|
import { SecretValue } from '@aztec/foundation/config';
|
|
17
13
|
import { randomBytes } from '@aztec/foundation/crypto';
|
|
18
14
|
import { withLogNameSuffix } from '@aztec/foundation/log';
|
|
15
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
16
|
+
import { sleep } from '@aztec/foundation/sleep';
|
|
19
17
|
import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
|
|
20
18
|
import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
|
|
21
19
|
import { ProverNode, type ProverNodeConfig, ProverNodePublisher } from '@aztec/prover-node';
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
|
|
2
|
-
import { Fr
|
|
2
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
3
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
3
4
|
import { Fq } from '@aztec/foundation/fields';
|
|
5
|
+
import { sleep } from '@aztec/foundation/sleep';
|
|
4
6
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
7
|
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
6
8
|
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
3
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
2
4
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
3
5
|
import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client } from '@aztec/ethereum';
|
|
4
6
|
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
5
7
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
8
|
+
import { sleep } from '@aztec/foundation/sleep';
|
|
6
9
|
import { TestERC20Abi } from '@aztec/l1-artifacts';
|
|
7
10
|
import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
|
|
8
11
|
import { FPCContract } from '@aztec/noir-contracts.js/FPC';
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { AztecAddress
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import type { L2Block } from '@aztec/aztec.js/block';
|
|
3
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
2
4
|
import { BatchedBlob, Blob } from '@aztec/blob-lib';
|
|
3
5
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
6
|
|
|
@@ -32,12 +34,12 @@ export async function writeJson(
|
|
|
32
34
|
|
|
33
35
|
const jsonObject = {
|
|
34
36
|
populate: {
|
|
35
|
-
l1ToL2Content: l1ToL2Content.map(asHex),
|
|
37
|
+
l1ToL2Content: l1ToL2Content.map(value => asHex(value)),
|
|
36
38
|
recipient: asHex(recipientAddress.toField()),
|
|
37
39
|
sender: deployerAddress,
|
|
38
40
|
},
|
|
39
41
|
messages: {
|
|
40
|
-
l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(asHex),
|
|
42
|
+
l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(value => asHex(value)),
|
|
41
43
|
},
|
|
42
44
|
block: {
|
|
43
45
|
// The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
2
|
import { getAddressFromPrivateKey } from '@aztec/ethereum';
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import type { EthPrivateKey } from '@aztec/node-keystore';
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import { AztecAddress
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
3
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
4
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
2
5
|
import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
|
|
3
6
|
import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
|
|
4
7
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { InitialAccountData } from '@aztec/accounts/testing';
|
|
2
2
|
import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
|
|
3
|
-
import { AztecAddress, EthAddress
|
|
3
|
+
import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
|
|
4
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
4
5
|
import {
|
|
5
6
|
type EmpireSlashingProposerContract,
|
|
6
7
|
type ExtendedViemWalletClient,
|
package/src/e2e_p2p/shared.ts
CHANGED
|
@@ -1,18 +1,14 @@
|
|
|
1
1
|
import type { InitialAccountData } from '@aztec/accounts/testing';
|
|
2
2
|
import type { AztecNodeService } from '@aztec/aztec-node';
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
type SentTx,
|
|
9
|
-
TxStatus,
|
|
10
|
-
getContractInstanceFromInstantiationParams,
|
|
11
|
-
retryUntil,
|
|
12
|
-
} from '@aztec/aztec.js';
|
|
3
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
4
|
+
import { type SentTx, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
|
|
5
|
+
import { Fr } from '@aztec/aztec.js/fields';
|
|
6
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
7
|
+
import { Tx, TxStatus } from '@aztec/aztec.js/tx';
|
|
13
8
|
import type { RollupCheatCodes } from '@aztec/aztec/testing';
|
|
14
9
|
import type { EmpireSlashingProposerContract, RollupContract, TallySlashingProposerContract } from '@aztec/ethereum';
|
|
15
10
|
import { timesAsync, unique } from '@aztec/foundation/collection';
|
|
11
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
16
12
|
import { pluralize } from '@aztec/foundation/string';
|
|
17
13
|
import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
|
|
18
14
|
import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
|
|
@@ -20,7 +16,7 @@ import { getPXEConfig, getPXEConfig as getRpcConfig } from '@aztec/pxe/server';
|
|
|
20
16
|
import { getRoundForOffense } from '@aztec/slasher';
|
|
21
17
|
import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
|
|
22
18
|
import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
|
|
23
|
-
import { TestWallet } from '@aztec/test-wallet/server';
|
|
19
|
+
import { TestWallet, proveInteraction } from '@aztec/test-wallet/server';
|
|
24
20
|
|
|
25
21
|
import { submitTxsTo } from '../shared/submit-transactions.js';
|
|
26
22
|
|
|
@@ -73,7 +69,7 @@ export async function prepareTransactions(
|
|
|
73
69
|
node: AztecNodeService,
|
|
74
70
|
numTxs: number,
|
|
75
71
|
fundedAccount: InitialAccountData,
|
|
76
|
-
): Promise<
|
|
72
|
+
): Promise<Tx[]> {
|
|
77
73
|
const rpcConfig = getRpcConfig();
|
|
78
74
|
rpcConfig.proverEnabled = false;
|
|
79
75
|
|
|
@@ -87,7 +83,9 @@ export async function prepareTransactions(
|
|
|
87
83
|
const contract = await TestContract.at(testContractInstance.address, wallet);
|
|
88
84
|
|
|
89
85
|
return timesAsync(numTxs, async () => {
|
|
90
|
-
const tx = await contract.methods.emit_nullifier(Fr.random())
|
|
86
|
+
const tx = await proveInteraction(wallet, contract.methods.emit_nullifier(Fr.random()), {
|
|
87
|
+
from: fundedAccountManager.address,
|
|
88
|
+
});
|
|
91
89
|
const txHash = tx.getTxHash();
|
|
92
90
|
logger.info(`Tx prepared with hash ${txHash}`);
|
|
93
91
|
return tx;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { AztecAddress
|
|
1
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
3
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
2
4
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
3
5
|
import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
|
|
4
6
|
import type { TestWallet } from '@aztec/test-wallet/server';
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { InitialAccountData } from '@aztec/accounts/testing';
|
|
2
2
|
import { type Archiver, createArchiver } from '@aztec/archiver';
|
|
3
|
-
import { AztecAddress,
|
|
3
|
+
import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
|
|
4
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
5
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
4
6
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
5
7
|
import {
|
|
6
8
|
BBCircuitVerifier,
|
|
@@ -56,6 +58,7 @@ export class FullProverTest {
|
|
|
56
58
|
private snapshotManager: ISnapshotManager;
|
|
57
59
|
logger: Logger;
|
|
58
60
|
wallet!: TestWallet;
|
|
61
|
+
provenWallet!: TestWallet;
|
|
59
62
|
accounts: AztecAddress[] = [];
|
|
60
63
|
deployedAccounts!: InitialAccountData[];
|
|
61
64
|
fakeProofsAsset!: TokenContract;
|
|
@@ -68,7 +71,7 @@ export class FullProverTest {
|
|
|
68
71
|
private bbConfigCleanup?: () => Promise<void>;
|
|
69
72
|
private acvmConfigCleanup?: () => Promise<void>;
|
|
70
73
|
circuitProofVerifier?: ClientProtocolCircuitVerifier;
|
|
71
|
-
|
|
74
|
+
provenAsset!: TokenContract;
|
|
72
75
|
private context!: SubsystemsContext;
|
|
73
76
|
private proverNode!: ProverNode;
|
|
74
77
|
private simulatedProverNode!: ProverNode;
|
|
@@ -207,32 +210,31 @@ export class FullProverTest {
|
|
|
207
210
|
await this.context.cheatCodes.rollup.markAsProven();
|
|
208
211
|
|
|
209
212
|
this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
await provenWallet.registerContract(this.fakeProofsAsset);
|
|
223
|
-
|
|
224
|
-
for (let i = 0; i < 2; i++) {
|
|
225
|
-
await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
|
|
226
|
-
await this.wallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
|
|
227
|
-
}
|
|
213
|
+
const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEAndGetWallet(
|
|
214
|
+
this.aztecNode,
|
|
215
|
+
{
|
|
216
|
+
proverEnabled: this.realProofs,
|
|
217
|
+
bbBinaryPath: bbConfig?.bbBinaryPath,
|
|
218
|
+
bbWorkingDirectory: bbConfig?.bbWorkingDirectory,
|
|
219
|
+
},
|
|
220
|
+
undefined,
|
|
221
|
+
true,
|
|
222
|
+
);
|
|
223
|
+
this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
|
|
224
|
+
await provenWallet.registerContract(this.fakeProofsAsset);
|
|
228
225
|
|
|
229
|
-
|
|
230
|
-
this.
|
|
231
|
-
|
|
232
|
-
teardown: provenTeardown,
|
|
233
|
-
});
|
|
234
|
-
this.provenAssets.push(asset);
|
|
226
|
+
for (let i = 0; i < 2; i++) {
|
|
227
|
+
await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
|
|
228
|
+
await this.wallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
|
|
235
229
|
}
|
|
230
|
+
|
|
231
|
+
const asset = await TokenContract.at(this.fakeProofsAsset.address, provenWallet);
|
|
232
|
+
this.provenComponents.push({
|
|
233
|
+
wallet: provenWallet,
|
|
234
|
+
teardown: provenTeardown,
|
|
235
|
+
});
|
|
236
|
+
this.provenAsset = asset;
|
|
237
|
+
this.provenWallet = provenWallet;
|
|
236
238
|
this.logger.info(`Full prover PXE started`);
|
|
237
239
|
|
|
238
240
|
// Shutdown the current, simulated prover node
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
2
2
|
import type { BBConfig } from '@aztec/bb-prover';
|
|
3
3
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
4
4
|
|
|
5
5
|
import fs from 'node:fs/promises';
|
|
6
6
|
import { tmpdir } from 'node:os';
|
|
7
7
|
import path from 'path';
|
|
8
|
+
import { fileURLToPath } from 'url';
|
|
8
9
|
|
|
9
10
|
const {
|
|
10
11
|
BB_RELEASE_DIR = 'barretenberg/cpp/build/bin',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Logger } from '@aztec/aztec.js';
|
|
1
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
2
2
|
import { type DeployL1ContractsArgs, type L1ContractsConfig, deployL1Contracts } from '@aztec/ethereum';
|
|
3
3
|
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
4
4
|
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
|
|
2
2
|
import { type InitialAccountData, generateSchnorrAccounts } from '@aztec/accounts/testing';
|
|
3
3
|
import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
BatchCall,
|
|
8
|
-
type ContractFunctionInteraction,
|
|
9
|
-
EthAddress,
|
|
10
|
-
type Logger,
|
|
11
|
-
type Wallet,
|
|
12
|
-
getContractClassFromArtifact,
|
|
13
|
-
waitForProven,
|
|
14
|
-
} from '@aztec/aztec.js';
|
|
4
|
+
import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
|
|
5
|
+
import { getContractClassFromArtifact } from '@aztec/aztec.js/contracts';
|
|
6
|
+
import { BatchCall, type ContractFunctionInteraction, waitForProven } from '@aztec/aztec.js/contracts';
|
|
15
7
|
import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
|
|
8
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
9
|
+
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
10
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
16
11
|
import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
|
|
17
12
|
import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/server';
|
|
18
13
|
import {
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
2
|
+
import { BatchCall } from '@aztec/aztec.js/contracts';
|
|
3
|
+
import type { Logger } from '@aztec/aztec.js/log';
|
|
4
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
2
5
|
import { TokenContract } from '@aztec/noir-contracts.js/Token';
|
|
3
6
|
|
|
4
7
|
export async function deployToken(wallet: Wallet, admin: AztecAddress, initialAdminBalance: bigint, logger: Logger) {
|
package/src/fixtures/utils.ts
CHANGED
|
@@ -2,19 +2,12 @@ import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
|
|
|
2
2
|
import { type InitialAccountData, generateSchnorrAccounts, getInitialTestAccountsData } from '@aztec/accounts/testing';
|
|
3
3
|
import { type Archiver, createArchiver } from '@aztec/archiver';
|
|
4
4
|
import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
|
|
5
|
-
import {
|
|
6
|
-
|
|
7
|
-
type AztecNode,
|
|
8
|
-
BatchCall,
|
|
9
|
-
type ContractMethod,
|
|
10
|
-
type Logger,
|
|
11
|
-
type Wallet,
|
|
12
|
-
createAztecNodeClient,
|
|
13
|
-
createLogger,
|
|
14
|
-
sleep,
|
|
15
|
-
waitForNode,
|
|
16
|
-
} from '@aztec/aztec.js';
|
|
5
|
+
import { AztecAddress } from '@aztec/aztec.js/addresses';
|
|
6
|
+
import { BatchCall, type ContractMethod } from '@aztec/aztec.js/contracts';
|
|
17
7
|
import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
|
|
8
|
+
import { type Logger, createLogger } from '@aztec/aztec.js/log';
|
|
9
|
+
import { type AztecNode, createAztecNodeClient, waitForNode } from '@aztec/aztec.js/node';
|
|
10
|
+
import type { Wallet } from '@aztec/aztec.js/wallet';
|
|
18
11
|
import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
|
|
19
12
|
import { createBlobSinkClient } from '@aztec/blob-sink/client';
|
|
20
13
|
import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/server';
|
|
@@ -46,6 +39,7 @@ import { Fr } from '@aztec/foundation/fields';
|
|
|
46
39
|
import { tryRmDir } from '@aztec/foundation/fs';
|
|
47
40
|
import { withLogNameSuffix } from '@aztec/foundation/log';
|
|
48
41
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
42
|
+
import { sleep } from '@aztec/foundation/sleep';
|
|
49
43
|
import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
|
|
50
44
|
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
51
45
|
import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
|