@aztec/cli-wallet 0.0.1-commit.d431d1c → 0.0.1-commit.dbf9cec

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

@@ -13,16 +13,16 @@ import { AccountManager, type Aliased, type SimulateOptions } from '@aztec/aztec
 import type { DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn } from '@aztec/foundation/log';
+import type { AccessScopes, NotesFilter } from '@aztec/pxe/client/lazy';
 import type { PXEConfig } from '@aztec/pxe/config';
 import type { PXE } from '@aztec/pxe/server';
 import { createPXE, getPXEConfig } from '@aztec/pxe/server';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { NoteDao } from '@aztec/stdlib/note';
-import type { NotesFilter } from '@aztec/stdlib/note';
 import type { TxProvingResult, TxSimulationResult } from '@aztec/stdlib/tx';
 import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
-import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
+import { BaseWallet, type FeeOptions } from '@aztec/wallet-sdk/base-wallet';
 
 import type { WalletDB } from '../storage/wallet_db.js';
 import type { AccountType } from './constants.js';
@@ -87,7 +87,7 @@ export class CLIWallet extends BaseWallet {
     increasedFee: InteractionFeeOptions,
   ): Promise<TxProvingResult> {
     const cancellationTxRequest = await this.createCancellationTxExecutionRequest(from, txNonce, increasedFee);
-    return await this.pxe.proveTx(cancellationTxRequest);
+    return await this.pxe.proveTx(cancellationTxRequest, this.scopesFrom(from));
   }
 
   override async getAccountFromAddress(address: AztecAddress) {
@@ -208,12 +208,40 @@ export class CLIWallet extends BaseWallet {
   }
 
   override async simulateTx(executionPayload: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResult> {
-    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 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).
+   */
+  protected override async simulateViaEntrypoint(
+    executionPayload: ExecutionPayload,
+    from: AztecAddress,
+    feeOptions: FeeOptions,
+    scopes: AccessScopes,
+    skipTxValidation?: boolean,
+    skipFeeEnforcement?: boolean,
+  ): Promise<TxSimulationResult> {
+    if (from.equals(AztecAddress.ZERO)) {
+      return super.simulateViaEntrypoint(
+        executionPayload,
+        from,
+        feeOptions,
+        scopes,
+        skipTxValidation,
+        skipFeeEnforcement,
+      );
+    }
+
     const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
-    const chainInfo = await this.getChainInfo();
     const executionOptions: DefaultAccountEntrypointOptions = {
       txNonce: Fr.random(),
       cancellable: this.cancellableTransactions,
@@ -223,44 +251,23 @@ export class CLIWallet extends BaseWallet {
       ? mergeExecutionPayloads([feeExecutionPayload, executionPayload])
       : executionPayload;
 
-    // Kernelless simulations using the multicall entrypoints are not currently supported,
-    // since we only override proper account contracts.
-    // 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,
-        chainInfo,
-        executionOptions,
-      );
-      simulationResults = await this.pxe.simulateTx(
-        txRequest,
-        true /* simulatePublic */,
-        opts?.skipTxValidation,
-        opts?.skipFeeEnforcement ?? true,
-      );
-    } else {
-      const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(opts.from);
-      const txRequest = await fromAccount.createTxExecutionRequest(
-        finalExecutionPayload,
-        feeOptions.gasSettings,
-        chainInfo,
-        executionOptions,
-      );
-      const contractOverrides = {
-        [opts.from.toString()]: { instance, artifact },
-      };
-      simulationResults = await this.pxe.simulateTx(txRequest, true /* simulatePublic */, true, true, {
-        contracts: contractOverrides,
-      });
-    }
-
-    if (opts.fee?.estimateGas) {
-      const limits = getGasLimits(simulationResults, opts.fee?.estimatedGasPadding);
-      printGasEstimates(feeOptions, limits, this.userLog);
-    }
-    return simulationResults;
+    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: {
+        contracts: { [from.toString()]: { instance, artifact } },
+      },
+      scopes,
+    });
   }
 
   // Exposed because of the `aztec-wallet get-tx` command. It has been decided that it's fine to keep around because