@aztec/cli-wallet 0.81.0 → 0.82.1-alpha-testnet.1

package/src/cmds/cancel_tx.ts

@@ -1,5 +1,6 @@
 import { type AccountWalletWithSecretKey, type FeePaymentMethod, SentTx, type TxHash, TxStatus } from '@aztec/aztec.js';
-import type { FeeOptions } from '@aztec/aztec.js/entrypoint';
+import type { FeeOptions } from '@aztec/entrypoints/interfaces';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
@@ -37,9 +38,7 @@ export async function cancelTx(
     }),
   };
 
-  const txRequest = await wallet.createTxExecutionRequest({
-    calls: [],
-    fee,
+  const txRequest = await wallet.createTxExecutionRequest(ExecutionPayload.empty(), fee, {
     nonce,
     cancellable: true,
   });

package/src/cmds/create_account.ts

@@ -32,7 +32,7 @@ export async function createAccount(
     Fr.ZERO,
     publicKey,
   );
-  const salt = account.getInstance().salt;
+  const { salt } = account.getInstance();
   const { address, publicKeys, partialAddress } = await account.getCompleteAddress();
 
   const out: Record<string, any> = {};
@@ -72,7 +72,7 @@ export async function createAccount(
       ...(await feeOpts.toDeployAccountOpts(wallet)),
     };
     if (feeOpts.estimateOnly) {
-      const gas = await (await account.getDeployMethod(deployOpts.deployWallet)).estimateGas(deployOpts);
+      const gas = await account.estimateDeploymentGas(deployOpts);
       if (json) {
         out.fee = {
           gasLimits: {

package/src/cmds/deploy.ts

@@ -1,4 +1,4 @@
-import { type AccountWalletWithSecretKey, ContractDeployer, type DeployMethod, Fr, type PXE } from '@aztec/aztec.js';
+import { type AccountWalletWithSecretKey, ContractDeployer, type DeployOptions, Fr, type PXE } from '@aztec/aztec.js';
 import { encodeArgs, getContractArtifact } from '@aztec/cli/utils';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { getInitializer } from '@aztec/stdlib/abi';
@@ -44,8 +44,8 @@ export async function deploy(
   }
 
   const deploy = deployer.deploy(...args);
-  const deployOpts: Parameters<DeployMethod['send']>[0] = {
-    ...(await feeOpts.toSendOpts(wallet)),
+  const deployOpts: DeployOptions = {
+    ...(await feeOpts.toDeployAccountOpts(wallet)),
     contractAddressSalt: salt,
     universalDeploy,
     skipClassRegistration,

package/src/cmds/deploy_account.ts

@@ -41,11 +41,12 @@ export async function deployAccount(
   let txReceipt;
 
   const deployOpts: DeployAccountOptions = {
-    ...(await feeOpts.toDeployAccountOpts(wallet)),
     skipInitialization: false,
+    ...(await feeOpts.toDeployAccountOpts(wallet)),
   };
+
   if (feeOpts.estimateOnly) {
-    const gas = await (await account.getDeployMethod(deployOpts.deployWallet)).estimateGas(deployOpts);
+    const gas = await account.estimateDeploymentGas(deployOpts);
     if (json) {
       out.fee = {
         gasLimits: {

package/src/cmds/index.ts

@@ -21,22 +21,23 @@ import { type Command, Option } from 'commander';
 import inquirer from 'inquirer';
 
 import type { WalletDB } from '../storage/wallet_db.js';
-import { type AccountType, addScopeToWallet, createOrRetrieveAccount, getWalletWithScopes } from '../utils/accounts.js';
+import { type AccountType, createOrRetrieveAccount } from '../utils/accounts.js';
 import { FeeOpts, FeeOptsWithFeePayer } from '../utils/options/fees.js';
 import {
   ARTIFACT_DESCRIPTION,
   aliasedAddressParser,
-  aliasedAuthWitParser,
   aliasedSecretKeyParser,
   aliasedTxHashParser,
   artifactPathFromPromiseOrAlias,
   artifactPathParser,
+  cleanupAuthWitnesses,
   createAccountOption,
   createAliasOption,
   createArgsOption,
   createArtifactOption,
+  createAuthwitnessOption,
   createContractAddressOption,
-  createProfileOption,
+  createDebugExecutionStepsDirOption,
   createTypeOption,
   integerArgParser,
   parseGasFees,
@@ -219,7 +220,7 @@ export function injectCommands(
     } = options;
     const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
     const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-    const wallet = await getWalletWithScopes(account, db);
+    const wallet = await account.getWallet();
     const artifactPath = await artifactPathPromise;
 
     debugLogger.info(`Using wallet with address ${wallet.getCompleteAddress().address.toString()}`);
@@ -262,6 +263,7 @@ export function injectCommands(
     .addOption(
       createSecretKeyOption("The sender's secret key", !db, sk => aliasedSecretKeyParser(sk, db)).conflicts('account'),
     )
+    .addOption(createAuthwitnessOption('Authorization witness to use for the transaction', !db, db))
     .addOption(createAccountOption('Alias or address of the account to send the transaction from', !db, db))
     .option('--no-wait', 'Print transaction hash without waiting for it to be mined')
     .option('--no-cancel', 'Do not allow the transaction to be cancelled. This makes for cheaper transactions.');
@@ -279,14 +281,16 @@ export function injectCommands(
       secretKey,
       alias,
       cancel,
+      authWitness,
     } = options;
     const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
     const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-    const wallet = await getWalletWithScopes(account, db);
+    const wallet = await account.getWallet();
     const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
 
     debugLogger.info(`Using wallet with address ${wallet.getCompleteAddress().address.toString()}`);
 
+    const authWitnesses = cleanupAuthWitnesses(authWitness);
     const sentTx = await send(
       wallet,
       functionName,
@@ -296,6 +300,7 @@ export function injectCommands(
       wait,
       cancel,
       await FeeOpts.fromCli(options, client, log, db),
+      authWitnesses,
       log,
     );
     if (db && sentTx) {
@@ -315,8 +320,8 @@ export function injectCommands(
     .addOption(
       createSecretKeyOption("The sender's secret key", !db, sk => aliasedSecretKeyParser(sk, db)).conflicts('account'),
     )
+    .addOption(createAuthwitnessOption('Authorization witness to use for the simulation', !db, db))
     .addOption(createAccountOption('Alias or address of the account to simulate from', !db, db))
-    .addOption(createProfileOption())
     .action(async (functionName, _options, command) => {
       const { simulate } = await import('./simulate.js');
       const options = command.optsWithGlobals();
@@ -327,14 +332,60 @@ export function injectCommands(
         from: parsedFromAddress,
         rpcUrl,
         secretKey,
-        profile,
+        authWitness,
       } = options;
 
       const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
       const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-      const wallet = await getWalletWithScopes(account, db);
+      const wallet = await account.getWallet();
       const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
-      await simulate(wallet, functionName, args, artifactPath, contractAddress, profile, log);
+      const authWitnesses = cleanupAuthWitnesses(authWitness);
+      await simulate(wallet, functionName, args, artifactPath, contractAddress, authWitnesses, log);
+    });
+
+  program
+    .command('profile')
+    .description('Profiles a private function by counting the unconditional operations in its execution steps')
+    .argument('<functionName>', 'Name of function to simulate')
+    .addOption(pxeOption)
+    .addOption(createArgsOption(false, db))
+    .addOption(createContractAddressOption(db))
+    .addOption(createArtifactOption(db))
+    .addOption(createDebugExecutionStepsDirOption())
+    .addOption(
+      createSecretKeyOption("The sender's secret key", !db, sk => aliasedSecretKeyParser(sk, db)).conflicts('account'),
+    )
+    .addOption(createAuthwitnessOption('Authorization witness to use for the simulation', !db, db))
+    .addOption(createAccountOption('Alias or address of the account to simulate from', !db, db))
+    .action(async (functionName, _options, command) => {
+      const { profile } = await import('./profile.js');
+      const options = command.optsWithGlobals();
+      const {
+        args,
+        contractArtifact: artifactPathPromise,
+        contractAddress,
+        from: parsedFromAddress,
+        rpcUrl,
+        secretKey,
+        debugExecutionStepsDir,
+        authWitness,
+      } = options;
+
+      const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
+      const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
+      const wallet = await account.getWallet();
+      const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
+      const authWitnesses = cleanupAuthWitnesses(authWitness);
+      await profile(
+        wallet,
+        functionName,
+        args,
+        artifactPath,
+        contractAddress,
+        debugExecutionStepsDir,
+        authWitnesses,
+        log,
+      );
     });
 
   program
@@ -372,6 +423,7 @@ export function injectCommands(
       const { bridgeL1FeeJuice } = await import('./bridge_fee_juice.js');
       const { rpcUrl, l1ChainId, l1RpcUrls, l1PrivateKey, mnemonic, mint, json, wait, interval: intervalS } = options;
       const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
+      log(`Minting ${amount} fee juice on L1 and pushing to L2`);
 
       const [secret, messageLeafIndex] = await bridgeL1FeeJuice(
         amount,
@@ -428,7 +480,7 @@ export function injectCommands(
 
       const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
       const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-      const wallet = await getWalletWithScopes(account, db);
+      const wallet = await account.getWallet();
       const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
       const witness = await createAuthwit(wallet, functionName, caller, args, artifactPath, contractAddress, log);
 
@@ -468,40 +520,11 @@ export function injectCommands(
 
       const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
       const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-      const wallet = await getWalletWithScopes(account, db);
+      const wallet = await account.getWallet();
       const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
       await authorizeAction(wallet, functionName, caller, args, artifactPath, contractAddress, log);
     });
 
-  program
-    .command('add-authwit')
-    .description(
-      'Adds an authorization witness to the provided account, granting PXE access to the notes of the authorizer so that it can be verified',
-    )
-    .argument('<authwit>', 'Authorization witness to add to the account', witness => aliasedAuthWitParser(witness, db))
-    .argument('<authorizer>', 'Account that provides the authorization to perform the action', address =>
-      aliasedAddressParser('accounts', address, db),
-    )
-    .addOption(pxeOption)
-    .addOption(
-      createSecretKeyOption("The sender's secret key", !db, sk => aliasedSecretKeyParser(sk, db)).conflicts('account'),
-    )
-    .addOption(createAccountOption('Alias or address of the account to simulate from', !db, db))
-    .addOption(
-      createAliasOption('Alias for the authorization witness. Used for easy reference in subsequent commands.', !db),
-    )
-    .action(async (authwit, authorizer, _options, command) => {
-      const { addAuthwit } = await import('./add_authwit.js');
-      const options = command.optsWithGlobals();
-      const { from: parsedFromAddress, rpcUrl, secretKey } = options;
-
-      const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
-      const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-      const wallet = await getWalletWithScopes(account, db);
-      await addAuthwit(wallet, authwit, authorizer, log);
-      await addScopeToWallet(wallet, authorizer, db);
-    });
-
   program
     .command('get-tx')
     .description('Gets the status of the recent txs, or a detailed view if a specific transaction hash is provided')
@@ -572,7 +595,7 @@ export function injectCommands(
       const { from: parsedFromAddress, rpcUrl, secretKey, payment, increasedFees, maxFeesPerGas } = options;
       const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
       const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-      const wallet = await getWalletWithScopes(account, db);
+      const wallet = await account.getWallet();
 
       const txData = await db?.retrieveTxData(txHash);
       if (!txData) {
@@ -600,7 +623,7 @@ export function injectCommands(
       const { from: parsedFromAddress, rpcUrl, secretKey, alias } = options;
       const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
       const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-      const wallet = await getWalletWithScopes(account, db);
+      const wallet = await account.getWallet();
 
       await registerSender(wallet, address, log);
 
@@ -626,7 +649,7 @@ export function injectCommands(
       const client = pxeWrapper?.getPXE() ?? (await createCompatibleClient(rpcUrl, debugLogger));
       const node = pxeWrapper?.getNode() ?? createAztecNodeClient(nodeUrl);
       const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-      const wallet = await getWalletWithScopes(account, db);
+      const wallet = await account.getWallet();
 
       const artifactPath = await artifactPathPromise;
 

package/src/cmds/profile.ts

@@ -0,0 +1,71 @@
+import { type AccountWalletWithSecretKey, AuthWitness, type AztecAddress, Contract } from '@aztec/aztec.js';
+import { prepTx } from '@aztec/cli/utils';
+import type { LogFn } from '@aztec/foundation/log';
+import { serializeWitness } from '@aztec/noir-noirc_abi';
+import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
+import type { TxProfileResult } from '@aztec/stdlib/tx';
+
+import { encode } from '@msgpack/msgpack';
+import { promises as fs } from 'fs';
+import path from 'path';
+import { format } from 'util';
+
+function printProfileResult(result: TxProfileResult, log: LogFn) {
+  // TODO(AD): this is a bit misleading - the maximum gate count of any piece is as important
+  // as the total gate count. We should probably print both.
+  log(format('\nGate count per circuit:'));
+  let acc = 0;
+  result.executionSteps.forEach(r => {
+    acc += r.gateCount!;
+    log(
+      format(
+        '  ',
+        r.functionName.padEnd(50),
+        'Gates:',
+        r.gateCount!.toLocaleString(),
+        '\tSubtotal:',
+        acc.toLocaleString(),
+      ),
+    );
+  });
+  log(format('\nTotal gates:', acc.toLocaleString()));
+}
+
+// TODO(#7371): This is duplicated.
+// Longer term we won't use this hacked together msgpack format
+// Leaving duplicated as this eventually bb will provide a serialization
+// helper for passing to a generic msgpack RPC endpoint.
+async function _createClientIvcProofFiles(directory: string, executionSteps: PrivateExecutionStep[]) {
+  const acirPath = path.join(directory, 'acir.msgpack');
+  const witnessPath = path.join(directory, 'witnesses.msgpack');
+  await fs.writeFile(acirPath, encode(executionSteps.map(map => map.bytecode)));
+  await fs.writeFile(witnessPath, encode(executionSteps.map(map => serializeWitness(map.witness))));
+  return {
+    acirPath,
+    witnessPath,
+  };
+}
+
+export async function profile(
+  wallet: AccountWalletWithSecretKey,
+  functionName: string,
+  functionArgsIn: any[],
+  contractArtifactPath: string,
+  contractAddress: AztecAddress,
+  debugOutputPath: string | undefined,
+  authWitnesses: AuthWitness[],
+  log: LogFn,
+) {
+  const profileMode = debugOutputPath ? ('full' as const) : ('gates' as const);
+  const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
+
+  const contract = await Contract.at(contractAddress, contractArtifact, wallet);
+  const call = contract.methods[functionName](...functionArgs);
+
+  const result = await call.profile({ profileMode, authWitnesses });
+  printProfileResult(result, log);
+  if (debugOutputPath) {
+    log(`Debug output written to ${debugOutputPath} (witnesses.msgpack and acir.msgpack)`);
+    await _createClientIvcProofFiles(debugOutputPath, result.executionSteps);
+  }
+}

package/src/cmds/send.ts

@@ -1,4 +1,11 @@
-import { type AccountWalletWithSecretKey, type AztecAddress, Contract, Fr } from '@aztec/aztec.js';
+import {
+  type AccountWalletWithSecretKey,
+  AuthWitness,
+  type AztecAddress,
+  Contract,
+  Fr,
+  type SendMethodOptions,
+} from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
 import { GasSettings } from '@aztec/stdlib/gas';
@@ -14,6 +21,7 @@ export async function send(
   wait: boolean,
   cancellable: boolean,
   feeOpts: IFeeOpts,
+  authWitnesses: AuthWitness[],
   log: LogFn,
 ) {
   const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
@@ -21,15 +29,23 @@ export async function send(
   const contract = await Contract.at(contractAddress, contractArtifact, wallet);
   const call = contract.methods[functionName](...functionArgs);
 
-  const gasLimits = await call.estimateGas({ ...(await feeOpts.toSendOpts(wallet)) });
+  const nonce = Fr.random();
+
+  const sendOptions: SendMethodOptions = {
+    ...(await feeOpts.toSendOpts(wallet)),
+    authWitnesses,
+    cancellable,
+    nonce,
+  };
+
+  const gasLimits = await call.estimateGas(sendOptions);
   printGasEstimates(feeOpts, gasLimits, log);
 
   if (feeOpts.estimateOnly) {
     return;
   }
 
-  const nonce = Fr.random();
-  const tx = call.send({ ...(await feeOpts.toSendOpts(wallet)), nonce, cancellable });
+  const tx = call.send(sendOptions);
   const txHash = await tx.getTxHash();
   log(`\nTransaction hash: ${txHash.toString()}`);
   if (wait) {

package/src/cmds/simulate.ts

@@ -1,42 +1,22 @@
-import { type AccountWalletWithSecretKey, type AztecAddress, Contract, type ProfileResult } from '@aztec/aztec.js';
+import { type AccountWalletWithSecretKey, AuthWitness, type AztecAddress, Contract } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
 
 import { format } from 'util';
 
-function printProfileResult(result: ProfileResult, log: LogFn) {
-  log(format('\nSimulation result:'));
-  log(format('Return value:', JSON.stringify(result.returnValues, null, 2)));
-
-  log(format('\nGate count per circuit:'));
-  let acc = 0;
-  result.gateCounts.forEach(r => {
-    acc += r.gateCount;
-    log(format('  ', r.circuitName.padEnd(50), 'Gates:', r.gateCount.toLocaleString(), '\tAcc:', acc.toLocaleString()));
-  });
-
-  log(format('\nTotal gates:', acc.toLocaleString()));
-}
-
 export async function simulate(
   wallet: AccountWalletWithSecretKey,
   functionName: string,
   functionArgsIn: any[],
   contractArtifactPath: string,
   contractAddress: AztecAddress,
-  profile: boolean,
+  authWitnesses: AuthWitness[],
   log: LogFn,
 ) {
   const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
 
   const contract = await Contract.at(contractAddress, contractArtifact, wallet);
   const call = contract.methods[functionName](...functionArgs);
-
-  if (profile) {
-    const result = await call.simulateWithProfile();
-    printProfileResult(result, log);
-  } else {
-    const result = await call.simulate();
-    log(format('\nSimulation result: ', result, '\n'));
-  }
+  const result = await call.simulate({ authWitnesses });
+  log(format('\nSimulation result: ', result, '\n'));
 }

package/src/utils/accounts.ts

@@ -1,5 +1,5 @@
 import { getIdentities } from '@aztec/accounts/utils';
-import type { AccountManager, AccountWalletWithSecretKey } from '@aztec/aztec.js';
+import type { AccountManager } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
@@ -70,33 +70,3 @@ export async function createOrRetrieveAccount(
 
   return account;
 }
-
-export async function addScopeToWallet(wallet: AccountWalletWithSecretKey, scope: AztecAddress, db?: WalletDB) {
-  const address = wallet.getAddress().toString();
-  const currentScopes = wallet.getScopes() ?? [];
-  const deduplicatedScopes = Array.from(
-    new Set([address, ...currentScopes, scope].map(scope => scope.toString())).values(),
-  );
-  if (db) {
-    await db.storeAccountMetadata(wallet.getAddress(), 'scopes', Buffer.from(deduplicatedScopes.join(',')));
-  }
-  wallet.setScopes(deduplicatedScopes.map(scope => AztecAddress.fromString(scope)));
-}
-
-export async function getWalletWithScopes(account: AccountManager, db?: WalletDB) {
-  const wallet = await account.getWallet();
-  if (db) {
-    const address = wallet.getAddress().toString();
-    let storedScopes: string[] = [];
-    try {
-      storedScopes = ((await db.retrieveAccountMetadata(wallet.getAddress(), 'scopes')) ?? '').toString().split(',');
-      // eslint-disable-next-line no-empty
-    } catch {}
-    const currentScopes = wallet.getScopes()?.map(scopes => scopes.toString()) ?? [];
-    const deduplicatedScopes = Array.from(new Set([address, ...currentScopes, ...storedScopes]).values()).map(scope =>
-      AztecAddress.fromString(scope),
-    );
-    wallet.setScopes(deduplicatedScopes);
-  }
-  return wallet;
-}

package/src/utils/options/fees.ts

@@ -15,7 +15,6 @@ import { Option } from 'commander';
 
 import type { WalletDB } from '../../storage/wallet_db.js';
 import { createOrRetrieveAccount } from '../accounts.js';
-import { SponsoredFeePaymentMethod } from '../sponsored_fee_payment.js';
 import { aliasedAddressParser } from './options.js';
 
 export type CliFeeArgs = {
@@ -325,6 +324,8 @@ export function parsePaymentMethod(
       }
       case 'fpc-sponsored': {
         const sponsor = getFpc();
+        log(`Using sponsored fee payment with sponsor ${sponsor}`);
+        const { SponsoredFeePaymentMethod } = await import('@aztec/aztec.js/fee/testing');
         return new SponsoredFeePaymentMethod(sponsor);
       }
       case undefined:

package/src/utils/options/options.ts

@@ -79,6 +79,12 @@ export function createAccountOption(description: string, hide: boolean, db?: Wal
     .argParser(address => aliasedAddressParser('accounts', address, db));
 }
 
+export function createAuthwitnessOption(description: string, hide: boolean, db?: WalletDB) {
+  return new Option('-aw, --auth-witness <string>', description)
+    .hideHelp(hide)
+    .argParser(witness => aliasedAuthWitParser(witness, db));
+}
+
 export function createTypeOption(mandatory: boolean) {
   return new Option('-t, --type <string>', 'Type of account to create')
     .choices(AccountTypes)
@@ -103,6 +109,13 @@ export function createContractAddressOption(db?: WalletDB) {
     .makeOptionMandatory(true);
 }
 
+export function createDebugExecutionStepsDirOption() {
+  return new Option(
+    '--debug-execution-steps-dir <address>',
+    'Directory to write execution step artifacts for bb profiling/debugging.',
+  ).makeOptionMandatory(false);
+}
+
 export function artifactPathParser(filePath: string, db?: WalletDB) {
   if (filePath.includes('@')) {
     const [pkg, contractName] = filePath.split('@');
@@ -140,13 +153,6 @@ export function createArtifactOption(db?: WalletDB) {
     .makeOptionMandatory(false);
 }
 
-export function createProfileOption() {
-  return new Option(
-    '-p, --profile',
-    'Run the real prover and get the gate count for each function in the transaction.',
-  ).default(false);
-}
-
 async function contractArtifactFromWorkspace(pkg?: string, contractName?: string) {
   const cwd = process.cwd();
   try {
@@ -173,3 +179,8 @@ async function contractArtifactFromWorkspace(pkg?: string, contractName?: string
   }
   return `${cwd}/${TARGET_DIR}/${bestMatch[0]}`;
 }
+
+export function cleanupAuthWitnesses(authWitnesses: AuthWitness | AuthWitness[]): AuthWitness[] {
+  const authWitnessArray = Array.isArray(authWitnesses) ? authWitnesses : [authWitnesses];
+  return authWitnessArray.filter(w => w !== undefined);
+}

package/dest/cmds/add_authwit.d.ts

@@ -1,4 +0,0 @@
-import type { AccountWalletWithSecretKey, AuthWitness, AztecAddress } from '@aztec/aztec.js';
-import type { LogFn } from '@aztec/foundation/log';
-export declare function addAuthwit(wallet: AccountWalletWithSecretKey, authwit: AuthWitness, authorizer: AztecAddress, log: LogFn): Promise<void>;
-//# sourceMappingURL=add_authwit.d.ts.map

package/dest/cmds/add_authwit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"add_authwit.d.ts","sourceRoot":"","sources":["../../src/cmds/add_authwit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,0BAA0B,EAClC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,YAAY,EACxB,GAAG,EAAE,KAAK,iBAKX"}

package/dest/cmds/add_authwit.js

@@ -1,4 +0,0 @@
-export async function addAuthwit(wallet, authwit, authorizer, log) {
-    await wallet.addAuthWitness(authwit);
-    log(`Added authorization witness from ${authorizer}`);
-}

package/dest/utils/sponsored_fee_payment.d.ts

@@ -1,19 +0,0 @@
-import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
-import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-export declare class SponsoredFeePaymentMethod implements FeePaymentMethod {
-    private paymentContract;
-    constructor(paymentContract: AztecAddress);
-    getAsset(): Promise<AztecAddress>;
-    getFeePayer(): Promise<AztecAddress>;
-    getFunctionCalls(): Promise<{
-        name: string;
-        to: AztecAddress;
-        selector: FunctionSelector;
-        type: FunctionType;
-        isStatic: boolean;
-        args: never[];
-        returnTypes: never[];
-    }[]>;
-}
-//# sourceMappingURL=sponsored_fee_payment.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"sponsored_fee_payment.d.ts","sourceRoot":"","sources":["../../src/utils/sponsored_fee_payment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,qBAAa,yBAA0B,YAAW,gBAAgB;IACpD,OAAO,CAAC,eAAe;gBAAf,eAAe,EAAE,YAAY;IAEjD,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAIjC,WAAW;IAIL,gBAAgB;;;;;;;;;CAavB"}

package/dest/utils/sponsored_fee_payment.js

@@ -1,26 +0,0 @@
-import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
-export class SponsoredFeePaymentMethod {
-    paymentContract;
-    constructor(paymentContract){
-        this.paymentContract = paymentContract;
-    }
-    getAsset() {
-        throw new Error('Asset is not required for sponsored fpc.');
-    }
-    getFeePayer() {
-        return Promise.resolve(this.paymentContract);
-    }
-    async getFunctionCalls() {
-        return [
-            {
-                name: 'sponsor_unconditionally',
-                to: this.paymentContract,
-                selector: await FunctionSelector.fromSignature('sponsor_unconditionally()'),
-                type: FunctionType.PRIVATE,
-                isStatic: false,
-                args: [],
-                returnTypes: []
-            }
-        ];
-    }
-}

package/src/cmds/add_authwit.ts

@@ -1,13 +0,0 @@
-import type { AccountWalletWithSecretKey, AuthWitness, AztecAddress } from '@aztec/aztec.js';
-import type { LogFn } from '@aztec/foundation/log';
-
-export async function addAuthwit(
-  wallet: AccountWalletWithSecretKey,
-  authwit: AuthWitness,
-  authorizer: AztecAddress,
-  log: LogFn,
-) {
-  await wallet.addAuthWitness(authwit);
-
-  log(`Added authorization witness from ${authorizer}`);
-}