@aztec/end-to-end 0.0.1-commit.0c875d939 → 0.0.1-commit.0ec55a70b
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 +27 -0
- package/dest/bench/client_flows/client_flows_benchmark.d.ts +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +21 -28
- package/dest/bench/utils.d.ts +1 -1
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +6 -3
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +3 -2
- 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 +15 -15
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js +1 -1
- package/dest/e2e_epochs/epochs_test.d.ts +26 -7
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +113 -43
- package/dest/e2e_fees/fees_test.d.ts +1 -1
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +17 -10
- package/dest/e2e_nested_contract/nested_contract_test.d.ts +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.js +4 -6
- package/dest/e2e_p2p/inactivity_slash_test.js +3 -3
- package/dest/e2e_p2p/p2p_network.d.ts +13 -11
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +70 -34
- package/dest/e2e_p2p/reqresp/utils.d.ts +3 -3
- package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -1
- package/dest/e2e_p2p/reqresp/utils.js +49 -9
- package/dest/e2e_p2p/shared.d.ts +25 -7
- package/dest/e2e_p2p/shared.d.ts.map +1 -1
- package/dest/e2e_p2p/shared.js +69 -49
- package/dest/e2e_token_contract/token_contract_test.d.ts +1 -1
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/e2e_token_contract/token_contract_test.js +11 -11
- 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 +6 -5
- package/dest/fixtures/e2e_prover_test.d.ts.map +1 -1
- package/dest/fixtures/e2e_prover_test.js +37 -49
- package/dest/fixtures/elu_monitor.d.ts +21 -0
- package/dest/fixtures/elu_monitor.d.ts.map +1 -0
- package/dest/fixtures/elu_monitor.js +102 -0
- package/dest/fixtures/fixtures.d.ts +16 -1
- package/dest/fixtures/fixtures.d.ts.map +1 -1
- package/dest/fixtures/fixtures.js +16 -0
- 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 +5 -5
- package/dest/fixtures/ha_setup.d.ts +2 -2
- package/dest/fixtures/ha_setup.d.ts.map +1 -1
- package/dest/fixtures/ha_setup.js +1 -1
- 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 +39 -0
- package/dest/fixtures/setup.d.ts +45 -17
- package/dest/fixtures/setup.d.ts.map +1 -1
- package/dest/fixtures/setup.js +89 -100
- package/dest/fixtures/setup_p2p_test.d.ts +10 -7
- package/dest/fixtures/setup_p2p_test.d.ts.map +1 -1
- package/dest/fixtures/setup_p2p_test.js +18 -15
- package/dest/fixtures/token_utils.d.ts +2 -2
- package/dest/fixtures/token_utils.d.ts.map +1 -1
- package/dest/fixtures/token_utils.js +5 -7
- 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/legacy-jest-resolver.d.cts +3 -0
- package/dest/legacy-jest-resolver.d.cts.map +1 -0
- package/dest/shared/cross_chain_test_harness.d.ts +1 -1
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +13 -13
- package/dest/shared/gas_portal_test_harness.js +3 -3
- package/dest/shared/jest_setup.js +41 -1
- package/dest/shared/submit-transactions.js +1 -1
- 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 +14 -21
- package/dest/simulators/lending_simulator.d.ts +1 -1
- package/dest/simulators/lending_simulator.d.ts.map +1 -1
- package/dest/simulators/lending_simulator.js +4 -4
- 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/spartan/setup_test_wallets.d.ts +11 -2
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +97 -38
- package/dest/spartan/tx_metrics.d.ts +1 -1
- package/dest/spartan/tx_metrics.d.ts.map +1 -1
- package/dest/spartan/tx_metrics.js +19 -3
- package/dest/spartan/utils/bot.d.ts +3 -2
- package/dest/spartan/utils/bot.d.ts.map +1 -1
- package/dest/spartan/utils/bot.js +2 -1
- package/dest/spartan/utils/config.d.ts +7 -1
- 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 +4 -2
- package/dest/spartan/utils/index.d.ts.map +1 -1
- package/dest/spartan/utils/index.js +5 -1
- package/dest/spartan/utils/k8s.d.ts +3 -1
- package/dest/spartan/utils/k8s.d.ts.map +1 -1
- package/dest/spartan/utils/k8s.js +6 -0
- package/dest/spartan/utils/nodes.d.ts +4 -5
- package/dest/spartan/utils/nodes.d.ts.map +1 -1
- package/dest/spartan/utils/nodes.js +9 -9
- 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 +24 -23
- package/dest/test-wallet/test_wallet.d.ts.map +1 -1
- package/dest/test-wallet/test_wallet.js +124 -83
- package/dest/test-wallet/wallet_worker_script.d.ts +2 -0
- package/dest/test-wallet/wallet_worker_script.d.ts.map +1 -0
- package/dest/test-wallet/wallet_worker_script.js +48 -0
- package/dest/test-wallet/worker_wallet.d.ts +52 -0
- package/dest/test-wallet/worker_wallet.d.ts.map +1 -0
- package/dest/test-wallet/worker_wallet.js +151 -0
- package/dest/test-wallet/worker_wallet_schema.d.ts +279 -0
- package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -0
- package/dest/test-wallet/worker_wallet_schema.js +10 -0
- package/package.json +43 -44
- package/src/bench/client_flows/client_flows_benchmark.ts +29 -12
- package/src/bench/utils.ts +7 -2
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +21 -20
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +1 -1
- package/src/e2e_epochs/epochs_test.ts +131 -70
- package/src/e2e_fees/fees_test.ts +18 -9
- package/src/e2e_nested_contract/nested_contract_test.ts +6 -4
- package/src/e2e_p2p/inactivity_slash_test.ts +3 -3
- package/src/e2e_p2p/p2p_network.ts +88 -44
- package/src/e2e_p2p/reqresp/utils.ts +59 -9
- package/src/e2e_p2p/shared.ts +88 -63
- package/src/e2e_token_contract/token_contract_test.ts +16 -8
- package/src/fixtures/authwit_proxy.ts +4 -0
- package/src/fixtures/dumps/epoch_proof_result.json +1 -1
- package/src/fixtures/e2e_prover_test.ts +43 -52
- package/src/fixtures/elu_monitor.ts +126 -0
- package/src/fixtures/fixtures.ts +32 -0
- package/src/fixtures/get_bb_config.ts +7 -6
- package/src/fixtures/ha_setup.ts +4 -2
- package/src/fixtures/schnorr_hardcoded_account_contract.ts +49 -0
- package/src/fixtures/setup.ts +126 -133
- package/src/fixtures/setup_p2p_test.ts +17 -25
- package/src/fixtures/token_utils.ts +3 -3
- package/src/forward-compatibility/wallet_rpc_client.ts +14 -0
- package/src/forward-compatibility/wallet_service.ts +104 -0
- package/src/guides/up_quick_start.sh +0 -2
- package/src/legacy-jest-resolver.cjs +135 -0
- package/src/shared/cross_chain_test_harness.ts +13 -9
- package/src/shared/gas_portal_test_harness.ts +1 -2
- package/src/shared/jest_setup.ts +51 -1
- package/src/shared/submit-transactions.ts +1 -1
- package/src/shared/uniswap_l1_l2.ts +35 -32
- package/src/simulators/lending_simulator.ts +8 -4
- package/src/simulators/token_simulator.ts +6 -2
- package/src/spartan/setup_test_wallets.ts +138 -31
- package/src/spartan/tx_metrics.ts +17 -5
- package/src/spartan/utils/bot.ts +3 -0
- package/src/spartan/utils/config.ts +2 -0
- package/src/spartan/utils/index.ts +7 -0
- package/src/spartan/utils/k8s.ts +8 -0
- package/src/spartan/utils/nodes.ts +15 -10
- package/src/spartan/utils/pod_logs.ts +99 -0
- package/src/test-wallet/test_wallet.ts +152 -101
- package/src/test-wallet/wallet_worker_script.ts +60 -0
- package/src/test-wallet/worker_wallet.ts +214 -0
- package/src/test-wallet/worker_wallet_schema.ts +13 -0
|
@@ -173,7 +173,7 @@ export async function withSequencersAdmin<T>(env: TestConfig, fn: (node: AztecNo
|
|
|
173
173
|
if (statusRes.status !== 200) {
|
|
174
174
|
throw new Error(`Admin endpoint returned status ${statusRes.status}`);
|
|
175
175
|
}
|
|
176
|
-
const client = createAztecNodeAdminClient(url);
|
|
176
|
+
const client = createAztecNodeAdminClient(url, {}, undefined, env.AZTEC_ADMIN_API_KEY);
|
|
177
177
|
return { result: await fn(client), process };
|
|
178
178
|
} catch (err) {
|
|
179
179
|
// Kill the port-forward before retrying
|
|
@@ -255,21 +255,18 @@ export async function initHADb(namespace: string): Promise<void> {
|
|
|
255
255
|
}
|
|
256
256
|
|
|
257
257
|
/**
|
|
258
|
-
*
|
|
259
|
-
* Wired to env
|
|
258
|
+
* Sets probabilistic transaction dropping on validators and waits for rollout.
|
|
259
|
+
* Use probability=0 to disable. Wired to env var P2P_DROP_TX_CHANCE via Helm values.
|
|
260
260
|
*/
|
|
261
261
|
export async function setValidatorTxDrop({
|
|
262
262
|
namespace,
|
|
263
|
-
enabled,
|
|
264
263
|
probability,
|
|
265
264
|
logger: log,
|
|
266
265
|
}: {
|
|
267
266
|
namespace: string;
|
|
268
|
-
enabled: boolean;
|
|
269
267
|
probability: number;
|
|
270
268
|
logger: Logger;
|
|
271
269
|
}) {
|
|
272
|
-
const drop = enabled ? 'true' : 'false';
|
|
273
270
|
const prob = String(probability);
|
|
274
271
|
|
|
275
272
|
const selectors = ['app.kubernetes.io/name=validator', 'app.kubernetes.io/component=validator', 'app=validator'];
|
|
@@ -284,7 +281,7 @@ export async function setValidatorTxDrop({
|
|
|
284
281
|
if (names.length === 0) {
|
|
285
282
|
continue;
|
|
286
283
|
}
|
|
287
|
-
const cmd = `kubectl set env statefulset -l ${selector} -n ${namespace}
|
|
284
|
+
const cmd = `kubectl set env statefulset -l ${selector} -n ${namespace} P2P_DROP_TX_CHANCE=${prob}`;
|
|
288
285
|
log.info(`command: ${cmd}`);
|
|
289
286
|
await execAsync(cmd);
|
|
290
287
|
updated = true;
|
|
@@ -366,16 +363,24 @@ export async function enableValidatorDynamicBootNode(
|
|
|
366
363
|
*/
|
|
367
364
|
export async function rollAztecPods(namespace: string, clearState: boolean = false) {
|
|
368
365
|
// Pod components use 'validator', but StatefulSets and PVCs use 'sequencer-node' for validators
|
|
366
|
+
// RPC nodes have nodeType='rpc-node' in Helm values, so their component label is 'rpc-node' (not 'rpc')
|
|
369
367
|
const podComponents = [
|
|
370
368
|
'p2p-bootstrap',
|
|
371
369
|
'prover-node',
|
|
372
370
|
'prover-broker',
|
|
373
371
|
'prover-agent',
|
|
374
372
|
'sequencer-node',
|
|
375
|
-
'rpc',
|
|
373
|
+
'rpc-node',
|
|
374
|
+
'validator-ha-db',
|
|
375
|
+
];
|
|
376
|
+
const pvcComponents = [
|
|
377
|
+
'p2p-bootstrap',
|
|
378
|
+
'prover-node',
|
|
379
|
+
'prover-broker',
|
|
380
|
+
'sequencer-node',
|
|
381
|
+
'rpc-node',
|
|
376
382
|
'validator-ha-db',
|
|
377
383
|
];
|
|
378
|
-
const pvcComponents = ['p2p-bootstrap', 'prover-node', 'prover-broker', 'sequencer-node', 'rpc', 'validator-ha-db'];
|
|
379
384
|
// StatefulSet components that need to be scaled down before PVC deletion
|
|
380
385
|
// Note: validators use 'sequencer-node' as component label, not 'validator'
|
|
381
386
|
const statefulSetComponents = [
|
|
@@ -383,7 +388,7 @@ export async function rollAztecPods(namespace: string, clearState: boolean = fal
|
|
|
383
388
|
'prover-node',
|
|
384
389
|
'prover-broker',
|
|
385
390
|
'sequencer-node',
|
|
386
|
-
'rpc',
|
|
391
|
+
'rpc-node',
|
|
387
392
|
'validator-ha-db',
|
|
388
393
|
];
|
|
389
394
|
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
+
|
|
3
|
+
import { exec } from 'child_process';
|
|
4
|
+
import { promisify } from 'util';
|
|
5
|
+
|
|
6
|
+
import { getSequencers } from './nodes.js';
|
|
7
|
+
|
|
8
|
+
const execAsync = promisify(exec);
|
|
9
|
+
|
|
10
|
+
/** Parsed l2-block-built stats from a sequencer pod log line. */
|
|
11
|
+
export type BlockBuiltLogEntry = {
|
|
12
|
+
blockNumber: number;
|
|
13
|
+
txCount: number;
|
|
14
|
+
duration: number;
|
|
15
|
+
publicProcessDuration: number;
|
|
16
|
+
manaPerSec: number;
|
|
17
|
+
privateLogCount: number;
|
|
18
|
+
publicLogCount: number;
|
|
19
|
+
contractClassLogCount: number;
|
|
20
|
+
contractClassLogSize: number;
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
const FIELDS: (keyof BlockBuiltLogEntry)[] = [
|
|
24
|
+
'blockNumber',
|
|
25
|
+
'txCount',
|
|
26
|
+
'duration',
|
|
27
|
+
'publicProcessDuration',
|
|
28
|
+
'manaPerSec',
|
|
29
|
+
'privateLogCount',
|
|
30
|
+
'publicLogCount',
|
|
31
|
+
'contractClassLogCount',
|
|
32
|
+
'contractClassLogSize',
|
|
33
|
+
];
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Fetches l2-block-built log entries from sequencer pods for given block numbers.
|
|
37
|
+
* Queries all validator pods (only the proposer will have the log for a given block).
|
|
38
|
+
*
|
|
39
|
+
* @param namespace - Kubernetes namespace
|
|
40
|
+
* @param sinceTime - ISO 8601 timestamp to limit log search (e.g., from before block building was re-enabled)
|
|
41
|
+
* @param blockNumbers - Set of block numbers to filter for
|
|
42
|
+
* @param logger - Logger instance
|
|
43
|
+
* @returns Array of parsed BlockBuiltLogEntry, de-duplicated by blockNumber, sorted ascending
|
|
44
|
+
*/
|
|
45
|
+
export async function fetchBlockBuiltLogs(
|
|
46
|
+
namespace: string,
|
|
47
|
+
sinceTime: string,
|
|
48
|
+
blockNumbers: Set<number>,
|
|
49
|
+
logger: Logger,
|
|
50
|
+
): Promise<BlockBuiltLogEntry[]> {
|
|
51
|
+
const pods = await getSequencers(namespace);
|
|
52
|
+
const entriesByBlock = new Map<number, BlockBuiltLogEntry>();
|
|
53
|
+
|
|
54
|
+
// Subtract 60s from sinceTime to account for clock skew between test runner and k8s pods.
|
|
55
|
+
// Block number filtering ensures we only match the right blocks, so extra lines are harmless.
|
|
56
|
+
const sinceDate = new Date(new Date(sinceTime).getTime() - 60_000);
|
|
57
|
+
const sinceFlag = sinceDate.toISOString();
|
|
58
|
+
|
|
59
|
+
for (const pod of pods) {
|
|
60
|
+
try {
|
|
61
|
+
const cmd = `kubectl logs ${pod} -n ${namespace} -c aztec --since-time=${sinceFlag}`;
|
|
62
|
+
logger.info(`Fetching logs: ${cmd}`);
|
|
63
|
+
const { stdout } = await execAsync(cmd, { maxBuffer: 10 * 1024 * 1024 });
|
|
64
|
+
|
|
65
|
+
const lines = stdout.split('\n');
|
|
66
|
+
const matchingLines = lines.filter(l => l.includes('l2-block-built'));
|
|
67
|
+
logger.info(`Pod ${pod}: ${lines.length} log lines, ${matchingLines.length} contain l2-block-built`);
|
|
68
|
+
|
|
69
|
+
for (const line of matchingLines) {
|
|
70
|
+
try {
|
|
71
|
+
const parsed = JSON.parse(line);
|
|
72
|
+
if (parsed.eventName !== 'l2-block-built' || !blockNumbers.has(parsed.blockNumber)) {
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
75
|
+
if (entriesByBlock.has(parsed.blockNumber)) {
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
const entry: BlockBuiltLogEntry = {} as BlockBuiltLogEntry;
|
|
79
|
+
for (const field of FIELDS) {
|
|
80
|
+
entry[field] = parsed[field] ?? 0;
|
|
81
|
+
}
|
|
82
|
+
entriesByBlock.set(entry.blockNumber, entry);
|
|
83
|
+
logger.verbose(`Parsed l2-block-built log for block ${entry.blockNumber}`, entry);
|
|
84
|
+
} catch {
|
|
85
|
+
// Not valid JSON, skip
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
} catch (err) {
|
|
89
|
+
logger.warn(`Failed to fetch logs from pod ${pod}: ${err}`);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
if (entriesByBlock.size < blockNumbers.size) {
|
|
94
|
+
const missing = [...blockNumbers].filter(bn => !entriesByBlock.has(bn));
|
|
95
|
+
logger.warn(`Missing l2-block-built logs for block(s): ${missing.join(', ')}`);
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
return [...entriesByBlock.values()].sort((a, b) => a.blockNumber - b.blockNumber);
|
|
99
|
+
}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { EcdsaKAccountContract, EcdsaRAccountContract } from '@aztec/accounts/ecdsa';
|
|
2
2
|
import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/stub/ecdsa';
|
|
4
|
+
import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub/schnorr';
|
|
5
|
+
import { type Account, type AccountContract, NO_FROM } from '@aztec/aztec.js/account';
|
|
6
|
+
import type { CompleteAddress } from '@aztec/aztec.js/addresses';
|
|
5
7
|
import {
|
|
6
8
|
type CallIntent,
|
|
7
9
|
type ContractFunctionInteractionCallIntent,
|
|
@@ -13,10 +15,12 @@ import {
|
|
|
13
15
|
} from '@aztec/aztec.js/authorization';
|
|
14
16
|
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
15
17
|
import { AccountManager, type SendOptions } from '@aztec/aztec.js/wallet';
|
|
18
|
+
import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
16
19
|
import type { DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
|
|
20
|
+
import { DefaultEntrypoint } from '@aztec/entrypoints/default';
|
|
17
21
|
import { Fq, Fr } from '@aztec/foundation/curves/bn254';
|
|
18
22
|
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
19
|
-
import type {
|
|
23
|
+
import type { NotesFilter } from '@aztec/pxe/client/lazy';
|
|
20
24
|
import { type PXEConfig, getPXEConfig } from '@aztec/pxe/config';
|
|
21
25
|
import { PXE, type PXECreationOptions, createPXE } from '@aztec/pxe/server';
|
|
22
26
|
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
@@ -24,10 +28,19 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
|
24
28
|
import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
|
|
25
29
|
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
26
30
|
import type { NoteDao } from '@aztec/stdlib/note';
|
|
27
|
-
import
|
|
31
|
+
import {
|
|
32
|
+
type BlockHeader,
|
|
33
|
+
type ContractOverrides,
|
|
34
|
+
SimulationOverrides,
|
|
35
|
+
type TxExecutionRequest,
|
|
36
|
+
type TxHash,
|
|
37
|
+
type TxReceipt,
|
|
38
|
+
} from '@aztec/stdlib/tx';
|
|
28
39
|
import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
|
|
29
|
-
import { BaseWallet, type
|
|
40
|
+
import { BaseWallet, type SimulateViaEntrypointOptions } from '@aztec/wallet-sdk/base-wallet';
|
|
41
|
+
import type { AccountType } from '@aztec/wallets/embedded';
|
|
30
42
|
|
|
43
|
+
import { DEFAULT_MIN_FEE_PADDING } from '../fixtures/fixtures.js';
|
|
31
44
|
import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
32
45
|
|
|
33
46
|
/**
|
|
@@ -36,6 +49,7 @@ import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
|
36
49
|
export interface AccountData {
|
|
37
50
|
secret: Fr;
|
|
38
51
|
salt: Fr;
|
|
52
|
+
type?: AccountType;
|
|
39
53
|
contract: AccountContract;
|
|
40
54
|
}
|
|
41
55
|
|
|
@@ -50,6 +64,7 @@ export class TestWallet extends BaseWallet {
|
|
|
50
64
|
private readonly nodeRef: AztecNodeProxy,
|
|
51
65
|
) {
|
|
52
66
|
super(pxe, nodeRef);
|
|
67
|
+
this.minFeePadding = DEFAULT_MIN_FEE_PADDING;
|
|
53
68
|
}
|
|
54
69
|
|
|
55
70
|
static async create(
|
|
@@ -76,98 +91,118 @@ export class TestWallet extends BaseWallet {
|
|
|
76
91
|
|
|
77
92
|
createSchnorrAccount(secret: Fr, salt: Fr, signingKey?: Fq): Promise<AccountManager> {
|
|
78
93
|
signingKey = signingKey ?? deriveSigningKey(secret);
|
|
79
|
-
|
|
80
|
-
secret,
|
|
81
|
-
salt,
|
|
82
|
-
contract: new SchnorrAccountContract(signingKey),
|
|
83
|
-
};
|
|
84
|
-
return this.createAccount(accountData);
|
|
94
|
+
return this.createAccount({ secret, salt, type: 'schnorr', contract: new SchnorrAccountContract(signingKey) });
|
|
85
95
|
}
|
|
86
96
|
|
|
87
97
|
createECDSARAccount(secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager> {
|
|
88
|
-
|
|
98
|
+
return this.createAccount({
|
|
89
99
|
secret,
|
|
90
100
|
salt,
|
|
101
|
+
type: 'ecdsasecp256r1',
|
|
91
102
|
contract: new EcdsaRAccountContract(signingKey),
|
|
92
|
-
};
|
|
93
|
-
return this.createAccount(accountData);
|
|
103
|
+
});
|
|
94
104
|
}
|
|
95
105
|
|
|
96
106
|
createECDSAKAccount(secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager> {
|
|
97
|
-
|
|
107
|
+
return this.createAccount({
|
|
98
108
|
secret,
|
|
99
109
|
salt,
|
|
110
|
+
type: 'ecdsasecp256k1',
|
|
100
111
|
contract: new EcdsaKAccountContract(signingKey),
|
|
101
|
-
};
|
|
102
|
-
return this.createAccount(accountData);
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
async getFakeAccountDataFor(address: AztecAddress) {
|
|
106
|
-
const originalAccount = await this.getAccountFromAddress(address);
|
|
107
|
-
if (originalAccount instanceof SignerlessAccount) {
|
|
108
|
-
throw new Error(`Cannot create fake account data for SignerlessAccount at address: ${address}`);
|
|
109
|
-
}
|
|
110
|
-
const originalAddress = (originalAccount as Account).getCompleteAddress();
|
|
111
|
-
const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
|
|
112
|
-
if (!contractInstance) {
|
|
113
|
-
throw new Error(`No contract instance found for address: ${originalAddress.address}`);
|
|
114
|
-
}
|
|
115
|
-
const stubAccount = createStubAccount(originalAddress);
|
|
116
|
-
const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
|
|
117
|
-
salt: Fr.random(),
|
|
118
112
|
});
|
|
119
|
-
return {
|
|
120
|
-
account: stubAccount,
|
|
121
|
-
instance,
|
|
122
|
-
artifact: StubAccountContractArtifact,
|
|
123
|
-
};
|
|
124
113
|
}
|
|
125
|
-
protected accounts: Map<string, Account> = new Map();
|
|
126
114
|
|
|
127
115
|
/**
|
|
128
|
-
*
|
|
129
|
-
*
|
|
130
|
-
* When this flag is true, simulateViaEntrypoint constructs a request using a fake account
|
|
131
|
-
* (and accepts contract overrides on the input) and the PXE emulates kernel effects without
|
|
132
|
-
* generating kernel witnesses. When false, simulateViaEntrypoint defers to the standard
|
|
133
|
-
* simulation path via the real account entrypoint.
|
|
116
|
+
* Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
|
|
134
117
|
*/
|
|
135
|
-
|
|
118
|
+
protected async buildAccountOverrides(addresses: AztecAddress[]): Promise<ContractOverrides> {
|
|
119
|
+
const accounts = await this.getAccounts();
|
|
120
|
+
const contracts: ContractOverrides = {};
|
|
121
|
+
|
|
122
|
+
const filtered = accounts.filter(acc => addresses.some(addr => addr.equals(acc.item)));
|
|
123
|
+
|
|
124
|
+
for (const account of filtered) {
|
|
125
|
+
const address = account.item;
|
|
126
|
+
const originalAccount = await this.getAccountFromAddress(address);
|
|
127
|
+
const completeAddress = originalAccount.getCompleteAddress();
|
|
128
|
+
const contractInstance = await this.pxe.getContractInstance(completeAddress.address);
|
|
129
|
+
if (!contractInstance) {
|
|
130
|
+
throw new Error(
|
|
131
|
+
`No contract instance found for address: ${completeAddress.address} during account override building. This is a bug!`,
|
|
132
|
+
);
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
const stubArtifact = this.getStubArtifactFor(address);
|
|
136
|
+
const stubConstructorArgs =
|
|
137
|
+
this.getTypeFor(address) === 'schnorr' ? [Fr.ZERO, Fr.ZERO] : [Buffer.alloc(32), Buffer.alloc(32)];
|
|
138
|
+
const stubInstance = await getContractInstanceFromInstantiationParams(stubArtifact, {
|
|
139
|
+
salt: Fr.random(),
|
|
140
|
+
constructorArgs: stubConstructorArgs,
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
contracts[address.toString()] = {
|
|
144
|
+
instance: stubInstance,
|
|
145
|
+
artifact: stubArtifact,
|
|
146
|
+
};
|
|
147
|
+
}
|
|
136
148
|
|
|
137
|
-
|
|
138
|
-
this.simulatedSimulations = true;
|
|
149
|
+
return contracts;
|
|
139
150
|
}
|
|
140
151
|
|
|
141
|
-
|
|
142
|
-
|
|
152
|
+
protected accounts: Map<string, { account: Account; type: AccountType }> = new Map();
|
|
153
|
+
|
|
154
|
+
private getTypeFor(address: AztecAddress): AccountType {
|
|
155
|
+
return this.accounts.get(address.toString())?.type ?? 'schnorr';
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
private getStubArtifactFor(address: AztecAddress) {
|
|
159
|
+
return this.getTypeFor(address) === 'schnorr'
|
|
160
|
+
? StubSchnorrAccountContractArtifact
|
|
161
|
+
: StubEcdsaAccountContractArtifact;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
private getStubAccountFor(address: AztecAddress, completeAddress: CompleteAddress) {
|
|
165
|
+
return this.getTypeFor(address) === 'schnorr'
|
|
166
|
+
? createStubSchnorrAccount(completeAddress)
|
|
167
|
+
: createStubEcdsaAccount(completeAddress);
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
/**
|
|
171
|
+
* Controls how the test wallet simulates transactions:
|
|
172
|
+
* - `kernelless`: Skips kernel circuits but uses the real account contract. Default.
|
|
173
|
+
* - `kernelless-override`: Skips kernels and replaces the account with a stub that doesn't do authwit validation.
|
|
174
|
+
* - `full`: Uses real kernel circuits and real account contracts. Slow!
|
|
175
|
+
*/
|
|
176
|
+
private simulationMode: 'kernelless' | 'kernelless-override' | 'full' = 'kernelless';
|
|
177
|
+
|
|
178
|
+
setSimulationMode(mode: 'kernelless' | 'kernelless-override' | 'full') {
|
|
179
|
+
this.simulationMode = mode;
|
|
143
180
|
}
|
|
144
181
|
|
|
145
182
|
setMinFeePadding(value?: number) {
|
|
146
|
-
this.minFeePadding = value ??
|
|
183
|
+
this.minFeePadding = value ?? DEFAULT_MIN_FEE_PADDING;
|
|
147
184
|
}
|
|
148
185
|
|
|
149
186
|
protected getAccountFromAddress(address: AztecAddress): Promise<Account> {
|
|
150
|
-
|
|
151
|
-
if (address.equals(AztecAddress.ZERO)) {
|
|
152
|
-
account = new SignerlessAccount();
|
|
153
|
-
} else {
|
|
154
|
-
account = this.accounts.get(address?.toString() ?? '');
|
|
155
|
-
}
|
|
187
|
+
const entry = this.accounts.get(address?.toString() ?? '');
|
|
156
188
|
|
|
157
|
-
if (!
|
|
189
|
+
if (!entry) {
|
|
158
190
|
throw new Error(`Account not found in wallet for address: ${address}`);
|
|
159
191
|
}
|
|
160
192
|
|
|
161
|
-
return Promise.resolve(account);
|
|
193
|
+
return Promise.resolve(entry.account);
|
|
162
194
|
}
|
|
163
195
|
|
|
164
196
|
getAccounts() {
|
|
165
|
-
return Promise.resolve(
|
|
197
|
+
return Promise.resolve(
|
|
198
|
+
Array.from(this.accounts.values()).map(entry => ({ alias: '', item: entry.account.getAddress() })),
|
|
199
|
+
);
|
|
166
200
|
}
|
|
167
201
|
|
|
168
202
|
async createAccount(accountData?: AccountData): Promise<AccountManager> {
|
|
169
203
|
const secret = accountData?.secret ?? Fr.random();
|
|
170
204
|
const salt = accountData?.salt ?? Fr.random();
|
|
205
|
+
const type = accountData?.type ?? 'schnorr';
|
|
171
206
|
const contract = accountData?.contract ?? new SchnorrAccountContract(GrumpkinScalar.random());
|
|
172
207
|
|
|
173
208
|
const accountManager = await AccountManager.create(this, secret, contract, salt);
|
|
@@ -177,7 +212,8 @@ export class TestWallet extends BaseWallet {
|
|
|
177
212
|
|
|
178
213
|
await this.registerContract(instance, artifact, secret);
|
|
179
214
|
|
|
180
|
-
|
|
215
|
+
const address = accountManager.address.toString();
|
|
216
|
+
this.accounts.set(address, { account: await accountManager.getAccount(), type });
|
|
181
217
|
|
|
182
218
|
return accountManager;
|
|
183
219
|
}
|
|
@@ -220,62 +256,77 @@ export class TestWallet extends BaseWallet {
|
|
|
220
256
|
return account.createAuthWit(intentInnerHash, chainInfo);
|
|
221
257
|
}
|
|
222
258
|
|
|
223
|
-
/**
|
|
224
|
-
* Override simulateViaEntrypoint to use fake accounts for kernelless simulation
|
|
225
|
-
* when simulatedSimulations is enabled. Otherwise falls through to the real entrypoint path.
|
|
226
|
-
*/
|
|
227
259
|
protected override async simulateViaEntrypoint(
|
|
228
260
|
executionPayload: ExecutionPayload,
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
if (!this.simulatedSimulations) {
|
|
236
|
-
return super.simulateViaEntrypoint(
|
|
237
|
-
executionPayload,
|
|
238
|
-
from,
|
|
239
|
-
feeOptions,
|
|
240
|
-
scopes,
|
|
241
|
-
skipTxValidation,
|
|
242
|
-
skipFeeEnforcement,
|
|
243
|
-
);
|
|
244
|
-
}
|
|
261
|
+
opts: SimulateViaEntrypointOptions,
|
|
262
|
+
): Promise<TxSimulationResultWithAppOffset> {
|
|
263
|
+
const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement, sendMessagesAs } = opts;
|
|
264
|
+
const scopes = this.scopesFrom(from, additionalScopes);
|
|
265
|
+
const skipKernels = this.simulationMode !== 'full';
|
|
266
|
+
const useOverride = this.simulationMode === 'kernelless-override';
|
|
245
267
|
|
|
246
268
|
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
247
|
-
const executionOptions: DefaultAccountEntrypointOptions = {
|
|
248
|
-
txNonce: Fr.random(),
|
|
249
|
-
cancellable: this.cancellableTransactions,
|
|
250
|
-
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions,
|
|
251
|
-
};
|
|
252
269
|
const finalExecutionPayload = feeExecutionPayload
|
|
253
270
|
? mergeExecutionPayloads([feeExecutionPayload, executionPayload])
|
|
254
271
|
: executionPayload;
|
|
255
|
-
const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(from);
|
|
256
272
|
const chainInfo = await this.getChainInfo();
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
273
|
+
|
|
274
|
+
let overrides: SimulationOverrides | undefined;
|
|
275
|
+
let txRequest: TxExecutionRequest;
|
|
276
|
+
if (useOverride) {
|
|
277
|
+
const accountOverrides = await this.buildAccountOverrides(scopes);
|
|
278
|
+
overrides = new SimulationOverrides(accountOverrides);
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
if (from === NO_FROM) {
|
|
282
|
+
const entrypoint = new DefaultEntrypoint();
|
|
283
|
+
txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
|
|
284
|
+
} else {
|
|
285
|
+
let fromAccount: Account;
|
|
286
|
+
if (useOverride) {
|
|
287
|
+
const originalAccount = await this.getAccountFromAddress(from);
|
|
288
|
+
fromAccount = this.getStubAccountFor(from, originalAccount.getCompleteAddress());
|
|
289
|
+
} else {
|
|
290
|
+
fromAccount = await this.getAccountFromAddress(from);
|
|
291
|
+
}
|
|
292
|
+
const executionOptions: DefaultAccountEntrypointOptions = {
|
|
293
|
+
txNonce: Fr.random(),
|
|
294
|
+
cancellable: this.cancellableTransactions,
|
|
295
|
+
// If from is an address, feeOptions include the way the account contract should handle the fee payment
|
|
296
|
+
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions!,
|
|
297
|
+
};
|
|
298
|
+
txRequest = await fromAccount.createTxExecutionRequest(
|
|
299
|
+
finalExecutionPayload,
|
|
300
|
+
feeOptions.gasSettings,
|
|
301
|
+
chainInfo,
|
|
302
|
+
executionOptions,
|
|
303
|
+
);
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
const result = await this.pxe.simulateTx(txRequest, {
|
|
267
307
|
simulatePublic: true,
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
308
|
+
skipKernels,
|
|
309
|
+
skipFeeEnforcement,
|
|
310
|
+
skipTxValidation,
|
|
311
|
+
overrides,
|
|
271
312
|
scopes,
|
|
313
|
+
senderForTags: this.senderForTagsFrom(from, sendMessagesAs),
|
|
272
314
|
});
|
|
315
|
+
const appCallOffset = await this.computeAppCallOffset(from, feeOptions);
|
|
316
|
+
return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
|
|
273
317
|
}
|
|
274
318
|
|
|
275
319
|
async proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<ProvenTx> {
|
|
276
|
-
const fee = await this.completeFeeOptions(
|
|
320
|
+
const fee = await this.completeFeeOptions({
|
|
321
|
+
from: opts.from,
|
|
322
|
+
feePayer: exec.feePayer,
|
|
323
|
+
gasSettings: opts.fee?.gasSettings,
|
|
324
|
+
});
|
|
277
325
|
const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(exec, opts.from, fee);
|
|
278
|
-
const txProvingResult = await this.pxe.proveTx(txRequest,
|
|
326
|
+
const txProvingResult = await this.pxe.proveTx(txRequest, {
|
|
327
|
+
scopes: this.scopesFrom(opts.from, opts.additionalScopes),
|
|
328
|
+
senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs),
|
|
329
|
+
});
|
|
279
330
|
return new ProvenTx(
|
|
280
331
|
this.aztecNode,
|
|
281
332
|
await txProvingResult.toTx(),
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { createAztecNodeClient } from '@aztec/aztec.js/node';
|
|
2
|
+
import type { SendOptions } from '@aztec/aztec.js/wallet';
|
|
3
|
+
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
4
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
+
import type { ApiSchema, Fr } from '@aztec/foundation/schemas';
|
|
6
|
+
import { parseWithOptionals, schemaHasMethod } from '@aztec/foundation/schemas';
|
|
7
|
+
import { NodeListener, TransportServer } from '@aztec/foundation/transport';
|
|
8
|
+
import { ExecutionPayload, Tx } from '@aztec/stdlib/tx';
|
|
9
|
+
|
|
10
|
+
import { workerData } from 'worker_threads';
|
|
11
|
+
|
|
12
|
+
import { TestWallet } from './test_wallet.js';
|
|
13
|
+
import { WorkerWalletSchema } from './worker_wallet_schema.js';
|
|
14
|
+
|
|
15
|
+
const logger = createLogger('e2e:test-wallet:worker');
|
|
16
|
+
|
|
17
|
+
try {
|
|
18
|
+
const { nodeUrl, pxeConfig } = workerData as { nodeUrl: string; pxeConfig?: Record<string, unknown> };
|
|
19
|
+
|
|
20
|
+
logger.info('Initializing worker wallet', { nodeUrl });
|
|
21
|
+
const node = createAztecNodeClient(nodeUrl);
|
|
22
|
+
const wallet = await TestWallet.create(node, pxeConfig);
|
|
23
|
+
logger.info('Worker wallet initialized');
|
|
24
|
+
|
|
25
|
+
const customMethods = {
|
|
26
|
+
proveTx: async (exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>) => {
|
|
27
|
+
const provenTx = await wallet.proveTx(exec, opts);
|
|
28
|
+
return new Tx(
|
|
29
|
+
provenTx.getTxHash(),
|
|
30
|
+
provenTx.data,
|
|
31
|
+
provenTx.chonkProof,
|
|
32
|
+
provenTx.contractClassLogFields,
|
|
33
|
+
provenTx.publicFunctionCalldata,
|
|
34
|
+
);
|
|
35
|
+
},
|
|
36
|
+
registerAccount: async (secret: Fr, salt: Fr) => {
|
|
37
|
+
const manager = await wallet.createSchnorrAccount(secret, salt);
|
|
38
|
+
return manager.address;
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
const schema = WorkerWalletSchema as ApiSchema;
|
|
43
|
+
const listener = new NodeListener();
|
|
44
|
+
const server = new TransportServer<{ fn: string; args: string }>(listener, async msg => {
|
|
45
|
+
if (!schemaHasMethod(schema, msg.fn)) {
|
|
46
|
+
throw new Error(`Unknown method: ${msg.fn}`);
|
|
47
|
+
}
|
|
48
|
+
const jsonParams = JSON.parse(msg.args) as unknown[];
|
|
49
|
+
const args: any[] = await parseWithOptionals(jsonParams, schema[msg.fn].parameters());
|
|
50
|
+
// we have to erase the fn type in order to be able to spread ...args
|
|
51
|
+
const handler: ((...args: any[]) => Promise<any>) | undefined =
|
|
52
|
+
msg.fn in customMethods ? customMethods[msg.fn as keyof typeof customMethods] : undefined;
|
|
53
|
+
const result = handler ? await handler(...args) : await (wallet as any)[msg.fn](...args);
|
|
54
|
+
return jsonStringify(result);
|
|
55
|
+
});
|
|
56
|
+
server.start();
|
|
57
|
+
} catch (err: unknown) {
|
|
58
|
+
logger.error('Worker wallet initialization failed', { error: err instanceof Error ? err.stack : String(err) });
|
|
59
|
+
process.exit(1);
|
|
60
|
+
}
|