@aztec/cli-wallet 0.0.1-commit.f295ac2 → 0.0.1-commit.f2ce05ee

package/dest/utils/wallet.js

@@ -38,12 +38,13 @@ export class CLIWallet extends BaseWallet {
         const feeOptions = await this.completeFeeOptions(from, executionPayload.feePayer, 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,
             feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
         };
-        return await fromAccount.createTxExecutionRequest(feeExecutionPayload ?? executionPayload, feeOptions.gasSettings, executionOptions);
+        return await fromAccount.createTxExecutionRequest(feeExecutionPayload ?? executionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
     }
     async proveCancellationTx(from, txNonce, increasedFee) {
         const cancellationTxRequest = await this.createCancellationTxExecutionRequest(from, txNonce, increasedFee);
@@ -52,8 +53,7 @@ export class CLIWallet extends BaseWallet {
     async getAccountFromAddress(address) {
         let account;
         if (address.equals(AztecAddress.ZERO)) {
-            const chainInfo = await this.getChainInfo();
-            account = new SignerlessAccount(chainInfo);
+            account = new SignerlessAccount();
         } else if (this.accountCache.has(address.toString())) {
             return this.accountCache.get(address.toString());
         } else {
@@ -118,15 +118,25 @@ export class CLIWallet extends BaseWallet {
         }
         return account;
     }
-    async getFakeAccountDataFor(address) {
-        const chainInfo = await this.getChainInfo();
+    /**
+   * 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);
+        // 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, chainInfo);
+        const stubAccount = createStubAccount(originalAddress);
         const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
             salt: Fr.random()
         });
@@ -140,6 +150,7 @@ export class CLIWallet extends BaseWallet {
         let simulationResults;
         const feeOptions = opts.fee?.estimateGas ? await this.completeFeeOptionsForEstimation(opts.from, executionPayload.feePayer, opts.fee?.gasSettings) : await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
         const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
+        const chainInfo = await this.getChainInfo();
         const executionOptions = {
             txNonce: Fr.random(),
             cancellable: this.cancellableTransactions,
@@ -154,11 +165,11 @@ export class CLIWallet extends BaseWallet {
         // TODO: allow disabling kernels even when no overrides are necessary
         if (opts.from.equals(AztecAddress.ZERO)) {
             const fromAccount = await this.getAccountFromAddress(opts.from);
-            const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, executionOptions);
+            const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
             simulationResults = await this.pxe.simulateTx(txRequest, true, opts?.skipTxValidation, opts?.skipFeeEnforcement ?? true);
         } else {
             const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(opts.from);
-            const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, executionOptions);
+            const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
             const contractOverrides = {
                 [opts.from.toString()]: {
                     instance,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.0.1-commit.f295ac2",
+  "version": "0.0.1-commit.f2ce05ee",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -67,19 +67,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.f295ac2",
-    "@aztec/aztec.js": "0.0.1-commit.f295ac2",
-    "@aztec/bb.js": "0.0.1-commit.f295ac2",
-    "@aztec/cli": "0.0.1-commit.f295ac2",
-    "@aztec/entrypoints": "0.0.1-commit.f295ac2",
-    "@aztec/ethereum": "0.0.1-commit.f295ac2",
-    "@aztec/foundation": "0.0.1-commit.f295ac2",
-    "@aztec/kv-store": "0.0.1-commit.f295ac2",
-    "@aztec/noir-contracts.js": "0.0.1-commit.f295ac2",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.f295ac2",
-    "@aztec/pxe": "0.0.1-commit.f295ac2",
-    "@aztec/stdlib": "0.0.1-commit.f295ac2",
-    "@aztec/wallet-sdk": "0.0.1-commit.f295ac2",
+    "@aztec/accounts": "0.0.1-commit.f2ce05ee",
+    "@aztec/aztec.js": "0.0.1-commit.f2ce05ee",
+    "@aztec/bb.js": "0.0.1-commit.f2ce05ee",
+    "@aztec/cli": "0.0.1-commit.f2ce05ee",
+    "@aztec/entrypoints": "0.0.1-commit.f2ce05ee",
+    "@aztec/ethereum": "0.0.1-commit.f2ce05ee",
+    "@aztec/foundation": "0.0.1-commit.f2ce05ee",
+    "@aztec/kv-store": "0.0.1-commit.f2ce05ee",
+    "@aztec/noir-contracts.js": "0.0.1-commit.f2ce05ee",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.f2ce05ee",
+    "@aztec/pxe": "0.0.1-commit.f2ce05ee",
+    "@aztec/stdlib": "0.0.1-commit.f2ce05ee",
+    "@aztec/wallet-sdk": "0.0.1-commit.f2ce05ee",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/cmds/authorize_action.ts

@@ -39,7 +39,7 @@ export async function authorizeAction(
     { caller, action },
     true,
   );
-  const witness = await setAuthwitnessInteraction.send().wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+  const witness = await setAuthwitnessInteraction.send({ wait: { timeout: DEFAULT_TX_TIMEOUT_S } });
 
   log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
 

package/src/cmds/check_tx.ts

@@ -32,7 +32,10 @@ async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash
   const [receipt, effectsInBlock] = await Promise.all([aztecNode.getTxReceipt(txHash), aztecNode.getTxEffect(txHash)]);
   // Base tx data
   log(`Tx ${txHash.toString()}`);
-  log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
+  log(` Status: ${receipt.status}`);
+  if (receipt.executionResult) {
+    log(` Execution result: ${receipt.executionResult}`);
+  }
   if (receipt.error) {
     log(` Error: ${receipt.error}`);
   }

package/src/cmds/create_account.ts

@@ -1,9 +1,11 @@
 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 { 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 { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import type { AccountType } from '../utils/constants.js';
@@ -64,8 +66,8 @@ export async function createAccount(
     log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
   }
 
-  let tx;
-  let txReceipt;
+  let txHash: TxHash | undefined;
+  let txReceipt: TxReceipt | undefined;
   if (!registerOnly) {
     const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
@@ -100,7 +102,14 @@ export async function createAccount(
         };
       }
     } else {
-      tx = deployMethod.send({
+      if (verbose) {
+        printProfileResult(stats, log);
+      }
+
+      if (!json) {
+        log(`\nWaiting for account contract deployment...`);
+      }
+      const result = await deployMethod.send({
         ...deployAccountOpts,
         fee: deployAccountOpts.fee
           ? {
@@ -108,32 +117,29 @@ export async function createAccount(
               gasSettings: estimatedGas,
             }
           : undefined,
+        wait: wait ? { timeout: DEFAULT_TX_TIMEOUT_S, returnReceipt: true } : NO_WAIT,
       });
-      if (verbose) {
-        printProfileResult(stats, log);
-      }
-
-      const txHash = await tx.getTxHash();
-      debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
-      out.txHash = txHash;
-      if (wait) {
-        if (!json) {
-          log(`\nWaiting for account contract deployment...`);
-        }
-        txReceipt = await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+      const isReceipt = (data: TxReceipt | TxHash): data is TxReceipt => 'txHash' in data;
+      if (isReceipt(result)) {
+        txReceipt = result;
+        txHash = result.txHash;
         out.txReceipt = {
           status: txReceipt.status,
           transactionFee: txReceipt.transactionFee,
         };
+      } else {
+        txHash = result;
       }
+      debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
+      out.txHash = txHash;
     }
   }
 
   if (json) {
     log(prettyPrintJSON(out));
   } else {
-    if (tx) {
-      log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
+    if (txHash) {
+      log(`Deploy tx hash:  ${txHash.toString()}`);
     }
     if (txReceipt) {
       log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/src/cmds/deploy.ts

@@ -1,5 +1,6 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { DeployOptions } from '@aztec/aztec.js/contracts';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { ContractDeployer } from '@aztec/aztec.js/deployment';
 import { Fr } from '@aztec/aztec.js/fields';
 import type { AztecNode } from '@aztec/aztec.js/node';
@@ -89,37 +90,55 @@ export async function deploy(
       };
     }
   } else {
-    const tx = deploy.send(deployOpts);
     if (verbose) {
       printProfileResult(stats, log);
     }
 
-    const txHash = await tx.getTxHash();
-    debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
-    out.hash = txHash;
     const { address, partialAddress } = deploy;
     const instance = await deploy.getInstance();
-    if (!json) {
-      log(`Contract deployed at ${address?.toString()}`);
-      log(`Contract partial address ${(await partialAddress)?.toString()}`);
-      log(`Contract init hash ${instance.initializationHash.toString()}`);
-      log(`Deployment tx hash: ${txHash.toString()}`);
-      log(`Deployment salt: ${salt.toString()}`);
-      log(`Deployer: ${instance.deployer.toString()}`);
-    } else {
-      out.contract = {
-        address: address?.toString(),
-        partialAddress: (await partialAddress)?.toString(),
-        initializationHash: instance.initializationHash.toString(),
-        salt: salt.toString(),
-      };
-    }
+
     if (wait) {
-      const deployed = await tx.wait({ timeout });
+      const receipt = await deploy.send({ ...deployOpts, wait: { timeout, returnReceipt: true } });
+      const txHash = receipt.txHash;
+      debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
+      out.hash = txHash;
+
+      if (!json) {
+        log(`Contract deployed at ${address?.toString()}`);
+        log(`Contract partial address ${(await partialAddress)?.toString()}`);
+        log(`Contract init hash ${instance.initializationHash.toString()}`);
+        log(`Deployment tx hash: ${txHash.toString()}`);
+        log(`Deployment salt: ${salt.toString()}`);
+        log(`Deployer: ${instance.deployer.toString()}`);
+        log(`Transaction fee: ${receipt.transactionFee?.toString()}`);
+      } else {
+        out.contract = {
+          address: address?.toString(),
+          partialAddress: (await partialAddress)?.toString(),
+          initializationHash: instance.initializationHash.toString(),
+          salt: salt.toString(),
+          transactionFee: receipt.transactionFee?.toString(),
+        };
+      }
+    } else {
+      const txHash = await deploy.send({ ...deployOpts, wait: NO_WAIT });
+      debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
+      out.hash = txHash;
+
       if (!json) {
-        log(`Transaction fee: ${deployed.transactionFee?.toString()}`);
+        log(`Contract deployed at ${address?.toString()}`);
+        log(`Contract partial address ${(await partialAddress)?.toString()}`);
+        log(`Contract init hash ${instance.initializationHash.toString()}`);
+        log(`Deployment tx hash: ${txHash.toString()}`);
+        log(`Deployment salt: ${salt.toString()}`);
+        log(`Deployer: ${instance.deployer.toString()}`);
       } else {
-        out.contract.transactionFee = deployed.transactionFee?.toString();
+        out.contract = {
+          address: address?.toString(),
+          partialAddress: (await partialAddress)?.toString(),
+          initializationHash: instance.initializationHash.toString(),
+          salt: salt.toString(),
+        };
       }
     }
   }

package/src/cmds/deploy_account.ts

@@ -1,8 +1,10 @@
 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 { DeployAccountOptions } from '@aztec/aztec.js/wallet';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import type { CLIFeeArgs } from '../utils/options/fees.js';
@@ -45,8 +47,8 @@ export async function deployAccount(
     log(`Init hash:       ${initializationHash.toString()}`);
   }
 
-  let tx;
-  let txReceipt;
+  let txHash: TxHash | undefined;
+  let txReceipt: TxReceipt | undefined;
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
   const delegatedDeployment = deployer && !account.address.equals(deployer);
@@ -80,7 +82,14 @@ export async function deployAccount(
       };
     }
   } else {
-    tx = deployMethod.send({
+    if (verbose) {
+      printProfileResult(stats, log);
+    }
+
+    if (!json) {
+      log(`\nWaiting for account contract deployment...`);
+    }
+    const result = await deployMethod.send({
       ...deployAccountOpts,
       fee: deployAccountOpts.fee
         ? {
@@ -88,31 +97,28 @@ export async function deployAccount(
             gasSettings: estimatedGas,
           }
         : undefined,
+      wait: wait ? { timeout: DEFAULT_TX_TIMEOUT_S, returnReceipt: true } : NO_WAIT,
     });
-    if (verbose) {
-      printProfileResult(stats, log);
-    }
-
-    const txHash = await tx.getTxHash();
-    debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
-    out.txHash = txHash;
-    if (wait) {
-      if (!json) {
-        log(`\nWaiting for account contract deployment...`);
-      }
-      txReceipt = await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+    const isReceipt = (data: TxReceipt | TxHash): data is TxReceipt => 'txHash' in data;
+    if (isReceipt(result)) {
+      txReceipt = result;
+      txHash = result.txHash;
       out.txReceipt = {
         status: txReceipt.status,
         transactionFee: txReceipt.transactionFee,
       };
+    } else {
+      txHash = result;
     }
+    debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
+    out.txHash = txHash;
   }
 
   if (json) {
     log(prettyPrintJSON(out));
   } else {
-    if (tx) {
-      log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
+    if (txHash) {
+      log(`Deploy tx hash:  ${txHash.toString()}`);
     }
     if (txReceipt) {
       log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/src/cmds/send.ts

@@ -1,6 +1,6 @@
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import { AuthWitness } from '@aztec/aztec.js/authorization';
-import { Contract, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
+import { Contract, NO_WAIT, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
@@ -46,31 +46,43 @@ export async function send(
     return;
   }
 
-  const tx = call.send({ ...sendOptions, fee: { ...sendOptions.fee, gasSettings: estimatedGas } });
   if (verbose) {
     printProfileResult(stats!, log);
   }
 
-  const txHash = await tx.getTxHash();
-  log(`\nTransaction hash: ${txHash.toString()}`);
   if (wait) {
     try {
-      await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+      const receipt = await call.send({
+        ...sendOptions,
+        fee: { ...sendOptions.fee, gasSettings: estimatedGas },
+        wait: { timeout: DEFAULT_TX_TIMEOUT_S },
+      });
 
+      const txHash = receipt.txHash;
+      log(`\nTransaction hash: ${txHash.toString()}`);
       log('Transaction has been mined');
-
-      const receipt = await tx.getReceipt();
       log(` Tx fee: ${receipt.transactionFee}`);
       log(` Status: ${receipt.status}`);
       log(` Block number: ${receipt.blockNumber}`);
       log(` Block hash: ${receipt.blockHash?.toString()}`);
+
+      return {
+        txHash,
+      };
     } catch (err: any) {
       log(`Transaction failed\n ${err.message}`);
+      throw err;
     }
   } else {
+    const txHash = await call.send({
+      ...sendOptions,
+      fee: { ...sendOptions.fee, gasSettings: estimatedGas },
+      wait: NO_WAIT,
+    });
+    log(`\nTransaction hash: ${txHash.toString()}`);
     log('Transaction pending. Check status with check-tx');
+    return {
+      txHash,
+    };
   }
-  return {
-    txHash,
-  };
 }

package/src/storage/wallet_db.ts

@@ -12,6 +12,7 @@ export const Aliases = ['accounts', 'contracts', 'artifacts', 'secrets', 'transa
 export type AliasType = (typeof Aliases)[number];
 
 export class WalletDB {
+  #store!: AztecAsyncKVStore;
   #accounts!: AztecAsyncMap<string, Buffer>;
   #aliases!: AztecAsyncMap<string, Buffer>;
   #bridgedFeeJuice!: AztecAsyncMap<string, Buffer>;
@@ -29,6 +30,7 @@ export class WalletDB {
   }
 
   async init(store: AztecAsyncKVStore) {
+    this.#store = store;
     this.#accounts = store.openMap('accounts');
     this.#aliases = store.openMap('aliases');
     this.#bridgedFeeJuice = store.openMap('bridgedFeeJuice');
@@ -41,14 +43,17 @@ export class WalletDB {
   }
 
   async pushBridgedFeeJuice(recipient: AztecAddress, secret: Fr, amount: bigint, leafIndex: bigint, log: LogFn) {
-    let stackPointer = (await this.#bridgedFeeJuice.getAsync(`${recipient.toString()}:stackPointer`))?.readInt8() || 0;
-    stackPointer++;
-    await this.#bridgedFeeJuice.set(
-      `${recipient.toString()}:${stackPointer}`,
-      Buffer.from(`${amount.toString()}:${secret.toString()}:${leafIndex.toString()}`),
-    );
-    await this.#bridgedFeeJuice.set(`${recipient.toString()}:stackPointer`, Buffer.from([stackPointer]));
-    log(`Pushed ${amount} fee juice for recipient ${recipient.toString()}. Stack pointer ${stackPointer}`);
+    await this.#store.transactionAsync(async () => {
+      let stackPointer =
+        (await this.#bridgedFeeJuice.getAsync(`${recipient.toString()}:stackPointer`))?.readInt8() || 0;
+      stackPointer++;
+      await this.#bridgedFeeJuice.set(
+        `${recipient.toString()}:${stackPointer}`,
+        Buffer.from(`${amount.toString()}:${secret.toString()}:${leafIndex.toString()}`),
+      );
+      await this.#bridgedFeeJuice.set(`${recipient.toString()}:stackPointer`, Buffer.from([stackPointer]));
+      log(`Pushed ${amount} fee juice for recipient ${recipient.toString()}. Stack pointer ${stackPointer}`);
+    });
   }
 
   async popBridgedFeeJuice(recipient: AztecAddress, log: LogFn) {
@@ -76,19 +81,24 @@ export class WalletDB {
     }: { type: AccountType; secretKey: Fr; salt: Fr; alias: string | undefined; publicKey: string | undefined },
     log: LogFn,
   ) {
-    if (alias) {
-      await this.#aliases.set(`accounts:${alias}`, Buffer.from(address.toString()));
-    }
-    await this.#accounts.set(`${address.toString()}:type`, Buffer.from(type));
-    await this.#accounts.set(`${address.toString()}:sk`, secretKey.toBuffer());
-    await this.#accounts.set(`${address.toString()}:salt`, salt.toBuffer());
+    let publicSigningKey: Buffer | undefined;
     if (type === 'ecdsasecp256r1ssh' && publicKey) {
-      const publicSigningKey = extractECDSAPublicKeyFromBase64String(publicKey);
-      await this.storeAccountMetadata(address, 'publicSigningKey', publicSigningKey);
+      publicSigningKey = extractECDSAPublicKeyFromBase64String(publicKey);
     }
-    await this.#aliases.set('accounts:last', Buffer.from(address.toString()));
-    log(`Account stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
 
+    await this.#store.transactionAsync(async () => {
+      if (alias) {
+        await this.#aliases.set(`accounts:${alias}`, Buffer.from(address.toString()));
+      }
+      await this.#accounts.set(`${address.toString()}:type`, Buffer.from(type));
+      await this.#accounts.set(`${address.toString()}:sk`, secretKey.toBuffer());
+      await this.#accounts.set(`${address.toString()}:salt`, salt.toBuffer());
+      if (publicSigningKey) {
+        await this.#accounts.set(`${address.toString()}:publicSigningKey`, publicSigningKey);
+      }
+      await this.#aliases.set('accounts:last', Buffer.from(address.toString()));
+    });
+    log(`Account stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
     await this.refreshAliasCache();
   }
 
@@ -100,35 +110,38 @@ export class WalletDB {
   }
 
   async storeContract(address: AztecAddress, artifactPath: string, log: LogFn, alias?: string) {
-    if (alias) {
-      await this.#aliases.set(`contracts:${alias}`, Buffer.from(address.toString()));
-      await this.#aliases.set(`artifacts:${alias}`, Buffer.from(artifactPath));
-    }
-    await this.#aliases.set(`contracts:last`, Buffer.from(address.toString()));
-    await this.#aliases.set(`artifacts:last`, Buffer.from(artifactPath));
-    await this.#aliases.set(`artifacts:${address.toString()}`, Buffer.from(artifactPath));
+    await this.#store.transactionAsync(async () => {
+      if (alias) {
+        await this.#aliases.set(`contracts:${alias}`, Buffer.from(address.toString()));
+        await this.#aliases.set(`artifacts:${alias}`, Buffer.from(artifactPath));
+      }
+      await this.#aliases.set(`contracts:last`, Buffer.from(address.toString()));
+      await this.#aliases.set(`artifacts:last`, Buffer.from(artifactPath));
+      await this.#aliases.set(`artifacts:${address.toString()}`, Buffer.from(artifactPath));
+    });
     log(`Contract stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
-
     await this.refreshAliasCache();
   }
 
   async storeAuthwitness(authWit: AuthWitness, log: LogFn, alias?: string) {
-    if (alias) {
-      await this.#aliases.set(`authwits:${alias}`, Buffer.from(authWit.toString()));
-    }
-    await this.#aliases.set(`authwits:last`, Buffer.from(authWit.toString()));
+    await this.#store.transactionAsync(async () => {
+      if (alias) {
+        await this.#aliases.set(`authwits:${alias}`, Buffer.from(authWit.toString()));
+      }
+      await this.#aliases.set(`authwits:last`, Buffer.from(authWit.toString()));
+    });
     log(`Authorization witness stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
-
     await this.refreshAliasCache();
   }
 
   async storeTx({ txHash }: { txHash: TxHash }, log: LogFn, alias?: string) {
-    if (alias) {
-      await this.#aliases.set(`transactions:${alias}`, Buffer.from(txHash.toString()));
-    }
-    await this.#aliases.set(`transactions:last`, Buffer.from(txHash.toString()));
+    await this.#store.transactionAsync(async () => {
+      if (alias) {
+        await this.#aliases.set(`transactions:${alias}`, Buffer.from(txHash.toString()));
+      }
+      await this.#aliases.set(`transactions:last`, Buffer.from(txHash.toString()));
+    });
     log(`Transaction hash stored in database with alias${alias ? `es last & ${alias}` : ' last'}`);
-
     await this.refreshAliasCache();
   }
 

package/src/utils/wallet.ts

@@ -67,6 +67,7 @@ export class CLIWallet extends BaseWallet {
     const feeOptions = await this.completeFeeOptions(from, executionPayload.feePayer, increasedFee.gasSettings);
     const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
     const fromAccount = await this.getAccountFromAddress(from);
+    const chainInfo = await this.getChainInfo();
     const executionOptions: DefaultAccountEntrypointOptions = {
       txNonce,
       cancellable: this.cancellableTransactions,
@@ -75,6 +76,7 @@ export class CLIWallet extends BaseWallet {
     return await fromAccount.createTxExecutionRequest(
       feeExecutionPayload ?? executionPayload,
       feeOptions.gasSettings,
+      chainInfo,
       executionOptions,
     );
   }
@@ -91,8 +93,7 @@ export class CLIWallet extends BaseWallet {
   override async getAccountFromAddress(address: AztecAddress) {
     let account: Account | undefined;
     if (address.equals(AztecAddress.ZERO)) {
-      const chainInfo = await this.getChainInfo();
-      account = new SignerlessAccount(chainInfo);
+      account = new SignerlessAccount();
     } else if (this.accountCache.has(address.toString())) {
       return this.accountCache.get(address.toString())!;
     } else {
@@ -176,15 +177,26 @@ export class CLIWallet extends BaseWallet {
     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
+   */
   private async getFakeAccountDataFor(address: AztecAddress) {
-    const chainInfo = await this.getChainInfo();
     const originalAccount = await this.getAccountFromAddress(address);
-    const originalAddress = originalAccount.getCompleteAddress();
+    // 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 as Account).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, chainInfo);
+    const stubAccount = createStubAccount(originalAddress);
     const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
       salt: Fr.random(),
     });
@@ -201,6 +213,7 @@ export class CLIWallet extends BaseWallet {
       ? await this.completeFeeOptionsForEstimation(opts.from, executionPayload.feePayer, opts.fee?.gasSettings)
       : await this.completeFeeOptions(opts.from, executionPayload.feePayer, opts.fee?.gasSettings);
     const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
+    const chainInfo = await this.getChainInfo();
     const executionOptions: DefaultAccountEntrypointOptions = {
       txNonce: Fr.random(),
       cancellable: this.cancellableTransactions,
@@ -218,6 +231,7 @@ export class CLIWallet extends BaseWallet {
       const txRequest = await fromAccount.createTxExecutionRequest(
         finalExecutionPayload,
         feeOptions.gasSettings,
+        chainInfo,
         executionOptions,
       );
       simulationResults = await this.pxe.simulateTx(
@@ -231,6 +245,7 @@ export class CLIWallet extends BaseWallet {
       const txRequest = await fromAccount.createTxExecutionRequest(
         finalExecutionPayload,
         feeOptions.gasSettings,
+        chainInfo,
         executionOptions,
       );
       const contractOverrides = {