@aztec/cli-wallet 0.80.0 → 0.82.0

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

@@ -1 +1 @@
-{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,gBAAgB,EAAU,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAExH,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEzD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EACL,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAChF,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBA4CX"}
+{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,gBAAgB,EAAU,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAGxH,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEzD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EACL,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAChF,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBA0CX"}

package/dest/cmds/cancel_tx.js

@@ -1,4 +1,5 @@
 import { SentTx, TxStatus } from '@aztec/aztec.js';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
 export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings, nonce, cancellable }, paymentMethod, increasedFees, maxFeesPerGas, log) {
     const receipt = await wallet.getTxReceipt(txHash);
@@ -15,9 +16,7 @@ export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings,
             maxFeesPerGas: maxFeesPerGas ?? prevTxGasSettings.maxFeesPerGas
         })
     };
-    const txRequest = await wallet.createTxExecutionRequest({
-        calls: [],
-        fee,
+    const txRequest = await wallet.createTxExecutionRequest(ExecutionPayload.empty(), fee, {
         nonce,
         cancellable: true
     });

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAsBxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,EACnB,EAAE,CAAC,EAAE,QAAQ,EACb,UAAU,CAAC,EAAE,UAAU,WA6kBxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAuBxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,EACnB,EAAE,CAAC,EAAE,QAAQ,EACb,UAAU,CAAC,EAAE,UAAU,WAmmBxB"}

package/dest/cmds/index.js

@@ -6,9 +6,9 @@ import { GasFees } from '@aztec/stdlib/gas';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { Option } from 'commander';
 import inquirer from 'inquirer';
-import { addScopeToWallet, createOrRetrieveAccount, getWalletWithScopes } from '../utils/accounts.js';
+import { createOrRetrieveAccount } from '../utils/accounts.js';
 import { FeeOpts, FeeOptsWithFeePayer } from '../utils/options/fees.js';
-import { ARTIFACT_DESCRIPTION, aliasedAddressParser, aliasedAuthWitParser, aliasedSecretKeyParser, aliasedTxHashParser, artifactPathFromPromiseOrAlias, artifactPathParser, createAccountOption, createAliasOption, createArgsOption, createArtifactOption, createContractAddressOption, createProfileOption, createTypeOption, integerArgParser, parseGasFees, parsePaymentMethod } from '../utils/options/index.js';
+import { ARTIFACT_DESCRIPTION, aliasedAddressParser, aliasedSecretKeyParser, aliasedTxHashParser, artifactPathFromPromiseOrAlias, artifactPathParser, cleanupAuthWitnesses, createAccountOption, createAliasOption, createArgsOption, createArtifactOption, createAuthwitnessOption, createContractAddressOption, createDebugExecutionStepsDirOption, createTypeOption, integerArgParser, parseGasFees, parsePaymentMethod } from '../utils/options/index.js';
 export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
     program.command('import-test-accounts').description('Import test accounts from pxe.').addOption(pxeOption).option('--json', 'Emit output as json').action(async (options)=>{
         if (!db) {
@@ -72,7 +72,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         const { json, publicKey, args, salt, wait, secretKey, classRegistration, init, publicDeployment, universal, rpcUrl, from: parsedFromAddress, 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();
         const artifactPath = await artifactPathPromise;
         debugLogger.info(`Using wallet with address ${wallet.getCompleteAddress().address.toString()}`);
         const address = await deploy(client, wallet, artifactPath, json, publicKey, args, salt, typeof init === 'string' ? init : undefined, !publicDeployment, !classRegistration, typeof init === 'string' ? false : init, universal, wait, await FeeOpts.fromCli(options, client, log, db), debugLogger, log, logJson(log));
@@ -80,31 +80,44 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
             await db.storeContract(address, artifactPath, log, alias);
         }
     });
-    const sendCommand = program.command('send').description('Calls a function on an Aztec contract.').argument('<functionName>', 'Name of function to execute').addOption(pxeOption).addOption(createArgsOption(false, db)).addOption(createArtifactOption(db)).addOption(createContractAddressOption(db)).addOption(createAliasOption('Alias for the transaction hash. Used for easy reference in subsequent commands.', !db)).addOption(createSecretKeyOption("The sender's secret key", !db, (sk)=>aliasedSecretKeyParser(sk, db)).conflicts('account')).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.');
+    const sendCommand = program.command('send').description('Calls a function on an Aztec contract.').argument('<functionName>', 'Name of function to execute').addOption(pxeOption).addOption(createArgsOption(false, db)).addOption(createArtifactOption(db)).addOption(createContractAddressOption(db)).addOption(createAliasOption('Alias for the transaction hash. Used for easy reference in subsequent commands.', !db)).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.');
     addOptions(sendCommand, FeeOpts.getOptions()).action(async (functionName, _options, command)=>{
         const { send } = await import('./send.js');
         const options = command.optsWithGlobals();
-        const { args, contractArtifact: artifactPathPromise, contractAddress, from: parsedFromAddress, wait, rpcUrl, secretKey, alias, cancel } = options;
+        const { args, contractArtifact: artifactPathPromise, contractAddress, from: parsedFromAddress, wait, rpcUrl, 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 sentTx = await send(wallet, functionName, args, artifactPath, contractAddress, wait, cancel, await FeeOpts.fromCli(options, client, log, db), log);
+        const authWitnesses = cleanupAuthWitnesses(authWitness);
+        const sentTx = await send(wallet, functionName, args, artifactPath, contractAddress, wait, cancel, await FeeOpts.fromCli(options, client, log, db), authWitnesses, log);
         if (db && sentTx) {
             const txAlias = alias ? alias : `${functionName}-${sentTx.nonce.toString().slice(-4)}`;
             await db.storeTx(sentTx, log, txAlias);
         }
     });
-    program.command('simulate').description('Simulates the execution of a function on an Aztec contract.').argument('<functionName>', 'Name of function to simulate').addOption(pxeOption).addOption(createArgsOption(false, db)).addOption(createContractAddressOption(db)).addOption(createArtifactOption(db)).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(createProfileOption()).action(async (functionName, _options, command)=>{
+    program.command('simulate').description('Simulates the execution of a function on an Aztec contract.').argument('<functionName>', 'Name of function to simulate').addOption(pxeOption).addOption(createArgsOption(false, db)).addOption(createContractAddressOption(db)).addOption(createArtifactOption(db)).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 { simulate } = await import('./simulate.js');
         const options = command.optsWithGlobals();
-        const { args, contractArtifact: artifactPathPromise, contractAddress, from: parsedFromAddress, rpcUrl, secretKey, profile } = options;
+        const { args, contractArtifact: artifactPathPromise, contractAddress, from: parsedFromAddress, rpcUrl, secretKey, 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.command('bridge-fee-juice').description('Mints L1 Fee Juice and pushes them to L2.').argument('<amount>', 'The amount of Fee Juice to mint and bridge.', parseBigint).argument('<recipient>', 'Aztec address of the recipient.', (address)=>aliasedAddressParser('accounts', address, db)).requiredOption('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)', (arg)=>arg.split(','), [
         ETHEREUM_HOSTS
@@ -114,6 +127,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         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, recipient, client, l1RpcUrls, l1ChainId, l1PrivateKey, mnemonic, mint, json, wait, intervalS * 1000, log, debugLogger);
         if (db) {
             await db.pushBridgedFeeJuice(recipient, secret, amount, messageLeafIndex, log);
@@ -125,7 +139,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         const { args, contractArtifact: artifactPathPromise, contractAddress, 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();
         const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
         const witness = await createAuthwit(wallet, functionName, caller, args, artifactPath, contractAddress, log);
         if (db) {
@@ -138,20 +152,10 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         const { args, contractArtifact: artifactPathPromise, contractAddress, 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);
+        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').argument('[txHash]', 'A transaction hash to get the receipt for.', (txHash)=>aliasedTxHashParser(txHash, db)).addOption(pxeOption).option('-p, --page <number>', 'The page number to display', (value)=>integerArgParser(value, '--page', 1), 1).option('-s, --page-size <number>', 'The number of transactions to display per page', (value)=>integerArgParser(value, '--page-size', 1), 10).action(async (txHash, options)=>{
         const { checkTx } = await import('./check_tx.js');
         const { rpcUrl, pageSize } = options;
@@ -187,7 +191,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         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) {
             throw new Error('Transaction data not found in the database, cannot reuse nonce');
@@ -200,7 +204,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         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);
         if (db && alias) {
             await db.storeSender(address, alias, log);
@@ -212,7 +216,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         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;
         const instance = await registerContract(wallet, node, address, artifactPath, log);
         if (db && alias) {

package/dest/cmds/profile.d.ts

@@ -0,0 +1,4 @@
+import { type AccountWalletWithSecretKey, AuthWitness, type AztecAddress } from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
+export declare function profile(wallet: AccountWalletWithSecretKey, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, debugOutputPath: string | undefined, authWitnesses: AuthWitness[], log: LogFn): Promise<void>;
+//# sourceMappingURL=profile.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/cmds/profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,WAAW,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE5G,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA8CnD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,aAAa,EAAE,WAAW,EAAE,EAC5B,GAAG,EAAE,KAAK,iBAcX"}

package/dest/cmds/profile.js

@@ -0,0 +1,47 @@
+import { Contract } from '@aztec/aztec.js';
+import { prepTx } from '@aztec/cli/utils';
+import { serializeWitness } from '@aztec/noir-noirc_abi';
+import { encode } from '@msgpack/msgpack';
+import { promises as fs } from 'fs';
+import path from 'path';
+import { format } from 'util';
+function printProfileResult(result, log) {
+    // 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, executionSteps) {
+    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, functionName, functionArgsIn, contractArtifactPath, contractAddress, debugOutputPath, authWitnesses, log) {
+    const profileMode = debugOutputPath ? 'full' : 'gates';
+    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/dest/cmds/send.d.ts

@@ -1,8 +1,8 @@
-import { type AccountWalletWithSecretKey, type AztecAddress, Fr } from '@aztec/aztec.js';
+import { type AccountWalletWithSecretKey, AuthWitness, type AztecAddress, Fr } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { type IFeeOpts } from '../utils/options/fees.js';
-export declare function send(wallet: AccountWalletWithSecretKey, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, wait: boolean, cancellable: boolean, feeOpts: IFeeOpts, log: LogFn): Promise<{
+export declare function send(wallet: AccountWalletWithSecretKey, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, wait: boolean, cancellable: boolean, feeOpts: IFeeOpts, authWitnesses: AuthWitness[], log: LogFn): Promise<{
     txHash: import("@aztec/aztec.js").TxHash;
     nonce: Fr;
     cancellable: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,YAAY,EAAY,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAEnG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,IAAI,CACxB,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,QAAQ,EACjB,GAAG,EAAE,KAAK;;;;;eA6CX"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAC/B,WAAW,EACX,KAAK,YAAY,EAEjB,EAAE,EAEH,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAE5E,wBAAsB,IAAI,CACxB,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,WAAW,EAAE,EAC5B,GAAG,EAAE,KAAK;;;;;eAqDX"}

package/dest/cmds/send.js

@@ -2,23 +2,23 @@ import { Contract, Fr } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { printGasEstimates } from '../utils/options/fees.js';
-export async function send(wallet, functionName, functionArgsIn, contractArtifactPath, contractAddress, wait, cancellable, feeOpts, log) {
+export async function send(wallet, functionName, functionArgsIn, contractArtifactPath, contractAddress, wait, cancellable, feeOpts, authWitnesses, log) {
     const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     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 = {
+        ...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/dest/cmds/simulate.d.ts

@@ -1,4 +1,4 @@
-import { type AccountWalletWithSecretKey, type AztecAddress } from '@aztec/aztec.js';
+import { type AccountWalletWithSecretKey, AuthWitness, type AztecAddress } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function simulate(wallet: AccountWalletWithSecretKey, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, profile: boolean, log: LogFn): Promise<void>;
+export declare function simulate(wallet: AccountWalletWithSecretKey, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, authWitnesses: AuthWitness[], log: LogFn): Promise<void>;
 //# sourceMappingURL=simulate.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"simulate.d.ts","sourceRoot":"","sources":["../../src/cmds/simulate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,YAAY,EAAgC,MAAM,iBAAiB,CAAC;AAEnH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAkBnD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,iBAcX"}
+{"version":3,"file":"simulate.d.ts","sourceRoot":"","sources":["../../src/cmds/simulate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,WAAW,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE5G,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,aAAa,EAAE,WAAW,EAAE,EAC5B,GAAG,EAAE,KAAK,iBAQX"}

package/dest/cmds/simulate.js

@@ -1,26 +1,12 @@
 import { Contract } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import { format } from 'util';
-function printProfileResult(result, log) {
-    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, functionName, functionArgsIn, contractArtifactPath, contractAddress, profile, log) {
+export async function simulate(wallet, functionName, functionArgsIn, contractArtifactPath, contractAddress, authWitnesses, log) {
     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/dest/utils/accounts.d.ts

@@ -1,4 +1,4 @@
-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';
@@ -6,6 +6,4 @@ import type { WalletDB } from '../storage/wallet_db.js';
 export declare const AccountTypes: readonly ["schnorr", "ecdsasecp256r1ssh", "ecdsasecp256k1"];
 export type AccountType = (typeof AccountTypes)[number];
 export declare function createOrRetrieveAccount(pxe: PXE, address?: AztecAddress, db?: WalletDB, secretKey?: Fr, type?: AccountType, salt?: Fr, publicKey?: string | undefined): Promise<AccountManager>;
-export declare function addScopeToWallet(wallet: AccountWalletWithSecretKey, scope: AztecAddress, db?: WalletDB): Promise<void>;
-export declare function getWalletWithScopes(account: AccountManager, db?: WalletDB): Promise<AccountWalletWithSecretKey>;
 //# sourceMappingURL=accounts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/utils/accounts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,eAAO,MAAM,YAAY,6DAA8D,CAAC;AACxF,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,YAAY,EACtB,EAAE,CAAC,EAAE,QAAQ,EACb,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,GAAE,WAAuB,EAC7B,IAAI,CAAC,EAAE,EAAE,EACT,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,cAAc,CAAC,CAkDzB;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,0BAA0B,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC,EAAE,QAAQ,iBAU5G;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,QAAQ,uCAgB/E"}
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/utils/accounts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,eAAO,MAAM,YAAY,6DAA8D,CAAC;AACxF,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,YAAY,EACtB,EAAE,CAAC,EAAE,QAAQ,EACb,SAAS,CAAC,EAAE,EAAE,EACd,IAAI,GAAE,WAAuB,EAC7B,IAAI,CAAC,EAAE,EAAE,EACT,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,cAAc,CAAC,CAkDzB"}

package/dest/utils/accounts.js

@@ -1,6 +1,5 @@
 import { getIdentities } from '@aztec/accounts/utils';
 import { Fr } from '@aztec/foundation/fields';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js';
 export const AccountTypes = [
@@ -53,35 +52,3 @@ export async function createOrRetrieveAccount(pxe, address, db, secretKey, type
     }
     return account;
 }
-export async function addScopeToWallet(wallet, scope, db) {
-    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, db) {
-    const wallet = await account.getWallet();
-    if (db) {
-        const address = wallet.getAddress().toString();
-        let storedScopes = [];
-        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/dest/utils/options/options.d.ts

@@ -10,11 +10,13 @@ export declare function aliasedAddressParser(defaultPrefix: AliasType, address:
 export declare function aliasedSecretKeyParser(sk: string, db?: WalletDB): import("@aztec/aztec.js").Fr;
 export declare function createAliasOption(description: string, hide: boolean): Option;
 export declare function createAccountOption(description: string, hide: boolean, db?: WalletDB): Option;
+export declare function createAuthwitnessOption(description: string, hide: boolean, db?: WalletDB): Option;
 export declare function createTypeOption(mandatory: boolean): Option;
 export declare function createArgsOption(isConstructor: boolean, db?: WalletDB): Option;
 export declare function createContractAddressOption(db?: WalletDB): Option;
+export declare function createDebugExecutionStepsDirOption(): Option;
 export declare function artifactPathParser(filePath: string, db?: WalletDB): Promise<string>;
 export declare function artifactPathFromPromiseOrAlias(artifactPathPromise: Promise<string>, contractAddress: AztecAddress, db?: WalletDB): Promise<string>;
 export declare function createArtifactOption(db?: WalletDB): Option;
-export declare function createProfileOption(): Option;
+export declare function cleanupAuthWitnesses(authWitnesses: AuthWitness | AuthWitness[]): AuthWitness[];
 //# sourceMappingURL=options.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/utils/options/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAKtE,eAAO,MAAM,oBAAoB,wKACsI,CAAC;AAExK,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,GAAG,SAA0B,EAC7B,GAAG,SAA0B,UAU9B;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,oCAQhE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,eAQlE;AAED,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,gBAQ5F;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,gCAQ/D;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,UAEnE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAIpF;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,UAMlD;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAQrE;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,QAAQ,UAIxD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,mBAajE;AAED,wBAAsB,8BAA8B,CAClD,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,EACpC,eAAe,EAAE,YAAY,EAC7B,EAAE,CAAC,EAAE,QAAQ,mBAWd;AAED,wBAAgB,oBAAoB,CAAC,EAAE,CAAC,EAAE,QAAQ,UAIjD;AAED,wBAAgB,mBAAmB,WAKlC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/utils/options/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAKtE,eAAO,MAAM,oBAAoB,wKACsI,CAAC;AAExK,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,GAAG,SAA0B,EAC7B,GAAG,SAA0B,UAU9B;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,oCAQhE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,eAQlE;AAED,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,gBAQ5F;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,gCAQ/D;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,UAEnE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAIpF;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAIxF;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,UAMlD;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,UAQrE;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,QAAQ,UAIxD;AAED,wBAAgB,kCAAkC,WAKjD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,mBAajE;AAED,wBAAsB,8BAA8B,CAClD,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,EACpC,eAAe,EAAE,YAAY,EAC7B,EAAE,CAAC,EAAE,QAAQ,mBAWd;AAED,wBAAgB,oBAAoB,CAAC,EAAE,CAAC,EAAE,QAAQ,UAIjD;AA6BD,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,WAAW,GAAG,WAAW,EAAE,GAAG,WAAW,EAAE,CAG9F"}

package/dest/utils/options/options.js

@@ -57,6 +57,9 @@ export function createAliasOption(description, hide) {
 export function createAccountOption(description, hide, db) {
     return new Option(`-f, --from <string>`, description).hideHelp(hide).argParser((address)=>aliasedAddressParser('accounts', address, db));
 }
+export function createAuthwitnessOption(description, hide, db) {
+    return new Option('-aw, --auth-witness <string>', description).hideHelp(hide).argParser((witness)=>aliasedAuthWitParser(witness, db));
+}
 export function createTypeOption(mandatory) {
     return new Option('-t, --type <string>', 'Type of account to create').choices(AccountTypes).default('schnorr').conflicts('account-or-address').makeOptionMandatory(mandatory);
 }
@@ -70,6 +73,9 @@ export function createArgsOption(isConstructor, db) {
 export function createContractAddressOption(db) {
     return new Option('-ca, --contract-address <address>', 'Aztec address of the contract.').argParser((address)=>aliasedAddressParser('contracts', address, db)).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, db) {
     if (filePath.includes('@')) {
         const [pkg, contractName] = filePath.split('@');
@@ -95,9 +101,6 @@ export async function artifactPathFromPromiseOrAlias(artifactPathPromise, contra
 export function createArtifactOption(db) {
     return new Option('-c, --contract-artifact <fileLocation>', ARTIFACT_DESCRIPTION).argParser((filePath)=>artifactPathParser(filePath, db)).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, contractName) {
     const cwd = process.cwd();
     try {
@@ -120,3 +123,9 @@ async function contractArtifactFromWorkspace(pkg, contractName) {
     }
     return `${cwd}/${TARGET_DIR}/${bestMatch[0]}`;
 }
+export function cleanupAuthWitnesses(authWitnesses) {
+    const authWitnessArray = Array.isArray(authWitnesses) ? authWitnesses : [
+        authWitnesses
+    ];
+    return authWitnessArray.filter((w)=>w !== undefined);
+}

package/dest/utils/sponsored_fee_payment.d.ts

@@ -1,19 +1,11 @@
 import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
-import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 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[];
-    }[]>;
+    getExecutionPayload(): Promise<ExecutionPayload>;
 }
 //# sourceMappingURL=sponsored_fee_payment.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"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,MAAM,4BAA4B,CAAC;AAE9D,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,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAiBvD"}

package/dest/utils/sponsored_fee_payment.js

@@ -1,3 +1,4 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
 export class SponsoredFeePaymentMethod {
     paymentContract;
@@ -10,8 +11,8 @@ export class SponsoredFeePaymentMethod {
     getFeePayer() {
         return Promise.resolve(this.paymentContract);
     }
-    async getFunctionCalls() {
-        return [
+    async getExecutionPayload() {
+        return new ExecutionPayload([
             {
                 name: 'sponsor_unconditionally',
                 to: this.paymentContract,
@@ -21,6 +22,6 @@ export class SponsoredFeePaymentMethod {
                 args: [],
                 returnTypes: []
             }
-        ];
+        ], [], []);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.80.0",
+  "version": "0.82.0",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -65,15 +65,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.80.0",
-    "@aztec/aztec.js": "0.80.0",
-    "@aztec/cli": "0.80.0",
-    "@aztec/ethereum": "0.80.0",
-    "@aztec/foundation": "0.80.0",
-    "@aztec/kv-store": "0.80.0",
-    "@aztec/noir-contracts.js": "0.80.0",
-    "@aztec/pxe": "0.80.0",
-    "@aztec/stdlib": "0.80.0",
+    "@aztec/accounts": "0.82.0",
+    "@aztec/aztec.js": "0.82.0",
+    "@aztec/cli": "0.82.0",
+    "@aztec/entrypoints": "0.82.0",
+    "@aztec/ethereum": "0.82.0",
+    "@aztec/foundation": "0.82.0",
+    "@aztec/kv-store": "0.82.0",
+    "@aztec/noir-contracts.js": "0.82.0",
+    "@aztec/noir-noirc_abi": "0.82.0",
+    "@aztec/pxe": "0.82.0",
+    "@aztec/stdlib": "0.82.0",
+    "@msgpack/msgpack": "^3.0.0-beta2",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

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/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/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/src/utils/sponsored_fee_payment.ts

@@ -1,4 +1,5 @@
 import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 
@@ -13,17 +14,21 @@ export class SponsoredFeePaymentMethod implements FeePaymentMethod {
     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: [],
-      },
-    ];
+  async getExecutionPayload(): Promise<ExecutionPayload> {
+    return new ExecutionPayload(
+      [
+        {
+          name: 'sponsor_unconditionally',
+          to: this.paymentContract,
+          selector: await FunctionSelector.fromSignature('sponsor_unconditionally()'),
+          type: FunctionType.PRIVATE,
+          isStatic: false,
+          args: [],
+          returnTypes: [],
+        },
+      ],
+      [],
+      [],
+    );
   }
 }

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/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}`);
-}