@aztec/end-to-end 0.0.1-commit.7b97ef96e → 0.0.1-commit.7cbc774
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/benchmark.d.ts +15 -1
- package/dest/bench/client_flows/benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/benchmark.js +17 -0
- package/dest/bench/client_flows/client_flows_benchmark.d.ts +2 -2
- package/dest/bench/client_flows/client_flows_benchmark.d.ts.map +1 -1
- package/dest/bench/client_flows/client_flows_benchmark.js +33 -36
- package/dest/bench/utils.d.ts +1 -1
- package/dest/bench/utils.d.ts.map +1 -1
- package/dest/bench/utils.js +8 -3
- package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts +5 -4
- 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 +28 -19
- package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts +15 -4
- 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 +39 -7
- package/dest/e2e_deploy_contract/deploy_test.d.ts +3 -3
- package/dest/e2e_deploy_contract/deploy_test.d.ts.map +1 -1
- package/dest/e2e_deploy_contract/deploy_test.js +2 -1
- package/dest/e2e_epochs/epochs_test.d.ts +25 -2
- package/dest/e2e_epochs/epochs_test.d.ts.map +1 -1
- package/dest/e2e_epochs/epochs_test.js +88 -14
- package/dest/e2e_fees/fees_test.d.ts +5 -2
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +45 -12
- package/dest/e2e_nested_contract/nested_contract_test.d.ts +3 -3
- package/dest/e2e_nested_contract/nested_contract_test.d.ts.map +1 -1
- package/dest/e2e_nested_contract/nested_contract_test.js +6 -7
- package/dest/e2e_p2p/inactivity_slash_test.d.ts +1 -1
- package/dest/e2e_p2p/inactivity_slash_test.d.ts.map +1 -1
- package/dest/e2e_p2p/inactivity_slash_test.js +5 -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 +65 -43
- package/dest/e2e_p2p/reqresp/utils.d.ts +1 -1
- package/dest/e2e_p2p/reqresp/utils.d.ts.map +1 -1
- package/dest/e2e_p2p/reqresp/utils.js +42 -13
- 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 +73 -50
- package/dest/e2e_token_contract/token_contract_test.d.ts +3 -3
- package/dest/e2e_token_contract/token_contract_test.d.ts.map +1 -1
- package/dest/e2e_token_contract/token_contract_test.js +15 -13
- 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 +13 -17
- 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 +73 -1
- package/dest/fixtures/fixtures.d.ts.map +1 -1
- package/dest/fixtures/fixtures.js +68 -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 +37 -0
- package/dest/fixtures/setup.d.ts +45 -14
- package/dest/fixtures/setup.d.ts.map +1 -1
- package/dest/fixtures/setup.js +138 -29
- 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 +8 -8
- package/dest/fixtures/token_utils.d.ts +1 -1
- package/dest/fixtures/token_utils.d.ts.map +1 -1
- package/dest/fixtures/token_utils.js +2 -5
- 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/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/shared/cross_chain_test_harness.d.ts +4 -2
- package/dest/shared/cross_chain_test_harness.d.ts.map +1 -1
- package/dest/shared/cross_chain_test_harness.js +22 -18
- package/dest/shared/gas_portal_test_harness.d.ts +8 -5
- package/dest/shared/gas_portal_test_harness.d.ts.map +1 -1
- package/dest/shared/gas_portal_test_harness.js +19 -10
- package/dest/shared/jest_setup.js +41 -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 +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 +60 -39
- 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 +26 -14
- 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 +4 -2
- package/dest/spartan/setup_test_wallets.d.ts.map +1 -1
- package/dest/spartan/setup_test_wallets.js +72 -39
- package/dest/spartan/tx_metrics.d.ts +18 -4
- package/dest/spartan/tx_metrics.d.ts.map +1 -1
- package/dest/spartan/tx_metrics.js +74 -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.d.ts +4 -5
- package/dest/spartan/utils/nodes.d.ts.map +1 -1
- package/dest/spartan/utils/nodes.js +11 -11
- 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 +25 -23
- package/dest/test-wallet/test_wallet.d.ts.map +1 -1
- package/dest/test-wallet/test_wallet.js +146 -87
- package/dest/test-wallet/utils.d.ts +3 -3
- package/dest/test-wallet/utils.d.ts.map +1 -1
- package/dest/test-wallet/utils.js +2 -7
- package/dest/test-wallet/wallet_worker_script.js +42 -34
- package/dest/test-wallet/worker_wallet.d.ts +5 -4
- package/dest/test-wallet/worker_wallet.d.ts.map +1 -1
- package/dest/test-wallet/worker_wallet.js +56 -4
- package/dest/test-wallet/worker_wallet_schema.d.ts +110 -224
- package/dest/test-wallet/worker_wallet_schema.d.ts.map +1 -1
- package/dest/test-wallet/worker_wallet_schema.js +14 -2
- package/package.json +49 -46
- package/src/bench/client_flows/benchmark.ts +19 -0
- package/src/bench/client_flows/client_flows_benchmark.ts +60 -41
- package/src/bench/utils.ts +9 -3
- package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +42 -24
- package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +49 -11
- package/src/e2e_deploy_contract/deploy_test.ts +3 -2
- package/src/e2e_epochs/epochs_test.ts +99 -11
- package/src/e2e_fees/fees_test.ts +50 -10
- package/src/e2e_nested_contract/nested_contract_test.ts +9 -5
- package/src/e2e_p2p/inactivity_slash_test.ts +5 -3
- package/src/e2e_p2p/p2p_network.ts +82 -60
- package/src/e2e_p2p/reqresp/utils.ts +51 -12
- package/src/e2e_p2p/shared.ts +92 -64
- package/src/e2e_token_contract/token_contract_test.ts +28 -10
- package/src/fixtures/authwit_proxy.ts +4 -0
- package/src/fixtures/e2e_prover_test.ts +22 -19
- package/src/fixtures/elu_monitor.ts +126 -0
- package/src/fixtures/fixtures.ts +86 -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 +179 -38
- package/src/fixtures/setup_p2p_test.ts +13 -9
- package/src/fixtures/token_utils.ts +1 -2
- package/src/fixtures/utils.ts +2 -0
- 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/install_legacy_contracts.cjs +75 -0
- package/src/legacy-jest-resolver.cjs +112 -0
- package/src/shared/cross_chain_test_harness.ts +27 -13
- package/src/shared/gas_portal_test_harness.ts +21 -11
- package/src/shared/jest_setup.ts +51 -1
- package/src/shared/submit-transactions.ts +1 -4
- package/src/shared/uniswap_l1_l2.ts +77 -50
- package/src/shared/wait_for_l1_to_l2_message.ts +23 -0
- package/src/simulators/lending_simulator.ts +32 -14
- package/src/simulators/token_simulator.ts +6 -2
- package/src/spartan/setup_test_wallets.ts +91 -37
- package/src/spartan/tx_metrics.ts +82 -24
- package/src/spartan/utils/config.ts +2 -0
- package/src/spartan/utils/index.ts +6 -0
- package/src/spartan/utils/nodes.ts +17 -12
- package/src/spartan/utils/pod_logs.ts +99 -0
- package/src/test-wallet/test_wallet.ts +174 -104
- package/src/test-wallet/utils.ts +3 -7
- package/src/test-wallet/wallet_worker_script.ts +48 -31
- package/src/test-wallet/worker_wallet.ts +60 -7
- package/src/test-wallet/worker_wallet_schema.ts +2 -2
|
@@ -37,7 +37,7 @@ export async function awaitCheckpointNumber(rollupCheatCodes, checkpointNumber,
|
|
|
37
37
|
// Get current proven block number
|
|
38
38
|
let initialProvenBlock;
|
|
39
39
|
try {
|
|
40
|
-
const tips = await node.
|
|
40
|
+
const tips = await node.getChainTips();
|
|
41
41
|
initialProvenBlock = Number(tips.proven.block.number);
|
|
42
42
|
log.info(`Current proven block: ${initialProvenBlock}. Waiting for it to increase...`);
|
|
43
43
|
} catch (err) {
|
|
@@ -46,7 +46,7 @@ export async function awaitCheckpointNumber(rollupCheatCodes, checkpointNumber,
|
|
|
46
46
|
}
|
|
47
47
|
await retryUntil(async ()=>{
|
|
48
48
|
try {
|
|
49
|
-
const tips = await node.
|
|
49
|
+
const tips = await node.getChainTips();
|
|
50
50
|
const currentProvenBlock = Number(tips.proven.block.number);
|
|
51
51
|
const proposedBlock = Number(tips.proposed.number);
|
|
52
52
|
log.verbose(`Chain state: proposed=${proposedBlock}, proven=${currentProvenBlock} (waiting for > ${initialProvenBlock})`);
|
|
@@ -119,7 +119,7 @@ export async function withSequencersAdmin(env, fn) {
|
|
|
119
119
|
if (statusRes.status !== 200) {
|
|
120
120
|
throw new Error(`Admin endpoint returned status ${statusRes.status}`);
|
|
121
121
|
}
|
|
122
|
-
const client = createAztecNodeAdminClient(url);
|
|
122
|
+
const client = createAztecNodeAdminClient(url, {}, undefined, env.AZTEC_ADMIN_API_KEY);
|
|
123
123
|
return {
|
|
124
124
|
result: await fn(client),
|
|
125
125
|
process: process1
|
|
@@ -193,10 +193,9 @@ export async function initHADb(namespace) {
|
|
|
193
193
|
]), logger, true);
|
|
194
194
|
}
|
|
195
195
|
/**
|
|
196
|
-
*
|
|
197
|
-
* Wired to env
|
|
198
|
-
*/ export async function setValidatorTxDrop({ namespace,
|
|
199
|
-
const drop = enabled ? 'true' : 'false';
|
|
196
|
+
* Sets probabilistic transaction dropping on validators and waits for rollout.
|
|
197
|
+
* Use probability=0 to disable. Wired to env var P2P_DROP_TX_CHANCE via Helm values.
|
|
198
|
+
*/ export async function setValidatorTxDrop({ namespace, probability, logger: log }) {
|
|
200
199
|
const prob = String(probability);
|
|
201
200
|
const selectors = [
|
|
202
201
|
'app.kubernetes.io/name=validator',
|
|
@@ -211,7 +210,7 @@ export async function initHADb(namespace) {
|
|
|
211
210
|
if (names.length === 0) {
|
|
212
211
|
continue;
|
|
213
212
|
}
|
|
214
|
-
const cmd = `kubectl set env statefulset -l ${selector} -n ${namespace}
|
|
213
|
+
const cmd = `kubectl set env statefulset -l ${selector} -n ${namespace} P2P_DROP_TX_CHANCE=${prob}`;
|
|
215
214
|
log.info(`command: ${cmd}`);
|
|
216
215
|
await execAsync(cmd);
|
|
217
216
|
updated = true;
|
|
@@ -291,13 +290,14 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
|
|
|
291
290
|
* Defaults to false, which preserves the existing storage.
|
|
292
291
|
*/ export async function rollAztecPods(namespace, clearState = false) {
|
|
293
292
|
// Pod components use 'validator', but StatefulSets and PVCs use 'sequencer-node' for validators
|
|
293
|
+
// RPC nodes have nodeType='rpc-node' in Helm values, so their component label is 'rpc-node' (not 'rpc')
|
|
294
294
|
const podComponents = [
|
|
295
295
|
'p2p-bootstrap',
|
|
296
296
|
'prover-node',
|
|
297
297
|
'prover-broker',
|
|
298
298
|
'prover-agent',
|
|
299
299
|
'sequencer-node',
|
|
300
|
-
'rpc',
|
|
300
|
+
'rpc-node',
|
|
301
301
|
'validator-ha-db'
|
|
302
302
|
];
|
|
303
303
|
const pvcComponents = [
|
|
@@ -305,7 +305,7 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
|
|
|
305
305
|
'prover-node',
|
|
306
306
|
'prover-broker',
|
|
307
307
|
'sequencer-node',
|
|
308
|
-
'rpc',
|
|
308
|
+
'rpc-node',
|
|
309
309
|
'validator-ha-db'
|
|
310
310
|
];
|
|
311
311
|
// StatefulSet components that need to be scaled down before PVC deletion
|
|
@@ -315,7 +315,7 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
|
|
|
315
315
|
'prover-node',
|
|
316
316
|
'prover-broker',
|
|
317
317
|
'sequencer-node',
|
|
318
|
-
'rpc',
|
|
318
|
+
'rpc-node',
|
|
319
319
|
'validator-ha-db'
|
|
320
320
|
];
|
|
321
321
|
if (clearState) {
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
+
/** Parsed l2-block-built stats from a sequencer pod log line. */
|
|
3
|
+
export type BlockBuiltLogEntry = {
|
|
4
|
+
blockNumber: number;
|
|
5
|
+
txCount: number;
|
|
6
|
+
duration: number;
|
|
7
|
+
publicProcessDuration: number;
|
|
8
|
+
manaPerSec: number;
|
|
9
|
+
privateLogCount: number;
|
|
10
|
+
publicLogCount: number;
|
|
11
|
+
contractClassLogCount: number;
|
|
12
|
+
contractClassLogSize: number;
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* Fetches l2-block-built log entries from sequencer pods for given block numbers.
|
|
16
|
+
* Queries all validator pods (only the proposer will have the log for a given block).
|
|
17
|
+
*
|
|
18
|
+
* @param namespace - Kubernetes namespace
|
|
19
|
+
* @param sinceTime - ISO 8601 timestamp to limit log search (e.g., from before block building was re-enabled)
|
|
20
|
+
* @param blockNumbers - Set of block numbers to filter for
|
|
21
|
+
* @param logger - Logger instance
|
|
22
|
+
* @returns Array of parsed BlockBuiltLogEntry, de-duplicated by blockNumber, sorted ascending
|
|
23
|
+
*/
|
|
24
|
+
export declare function fetchBlockBuiltLogs(namespace: string, sinceTime: string, blockNumbers: Set<number>, logger: Logger): Promise<BlockBuiltLogEntry[]>;
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9kX2xvZ3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zcGFydGFuL3V0aWxzL3BvZF9sb2dzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBU3BELGlFQUFpRTtBQUNqRSxNQUFNLE1BQU0sa0JBQWtCLEdBQUc7SUFDL0IsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFDakIscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsZUFBZSxFQUFFLE1BQU0sQ0FBQztJQUN4QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixvQkFBb0IsRUFBRSxNQUFNLENBQUM7Q0FDOUIsQ0FBQztBQWNGOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFzQixtQkFBbUIsQ0FDdkMsU0FBUyxFQUFFLE1BQU0sRUFDakIsU0FBUyxFQUFFLE1BQU0sRUFDakIsWUFBWSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFDekIsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQWlEL0IifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pod_logs.d.ts","sourceRoot":"","sources":["../../../src/spartan/utils/pod_logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AASpD,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAcF;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAiD/B"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { exec } from 'child_process';
|
|
2
|
+
import { promisify } from 'util';
|
|
3
|
+
import { getSequencers } from './nodes.js';
|
|
4
|
+
const execAsync = promisify(exec);
|
|
5
|
+
const FIELDS = [
|
|
6
|
+
'blockNumber',
|
|
7
|
+
'txCount',
|
|
8
|
+
'duration',
|
|
9
|
+
'publicProcessDuration',
|
|
10
|
+
'manaPerSec',
|
|
11
|
+
'privateLogCount',
|
|
12
|
+
'publicLogCount',
|
|
13
|
+
'contractClassLogCount',
|
|
14
|
+
'contractClassLogSize'
|
|
15
|
+
];
|
|
16
|
+
/**
|
|
17
|
+
* Fetches l2-block-built log entries from sequencer pods for given block numbers.
|
|
18
|
+
* Queries all validator pods (only the proposer will have the log for a given block).
|
|
19
|
+
*
|
|
20
|
+
* @param namespace - Kubernetes namespace
|
|
21
|
+
* @param sinceTime - ISO 8601 timestamp to limit log search (e.g., from before block building was re-enabled)
|
|
22
|
+
* @param blockNumbers - Set of block numbers to filter for
|
|
23
|
+
* @param logger - Logger instance
|
|
24
|
+
* @returns Array of parsed BlockBuiltLogEntry, de-duplicated by blockNumber, sorted ascending
|
|
25
|
+
*/ export async function fetchBlockBuiltLogs(namespace, sinceTime, blockNumbers, logger) {
|
|
26
|
+
const pods = await getSequencers(namespace);
|
|
27
|
+
const entriesByBlock = new Map();
|
|
28
|
+
// Subtract 60s from sinceTime to account for clock skew between test runner and k8s pods.
|
|
29
|
+
// Block number filtering ensures we only match the right blocks, so extra lines are harmless.
|
|
30
|
+
const sinceDate = new Date(new Date(sinceTime).getTime() - 60_000);
|
|
31
|
+
const sinceFlag = sinceDate.toISOString();
|
|
32
|
+
for (const pod of pods){
|
|
33
|
+
try {
|
|
34
|
+
const cmd = `kubectl logs ${pod} -n ${namespace} -c aztec --since-time=${sinceFlag}`;
|
|
35
|
+
logger.info(`Fetching logs: ${cmd}`);
|
|
36
|
+
const { stdout } = await execAsync(cmd, {
|
|
37
|
+
maxBuffer: 10 * 1024 * 1024
|
|
38
|
+
});
|
|
39
|
+
const lines = stdout.split('\n');
|
|
40
|
+
const matchingLines = lines.filter((l)=>l.includes('l2-block-built'));
|
|
41
|
+
logger.info(`Pod ${pod}: ${lines.length} log lines, ${matchingLines.length} contain l2-block-built`);
|
|
42
|
+
for (const line of matchingLines){
|
|
43
|
+
try {
|
|
44
|
+
const parsed = JSON.parse(line);
|
|
45
|
+
if (parsed.eventName !== 'l2-block-built' || !blockNumbers.has(parsed.blockNumber)) {
|
|
46
|
+
continue;
|
|
47
|
+
}
|
|
48
|
+
if (entriesByBlock.has(parsed.blockNumber)) {
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
const entry = {};
|
|
52
|
+
for (const field of FIELDS){
|
|
53
|
+
entry[field] = parsed[field] ?? 0;
|
|
54
|
+
}
|
|
55
|
+
entriesByBlock.set(entry.blockNumber, entry);
|
|
56
|
+
logger.verbose(`Parsed l2-block-built log for block ${entry.blockNumber}`, entry);
|
|
57
|
+
} catch {
|
|
58
|
+
// Not valid JSON, skip
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
} catch (err) {
|
|
62
|
+
logger.warn(`Failed to fetch logs from pod ${pod}: ${err}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
if (entriesByBlock.size < blockNumbers.size) {
|
|
66
|
+
const missing = [
|
|
67
|
+
...blockNumbers
|
|
68
|
+
].filter((bn)=>!entriesByBlock.has(bn));
|
|
69
|
+
logger.warn(`Missing l2-block-built logs for block(s): ${missing.join(', ')}`);
|
|
70
|
+
}
|
|
71
|
+
return [
|
|
72
|
+
...entriesByBlock.values()
|
|
73
|
+
].sort((a, b)=>a.blockNumber - b.blockNumber);
|
|
74
|
+
}
|
|
@@ -2,16 +2,18 @@ import { type Account, type AccountContract } from '@aztec/aztec.js/account';
|
|
|
2
2
|
import { type CallIntent, type ContractFunctionInteractionCallIntent, type IntentInnerHash, SetPublicAuthwitContractInteraction } from '@aztec/aztec.js/authorization';
|
|
3
3
|
import type { AztecNode } from '@aztec/aztec.js/node';
|
|
4
4
|
import { AccountManager, type SendOptions } from '@aztec/aztec.js/wallet';
|
|
5
|
+
import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
5
6
|
import { Fq, Fr } from '@aztec/foundation/curves/bn254';
|
|
6
|
-
import type {
|
|
7
|
+
import type { NotesFilter } from '@aztec/pxe/client/lazy';
|
|
7
8
|
import { type PXEConfig } from '@aztec/pxe/config';
|
|
8
9
|
import { PXE, type PXECreationOptions } from '@aztec/pxe/server';
|
|
9
10
|
import { AuthWitness } from '@aztec/stdlib/auth-witness';
|
|
10
11
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
11
12
|
import type { NoteDao } from '@aztec/stdlib/note';
|
|
12
|
-
import type
|
|
13
|
+
import { type BlockHeader, type ContractOverrides, type TxHash, type TxReceipt } from '@aztec/stdlib/tx';
|
|
13
14
|
import { ExecutionPayload } from '@aztec/stdlib/tx';
|
|
14
|
-
import { BaseWallet, type
|
|
15
|
+
import { BaseWallet, type SimulateViaEntrypointOptions } from '@aztec/wallet-sdk/base-wallet';
|
|
16
|
+
import type { AccountType } from '@aztec/wallets/embedded';
|
|
15
17
|
import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
16
18
|
/**
|
|
17
19
|
* Data for generating an account.
|
|
@@ -19,6 +21,7 @@ import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
|
19
21
|
export interface AccountData {
|
|
20
22
|
secret: Fr;
|
|
21
23
|
salt: Fr;
|
|
24
|
+
type?: AccountType;
|
|
22
25
|
contract: AccountContract;
|
|
23
26
|
}
|
|
24
27
|
/**
|
|
@@ -38,23 +41,26 @@ export declare class TestWallet extends BaseWallet {
|
|
|
38
41
|
createSchnorrAccount(secret: Fr, salt: Fr, signingKey?: Fq): Promise<AccountManager>;
|
|
39
42
|
createECDSARAccount(secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager>;
|
|
40
43
|
createECDSAKAccount(secret: Fr, salt: Fr, signingKey: Buffer): Promise<AccountManager>;
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
44
|
+
private stubClassIds;
|
|
45
|
+
private initStubClasses;
|
|
46
|
+
/**
|
|
47
|
+
* Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
|
|
48
|
+
*/
|
|
49
|
+
protected buildAccountOverrides(addresses: AztecAddress[]): Promise<ContractOverrides>;
|
|
50
|
+
protected accounts: Map<string, {
|
|
51
|
+
account: Account;
|
|
52
|
+
type: AccountType;
|
|
45
53
|
}>;
|
|
46
|
-
|
|
54
|
+
private getTypeFor;
|
|
55
|
+
private getStubAccountFor;
|
|
47
56
|
/**
|
|
48
|
-
*
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
*
|
|
52
|
-
* generating kernel witnesses. When false, simulateViaEntrypoint defers to the standard
|
|
53
|
-
* simulation path via the real account entrypoint.
|
|
57
|
+
* Controls how the test wallet simulates transactions:
|
|
58
|
+
* - `kernelless`: Skips kernel circuits but uses the real account contract. Default.
|
|
59
|
+
* - `kernelless-override`: Skips kernels and replaces the account with a stub that doesn't do authwit validation.
|
|
60
|
+
* - `full`: Uses real kernel circuits and real account contracts. Slow!
|
|
54
61
|
*/
|
|
55
|
-
private
|
|
56
|
-
|
|
57
|
-
disableSimulatedSimulations(): void;
|
|
62
|
+
private simulationMode;
|
|
63
|
+
setSimulationMode(mode: 'kernelless' | 'kernelless-override' | 'full'): void;
|
|
58
64
|
setMinFeePadding(value?: number): void;
|
|
59
65
|
protected getAccountFromAddress(address: AztecAddress): Promise<Account>;
|
|
60
66
|
getAccounts(): Promise<{
|
|
@@ -68,11 +74,7 @@ export declare class TestWallet extends BaseWallet {
|
|
|
68
74
|
}>;
|
|
69
75
|
setPublicAuthWit(from: AztecAddress, messageHashOrIntent: Fr | IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent, authorized: boolean): Promise<SetPublicAuthwitContractInteraction>;
|
|
70
76
|
createAuthWit(from: AztecAddress, intent: IntentInnerHash | CallIntent | ContractFunctionInteractionCallIntent): Promise<AuthWitness>;
|
|
71
|
-
|
|
72
|
-
* Override simulateViaEntrypoint to use fake accounts for kernelless simulation
|
|
73
|
-
* when simulatedSimulations is enabled. Otherwise falls through to the real entrypoint path.
|
|
74
|
-
*/
|
|
75
|
-
protected simulateViaEntrypoint(executionPayload: ExecutionPayload, from: AztecAddress, feeOptions: FeeOptions, scopes: AccessScopes, skipTxValidation?: boolean, skipFeeEnforcement?: boolean): Promise<TxSimulationResult>;
|
|
77
|
+
protected simulateViaEntrypoint(executionPayload: ExecutionPayload, opts: SimulateViaEntrypointOptions): Promise<TxSimulationResultWithAppOffset>;
|
|
76
78
|
proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<ProvenTx>;
|
|
77
79
|
getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
|
|
78
80
|
getNotes(filter: NotesFilter): Promise<NoteDao[]>;
|
|
@@ -80,4 +82,4 @@ export declare class TestWallet extends BaseWallet {
|
|
|
80
82
|
sync(): Promise<void>;
|
|
81
83
|
stop(): Promise<void>;
|
|
82
84
|
}
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF93YWxsZXQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC90ZXN0X3dhbGxldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUV0RixPQUFPLEVBQ0wsS0FBSyxVQUFVLEVBQ2YsS0FBSyxxQ0FBcUMsRUFDMUMsS0FBSyxlQUFlLEVBQ3BCLG1DQUFtQyxFQUlwQyxNQUFNLCtCQUErQixDQUFDO0FBQ3ZDLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxjQUFjLEVBQUUsS0FBSyxXQUFXLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRSxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUd6RSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFELE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBZ0IsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRSxPQUFPLEVBQUUsR0FBRyxFQUFFLEtBQUssa0JBQWtCLEVBQWEsTUFBTSxtQkFBbUIsQ0FBQztBQUM1RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDekQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRzNELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFDaEIsS0FBSyxpQkFBaUIsRUFHdEIsS0FBSyxNQUFNLEVBQ1gsS0FBSyxTQUFTLEVBQ2YsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEVBQUUsZ0JBQWdC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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_wallet.d.ts","sourceRoot":"","sources":["../../src/test-wallet/test_wallet.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"test_wallet.d.ts","sourceRoot":"","sources":["../../src/test-wallet/test_wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,22 @@
|
|
|
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 { NO_FROM } from '@aztec/aztec.js/account';
|
|
5
6
|
import { SetPublicAuthwitContractInteraction, computeInnerAuthWitHashFromAction, isContractFunctionInteractionCallIntent, lookupValidity } from '@aztec/aztec.js/authorization';
|
|
6
7
|
import { AccountManager } from '@aztec/aztec.js/wallet';
|
|
8
|
+
import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
|
|
9
|
+
import { DefaultEntrypoint } from '@aztec/entrypoints/default';
|
|
7
10
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
8
11
|
import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
|
|
9
12
|
import { getPXEConfig } from '@aztec/pxe/config';
|
|
10
13
|
import { createPXE } from '@aztec/pxe/server';
|
|
11
|
-
import {
|
|
12
|
-
import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
|
|
14
|
+
import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
|
|
13
15
|
import { deriveSigningKey } from '@aztec/stdlib/keys';
|
|
16
|
+
import { SimulationOverrides } from '@aztec/stdlib/tx';
|
|
14
17
|
import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
|
|
15
18
|
import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
|
|
19
|
+
import { DEFAULT_MIN_FEE_PADDING } from '../fixtures/fixtures.js';
|
|
16
20
|
import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
17
21
|
/**
|
|
18
22
|
* Wallet implementation that stores accounts in memory and provides extra debugging
|
|
@@ -21,7 +25,8 @@ import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
|
21
25
|
*/ export class TestWallet extends BaseWallet {
|
|
22
26
|
nodeRef;
|
|
23
27
|
constructor(pxe, nodeRef){
|
|
24
|
-
super(pxe, nodeRef), this.nodeRef = nodeRef, this.accounts = new Map(), this.
|
|
28
|
+
super(pxe, nodeRef), this.nodeRef = nodeRef, this.stubClassIds = new Map(), this.accounts = new Map(), this.simulationMode = 'kernelless';
|
|
29
|
+
this.minFeePadding = DEFAULT_MIN_FEE_PADDING;
|
|
25
30
|
}
|
|
26
31
|
static async create(node, overridePXEConfig, options = {
|
|
27
32
|
loggers: {}
|
|
@@ -32,7 +37,9 @@ import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
|
32
37
|
...overridePXEConfig
|
|
33
38
|
});
|
|
34
39
|
const pxe = await createPXE(nodeRef, pxeConfig, options);
|
|
35
|
-
|
|
40
|
+
const wallet = new TestWallet(pxe, nodeRef);
|
|
41
|
+
await wallet.initStubClasses();
|
|
42
|
+
return wallet;
|
|
36
43
|
}
|
|
37
44
|
/**
|
|
38
45
|
* Updates the underlying node that this wallet and its PXE communicate with.
|
|
@@ -42,94 +49,121 @@ import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
|
42
49
|
}
|
|
43
50
|
createSchnorrAccount(secret, salt, signingKey) {
|
|
44
51
|
signingKey = signingKey ?? deriveSigningKey(secret);
|
|
45
|
-
|
|
52
|
+
return this.createAccount({
|
|
46
53
|
secret,
|
|
47
54
|
salt,
|
|
55
|
+
type: 'schnorr',
|
|
48
56
|
contract: new SchnorrAccountContract(signingKey)
|
|
49
|
-
};
|
|
50
|
-
return this.createAccount(accountData);
|
|
57
|
+
});
|
|
51
58
|
}
|
|
52
59
|
createECDSARAccount(secret, salt, signingKey) {
|
|
53
|
-
|
|
60
|
+
return this.createAccount({
|
|
54
61
|
secret,
|
|
55
62
|
salt,
|
|
63
|
+
type: 'ecdsasecp256r1',
|
|
56
64
|
contract: new EcdsaRAccountContract(signingKey)
|
|
57
|
-
};
|
|
58
|
-
return this.createAccount(accountData);
|
|
65
|
+
});
|
|
59
66
|
}
|
|
60
67
|
createECDSAKAccount(secret, salt, signingKey) {
|
|
61
|
-
|
|
68
|
+
return this.createAccount({
|
|
62
69
|
secret,
|
|
63
70
|
salt,
|
|
71
|
+
type: 'ecdsasecp256k1',
|
|
64
72
|
contract: new EcdsaKAccountContract(signingKey)
|
|
65
|
-
};
|
|
66
|
-
return this.createAccount(accountData);
|
|
73
|
+
});
|
|
67
74
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
// Stub class ids, populated on wallet startup
|
|
76
|
+
// to avoid redundant work per simulation
|
|
77
|
+
stubClassIds;
|
|
78
|
+
/**
|
|
79
|
+
* Hashes and registers the stub class for every supported account type with PXE, populating
|
|
80
|
+
* stubClassIds. Called on wallet initialization.
|
|
81
|
+
*/ async initStubClasses() {
|
|
82
|
+
const { id: schnorrClassId } = await getContractClassFromArtifact(StubSchnorrAccountContractArtifact);
|
|
83
|
+
await this.pxe.registerContractClass(StubSchnorrAccountContractArtifact);
|
|
84
|
+
// ecdsa stubs share the same class id
|
|
85
|
+
const { id: ecdsaClassId } = await getContractClassFromArtifact(StubEcdsaAccountContractArtifact);
|
|
86
|
+
await this.pxe.registerContractClass(StubEcdsaAccountContractArtifact);
|
|
87
|
+
this.stubClassIds.set('schnorr', schnorrClassId);
|
|
88
|
+
this.stubClassIds.set('ecdsasecp256k1', ecdsaClassId);
|
|
89
|
+
this.stubClassIds.set('ecdsasecp256r1', ecdsaClassId);
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
|
|
93
|
+
*/ async buildAccountOverrides(addresses) {
|
|
94
|
+
const accounts = await this.getAccounts();
|
|
95
|
+
const contracts = {};
|
|
96
|
+
const filtered = accounts.filter((acc)=>addresses.some((addr)=>addr.equals(acc.item)));
|
|
97
|
+
for (const account of filtered){
|
|
98
|
+
const address = account.item;
|
|
99
|
+
const originalAccount = await this.getAccountFromAddress(address);
|
|
100
|
+
const completeAddress = originalAccount.getCompleteAddress();
|
|
101
|
+
const contractInstance = await this.pxe.getContractInstance(completeAddress.address);
|
|
102
|
+
if (!contractInstance) {
|
|
103
|
+
throw new Error(`No contract instance found for address: ${completeAddress.address} during account override building. This is a bug!`);
|
|
104
|
+
}
|
|
105
|
+
const type = this.getTypeFor(address);
|
|
106
|
+
const stubClassId = this.stubClassIds.get(type);
|
|
107
|
+
if (!stubClassId) {
|
|
108
|
+
throw new Error(`Stub class for account type '${type}' was not registered at wallet init. This is a bug — initStubClasses should cover every supported AccountType.`);
|
|
109
|
+
}
|
|
110
|
+
contracts[address.toString()] = {
|
|
111
|
+
instance: {
|
|
112
|
+
...contractInstance,
|
|
113
|
+
currentContractClassId: stubClassId
|
|
114
|
+
}
|
|
115
|
+
};
|
|
77
116
|
}
|
|
78
|
-
|
|
79
|
-
const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
|
|
80
|
-
salt: Fr.random()
|
|
81
|
-
});
|
|
82
|
-
return {
|
|
83
|
-
account: stubAccount,
|
|
84
|
-
instance,
|
|
85
|
-
artifact: StubAccountContractArtifact
|
|
86
|
-
};
|
|
117
|
+
return contracts;
|
|
87
118
|
}
|
|
88
119
|
accounts;
|
|
120
|
+
getTypeFor(address) {
|
|
121
|
+
return this.accounts.get(address.toString())?.type ?? 'schnorr';
|
|
122
|
+
}
|
|
123
|
+
getStubAccountFor(address, completeAddress) {
|
|
124
|
+
return this.getTypeFor(address) === 'schnorr' ? createStubSchnorrAccount(completeAddress) : createStubEcdsaAccount(completeAddress);
|
|
125
|
+
}
|
|
89
126
|
/**
|
|
90
|
-
*
|
|
91
|
-
*
|
|
92
|
-
*
|
|
93
|
-
*
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
enableSimulatedSimulations() {
|
|
98
|
-
this.simulatedSimulations = true;
|
|
99
|
-
}
|
|
100
|
-
disableSimulatedSimulations() {
|
|
101
|
-
this.simulatedSimulations = false;
|
|
127
|
+
* Controls how the test wallet simulates transactions:
|
|
128
|
+
* - `kernelless`: Skips kernel circuits but uses the real account contract. Default.
|
|
129
|
+
* - `kernelless-override`: Skips kernels and replaces the account with a stub that doesn't do authwit validation.
|
|
130
|
+
* - `full`: Uses real kernel circuits and real account contracts. Slow!
|
|
131
|
+
*/ simulationMode;
|
|
132
|
+
setSimulationMode(mode) {
|
|
133
|
+
this.simulationMode = mode;
|
|
102
134
|
}
|
|
103
135
|
setMinFeePadding(value) {
|
|
104
|
-
this.minFeePadding = value ??
|
|
136
|
+
this.minFeePadding = value ?? DEFAULT_MIN_FEE_PADDING;
|
|
105
137
|
}
|
|
106
138
|
getAccountFromAddress(address) {
|
|
107
|
-
|
|
108
|
-
if (
|
|
109
|
-
account = new SignerlessAccount();
|
|
110
|
-
} else {
|
|
111
|
-
account = this.accounts.get(address?.toString() ?? '');
|
|
112
|
-
}
|
|
113
|
-
if (!account) {
|
|
139
|
+
const entry = this.accounts.get(address?.toString() ?? '');
|
|
140
|
+
if (!entry) {
|
|
114
141
|
throw new Error(`Account not found in wallet for address: ${address}`);
|
|
115
142
|
}
|
|
116
|
-
return Promise.resolve(account);
|
|
143
|
+
return Promise.resolve(entry.account);
|
|
117
144
|
}
|
|
118
145
|
getAccounts() {
|
|
119
|
-
return Promise.resolve(Array.from(this.accounts.values()).map((
|
|
146
|
+
return Promise.resolve(Array.from(this.accounts.values()).map((entry)=>({
|
|
120
147
|
alias: '',
|
|
121
|
-
item:
|
|
148
|
+
item: entry.account.getAddress()
|
|
122
149
|
})));
|
|
123
150
|
}
|
|
124
151
|
async createAccount(accountData) {
|
|
125
152
|
const secret = accountData?.secret ?? Fr.random();
|
|
126
153
|
const salt = accountData?.salt ?? Fr.random();
|
|
154
|
+
const type = accountData?.type ?? 'schnorr';
|
|
127
155
|
const contract = accountData?.contract ?? new SchnorrAccountContract(GrumpkinScalar.random());
|
|
128
|
-
const accountManager = await AccountManager.create(this, secret, contract,
|
|
156
|
+
const accountManager = await AccountManager.create(this, secret, contract, {
|
|
157
|
+
salt
|
|
158
|
+
});
|
|
129
159
|
const instance = accountManager.getInstance();
|
|
130
160
|
const artifact = await contract.getContractArtifact();
|
|
131
161
|
await this.registerContract(instance, artifact, secret);
|
|
132
|
-
|
|
162
|
+
const address = accountManager.address.toString();
|
|
163
|
+
this.accounts.set(address, {
|
|
164
|
+
account: await accountManager.getAccount(),
|
|
165
|
+
type
|
|
166
|
+
});
|
|
133
167
|
return accountManager;
|
|
134
168
|
}
|
|
135
169
|
lookupValidity(onBehalfOf, intent, witness) {
|
|
@@ -154,46 +188,71 @@ import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
|
154
188
|
}
|
|
155
189
|
return account.createAuthWit(intentInnerHash, chainInfo);
|
|
156
190
|
}
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
return super.simulateViaEntrypoint(executionPayload, from, feeOptions, scopes, skipTxValidation, skipFeeEnforcement);
|
|
163
|
-
}
|
|
191
|
+
async simulateViaEntrypoint(executionPayload, opts) {
|
|
192
|
+
const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement, sendMessagesAs } = opts;
|
|
193
|
+
const scopes = this.scopesFrom(from, additionalScopes);
|
|
194
|
+
const skipKernels = this.simulationMode !== 'full';
|
|
195
|
+
const useOverride = this.simulationMode === 'kernelless-override';
|
|
164
196
|
const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
|
|
165
|
-
const executionOptions = {
|
|
166
|
-
txNonce: Fr.random(),
|
|
167
|
-
cancellable: this.cancellableTransactions,
|
|
168
|
-
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
|
|
169
|
-
};
|
|
170
197
|
const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
|
|
171
198
|
feeExecutionPayload,
|
|
172
199
|
executionPayload
|
|
173
200
|
]) : executionPayload;
|
|
174
|
-
const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(from);
|
|
175
201
|
const chainInfo = await this.getChainInfo();
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
202
|
+
let overrides = opts.overrides;
|
|
203
|
+
let txRequest;
|
|
204
|
+
if (useOverride) {
|
|
205
|
+
const accountOverrides = await this.buildAccountOverrides(scopes);
|
|
206
|
+
overrides = new SimulationOverrides({
|
|
207
|
+
publicStorage: overrides?.publicStorage,
|
|
208
|
+
contracts: {
|
|
209
|
+
...overrides?.contracts,
|
|
210
|
+
...accountOverrides
|
|
211
|
+
}
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
if (from === NO_FROM) {
|
|
215
|
+
const entrypoint = new DefaultEntrypoint();
|
|
216
|
+
txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
|
|
217
|
+
} else {
|
|
218
|
+
let fromAccount;
|
|
219
|
+
if (useOverride) {
|
|
220
|
+
const originalAccount = await this.getAccountFromAddress(from);
|
|
221
|
+
fromAccount = this.getStubAccountFor(from, originalAccount.getCompleteAddress());
|
|
222
|
+
} else {
|
|
223
|
+
fromAccount = await this.getAccountFromAddress(from);
|
|
181
224
|
}
|
|
182
|
-
|
|
183
|
-
|
|
225
|
+
const executionOptions = {
|
|
226
|
+
txNonce: Fr.random(),
|
|
227
|
+
cancellable: this.cancellableTransactions,
|
|
228
|
+
// If from is an address, feeOptions include the way the account contract should handle the fee payment
|
|
229
|
+
feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
|
|
230
|
+
};
|
|
231
|
+
txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
|
|
232
|
+
}
|
|
233
|
+
const result = await this.pxe.simulateTx(txRequest, {
|
|
184
234
|
simulatePublic: true,
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
235
|
+
skipKernels,
|
|
236
|
+
skipFeeEnforcement,
|
|
237
|
+
skipTxValidation,
|
|
238
|
+
overrides,
|
|
239
|
+
scopes,
|
|
240
|
+
senderForTags: this.senderForTagsFrom(from, sendMessagesAs)
|
|
191
241
|
});
|
|
242
|
+
const appCallOffset = await this.computeAppCallOffset(from, feeOptions);
|
|
243
|
+
return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
|
|
192
244
|
}
|
|
193
245
|
async proveTx(exec, opts) {
|
|
194
|
-
const fee = await this.completeFeeOptions(
|
|
246
|
+
const fee = await this.completeFeeOptions({
|
|
247
|
+
from: opts.from,
|
|
248
|
+
feePayer: exec.feePayer,
|
|
249
|
+
gasSettings: opts.fee?.gasSettings
|
|
250
|
+
});
|
|
195
251
|
const txRequest = await this.createTxExecutionRequestFromPayloadAndFee(exec, opts.from, fee);
|
|
196
|
-
const txProvingResult = await this.pxe.proveTx(txRequest,
|
|
252
|
+
const txProvingResult = await this.pxe.proveTx(txRequest, {
|
|
253
|
+
scopes: this.scopesFrom(opts.from, opts.additionalScopes),
|
|
254
|
+
senderForTags: this.senderForTagsFrom(opts.from, opts.sendMessagesAs)
|
|
255
|
+
});
|
|
197
256
|
return new ProvenTx(this.aztecNode, await txProvingResult.toTx(), txProvingResult.getOffchainEffects(), txProvingResult.stats);
|
|
198
257
|
}
|
|
199
258
|
getTxReceipt(txHash) {
|
|
@@ -206,7 +265,7 @@ import { AztecNodeProxy, ProvenTx } from './utils.js';
|
|
|
206
265
|
return this.pxe.getSyncedBlockHeader();
|
|
207
266
|
}
|
|
208
267
|
sync() {
|
|
209
|
-
return this.pxe.
|
|
268
|
+
return this.pxe.sync();
|
|
210
269
|
}
|
|
211
270
|
stop() {
|
|
212
271
|
return this.pxe.stop();
|