@aztec/cli-wallet 5.0.0-private.20260318 → 5.0.0-rc.1

package/dest/utils/wallet.js

@@ -1,60 +1,109 @@
 import { EcdsaRAccountContract, EcdsaRSSHAccountContract } from '@aztec/accounts/ecdsa';
-import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
-import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
+import { StubEcdsaAccountContractArtifact, createStubEcdsaAccount } from '@aztec/accounts/ecdsa/stub';
+import { SchnorrAccountContract, SchnorrInitializerlessAccountContract } from '@aztec/accounts/schnorr';
+import { StubSchnorrAccountContractArtifact, createStubSchnorrAccount } from '@aztec/accounts/schnorr/stub';
 import { getIdentities } from '@aztec/accounts/utils';
-import { SignerlessAccount } from '@aztec/aztec.js/account';
-import { getContractInstanceFromInstantiationParams, getGasLimits } from '@aztec/aztec.js/contracts';
+import { NO_FROM } from '@aztec/aztec.js/account';
+import { ContractFunctionInteraction, getContractClassFromArtifact } 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 { BaseWallet, getGasLimits } from '@aztec/wallet-sdk/base-wallet';
 import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
-import { printGasEstimates } from './options/fees.js';
+/** Padding the CLI wallet applies to simulated gas usage when deriving declared gas limits. */ const DEFAULT_ESTIMATED_GAS_PADDING = 0.1;
 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();
+        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);
-        return new CLIWallet(pxe, node, log, db);
+        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('schnorr_initializerless', 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 })=>({
-                alias: value,
-                item: AztecAddress.fromString(key)
-            })));
+        return Promise.resolve(accounts.map(({ key, value })=>{
+            const alias = key.includes(':') ? key.slice(key.indexOf(':') + 1) : key;
+            return {
+                alias,
+                item: AztecAddress.fromString(value)
+            };
+        }));
+    }
+    /**
+   * Derives suggested total and teardown gas limits from simulated gas usage, padded and clamped to the
+   * network's per-tx admission limits.
+   * @param gasUsed - The gas consumed during simulation (from a `simulate({ includeMetadata: true })` result).
+   */ async estimateGasLimits(gasUsed) {
+        const maxTxGasLimits = await this.getMaxTxGasLimits();
+        return getGasLimits(gasUsed, maxTxGasLimits, DEFAULT_ESTIMATED_GAS_PADDING);
     }
     async createCancellationTxExecutionRequest(from, txNonce, increasedFee) {
         const executionPayload = ExecutionPayload.empty();
-        const feeOptions = await this.completeFeeOptions(from, executionPayload.feePayer, increasedFee.gasSettings);
+        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, this.scopesFrom(from));
+        return await this.pxe.proveTx(cancellationTxRequest, {
+            scopes: this.scopesFrom(from),
+            senderForTags: from
+        });
     }
     async getAccountFromAddress(address) {
         let account;
-        if (address.equals(AztecAddress.ZERO)) {
-            account = new SignerlessAccount();
-        } else if (this.accountCache.has(address.toString())) {
+        if (this.accountCache.has(address.toString())) {
             return this.accountCache.get(address.toString());
         } else {
             const accountManager = await this.createOrRetrieveAccount(address);
@@ -66,11 +115,30 @@ export class CLIWallet extends BaseWallet {
         return account;
     }
     async createAccount(secret, salt, contract) {
-        const accountManager = await AccountManager.create(this, secret, contract, salt);
+        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());
+        // Initializerless accounts have no deployment tx; their address commits to the signing public key
+        // (via the contract's immutablesHash, resolved by AccountManager.create) and the constructor's
+        // storage writes are materialized locally via a simulated "store" call here.
+        if (contract instanceof SchnorrInitializerlessAccountContract) {
+            const constructorAbi = artifact.functions.find((f)=>f.name === 'constructor');
+            if (!constructorAbi) {
+                throw new Error('Could not create SchnorrInitializerlessAccount: constructor ABI not found');
+            }
+            const { x, y } = await contract.getSigningPublicKey();
+            const storeCall = new ContractFunctionInteraction(this, instance.address, constructorAbi, [
+                x,
+                y
+            ]);
+            await storeCall.simulate({
+                from: instance.address
+            });
+        }
         return accountManager;
     }
     async createOrRetrieveAccount(address, secretKey, type = 'schnorr', salt, publicKey) {
@@ -88,6 +156,11 @@ export class CLIWallet extends BaseWallet {
                     account = await this.createAccount(secretKey, salt, new SchnorrAccountContract(deriveSigningKey(secretKey)));
                     break;
                 }
+            case 'schnorr_initializerless':
+                {
+                    account = await this.createAccount(secretKey, salt, new SchnorrInitializerlessAccountContract(deriveSigningKey(secretKey)));
+                    break;
+                }
             case 'ecdsasecp256r1':
                 {
                     account = await this.createAccount(secretKey, salt, new EcdsaRAccountContract(deriveSigningKey(secretKey).toBuffer()));
@@ -125,70 +198,70 @@ export class CLIWallet extends BaseWallet {
    * @returns The stub account, contract instance, and artifact for simulation
    */ async getFakeAccountDataFor(address) {
         const originalAccount = await this.getAccountFromAddress(address);
-        // Account contracts can only be overridden if they have an associated address
-        // Overwriting SignerlessAccount is not supported, and does not really make sense
-        // since it has no authorization mechanism.
-        if (originalAccount instanceof SignerlessAccount) {
-            throw new Error(`Cannot create fake account data for SignerlessAccount at address: ${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 stubAccount = createStubAccount(originalAddress);
-        const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
-            salt: Fr.random()
-        });
+        const { type } = await this.db.retrieveAccount(address);
+        const stubAccount = type === 'schnorr' || type === 'schnorr_initializerless' ? 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,
-            artifact: StubAccountContractArtifact
+            instance
         };
     }
-    async simulateTx(executionPayload, opts) {
-        const simulationResults = await super.simulateTx(executionPayload, opts);
-        if (opts.fee?.estimateGas) {
-            const feeOptions = await this.completeFeeOptions(opts.from, executionPayload.feePayer, 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.
-   * Falls through to the standard entrypoint path for SignerlessAccount (ZERO address).
-   */ async simulateViaEntrypoint(executionPayload, from, feeOptions, scopes, skipTxValidation, skipFeeEnforcement) {
-        if (from.equals(AztecAddress.ZERO)) {
-            return super.simulateViaEntrypoint(executionPayload, from, feeOptions, scopes, skipTxValidation, skipFeeEnforcement);
-        }
+   * 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 executionOptions = {
-            txNonce: Fr.random(),
-            cancellable: this.cancellableTransactions,
-            feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
-        };
         const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
             feeExecutionPayload,
             executionPayload
         ]) : executionPayload;
-        const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(from);
         const chainInfo = await this.getChainInfo();
-        const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
-        return this.pxe.simulateTx(txRequest, {
-            simulatePublic: true,
-            skipFeeEnforcement: true,
-            skipTxValidation: true,
-            overrides: {
+        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,
-                        artifact
+                        instance
                     }
                 }
-            },
-            scopes
+            };
+            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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "5.0.0-private.20260318",
+  "version": "5.0.0-rc.1",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -19,7 +19,7 @@
   "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",
+    "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",
@@ -67,19 +67,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "5.0.0-private.20260318",
-    "@aztec/aztec.js": "5.0.0-private.20260318",
-    "@aztec/bb.js": "5.0.0-private.20260318",
-    "@aztec/cli": "5.0.0-private.20260318",
-    "@aztec/entrypoints": "5.0.0-private.20260318",
-    "@aztec/ethereum": "5.0.0-private.20260318",
-    "@aztec/foundation": "5.0.0-private.20260318",
-    "@aztec/kv-store": "5.0.0-private.20260318",
-    "@aztec/noir-contracts.js": "5.0.0-private.20260318",
-    "@aztec/noir-noirc_abi": "5.0.0-private.20260318",
-    "@aztec/pxe": "5.0.0-private.20260318",
-    "@aztec/stdlib": "5.0.0-private.20260318",
-    "@aztec/wallet-sdk": "5.0.0-private.20260318",
+    "@aztec/accounts": "5.0.0-rc.1",
+    "@aztec/aztec.js": "5.0.0-rc.1",
+    "@aztec/bb.js": "5.0.0-rc.1",
+    "@aztec/cli": "5.0.0-rc.1",
+    "@aztec/entrypoints": "5.0.0-rc.1",
+    "@aztec/ethereum": "5.0.0-rc.1",
+    "@aztec/foundation": "5.0.0-rc.1",
+    "@aztec/kv-store": "5.0.0-rc.1",
+    "@aztec/noir-contracts.js": "5.0.0-rc.1",
+    "@aztec/noir-noirc_abi": "5.0.0-rc.1",
+    "@aztec/pxe": "5.0.0-rc.1",
+    "@aztec/standard-contracts": "5.0.0-rc.1",
+    "@aztec/stdlib": "5.0.0-rc.1",
+    "@aztec/wallet-sdk": "5.0.0-rc.1",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/bin/index.ts

@@ -73,7 +73,7 @@ function injectInternalCommands(program: Command, log: LogFn, db: WalletDB) {
 
 /** CLI wallet main entrypoint */
 async function main() {
-  const walletVersion = getPackageVersion() ?? '0.0.0';
+  const walletVersion = getPackageVersion();
 
   const db = WalletDB.getInstance();
   const walletAndNodeWrapper = new CliWalletAndNodeWrapper();

package/src/cmds/check_tx.ts

@@ -1,11 +1,15 @@
 import type { ContractArtifact } from '@aztec/aztec.js/abi';
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { Fr } from '@aztec/aztec.js/fields';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { ProtocolContractAddress } from '@aztec/aztec.js/protocol';
 import type { TxHash } from '@aztec/aztec.js/tx';
 import type { LogFn } from '@aztec/foundation/log';
-import { siloNullifier } from '@aztec/stdlib/hash';
+import {
+  computeSiloedPrivateInitializationNullifier,
+  computeSiloedPublicInitializationNullifier,
+  siloNullifier,
+} from '@aztec/stdlib/hash';
 import { NoteDao } from '@aztec/stdlib/note';
 
 import type { CLIWallet } from '../utils/wallet.js';
@@ -29,7 +33,7 @@ export async function checkTx(
 // dependency when dropping PXE JSON RPC Server.
 
 async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash, log: LogFn) {
-  const [receipt, effectsInBlock] = await Promise.all([aztecNode.getTxReceipt(txHash), aztecNode.getTxEffect(txHash)]);
+  const receipt = await aztecNode.getTxReceipt(txHash, { includeTxEffect: true });
   // Base tx data
   log(`Tx ${txHash.toString()}`);
   log(` Status: ${receipt.status}`);
@@ -40,11 +44,11 @@ async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash
     log(` Error: ${receipt.error}`);
   }
 
-  if (!effectsInBlock) {
+  if (!receipt.isMined() || !receipt.txEffect) {
     return;
   }
 
-  const effects = effectsInBlock.data;
+  const effects = receipt.txEffect;
   const artifactMap = await getKnownArtifacts(wallet);
 
   log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
@@ -83,12 +87,13 @@ async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash
   // Nullifiers
   const nullifierCount = effects.nullifiers.length;
   const { deployNullifiers, initNullifiers, classNullifiers } = await getKnownNullifiers(wallet, artifactMap);
+  const accounts = (await wallet.getAccounts()).map(a => a.item);
   if (nullifierCount > 0) {
     log(' Nullifiers:');
     for (const nullifier of effects.nullifiers) {
       const deployed = deployNullifiers[nullifier.toString()];
       const note = deployed
-        ? (await wallet.getNotes({ siloedNullifier: nullifier, contractAddress: deployed, scopes: 'ALL_SCOPES' }))[0]
+        ? (await wallet.getNotes({ siloedNullifier: nullifier, contractAddress: deployed, scopes: accounts }))[0]
         : undefined;
       const initialized = initNullifiers[nullifier.toString()];
       const registered = classNullifiers[nullifier.toString()];
@@ -144,22 +149,49 @@ function toFriendlyAddress(address: AztecAddress, artifactMap: ArtifactMap) {
 
 async function getKnownNullifiers(wallet: CLIWallet, artifactMap: ArtifactMap) {
   const knownContracts = await wallet.getContracts();
-  const deployerAddress = ProtocolContractAddress.ContractInstanceRegistry;
-  const classRegistryAddress = ProtocolContractAddress.ContractClassRegistry;
+
+  const [contractResults, classResults] = await Promise.all([
+    Promise.all(knownContracts.map(contract => getContractNullifiers(wallet, contract))),
+    Promise.all(Object.values(artifactMap).map(artifact => getClassNullifier(artifact))),
+  ]);
+
   const initNullifiers: Record<string, AztecAddress> = {};
   const deployNullifiers: Record<string, AztecAddress> = {};
   const classNullifiers: Record<string, string> = {};
-  for (const contract of knownContracts) {
-    initNullifiers[(await siloNullifier(contract, contract.toField())).toString()] = contract;
-    deployNullifiers[(await siloNullifier(deployerAddress, contract.toField())).toString()] = contract;
+
+  for (const { contract, deployNullifier, privateInitNullifier, publicInitNullifier } of contractResults) {
+    deployNullifiers[deployNullifier.toString()] = contract;
+    if (privateInitNullifier) {
+      initNullifiers[privateInitNullifier.toString()] = contract;
+    }
+    initNullifiers[publicInitNullifier.toString()] = contract;
   }
-  for (const artifact of Object.values(artifactMap)) {
-    classNullifiers[(await siloNullifier(classRegistryAddress, artifact.classId)).toString()] =
-      `${artifact.name}Class<${artifact.classId}>`;
+  for (const { nullifier, label } of classResults) {
+    classNullifiers[nullifier.toString()] = label;
   }
+
   return { initNullifiers, deployNullifiers, classNullifiers };
 }
 
+async function getContractNullifiers(wallet: CLIWallet, contract: AztecAddress) {
+  const deployerAddress = ProtocolContractAddress.ContractInstanceRegistry;
+  const deployNullifier = await siloNullifier(deployerAddress, contract.toField());
+
+  const metadata = await wallet.getContractMetadata(contract);
+  const privateInitNullifier = metadata.instance
+    ? await computeSiloedPrivateInitializationNullifier(contract, metadata.instance.initializationHash)
+    : undefined;
+  const publicInitNullifier = await computeSiloedPublicInitializationNullifier(contract);
+
+  return { contract, deployNullifier, privateInitNullifier, publicInitNullifier };
+}
+
+async function getClassNullifier(artifact: ContractArtifactWithClassId) {
+  const classRegistryAddress = ProtocolContractAddress.ContractClassRegistry;
+  const nullifier = await siloNullifier(classRegistryAddress, artifact.classId);
+  return { nullifier, label: `${artifact.name}Class<${artifact.classId}>` };
+}
+
 type ArtifactMap = Record<string, ContractArtifactWithClassId>;
 type ContractArtifactWithClassId = ContractArtifact & { classId: Fr };
 

package/src/cmds/create_account.ts

@@ -1,11 +1,12 @@
+import { NO_FROM } from '@aztec/aztec.js/account';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { NO_WAIT } from '@aztec/aztec.js/contracts';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import { type AztecNode, waitForTx } from '@aztec/aztec.js/node';
 import type { DeployAccountOptions } from '@aztec/aztec.js/wallet';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
+import { type TxHash, type TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import type { AccountType } from '../utils/constants.js';
@@ -18,6 +19,7 @@ export async function createAccount(
   aztecNode: AztecNode,
   accountType: AccountType,
   secretKey: Fr | undefined,
+  salt: Fr | undefined,
   publicKey: string | undefined,
   alias: string | undefined,
   deployer: AztecAddress | undefined,
@@ -27,6 +29,7 @@ export async function createAccount(
   registerClass: boolean,
   wait: boolean,
   feeOpts: CLIFeeArgs,
+  waitForStatus: TxStatus,
   json: boolean,
   verbose: boolean,
   debugLogger: Logger,
@@ -38,10 +41,10 @@ export async function createAccount(
     undefined /* address, we don't have it yet */,
     secretKey,
     accountType,
-    Fr.ZERO,
+    salt,
     publicKey,
   );
-  const { salt } = account.getInstance();
+  const instanceSalt = account.getInstance().salt;
   const { address, publicKeys, partialAddress } = await account.getCompleteAddress();
 
   const out: Record<string, any> = {};
@@ -52,7 +55,7 @@ export async function createAccount(
       out.secretKey = secretKey;
     }
     out.partialAddress = partialAddress;
-    out.salt = salt;
+    out.salt = instanceSalt;
     out.initHash = account.getInstance().initializationHash;
   } else {
     log(`\nNew account:\n`);
@@ -62,17 +65,19 @@ export async function createAccount(
       log(`Secret key:     ${secretKey.toString()}`);
     }
     log(`Partial address: ${partialAddress.toString()}`);
-    log(`Salt:            ${salt.toString()}`);
+    log(`Salt:            ${instanceSalt.toString()}`);
     log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
   }
 
   let txHash: TxHash | undefined;
   let txReceipt: TxReceipt | undefined;
-  if (!registerOnly) {
+  // Initializerless accounts have no deployment tx — creating one only registers it locally — so there is
+  // nothing to deploy on-chain.
+  if (!registerOnly && accountType !== 'schnorr_initializerless') {
     const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
     const delegatedDeployment = deployer && !account.address.equals(deployer);
-    const from = delegatedDeployment ? deployer : AztecAddress.ZERO;
+    const from = delegatedDeployment ? deployer : NO_FROM;
 
     const deployAccountOpts: DeployAccountOptions = {
       skipClassPublication: !registerClass,
@@ -82,13 +87,14 @@ export async function createAccount(
       fee: { paymentMethod, gasSettings },
     };
 
+    const localStart = performance.now();
     const deployMethod = await account.getDeployMethod();
     const sim = await deployMethod.simulate({
       ...deployAccountOpts,
-      fee: { ...deployAccountOpts.fee, estimateGas: true },
+      includeMetadata: true,
     });
-    // estimateGas: true guarantees these fields are present
-    const estimatedGas = sim.estimatedGas!;
+    // includeMetadata: true guarantees these fields are present
+    const estimatedGas = await wallet.estimateGasLimits(sim.gasUsed!);
     const stats = sim.stats!;
 
     if (feeOpts.estimateOnly) {
@@ -121,19 +127,24 @@ export async function createAccount(
             }
           : undefined,
       };
+
+      ({ txHash } = await deployMethod.send({ ...sendOpts, wait: NO_WAIT }));
+      const localTimeMs = performance.now() - localStart;
+
       if (wait) {
-        const { receipt } = await deployMethod.send({
-          ...sendOpts,
-          wait: { timeout: DEFAULT_TX_TIMEOUT_S, returnReceipt: true },
-        });
-        txReceipt = receipt;
-        txHash = receipt.txHash;
+        const nodeStart = performance.now();
+        txReceipt = await waitForTx(aztecNode, txHash, { timeout: DEFAULT_TX_TIMEOUT_S, waitForStatus });
+        const nodeTimeMs = performance.now() - nodeStart;
+
         out.txReceipt = {
           status: txReceipt.status,
           transactionFee: txReceipt.transactionFee,
         };
-      } else {
-        ({ txHash } = await deployMethod.send({ ...sendOpts, wait: NO_WAIT }));
+
+        if (!json) {
+          log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
+          log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
+        }
       }
       debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
       out.txHash = txHash;
@@ -151,5 +162,5 @@ export async function createAccount(
     }
   }
 
-  return { alias, address, secretKey, salt };
+  return { alias, address, secretKey, salt: instanceSalt };
 }