@aztec/cli-wallet 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/utils/profiling.js

@@ -0,0 +1,68 @@
+import { format } from 'util';
+const FN_NAME_PADDING = 60;
+const COLUMN_MIN_WIDTH = 13;
+const COLUMN_MAX_WIDTH = 15;
+const ORACLE_NAME_PADDING = 50;
+export function printProfileResult(stats, log, printOracles = false, executionSteps) {
+    log(format('\nPer circuit breakdown:\n'));
+    log(format('  ', 'Function name'.padEnd(FN_NAME_PADDING), 'Time'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), executionSteps ? 'Gates'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '', executionSteps ? 'Subtotal'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : ''));
+    log(format(''.padEnd(FN_NAME_PADDING + COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH + (executionSteps ? COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH : 0), '-')));
+    let acc = 0;
+    let biggest = executionSteps?.[0];
+    const timings = stats.timings;
+    timings.perFunction.forEach((fn, i)=>{
+        const currentExecutionStep = executionSteps?.[i];
+        if (currentExecutionStep && biggest && currentExecutionStep.gateCount > biggest.gateCount) {
+            biggest = currentExecutionStep;
+        }
+        acc += currentExecutionStep ? currentExecutionStep.gateCount : 0;
+        log(format(' - ', fn.functionName.padEnd(FN_NAME_PADDING), `${fn.time.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), currentExecutionStep ? currentExecutionStep.gateCount.toLocaleString().padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '', currentExecutionStep ? acc.toLocaleString().padStart(COLUMN_MAX_WIDTH) : ''));
+        if (printOracles && fn.oracles) {
+            log('');
+            for (const [oracleName, { times }] of Object.entries(fn.oracles)){
+                const calls = times.length;
+                const min = Math.min(...times);
+                const max = Math.max(...times);
+                const total = times.reduce((acc, time)=>acc + time, 0);
+                const avg = total / calls;
+                log(format('    ', oracleName.padEnd(ORACLE_NAME_PADDING), `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH)));
+            }
+        }
+        log('');
+    });
+    if (biggest) {
+        log(format('\nTotal gates:', acc.toLocaleString(), `(Biggest circuit: ${biggest.functionName} -> ${biggest.gateCount.toLocaleString()})`));
+    }
+    if (stats.nodeRPCCalls) {
+        log(format('\nRPC calls:\n'));
+        for (const [method, { times }] of Object.entries(stats.nodeRPCCalls.perMethod)){
+            const calls = times.length;
+            const total = times.reduce((acc, time)=>acc + time, 0);
+            const avg = total / calls;
+            const min = Math.min(...times);
+            const max = Math.max(...times);
+            log(format(method.padEnd(ORACLE_NAME_PADDING), `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH)));
+        }
+        const { roundTrips } = stats.nodeRPCCalls;
+        log(format('\nRound trips (actual blocking waits):\n'));
+        log(format('Round trips:'.padEnd(25), `${roundTrips.roundTrips}`.padStart(COLUMN_MAX_WIDTH)));
+        log(format('Total blocking time:'.padEnd(25), `${roundTrips.totalBlockingTime.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+        if (roundTrips.roundTrips > 0) {
+            const avgRoundTrip = roundTrips.totalBlockingTime / roundTrips.roundTrips;
+            log(format('Avg round trip:'.padEnd(25), `${avgRoundTrip.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+        }
+    }
+    log(format('\nSync time:'.padEnd(25), `${timings.sync?.toFixed(2)}ms`.padStart(16)));
+    log(format('Private simulation time:'.padEnd(25), `${timings.perFunction.reduce((acc, { time })=>acc + time, 0).toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    if (timings.proving) {
+        log(format('Proving time:'.padEnd(25), `${timings.proving?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    }
+    if (timings.publicSimulation) {
+        log(format('Public simulation time:'.padEnd(25), `${timings.publicSimulation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    }
+    if (timings.validation) {
+        log(format('Validation time:'.padEnd(25), `${timings.validation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
+    }
+    log(format('Total time:'.padEnd(25), `${timings.total.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH), `(${timings.unaccounted.toFixed(2)}ms unaccounted)`));
+    log('\n');
+}

package/dest/utils/wallet.d.ts

@@ -0,0 +1,44 @@
+import { type Account } from '@aztec/aztec.js/account';
+import { type InteractionFeeOptions } from '@aztec/aztec.js/contracts';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import { AccountManager, type Aliased, type SimulateOptions } from '@aztec/aztec.js/wallet';
+import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { LogFn } from '@aztec/foundation/log';
+import type { NotesFilter } from '@aztec/pxe/client/lazy';
+import type { PXEConfig } from '@aztec/pxe/config';
+import type { PXE } from '@aztec/pxe/server';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { NoteDao } from '@aztec/stdlib/note';
+import type { TxProvingResult } from '@aztec/stdlib/tx';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
+import { BaseWallet, type SimulateViaEntrypointOptions } from '@aztec/wallet-sdk/base-wallet';
+import type { WalletDB } from '../storage/wallet_db.js';
+import type { AccountType } from './constants.js';
+export declare class CLIWallet extends BaseWallet {
+    private userLog;
+    private db?;
+    private accountCache;
+    private stubClassIds;
+    constructor(pxe: PXE, node: AztecNode, userLog: LogFn, db?: WalletDB | undefined);
+    static create(node: AztecNode, log: LogFn, db?: WalletDB, overridePXEConfig?: Partial<PXEConfig>): Promise<CLIWallet>;
+    private registerAuthRegistry;
+    private initStubClasses;
+    getAccounts(): Promise<Aliased<AztecAddress>[]>;
+    private createCancellationTxExecutionRequest;
+    proveCancellationTx(from: AztecAddress, txNonce: Fr, increasedFee: InteractionFeeOptions): Promise<TxProvingResult>;
+    getAccountFromAddress(address: AztecAddress): Promise<Account>;
+    private createAccount;
+    createOrRetrieveAccount(address?: AztecAddress, secretKey?: Fr, type?: AccountType, salt?: Fr, publicKey?: string): Promise<AccountManager>;
+    private getFakeAccountDataFor;
+    simulateTx(executionPayload: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset>;
+    /**
+     * Uses a stub account for kernelless simulation, bypassing real account authorization.
+     * Uses DefaultEntrypoint directly for NO_FROM transactions.
+     */
+    protected simulateViaEntrypoint(executionPayload: ExecutionPayload, opts: SimulateViaEntrypointOptions): Promise<TxSimulationResultWithAppOffset>;
+    getContracts(): Promise<AztecAddress[]>;
+    getNotes(filter: NotesFilter): Promise<NoteDao[]>;
+    getContractArtifact(id: Fr): Promise<import("@aztec/stdlib/abi").ContractArtifact | undefined>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2FsbGV0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvd2FsbGV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBaUMsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RixPQUFPLEVBQUUsS0FBSyxxQkFBcUIsRUFBOEMsTUFBTSwyQkFBMkIsQ0FBQztBQUNuSCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUssT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUYsT0FBTyxFQUFFLCtCQUErQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHekUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRzdDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDN0MsT0FBTyxLQUFLLEVBQTJDLGVBQWUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2pHLE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUM1RSxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssNEJBQTRCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU5RixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUlsRCxxQkFBYSxTQUFVLFNBQVEsVUFBVTtJQVNyQyxPQUFPLENBQUMsT0FBTztJQUNmLE9BQU8sQ0FBQyxFQUFFLENBQUM7SUFUYixPQUFPLENBQUMsWUFBWSxDQUE4QjtJQUdsRCxPQUFPLENBQUMsWUFBWSxDQUE4QjtJQUVsRCxZQUNFLEdBQUcsRUFBRSxHQUFHLEVBQ1IsSUFBSSxFQUFFLFNBQVMsRUFDUCxPQUFPLEVBQUUsS0FBSyxFQUNkLEVBQUUsQ0FBQyxzQkFBVSxFQUl0QjtJQUVELE9BQWEsTUFBTSxDQUNqQixJQUFJLEVBQUUsU0FBUyxFQUNmLEdBQUcsRUFBRSxLQUFLLEVBQ1YsRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUNiLGlCQUFpQixDQUFDLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUNyQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBT3BCO1lBRWEsb0JBQW9CO1lBU3BCLGVBQWU7SUFjZCxXQUFXLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLENBUTdEO1lBRWEsb0NBQW9DO0lBNEI1QyxtQkFBbUIsQ0FDdkIsSUFBSSxFQUFFLFlBQVksRUFDbEIsT0FBTyxFQUFFLEVBQUUsRUFDWCxZQUFZLEVBQUUscUJBQXFCLEdBQ2xDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FHMUI7SUFFYyxxQkFBcUIsQ0FBQyxPQUFPLEVBQUUsWUFBWSxvQkFhekQ7WUFFYSxhQUFhO0lBV3JCLHVCQUF1QixDQUMzQixPQUFPLENBQUMsRUFBRSxZQUFZLEVBQ3RCLFNBQVMsQ0FBQyxFQUFFLEVBQUUsRUFDZCxJQUFJLEdBQUUsV0FBdUIsRUFDN0IsSUFBSSxDQUFDLEVBQUUsRUFBRSxFQUNULFNBQVMsQ0FBQyxFQUFFLE1BQU0sR0FDakIsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQW1EekI7WUFRYSxxQkFBcUI7SUFvQnBCLFVBQVUsQ0FDdkIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLElBQUksRUFBRSxlQUFlLEdBQ3BCLE9BQU8sQ0FBQywrQkFBK0IsQ0FBQyxDQWExQztJQUVEOzs7T0FHRztJQUNILFVBQXlCLHFCQUFxQixDQUM1QyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsSUFBSSxFQUFFLDRCQUE0QixHQUNqQyxPQUFPLENBQUMsK0JBQStCLENBQUMsQ0EyQzFDO0lBSUQsWUFBWSxJQUFJLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUV0QztJQUlELFFBQVEsQ0FBQyxNQUFNLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUVoRDtJQUlELG1CQUFtQixDQUFDLEVBQUUsRUFBRSxFQUFFLHFFQUV6QjtDQUNGIn0=

package/dest/utils/wallet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/utils/wallet.ts"],"names":[],"mappings":"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"}

package/dest/utils/wallet.js

@@ -0,0 +1,263 @@
+import { EcdsaRAccountContract, EcdsaRSSHAccountContract } from '@aztec/accounts/ecdsa';
+import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
+import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/stub/ecdsa';
+import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/stub/schnorr';
+import { getIdentities } from '@aztec/accounts/utils';
+import { NO_FROM } from '@aztec/aztec.js/account';
+import { getContractClassFromArtifact, getGasLimits } from '@aztec/aztec.js/contracts';
+import { AccountManager } from '@aztec/aztec.js/wallet';
+import { TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
+import { DefaultEntrypoint } from '@aztec/entrypoints/default';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { createPXE, getPXEConfig } from '@aztec/pxe/server';
+import { getStandardAuthRegistry } from '@aztec/standard-contracts/auth-registry';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
+import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
+import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
+import { printGasEstimates } from './options/fees.js';
+export class CLIWallet extends BaseWallet {
+    userLog;
+    db;
+    accountCache;
+    // Stub class ids, populated on wallet startup
+    // to avoid redundant work per simulation
+    stubClassIds;
+    constructor(pxe, node, userLog, db){
+        super(pxe, node), this.userLog = userLog, this.db = db, this.accountCache = new Map(), this.stubClassIds = new Map();
+        this.cancellableTransactions = true;
+    }
+    static async create(node, log, db, overridePXEConfig) {
+        const pxeConfig = Object.assign(getPXEConfig(), overridePXEConfig);
+        const pxe = await createPXE(node, pxeConfig);
+        const wallet = new CLIWallet(pxe, node, log, db);
+        await wallet.initStubClasses();
+        await wallet.registerAuthRegistry();
+        return wallet;
+    }
+    async registerAuthRegistry() {
+        const { instance, artifact } = await getStandardAuthRegistry();
+        await this.pxe.registerContract({
+            instance,
+            artifact
+        });
+    }
+    /**
+   * Hashes and registers the stub class for every supported account type with PXE, populating
+   * stubClassIds. Called on wallet initialization.
+   */ async initStubClasses() {
+        const { id: schnorrClassId } = await getContractClassFromArtifact(StubSchnorrAccountContractArtifact);
+        await this.pxe.registerContractClass(StubSchnorrAccountContractArtifact);
+        // ecdsa stubs share the same class id
+        const { id: ecdsaClassId } = await getContractClassFromArtifact(StubEcdsaAccountContractArtifact);
+        await this.pxe.registerContractClass(StubEcdsaAccountContractArtifact);
+        this.stubClassIds.set('schnorr', schnorrClassId);
+        this.stubClassIds.set('ecdsasecp256k1', ecdsaClassId);
+        this.stubClassIds.set('ecdsasecp256r1', ecdsaClassId);
+        this.stubClassIds.set('ecdsasecp256r1ssh', ecdsaClassId);
+    }
+    async getAccounts() {
+        const accounts = await this.db?.listAliases('accounts') ?? [];
+        return Promise.resolve(accounts.map(({ key, value })=>{
+            const alias = key.includes(':') ? key.slice(key.indexOf(':') + 1) : key;
+            return {
+                alias,
+                item: AztecAddress.fromString(value)
+            };
+        }));
+    }
+    async createCancellationTxExecutionRequest(from, txNonce, increasedFee) {
+        const executionPayload = ExecutionPayload.empty();
+        const feeOptions = await this.completeFeeOptions({
+            from,
+            feePayer: executionPayload.feePayer,
+            gasSettings: increasedFee.gasSettings
+        });
+        const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
+        const fromAccount = await this.getAccountFromAddress(from);
+        const chainInfo = await this.getChainInfo();
+        const executionOptions = {
+            txNonce,
+            cancellable: this.cancellableTransactions,
+            // If from is an address, feeOptions include the way the account contract should handle the fee payment
+            feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
+        };
+        return await fromAccount.createTxExecutionRequest(feeExecutionPayload ?? executionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
+    }
+    async proveCancellationTx(from, txNonce, increasedFee) {
+        const cancellationTxRequest = await this.createCancellationTxExecutionRequest(from, txNonce, increasedFee);
+        return await this.pxe.proveTx(cancellationTxRequest, {
+            scopes: this.scopesFrom(from),
+            senderForTags: from
+        });
+    }
+    async getAccountFromAddress(address) {
+        let account;
+        if (this.accountCache.has(address.toString())) {
+            return this.accountCache.get(address.toString());
+        } else {
+            const accountManager = await this.createOrRetrieveAccount(address);
+            account = await accountManager.getAccount();
+        }
+        if (!account) {
+            throw new Error(`Account not found in wallet for address: ${address}`);
+        }
+        return account;
+    }
+    async createAccount(secret, salt, contract) {
+        const accountManager = await AccountManager.create(this, secret, contract, {
+            salt
+        });
+        const instance = accountManager.getInstance();
+        const artifact = await contract.getContractArtifact();
+        await this.registerContract(instance, artifact, secret);
+        this.accountCache.set(accountManager.address.toString(), await accountManager.getAccount());
+        return accountManager;
+    }
+    async createOrRetrieveAccount(address, secretKey, type = 'schnorr', salt, publicKey) {
+        let account;
+        salt ??= Fr.ZERO;
+        if (this.db && address) {
+            ({ type, secretKey, salt } = await this.db.retrieveAccount(address));
+        }
+        if (!secretKey) {
+            throw new Error('Cannot retrieve/create wallet without secret key');
+        }
+        switch(type){
+            case 'schnorr':
+                {
+                    account = await this.createAccount(secretKey, salt, new SchnorrAccountContract(deriveSigningKey(secretKey)));
+                    break;
+                }
+            case 'ecdsasecp256r1':
+                {
+                    account = await this.createAccount(secretKey, salt, new EcdsaRAccountContract(deriveSigningKey(secretKey).toBuffer()));
+                    break;
+                }
+            case 'ecdsasecp256r1ssh':
+                {
+                    let publicSigningKey;
+                    if (this.db && address) {
+                        publicSigningKey = await this.db.retrieveAccountMetadata(address, 'publicSigningKey');
+                    } else if (publicKey) {
+                        const identities = await getIdentities();
+                        const foundIdentity = identities.find((identity)=>identity.type === 'ecdsa-sha2-nistp256' && identity.publicKey === publicKey);
+                        if (!foundIdentity) {
+                            throw new Error(`Identity for public key ${publicKey} not found in the SSH agent`);
+                        }
+                        publicSigningKey = extractECDSAPublicKeyFromBase64String(foundIdentity.publicKey);
+                    } else {
+                        throw new Error('Public key must be provided for ECDSA SSH account');
+                    }
+                    account = await this.createAccount(secretKey, salt, new EcdsaRSSHAccountContract(publicSigningKey));
+                    break;
+                }
+            default:
+                {
+                    throw new Error(`Unsupported account type: ${type}`);
+                }
+        }
+        return account;
+    }
+    /**
+   * Creates a stub account that impersonates the given address, allowing kernelless simulations
+   * to bypass the account's authorization mechanisms via contract overrides.
+   * @param address - The address of the account to impersonate
+   * @returns The stub account, contract instance, and artifact for simulation
+   */ async getFakeAccountDataFor(address) {
+        const originalAccount = await this.getAccountFromAddress(address);
+        const originalAddress = originalAccount.getCompleteAddress();
+        const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
+        if (!contractInstance) {
+            throw new Error(`No contract instance found for address: ${originalAddress.address}`);
+        }
+        const { type } = await this.db.retrieveAccount(address);
+        const stubAccount = type === 'schnorr' ? createStubSchnorrAccount(originalAddress) : createStubEcdsaAccount(originalAddress);
+        const stubClassId = this.stubClassIds.get(type);
+        if (!stubClassId) {
+            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.`);
+        }
+        const instance = {
+            ...contractInstance,
+            currentContractClassId: stubClassId
+        };
+        return {
+            account: stubAccount,
+            instance
+        };
+    }
+    async simulateTx(executionPayload, opts) {
+        const simulationResults = await super.simulateTx(executionPayload, opts);
+        if (opts.fee?.estimateGas) {
+            const feeOptions = await this.completeFeeOptions({
+                from: opts.from,
+                feePayer: executionPayload.feePayer,
+                gasSettings: opts.fee?.gasSettings
+            });
+            const limits = getGasLimits(simulationResults, opts.fee?.estimatedGasPadding);
+            printGasEstimates(feeOptions, limits, this.userLog);
+        }
+        return simulationResults;
+    }
+    /**
+   * Uses a stub account for kernelless simulation, bypassing real account authorization.
+   * Uses DefaultEntrypoint directly for NO_FROM transactions.
+   */ async simulateViaEntrypoint(executionPayload, opts) {
+        const { from, feeOptions, additionalScopes, sendMessagesAs } = opts;
+        const scopes = this.scopesFrom(from, additionalScopes);
+        const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
+        const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
+            feeExecutionPayload,
+            executionPayload
+        ]) : executionPayload;
+        const chainInfo = await this.getChainInfo();
+        let overrides;
+        let txRequest;
+        if (from === NO_FROM) {
+            const entrypoint = new DefaultEntrypoint();
+            txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
+        } else {
+            const { account, instance } = await this.getFakeAccountDataFor(from);
+            overrides = {
+                contracts: {
+                    [from.toString()]: {
+                        instance
+                    }
+                }
+            };
+            const executionOptions = {
+                txNonce: Fr.random(),
+                cancellable: this.cancellableTransactions,
+                // If from is an address, feeOptions include the way the account contract should handle the fee payment
+                feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
+            };
+            txRequest = await account.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
+        }
+        const result = await this.pxe.simulateTx(txRequest, {
+            simulatePublic: true,
+            skipFeeEnforcement: true,
+            skipTxValidation: true,
+            overrides,
+            scopes,
+            senderForTags: this.senderForTagsFrom(from, sendMessagesAs)
+        });
+        const appCallOffset = await this.computeAppCallOffset(from, feeOptions);
+        return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
+    }
+    // Exposed because of the `aztec-wallet get-tx` command. It has been decided that it's fine to keep around because
+    // this is just a CLI wallet.
+    getContracts() {
+        return this.pxe.getContracts();
+    }
+    // Exposed because of the `aztec-wallet get-tx` command. It has been decided that it's fine to keep around because
+    // this is just a CLI wallet.
+    getNotes(filter) {
+        return this.pxe.debug.getNotes(filter);
+    }
+    // Exposed because of the `aztec-wallet get-tx` command. It has been decided that it's fine to keep around because
+    // this is just a CLI wallet.
+    getContractArtifact(id) {
+        return this.pxe.getContractArtifact(id);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.017a351",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -19,12 +19,10 @@
   "scripts": {
     "start": "node --no-warnings ./dest/bin",
     "start:debug": "node --inspect=0.0.0.0:9221 --no-warnings ./dest/bin",
-    "dev": "LOG_LEVEL=debug && node ./dest/bin",
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "dev": "LOG_LEVEL=\"debug; info: json-rpc, simulator\" node ./dest/bin",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -62,33 +60,43 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.0-test.1",
-    "@aztec/aztec.js": "0.0.0-test.1",
-    "@aztec/cli": "0.0.0-test.1",
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/kv-store": "0.0.0-test.1",
-    "@aztec/noir-contracts.js": "0.0.0-test.1",
-    "@aztec/pxe": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
+    "@aztec/accounts": "0.0.1-commit.017a351",
+    "@aztec/aztec.js": "0.0.1-commit.017a351",
+    "@aztec/bb.js": "0.0.1-commit.017a351",
+    "@aztec/cli": "0.0.1-commit.017a351",
+    "@aztec/entrypoints": "0.0.1-commit.017a351",
+    "@aztec/ethereum": "0.0.1-commit.017a351",
+    "@aztec/foundation": "0.0.1-commit.017a351",
+    "@aztec/kv-store": "0.0.1-commit.017a351",
+    "@aztec/noir-contracts.js": "0.0.1-commit.017a351",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.017a351",
+    "@aztec/pxe": "0.0.1-commit.017a351",
+    "@aztec/standard-contracts": "0.0.1-commit.017a351",
+    "@aztec/stdlib": "0.0.1-commit.017a351",
+    "@aztec/wallet-sdk": "0.0.1-commit.017a351",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.7.23",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^22.15.17",
     "@types/source-map-support": "^0.5.10",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.5",
-    "ts-jest": "^29.1.0",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
+    "ts-jest": "^29.4.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -97,6 +105,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/bin/index.ts

@@ -1,24 +1,31 @@
-import { Fr, computeSecretHash, fileURLToPath } from '@aztec/aztec.js';
+#!/usr/bin/env node
+import { computeSecretHash } from '@aztec/aztec.js/crypto';
+import { Fr } from '@aztec/aztec.js/fields';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { ProtocolContractAddress } from '@aztec/aztec.js/protocol';
+import { BackendType, Barretenberg } from '@aztec/bb.js';
 import { LOCALHOST } from '@aztec/cli/cli-utils';
 import { type LogFn, createConsoleLogger, createLogger } from '@aztec/foundation/log';
 import { openStoreAt } from '@aztec/kv-store/lmdb-v2';
-import type { PXEServiceConfig } from '@aztec/pxe/config';
+import type { PXEConfig } from '@aztec/pxe/config';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 
 import { Argument, Command, Option } from 'commander';
-import { mkdirSync, readFileSync } from 'fs';
 import { homedir } from 'os';
-import { dirname, join, resolve } from 'path';
+import { join } from 'path';
 
 import { injectCommands } from '../cmds/index.js';
 import { Aliases, WalletDB } from '../storage/wallet_db.js';
+import { CliWalletAndNodeWrapper } from '../utils/cli_wallet_and_node_wrapper.js';
 import { createAliasOption } from '../utils/options/index.js';
-import { PXEWrapper } from '../utils/pxe_wrapper.js';
+import { CLIWallet } from '../utils/wallet.js';
 
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('wallet');
 
-const { WALLET_DATA_DIRECTORY = join(homedir(), '.aztec/wallet'), PXE_PROVER = 'none' } = process.env;
+const { WALLET_DATA_DIRECTORY = join(homedir(), '.aztec/wallet') } = process.env;
 
+// TODO: This function is only used in 1 place so we could just inline this
 function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
   program
     .command('alias')
@@ -55,7 +62,7 @@ function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
       const options = command.optsWithGlobals();
       const { alias } = options;
       const value = Fr.random();
-      const hash = computeSecretHash(value);
+      const hash = await computeSecretHash(value);
 
       await db.storeAlias('secrets', alias, Buffer.from(value.toString()), log);
       await db.storeAlias('secrets', `${alias}:hash`, Buffer.from(hash.toString()), log);
@@ -66,23 +73,21 @@ function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
 
 /** CLI wallet main entrypoint */
 async function main() {
-  const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-  const walletVersion: string = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+  const walletVersion = getPackageVersion();
 
   const db = WalletDB.getInstance();
-  const pxeWrapper = new PXEWrapper();
+  const walletAndNodeWrapper = new CliWalletAndNodeWrapper();
 
   const program = new Command('wallet');
   program
     .description('Aztec wallet')
     .version(walletVersion)
     .option('-d, --data-dir <string>', 'Storage directory for wallet data', WALLET_DATA_DIRECTORY)
-    .option('-p, --prover <string>', 'wasm|native|none', PXE_PROVER)
     .addOption(
-      new Option('--remote-pxe', 'Connect to an external PXE RPC server, instead of the local one')
-        .env('REMOTE_PXE')
-        .default(false)
-        .conflicts('rpc-url'),
+      new Option('-p, --prover <string>', 'The type of prover the wallet uses')
+        .choices(['wasm', 'native', 'none'])
+        .env('PXE_PROVER')
+        .default('native'),
     )
     .addOption(
       new Option('-n, --node-url <string>', 'URL of the Aztec node to connect to')
@@ -90,34 +95,59 @@ async function main() {
         .default(`http://${LOCALHOST}:8080`),
     )
     .hook('preSubcommand', async command => {
-      const { dataDir, remotePxe, nodeUrl, prover } = command.optsWithGlobals();
+      // Skip initialization if user is just requesting help
+      if (command.args.includes('--help') || command.args.includes('-h')) {
+        return;
+      }
+
+      const { dataDir, nodeUrl, prover } = command.optsWithGlobals();
 
-      if (!remotePxe) {
-        debugLogger.info('Using local PXE service');
+      const proverEnabled = prover !== 'none';
 
-        const proverEnabled = prover !== 'none';
+      switch (prover) {
+        case 'native':
+          await Barretenberg.initSingleton({ backend: BackendType.NativeUnixSocket });
+          break;
+        case 'wasm':
+          await Barretenberg.initSingleton({ backend: BackendType.Wasm });
+          break;
+      }
 
-        const bbBinaryPath =
-          prover === 'native'
-            ? resolve(dirname(fileURLToPath(import.meta.url)), '../../../../barretenberg/cpp/build/bin/bb')
-            : undefined;
-        const bbWorkingDirectory = dataDir + '/bb';
-        mkdirSync(bbWorkingDirectory, { recursive: true });
+      const overridePXEConfig: Partial<PXEConfig> = {
+        proverEnabled,
+        dataDirectory: join(dataDir, 'pxe'),
+      };
 
-        const overridePXEConfig: Partial<PXEServiceConfig> = {
-          proverEnabled,
-          bbBinaryPath: prover === 'native' ? bbBinaryPath : undefined,
-          bbWorkingDirectory: prover === 'native' ? bbWorkingDirectory : undefined,
-        };
+      const node = createAztecNodeClient(nodeUrl);
+      const wallet = await CLIWallet.create(node, userLog, db, overridePXEConfig);
+
+      walletAndNodeWrapper.setNodeAndWallet(node, wallet);
 
-        await pxeWrapper.init(nodeUrl, join(dataDir, 'pxe'), overridePXEConfig);
-      }
       await db.init(await openStoreAt(dataDir));
+      let protocolContractsRegistered;
+      try {
+        protocolContractsRegistered = !!(await db.retrieveAlias('contracts:ContractClassRegistry'));
+        // eslint-disable-next-line no-empty
+      } catch {}
+      if (!protocolContractsRegistered) {
+        userLog('Registering protocol contract aliases...');
+        for (const [name, address] of Object.entries(ProtocolContractAddress)) {
+          await db.storeAlias('contracts', name, Buffer.from(address.toString()), userLog);
+          await db.storeAlias(
+            'artifacts',
+            address.toString(),
+            Buffer.from(`${name.slice(0, 1).toUpperCase()}${name.slice(1)}`),
+            userLog,
+          );
+        }
+      }
     });
 
-  injectCommands(program, userLog, debugLogger, db, pxeWrapper);
+  injectCommands(program, userLog, debugLogger, walletAndNodeWrapper, db);
   injectInternalCommands(program, userLog, db);
   await program.parseAsync(process.argv);
+
+  await Barretenberg.destroySingleton();
 }
 
 main().catch(err => {