@aztec/cli-wallet 1.2.1 → 2.0.0-nightly.20250813

package/dest/bin/index.js

@@ -69,7 +69,7 @@ function injectInternalCommands(program, log, db) {
         await db.init(await openStoreAt(dataDir));
         let protocolContractsRegistered;
         try {
-            protocolContractsRegistered = !!await db.retrieveAlias('contracts:ContractClassRegisterer');
+            protocolContractsRegistered = !!await db.retrieveAlias('contracts:ContractClassRegistry');
         // eslint-disable-next-line no-empty
         } catch  {}
         if (!protocolContractsRegistered) {

package/dest/cmds/authorize_action.d.ts

@@ -1,4 +1,4 @@
 import { type AccountWalletWithSecretKey, type AztecAddress } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function authorizeAction(wallet: AccountWalletWithSecretKey, functionName: string, caller: AztecAddress, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, log: LogFn): Promise<import("@aztec/aztec.js").FieldsOf<import("@aztec/aztec.js").TxReceipt>>;
+export declare function authorizeAction(wallet: AccountWalletWithSecretKey, from: AztecAddress, functionName: string, caller: AztecAddress, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, log: LogFn): Promise<import("@aztec/aztec.js").FieldsOf<import("@aztec/aztec.js").TxReceipt>>;
 //# sourceMappingURL=authorize_action.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"authorize_action.d.ts","sourceRoot":"","sources":["../../src/cmds/authorize_action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,eAAe,CACnC,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,KAAK,oFAwBX"}
+{"version":3,"file":"authorize_action.d.ts","sourceRoot":"","sources":["../../src/cmds/authorize_action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,eAAe,CACnC,MAAM,EAAE,0BAA0B,EAClC,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,KAAK,oFAwBX"}

package/dest/cmds/authorize_action.js

@@ -1,7 +1,7 @@
 import { Contract } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
-export async function authorizeAction(wallet, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
+export async function authorizeAction(wallet, from, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
     const { functionArgs, contractArtifact, isPrivate } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     if (isPrivate) {
         throw new Error('Cannot authorize private function. To allow a third party to call a private function, please create an authorization witness via the create-authwit command');
@@ -12,7 +12,9 @@ export async function authorizeAction(wallet, functionName, caller, functionArgs
         caller,
         action
     }, true);
-    const witness = await setAuthwitnessInteraction.send().wait({
+    const witness = await setAuthwitnessInteraction.send({
+        from
+    }).wait({
         timeout: DEFAULT_TX_TIMEOUT_S
     });
     log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);

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;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;AAIzD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EACP,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAClF,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBA0CX"}
+{"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;AAIzD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EACP,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAClF,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBA6CX"}

package/dest/cmds/cancel_tx.js

@@ -23,7 +23,10 @@ export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings,
     });
     const txSimulationResult = await wallet.simulateTx(txRequest, true);
     const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
-    const sentTx = new SentTx(wallet, ()=>wallet.sendTx(txProvingResult.toTx()));
+    const sentTx = new SentTx(wallet, async ()=>{
+        const tx = await txProvingResult.toTx();
+        return wallet.sendTx(tx);
+    });
     try {
         await sentTx.wait({
             timeout: DEFAULT_TX_TIMEOUT_S

package/dest/cmds/create_account.d.ts

@@ -1,11 +1,11 @@
-import type { PXE } from '@aztec/aztec.js';
+import { AztecAddress, type PXE } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { type AccountType } from '../utils/accounts.js';
 import { type IFeeOpts } from '../utils/options/fees.js';
 export declare function createAccount(client: PXE, accountType: AccountType, secretKey: Fr | undefined, publicKey: string | undefined, alias: string | undefined, registerOnly: boolean, publicDeploy: boolean, skipInitialization: boolean, wait: boolean, feeOpts: IFeeOpts, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<{
     alias: string | undefined;
-    address: import("@aztec/aztec.js").AztecAddress;
+    address: AztecAddress;
     secretKey: Fr;
     salt: Fr;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAwB,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAI5E,wBAAsB,aAAa,CACjC,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAsHX"}
+{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA6B,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEpF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAI5E,wBAAsB,aAAa,CACjC,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAgIX"}

package/dest/cmds/create_account.js

@@ -1,3 +1,4 @@
+import { AztecAddress } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { Fr } from '@aztec/foundation/fields';
 import { createOrRetrieveAccount } from '../utils/accounts.js';
@@ -39,17 +40,17 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
     } else {
         const wallet = await account.getWallet();
         const deployOpts = {
-            skipClassRegistration: !publicDeploy,
-            skipPublicDeployment: !publicDeploy,
+            skipClassPublication: !publicDeploy,
+            skipInstancePublication: !publicDeploy,
             skipInitialization: skipInitialization,
             ...await feeOpts.toDeployAccountOpts(wallet)
         };
         /*
-     * This is usually handled by accountManager.deploy(), but we're accessing the lower
+     * This is usually handled by accountManager.create(), but we're accessing the lower
      * level method to get gas and timings. That means we have to replicate some of the logic here.
-     * In case we're deploying our own account, we need to hijack the payment method for the fee,
+     * In case we're initializing and/or publishing our own account, we need to hijack the payment method for the fee,
      * wrapping it in the one that will make use of the freshly deployed account's
-     * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
+     * entrypoint. For reference, see aztec.js/src/account_manager.ts:sendAccountContractSetupTx()
      * Also, salt and universalDeploy have to be explicitly provided
      */ deployOpts.fee = !deployOpts?.deployWallet && deployOpts?.fee ? {
             ...deployOpts.fee,
@@ -59,6 +60,7 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
         if (feeOpts.estimateOnly) {
             const gas = await deployMethod.estimateGas({
                 ...deployOpts,
+                from: AztecAddress.ZERO,
                 universalDeploy: true,
                 contractAddressSalt: salt
             });
@@ -79,6 +81,7 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
         } else {
             const provenTx = await deployMethod.prove({
                 ...deployOpts,
+                from: AztecAddress.ZERO,
                 universalDeploy: true,
                 contractAddressSalt: salt
             });
@@ -87,7 +90,7 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
             }
             tx = provenTx.send();
             const txHash = await tx.getTxHash();
-            debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
+            debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
             out.txHash = txHash;
             if (wait) {
                 if (!json) {
@@ -107,7 +110,7 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
         log(prettyPrintJSON(out));
     } else {
         if (tx) {
-            log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+            log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/dest/cmds/deploy.d.ts

@@ -1,6 +1,6 @@
-import { type AccountWalletWithSecretKey, Fr } from '@aztec/aztec.js';
+import { type AccountWalletWithSecretKey, AztecAddress, Fr } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import { type IFeeOpts } from '../utils/options/fees.js';
-export declare function deploy(wallet: AccountWalletWithSecretKey, artifactPath: string, json: boolean, publicKeys: PublicKeys | undefined, rawArgs: any[], salt: Fr | undefined, initializer: string | undefined, skipPublicDeployment: boolean, skipClassRegistration: boolean, skipInitialization: boolean | undefined, universalDeploy: boolean | undefined, wait: boolean, feeOpts: IFeeOpts, verbose: boolean, debugLogger: Logger, log: LogFn, logJson: (output: any) => void): Promise<import("@aztec/aztec.js").AztecAddress | undefined>;
+export declare function deploy(wallet: AccountWalletWithSecretKey, deployer: AztecAddress | undefined, artifactPath: string, json: boolean, publicKeys: PublicKeys | undefined, rawArgs: any[], salt: Fr | undefined, initializer: string | undefined, skipInstancePublication: boolean, skipClassPublication: boolean, skipInitialization: boolean | undefined, wait: boolean, feeOpts: IFeeOpts, verbose: boolean, timeout: number | undefined, debugLogger: Logger, log: LogFn, logJson: (output: any) => void): Promise<AztecAddress | undefined>;
 //# sourceMappingURL=deploy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAwC,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAE5G,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAI5E,wBAAsB,MAAM,CAC1B,MAAM,EAAE,0BAA0B,EAClC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,GAAG,EAAE,EACd,IAAI,EAAE,EAAE,GAAG,SAAS,EACpB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,oBAAoB,EAAE,OAAO,EAC7B,qBAAqB,EAAE,OAAO,EAC9B,kBAAkB,EAAE,OAAO,GAAG,SAAS,EACvC,eAAe,EAAE,OAAO,GAAG,SAAS,EACpC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,+DAuF/B"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAC/B,YAAY,EAGZ,EAAE,EACH,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAI5E,wBAAsB,MAAM,CAC1B,MAAM,EAAE,0BAA0B,EAClC,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,GAAG,EAAE,EACd,IAAI,EAAE,EAAE,GAAG,SAAS,EACpB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,uBAAuB,EAAE,OAAO,EAChC,oBAAoB,EAAE,OAAO,EAC7B,kBAAkB,EAAE,OAAO,GAAG,SAAS,EACvC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,YAAuB,EACtC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,qCA6F/B"}

package/dest/cmds/deploy.js

@@ -1,17 +1,17 @@
-import { ContractDeployer, Fr } from '@aztec/aztec.js';
+import { AztecAddress, ContractDeployer, Fr } from '@aztec/aztec.js';
 import { encodeArgs, getContractArtifact } from '@aztec/cli/utils';
 import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import { printGasEstimates } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
-export async function deploy(wallet, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipPublicDeployment, skipClassRegistration, skipInitialization, universalDeploy, wait, feeOpts, verbose, debugLogger, log, logJson) {
+export async function deploy(wallet, deployer, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipInstancePublication, skipClassPublication, skipInitialization, wait, feeOpts, verbose, timeout = DEFAULT_TX_TIMEOUT_S, debugLogger, log, logJson) {
     salt ??= Fr.random();
     const contractArtifact = await getContractArtifact(artifactPath, log);
     const hasInitializer = getAllFunctionAbis(contractArtifact).some((fn)=>fn.isInitializer);
     const constructorArtifact = hasInitializer ? getInitializer(contractArtifact, initializer) : undefined;
     // TODO(#12081): Add contractArtifact.noirVersion and check here (via Noir.lock)?
-    const deployer = new ContractDeployer(contractArtifact, wallet, publicKeys ?? PublicKeys.default(), initializer);
+    const contractDeployer = new ContractDeployer(contractArtifact, wallet, publicKeys ?? PublicKeys.default(), initializer);
     let args = [];
     if (rawArgs.length > 0) {
         if (!constructorArtifact) {
@@ -21,30 +21,31 @@ export async function deploy(wallet, artifactPath, json, publicKeys, rawArgs, sa
         args = encodeArgs(rawArgs, constructorArtifact.parameters);
         debugLogger.debug(`Encoded arguments: ${args.join(', ')}`);
     }
-    const deploy = deployer.deploy(...args);
+    const deploy1 = contractDeployer.deploy(...args);
     const deployOpts = {
         ...await feeOpts.toDeployAccountOpts(wallet),
+        from: deployer ?? AztecAddress.ZERO,
         contractAddressSalt: salt,
-        universalDeploy,
-        skipClassRegistration,
+        universalDeploy: !deployer,
+        skipClassPublication,
         skipInitialization,
-        skipPublicDeployment
+        skipInstancePublication
     };
     if (feeOpts.estimateOnly) {
-        const gas = await deploy.estimateGas(deployOpts);
+        const gas = await deploy1.estimateGas(deployOpts);
         printGasEstimates(feeOpts, gas, log);
         return;
     }
-    const provenTx = await deploy.prove(deployOpts);
+    const provenTx = await deploy1.prove(deployOpts);
     if (verbose) {
         printProfileResult(provenTx.stats, log);
     }
     const tx = provenTx.send();
     const txHash = await tx.getTxHash();
-    debugLogger.debug(`Deploy tx sent with hash ${txHash}`);
+    debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
     if (wait) {
         const deployed = await tx.wait({
-            timeout: DEFAULT_TX_TIMEOUT_S
+            timeout
         });
         const { address, partialAddress, instance } = deployed.contract;
         if (json) {
@@ -64,8 +65,8 @@ export async function deploy(wallet, artifactPath, json, publicKeys, rawArgs, sa
             log(`Deployment fee: ${deployed.transactionFee}`);
         }
     } else {
-        const { address, partialAddress } = deploy;
-        const instance = await deploy.getInstance();
+        const { address, partialAddress } = deploy1;
+        const instance = await deploy1.getInstance();
         if (json) {
             logJson({
                 address: address?.toString() ?? 'N/A',
@@ -84,5 +85,5 @@ export async function deploy(wallet, artifactPath, json, publicKeys, rawArgs, sa
             log(`Deployer: ${instance.deployer.toString()}`);
         }
     }
-    return deploy.address;
+    return deploy1.address;
 }

package/dest/cmds/deploy_account.d.ts

@@ -1,8 +1,8 @@
-import type { AccountManager } from '@aztec/aztec.js';
+import { type AccountManager, AztecAddress } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { type IFeeOpts } from '../utils/options/fees.js';
 export declare function deployAccount(account: AccountManager, wait: boolean, registerClass: boolean, publicDeploy: boolean, feeOpts: IFeeOpts, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<{
-    address: import("@aztec/aztec.js").AztecAddress;
+    address: AztecAddress;
     secretKey: import("@aztec/aztec.js").Fr;
     salt: import("@aztec/aztec.js").Fr;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAI5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,EACrB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GAqGX"}
+{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,YAAY,EAA6B,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAI5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,EACrB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GA+GX"}

package/dest/cmds/deploy_account.js

@@ -1,3 +1,4 @@
+import { AztecAddress } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { printGasEstimates } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
@@ -29,8 +30,8 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
     let tx;
     let txReceipt;
     const deployOpts = {
-        skipPublicDeployment: !publicDeploy,
-        skipClassRegistration: !registerClass,
+        skipInstancePublication: !publicDeploy,
+        skipClassPublication: !registerClass,
         ...await feeOpts.toDeployAccountOpts(wallet)
     };
     /*
@@ -48,6 +49,7 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
     if (feeOpts.estimateOnly) {
         const gas = await deployMethod.estimateGas({
             ...deployOpts,
+            from: AztecAddress.ZERO,
             universalDeploy: true,
             contractAddressSalt: salt
         });
@@ -68,6 +70,7 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
     } else {
         const provenTx = await deployMethod.prove({
             ...deployOpts,
+            from: AztecAddress.ZERO,
             universalDeploy: true,
             contractAddressSalt: salt
         });
@@ -76,7 +79,7 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
         }
         tx = provenTx.send();
         const txHash = await tx.getTxHash();
-        debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
+        debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
         out.txHash = txHash;
         if (wait) {
             if (!json) {
@@ -95,7 +98,7 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
         log(prettyPrintJSON(out));
     } else {
         if (tx) {
-            log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+            log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

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;AAwBxD,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,WA4qBxB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAgBA,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;AAwBxD,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,WAosBxB"}

package/dest/cmds/index.js

@@ -1,3 +1,4 @@
+import { CopyCatAccountWallet } from '@aztec/accounts/copy-cat';
 import { getIdentities } from '@aztec/accounts/utils';
 import { createCompatibleClient } from '@aztec/aztec.js/rpc';
 import { TxHash } from '@aztec/aztec.js/tx_hash';
@@ -19,7 +20,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         const client = await pxeWrapper?.getPXE() ?? await createCompatibleClient(rpcUrl, debugLogger);
         await importTestAccounts(client, db, json, log);
     });
-    const createAccountCommand = program.command('create-account').description('Creates an aztec account that can be used for sending transactions. Registers the account on the PXE and deploys an account contract. Uses a Schnorr single-key account which uses the same key for encryption and authentication (not secure for production usage).').summary('Creates an aztec account that can be used for sending transactions.').option('--skip-initialization', 'Skip initializing the account contract. Useful for publicly deploying an existing account.').option('--public-deploy', 'Publicly deploys the account and registers the class if needed.').option('-p, --public-key <string>', 'Public key that identifies a private signing key stored outside of the wallet. Used for ECDSA SSH accounts over the secp256r1 curve.').addOption(pxeOption).addOption(createSecretKeyOption('Secret key for account. Uses random by default.', false, (sk)=>aliasedSecretKeyParser(sk, db)).conflicts('public-key')).addOption(createAliasOption('Alias for the account. Used for easy reference in subsequent commands.', !db)).addOption(createTypeOption(true)).option('--register-only', 'Just register the account on the PXE. Do not deploy or initialize the account contract.').option('--json', 'Emit output as json')// `options.wait` is default true. Passing `--no-wait` will set it to false.
+    const createAccountCommand = program.command('create-account').description('Creates an aztec account that can be used for sending transactions. Registers the account on the PXE and deploys an account contract. Uses a Schnorr single-key account which uses the same key for encryption and authentication (not secure for production usage).').summary('Creates an aztec account that can be used for sending transactions.').option('--skip-initialization', 'Skip initializing the account contract. Useful for publicly deploying an existing account.').option('--public-deploy', 'Publishes the account contract instance (and the class, if needed). Needed if the contract contains public functions.').option('-p, --public-key <string>', 'Public key that identifies a private signing key stored outside of the wallet. Used for ECDSA SSH accounts over the secp256r1 curve.').addOption(pxeOption).addOption(createSecretKeyOption('Secret key for account. Uses random by default.', false, (sk)=>aliasedSecretKeyParser(sk, db)).conflicts('public-key')).addOption(createAliasOption('Alias for the account. Used for easy reference in subsequent commands.', !db)).addOption(createTypeOption(true)).option('--register-only', 'Just register the account on the PXE. Do not deploy or initialize the account contract.').option('--json', 'Emit output as json')// `options.wait` is default true. Passing `--no-wait` will set it to false.
     // https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
     .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').addOption(createVerboseOption());
     addOptions(createAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command)=>{
@@ -54,7 +55,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
     });
     const deployAccountCommand = program.command('deploy-account').description('Deploys an already registered aztec account that can be used for sending transactions.').addOption(createAccountOption('Alias or address of the account to deploy', !db, db)).addOption(pxeOption).option('--json', 'Emit output as json')// `options.wait` is default true. Passing `--no-wait` will set it to false.
     // https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
-    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').option('--register-class', 'Register the contract class (useful for when the contract class has not been deployed yet).').option('--public-deploy', 'Publicly deploy this account contract (only useful if it contains public functions').addOption(createVerboseOption());
+    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').option('--register-class', 'Register the contract class (useful for when the contract class has not been deployed yet).').option('--public-deploy', 'Publishes the account contract instance (and the class, if needed). Needed if the contract contains public functions.').addOption(createVerboseOption());
     addOptions(deployAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command)=>{
         const { deployAccount } = await import('./deploy_account.js');
         const options = command.optsWithGlobals();
@@ -65,17 +66,17 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
     });
     const deployCommand = program.command('deploy').description('Deploys a compiled Aztec.nr contract to Aztec.').argument('[artifact]', ARTIFACT_DESCRIPTION, artifactPathParser).option('--init <string>', 'The contract initializer function to call', 'constructor').option('--no-init', 'Leave the contract uninitialized').option('-k, --public-key <string>', 'Optional encryption public key for this address. Set this value only if this contract is expected to receive private notes, which will be encrypted using this public key.', parsePublicKey).option('-s, --salt <hex string>', 'Optional deployment salt as a hex string for generating the deployment address.', parseFieldFromHexString).option('--universal', 'Do not mix the sender address into the deployment.').addOption(pxeOption).addOption(createArgsOption(true, db)).addOption(createSecretKeyOption("The sender's secret key", !db, (sk)=>aliasedSecretKeyParser(sk, db)).conflicts('account')).addOption(createAccountOption('Alias or address of the account to deploy from', !db, db)).addOption(createAliasOption('Alias for the contract. Used for easy reference subsequent commands.', !db)).option('--json', 'Emit output as json')// `options.wait` is default true. Passing `--no-wait` will set it to false.
     // https://github.com/tj/commander.js#other-option-types-negatable-boolean-and-booleanvalue
-    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').option('--no-class-registration', "Don't register this contract class").option('--no-public-deployment', "Don't emit this contract's public bytecode").addOption(createVerboseOption());
+    .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction').option('--no-class-registration', "Don't register this contract class").option('--no-public-deployment', "Don't emit this contract's public bytecode").addOption(new Option('--timeout <number>', 'The amount of time in seconds to wait for the deployment to post to L2').conflicts('wait')).addOption(createVerboseOption());
     addOptions(deployCommand, FeeOpts.getOptions()).action(async (artifactPathPromise, _options, command)=>{
         const { deploy } = await import('./deploy.js');
         const options = command.optsWithGlobals();
-        const { json, publicKey, args, salt, wait, secretKey, classRegistration, init, publicDeployment, universal, rpcUrl, from: parsedFromAddress, alias, verbose } = options;
+        const { json, publicKey, args, salt, wait, secretKey, classRegistration, init, publicDeployment, universal, rpcUrl, from: parsedFromAddress, alias, timeout, verbose } = options;
         const client = await pxeWrapper?.getPXE() ?? await createCompatibleClient(rpcUrl, debugLogger);
         const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
         const wallet = await account.getWallet();
         const artifactPath = await artifactPathPromise;
         debugLogger.info(`Using wallet with address ${wallet.getCompleteAddress().address.toString()}`);
-        const address = await deploy(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), verbose, debugLogger, log, logJson(log));
+        const address = await deploy(wallet, universal ? undefined : wallet.getAddress(), artifactPath, json, publicKey, args, salt, typeof init === 'string' ? init : undefined, !publicDeployment, !classRegistration, typeof init === 'string' ? false : init, wait, await FeeOpts.fromCli(options, client, log, db), timeout, verbose, debugLogger, log, logJson(log));
         if (db && address) {
             await db.storeContract(address, artifactPath, log, alias);
         }
@@ -104,7 +105,8 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         const { args, contractArtifact: artifactPathPromise, contractAddress, from: parsedFromAddress, rpcUrl, secretKey, verbose, authWitness } = options;
         const client = await pxeWrapper?.getPXE() ?? await createCompatibleClient(rpcUrl, debugLogger);
         const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-        const wallet = await account.getWallet();
+        const originalWallet = await account.getWallet();
+        const wallet = await CopyCatAccountWallet.create(client, originalWallet);
         const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
         const authWitnesses = cleanupAuthWitnesses(authWitness);
         await simulate(wallet, functionName, args, artifactPath, contractAddress, await FeeOpts.fromCli(options, client, log, db), authWitnesses, verbose, log);
@@ -155,7 +157,7 @@ export function injectCommands(program, log, debugLogger, db, pxeWrapper) {
         const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
         const wallet = await account.getWallet();
         const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
-        await authorizeAction(wallet, functionName, caller, args, artifactPath, contractAddress, log);
+        await authorizeAction(wallet, wallet.getAddress(), functionName, caller, args, artifactPath, contractAddress, log);
     });
     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');

package/dest/cmds/profile.js

@@ -14,7 +14,7 @@ export async function profile(wallet, functionName, functionArgsIn, contractArti
         authWitnesses,
         skipProofGeneration: false
     });
-    printProfileResult(result.stats, log, result.executionSteps);
+    printProfileResult(result.stats, log, true, result.executionSteps);
     if (debugOutputPath) {
         const ivcInputsPath = path.join(debugOutputPath, 'ivc-inputs.msgpack');
         log(`Debug output written to ${ivcInputsPath}.`);

package/dest/cmds/register_contract.js

@@ -1,4 +1,4 @@
-import { PublicKeys, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
+import { PublicKeys, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js';
 import { getContractArtifact } from '@aztec/cli/cli-utils';
 import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
 export async function registerContract(wallet, node, address, artifactPath, log, initializer, publicKeys, rawArgs, salt, deployer) {
@@ -8,7 +8,7 @@ export async function registerContract(wallet, node, address, artifactPath, log,
     let contractInstance = await node.getContract(address);
     if (!contractInstance) {
         log(`Contract not found in the node at ${address}. Computing instance locally...`);
-        contractInstance = await getContractInstanceFromDeployParams(contractArtifact, {
+        contractInstance = await getContractInstanceFromInstantiationParams(contractArtifact, {
             constructorArtifact,
             publicKeys: publicKeys ?? PublicKeys.default(),
             constructorArgs: rawArgs,

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,WAAW,EAAE,KAAK,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE5G,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGzD,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,QAAQ,EACjB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,iBAeX"}
+{"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;AAKnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGzD,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,QAAQ,EACjB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK,iBA8BX"}

package/dest/cmds/simulate.js

@@ -1,6 +1,7 @@
 import { Contract } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
 import { format } from 'util';
+import { printAuthorizations } from '../utils/authorizations.js';
 import { printProfileResult } from '../utils/profiling.js';
 export async function simulate(wallet, functionName, functionArgsIn, contractArtifactPath, contractAddress, feeOpts, authWitnesses, verbose, log) {
     const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
@@ -12,6 +13,14 @@ export async function simulate(wallet, functionName, functionArgsIn, contractArt
         includeMetadata: true
     });
     if (verbose) {
+        await printAuthorizations(simulationResult.offchainEffects, async (address)=>{
+            const metadata = await wallet.getContractMetadata(address);
+            if (!metadata.contractInstance) {
+                return undefined;
+            }
+            const classMetadata = await wallet.getContractClassMetadata(metadata.contractInstance.currentContractClassId, true);
+            return classMetadata.artifact;
+        }, log);
         printProfileResult(simulationResult.stats, log);
     }
     log(format('\nSimulation result: ', simulationResult.result, '\n'));

package/dest/utils/authorizations.d.ts

@@ -0,0 +1,5 @@
+import { type AztecAddress, type ContractArtifact } from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
+import type { OffchainEffect } from '@aztec/stdlib/tx';
+export declare function printAuthorizations(offchainEffects: OffchainEffect[], artifactRetriever: (address: AztecAddress) => Promise<ContractArtifact | undefined>, log: LogFn): Promise<void>;
+//# sourceMappingURL=authorizations.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"authorizations.d.ts","sourceRoot":"","sources":["../../src/utils/authorizations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAA4B,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACrG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,cAAc,EAAE,EACjC,iBAAiB,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,EACnF,GAAG,EAAE,KAAK,iBAsCX"}

package/dest/utils/authorizations.js

@@ -0,0 +1,28 @@
+import { CallAuthorizationRequest } from '@aztec/aztec.js';
+import { decodeFromAbi, getFunctionArtifact } from '@aztec/stdlib/abi';
+import { format } from 'util';
+export async function printAuthorizations(offchainEffects, artifactRetriever, log) {
+    log(format('\nAuthorizations requested by the tx:\n'));
+    const callAuthorizationSelector = await CallAuthorizationRequest.getSelector();
+    const callAuthorizationEffects = offchainEffects.filter((effect)=>effect.data[0].equals(callAuthorizationSelector.toField()));
+    for (const callAuthorizationEffect of callAuthorizationEffects){
+        const callAuthorizationRequest = await CallAuthorizationRequest.fromFields(callAuthorizationEffect.data);
+        const artifact = await artifactRetriever(callAuthorizationEffect.contractAddress);
+        if (!artifact) {
+            log(format(' -', `Call authorization. Inner hash: ${callAuthorizationRequest.innerHash.toString()}\n`));
+            log(format('  ', `Contract: unknown@${callAuthorizationEffect.contractAddress}`));
+            log(format(' ', `${callAuthorizationRequest.functionSelector.toString()}(\n${callAuthorizationRequest.args.map((arg)=>`    ${arg.toString()}`).join(',\n')}\n  )`));
+        } else {
+            const functionAbi = await getFunctionArtifact(artifact, callAuthorizationRequest.functionSelector);
+            const callData = decodeFromAbi(functionAbi.parameters.map((param)=>param.type), callAuthorizationRequest.args);
+            const parameters = functionAbi.parameters.map((param, i)=>({
+                    name: param.name,
+                    value: callData[i]
+                }));
+            log(format(' -', `Call authorization. Inner hash: ${callAuthorizationRequest.innerHash.toString()}`));
+            log(format('  ', `Contract: ${artifact.name}@${callAuthorizationEffect.contractAddress}`));
+            log(format('  ', /* eslint-disable-next-line @typescript-eslint/no-base-to-string */ `${functionAbi.name}(\n${parameters.map((p)=>`    ${p.name}: ${p.value}`).join(',\n')}\n  )`));
+        }
+        log(`\n`);
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACR,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC3E;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX;AAuGD,qBAAa,OAAQ,YAAW,QAAQ;IAE7B,YAAY,EAAE,OAAO;IACrB,WAAW,EAAE,WAAW;IAC/B,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;gBAPZ,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,WAAW,EACvB,oBAAoB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,EAC1E,eAAe,EAAE,CACvB,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gBAAgB,KAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,EAC/B,WAAW,EAAE,OAAO;IAGxB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAU7D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa/E,MAAM,CAAC,mBAAmB;IAI1B,MAAM,CAAC,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CAsB3E;AAED,qBAAa,mBAAoB,SAAQ,OAAO;WAC9B,mBAAmB;WAInB,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CA2BpF;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,mBAAmB,EAAE,OAAO,EAC5B,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,GACZ,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAoFtD;AAyBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAkBrD"}
+{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACR,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC3E;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX;AAuGD,qBAAa,OAAQ,YAAW,QAAQ;IAE7B,YAAY,EAAE,OAAO;IACrB,WAAW,EAAE,WAAW;IAC/B,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;gBAPZ,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,WAAW,EACvB,oBAAoB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,EAC1E,eAAe,EAAE,CACvB,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gBAAgB,KAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,EAC/B,WAAW,EAAE,OAAO;IAGxB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAW7D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa/E,MAAM,CAAC,mBAAmB;IAI1B,MAAM,CAAC,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CAsB3E;AAED,qBAAa,mBAAoB,SAAQ,OAAO;WAC9B,mBAAmB;WAInB,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CA2BpF;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,mBAAmB,EAAE,OAAO,EAC5B,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,GACZ,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAoFtD;AAyBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAkBrD"}

package/dest/utils/options/fees.js

@@ -111,6 +111,7 @@ export class FeeOpts {
     }
     async toSendOpts(sender) {
         return {
+            from: sender.getAddress(),
             fee: {
                 estimateGas: this.estimateGas,
                 gasSettings: this.gasSettings,

package/dest/utils/profiling.d.ts

@@ -1,5 +1,5 @@
 import type { LogFn } from '@aztec/foundation/log';
 import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
 import type { ProvingStats, SimulationStats } from '@aztec/stdlib/tx';
-export declare function printProfileResult(stats: ProvingStats | SimulationStats, log: LogFn, executionSteps?: PrivateExecutionStep[]): void;
+export declare function printProfileResult(stats: ProvingStats | SimulationStats, log: LogFn, printOracles?: boolean, executionSteps?: PrivateExecutionStep[]): void;
 //# sourceMappingURL=profiling.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/utils/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAkB,eAAe,EAAqB,MAAM,kBAAkB,CAAC;AAUzG,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,YAAY,GAAG,eAAe,EACrC,GAAG,EAAE,KAAK,EACV,cAAc,CAAC,EAAE,oBAAoB,EAAE,QA6IxC"}
+{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/utils/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAkB,eAAe,EAAqB,MAAM,kBAAkB,CAAC;AAUzG,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,YAAY,GAAG,eAAe,EACrC,GAAG,EAAE,KAAK,EACV,YAAY,GAAE,OAAe,EAC7B,cAAc,CAAC,EAAE,oBAAoB,EAAE,QA6IxC"}

package/dest/utils/profiling.js

@@ -1,9 +1,9 @@
 import { format } from 'util';
-const FN_NAME_PADDING = 50;
+const FN_NAME_PADDING = 60;
 const COLUMN_MIN_WIDTH = 13;
 const COLUMN_MAX_WIDTH = 15;
 const ORACLE_NAME_PADDING = 50;
-export function printProfileResult(stats, log, executionSteps) {
+export function printProfileResult(stats, log, printOracles = false, executionSteps) {
     log(format('\nPer circuit breakdown:\n'));
     log(format('  ', 'Function name'.padEnd(FN_NAME_PADDING), 'Time'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), executionSteps ? 'Gates'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '', executionSteps ? 'Subtotal'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : ''));
     log(format(''.padEnd(FN_NAME_PADDING + COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH + (executionSteps ? COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH : 0), '-')));
@@ -17,7 +17,7 @@ export function printProfileResult(stats, log, executionSteps) {
         }
         acc += currentExecutionStep ? currentExecutionStep.gateCount : 0;
         log(format(' - ', fn.functionName.padEnd(FN_NAME_PADDING), `${fn.time.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), currentExecutionStep ? currentExecutionStep.gateCount.toLocaleString().padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '', currentExecutionStep ? acc.toLocaleString().padStart(COLUMN_MAX_WIDTH) : ''));
-        if (fn.oracles) {
+        if (printOracles && fn.oracles) {
             log('');
             for (const [oracleName, { times }] of Object.entries(fn.oracles)){
                 const calls = times.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "1.2.1",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -67,17 +67,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "1.2.1",
-    "@aztec/aztec.js": "1.2.1",
-    "@aztec/cli": "1.2.1",
-    "@aztec/entrypoints": "1.2.1",
-    "@aztec/ethereum": "1.2.1",
-    "@aztec/foundation": "1.2.1",
-    "@aztec/kv-store": "1.2.1",
-    "@aztec/noir-contracts.js": "1.2.1",
-    "@aztec/noir-noirc_abi": "1.2.1",
-    "@aztec/pxe": "1.2.1",
-    "@aztec/stdlib": "1.2.1",
+    "@aztec/accounts": "2.0.0-nightly.20250813",
+    "@aztec/aztec.js": "2.0.0-nightly.20250813",
+    "@aztec/cli": "2.0.0-nightly.20250813",
+    "@aztec/entrypoints": "2.0.0-nightly.20250813",
+    "@aztec/ethereum": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/kv-store": "2.0.0-nightly.20250813",
+    "@aztec/noir-contracts.js": "2.0.0-nightly.20250813",
+    "@aztec/noir-noirc_abi": "2.0.0-nightly.20250813",
+    "@aztec/pxe": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/bin/index.ts

@@ -120,7 +120,7 @@ async function main() {
       await db.init(await openStoreAt(dataDir));
       let protocolContractsRegistered;
       try {
-        protocolContractsRegistered = !!(await db.retrieveAlias('contracts:ContractClassRegisterer'));
+        protocolContractsRegistered = !!(await db.retrieveAlias('contracts:ContractClassRegistry'));
         // eslint-disable-next-line no-empty
       } catch {}
       if (!protocolContractsRegistered) {

package/src/cmds/authorize_action.ts

@@ -6,6 +6,7 @@ import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 
 export async function authorizeAction(
   wallet: AccountWalletWithSecretKey,
+  from: AztecAddress,
   functionName: string,
   caller: AztecAddress,
   functionArgsIn: any[],
@@ -30,7 +31,7 @@ export async function authorizeAction(
   const action = contract.methods[functionName](...functionArgs);
 
   const setAuthwitnessInteraction = await wallet.setPublicAuthWit({ caller, action }, true);
-  const witness = await setAuthwitnessInteraction.send().wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+  const witness = await setAuthwitnessInteraction.send({ from }).wait({ timeout: DEFAULT_TX_TIMEOUT_S });
 
   log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
 

package/src/cmds/cancel_tx.ts

@@ -46,7 +46,10 @@ export async function cancelTx(
   });
   const txSimulationResult = await wallet.simulateTx(txRequest, true);
   const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
-  const sentTx = new SentTx(wallet, () => wallet.sendTx(txProvingResult.toTx()));
+  const sentTx = new SentTx(wallet, async () => {
+    const tx = await txProvingResult.toTx();
+    return wallet.sendTx(tx);
+  });
   try {
     await sentTx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
 

package/src/cmds/create_account.ts

@@ -1,4 +1,4 @@
-import type { DeployAccountOptions, PXE } from '@aztec/aztec.js';
+import { AztecAddress, type DeployAccountOptions, type PXE } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
@@ -69,17 +69,17 @@ export async function createAccount(
   } else {
     const wallet = await account.getWallet();
     const deployOpts: DeployAccountOptions = {
-      skipClassRegistration: !publicDeploy,
-      skipPublicDeployment: !publicDeploy,
+      skipClassPublication: !publicDeploy,
+      skipInstancePublication: !publicDeploy,
       skipInitialization: skipInitialization,
       ...(await feeOpts.toDeployAccountOpts(wallet)),
     };
     /*
-     * This is usually handled by accountManager.deploy(), but we're accessing the lower
+     * This is usually handled by accountManager.create(), but we're accessing the lower
      * level method to get gas and timings. That means we have to replicate some of the logic here.
-     * In case we're deploying our own account, we need to hijack the payment method for the fee,
+     * In case we're initializing and/or publishing our own account, we need to hijack the payment method for the fee,
      * wrapping it in the one that will make use of the freshly deployed account's
-     * entrypoint. For reference, see aztec.js/src/account_manager.ts:deploy()
+     * entrypoint. For reference, see aztec.js/src/account_manager.ts:sendAccountContractSetupTx()
      * Also, salt and universalDeploy have to be explicitly provided
      */
     deployOpts.fee =
@@ -90,7 +90,12 @@ export async function createAccount(
     const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
 
     if (feeOpts.estimateOnly) {
-      const gas = await deployMethod.estimateGas({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
+      const gas = await deployMethod.estimateGas({
+        ...deployOpts,
+        from: AztecAddress.ZERO,
+        universalDeploy: true,
+        contractAddressSalt: salt,
+      });
       if (json) {
         out.fee = {
           gasLimits: {
@@ -106,14 +111,19 @@ export async function createAccount(
         printGasEstimates(feeOpts, gas, log);
       }
     } else {
-      const provenTx = await deployMethod.prove({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
+      const provenTx = await deployMethod.prove({
+        ...deployOpts,
+        from: AztecAddress.ZERO,
+        universalDeploy: true,
+        contractAddressSalt: salt,
+      });
       if (verbose) {
         printProfileResult(provenTx.stats!, log);
       }
       tx = provenTx.send();
 
       const txHash = await tx.getTxHash();
-      debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
+      debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
       out.txHash = txHash;
       if (wait) {
         if (!json) {
@@ -132,7 +142,7 @@ export async function createAccount(
     log(prettyPrintJSON(out));
   } else {
     if (tx) {
-      log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+      log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
     }
     if (txReceipt) {
       log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/src/cmds/deploy.ts

@@ -1,4 +1,10 @@
-import { type AccountWalletWithSecretKey, ContractDeployer, type DeployOptions, Fr } from '@aztec/aztec.js';
+import {
+  type AccountWalletWithSecretKey,
+  AztecAddress,
+  ContractDeployer,
+  type DeployOptions,
+  Fr,
+} from '@aztec/aztec.js';
 import { encodeArgs, getContractArtifact } from '@aztec/cli/utils';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
@@ -10,19 +16,20 @@ import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 
 export async function deploy(
   wallet: AccountWalletWithSecretKey,
+  deployer: AztecAddress | undefined,
   artifactPath: string,
   json: boolean,
   publicKeys: PublicKeys | undefined,
   rawArgs: any[],
   salt: Fr | undefined,
   initializer: string | undefined,
-  skipPublicDeployment: boolean,
-  skipClassRegistration: boolean,
+  skipInstancePublication: boolean,
+  skipClassPublication: boolean,
   skipInitialization: boolean | undefined,
-  universalDeploy: boolean | undefined,
   wait: boolean,
   feeOpts: IFeeOpts,
   verbose: boolean,
+  timeout: number = DEFAULT_TX_TIMEOUT_S,
   debugLogger: Logger,
   log: LogFn,
   logJson: (output: any) => void,
@@ -34,7 +41,12 @@ export async function deploy(
 
   // TODO(#12081): Add contractArtifact.noirVersion and check here (via Noir.lock)?
 
-  const deployer = new ContractDeployer(contractArtifact, wallet, publicKeys ?? PublicKeys.default(), initializer);
+  const contractDeployer = new ContractDeployer(
+    contractArtifact,
+    wallet,
+    publicKeys ?? PublicKeys.default(),
+    initializer,
+  );
 
   let args = [];
   if (rawArgs.length > 0) {
@@ -46,14 +58,15 @@ export async function deploy(
     debugLogger.debug(`Encoded arguments: ${args.join(', ')}`);
   }
 
-  const deploy = deployer.deploy(...args);
+  const deploy = contractDeployer.deploy(...args);
   const deployOpts: DeployOptions = {
     ...(await feeOpts.toDeployAccountOpts(wallet)),
+    from: deployer ?? AztecAddress.ZERO,
     contractAddressSalt: salt,
-    universalDeploy,
-    skipClassRegistration,
+    universalDeploy: !deployer,
+    skipClassPublication,
     skipInitialization,
-    skipPublicDeployment,
+    skipInstancePublication,
   };
 
   if (feeOpts.estimateOnly) {
@@ -70,9 +83,9 @@ export async function deploy(
   const tx = provenTx.send();
 
   const txHash = await tx.getTxHash();
-  debugLogger.debug(`Deploy tx sent with hash ${txHash}`);
+  debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
   if (wait) {
-    const deployed = await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
+    const deployed = await tx.wait({ timeout });
     const { address, partialAddress, instance } = deployed.contract;
     if (json) {
       logJson({

package/src/cmds/deploy_account.ts

@@ -1,4 +1,4 @@
-import type { AccountManager, DeployAccountOptions } from '@aztec/aztec.js';
+import { type AccountManager, AztecAddress, type DeployAccountOptions } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 
@@ -46,8 +46,8 @@ export async function deployAccount(
   let txReceipt;
 
   const deployOpts: DeployAccountOptions = {
-    skipPublicDeployment: !publicDeploy,
-    skipClassRegistration: !registerClass,
+    skipInstancePublication: !publicDeploy,
+    skipClassPublication: !registerClass,
     ...(await feeOpts.toDeployAccountOpts(wallet)),
   };
 
@@ -67,7 +67,12 @@ export async function deployAccount(
   const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
 
   if (feeOpts.estimateOnly) {
-    const gas = await deployMethod.estimateGas({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
+    const gas = await deployMethod.estimateGas({
+      ...deployOpts,
+      from: AztecAddress.ZERO,
+      universalDeploy: true,
+      contractAddressSalt: salt,
+    });
     if (json) {
       out.fee = {
         gasLimits: {
@@ -83,14 +88,19 @@ export async function deployAccount(
       printGasEstimates(feeOpts, gas, log);
     }
   } else {
-    const provenTx = await deployMethod.prove({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
+    const provenTx = await deployMethod.prove({
+      ...deployOpts,
+      from: AztecAddress.ZERO,
+      universalDeploy: true,
+      contractAddressSalt: salt,
+    });
     if (verbose) {
       printProfileResult(provenTx.stats!, log);
     }
     tx = provenTx.send();
 
     const txHash = await tx.getTxHash();
-    debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
+    debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
     out.txHash = txHash;
     if (wait) {
       if (!json) {
@@ -108,7 +118,7 @@ export async function deployAccount(
     log(prettyPrintJSON(out));
   } else {
     if (tx) {
-      log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+      log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
     }
     if (txReceipt) {
       log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/src/cmds/index.ts

@@ -1,3 +1,4 @@
+import { CopyCatAccountWallet } from '@aztec/accounts/copy-cat';
 import { getIdentities } from '@aztec/accounts/utils';
 import { createCompatibleClient } from '@aztec/aztec.js/rpc';
 import { TxHash } from '@aztec/aztec.js/tx_hash';
@@ -80,7 +81,10 @@ export function injectCommands(
       '--skip-initialization',
       'Skip initializing the account contract. Useful for publicly deploying an existing account.',
     )
-    .option('--public-deploy', 'Publicly deploys the account and registers the class if needed.')
+    .option(
+      '--public-deploy',
+      'Publishes the account contract instance (and the class, if needed). Needed if the contract contains public functions.',
+    )
     .option(
       '-p, --public-key <string>',
       'Public key that identifies a private signing key stored outside of the wallet. Used for ECDSA SSH accounts over the secp256r1 curve.',
@@ -158,7 +162,10 @@ export function injectCommands(
       '--register-class',
       'Register the contract class (useful for when the contract class has not been deployed yet).',
     )
-    .option('--public-deploy', 'Publicly deploy this account contract (only useful if it contains public functions')
+    .option(
+      '--public-deploy',
+      'Publishes the account contract instance (and the class, if needed). Needed if the contract contains public functions.',
+    )
     .addOption(createVerboseOption());
 
   addOptions(deployAccountCommand, FeeOptsWithFeePayer.getOptions()).action(async (_options, command) => {
@@ -212,6 +219,12 @@ export function injectCommands(
     .option('--no-wait', 'Skip waiting for the contract to be deployed. Print the hash of deployment transaction')
     .option('--no-class-registration', "Don't register this contract class")
     .option('--no-public-deployment', "Don't emit this contract's public bytecode")
+    .addOption(
+      new Option(
+        '--timeout <number>',
+        'The amount of time in seconds to wait for the deployment to post to L2',
+      ).conflicts('wait'),
+    )
     .addOption(createVerboseOption());
 
   addOptions(deployCommand, FeeOpts.getOptions()).action(async (artifactPathPromise, _options, command) => {
@@ -231,6 +244,7 @@ export function injectCommands(
       rpcUrl,
       from: parsedFromAddress,
       alias,
+      timeout,
       verbose,
     } = options;
     const client = (await pxeWrapper?.getPXE()) ?? (await createCompatibleClient(rpcUrl, debugLogger));
@@ -242,6 +256,7 @@ export function injectCommands(
 
     const address = await deploy(
       wallet,
+      universal ? undefined : wallet.getAddress(),
       artifactPath,
       json,
       publicKey,
@@ -251,9 +266,9 @@ export function injectCommands(
       !publicDeployment,
       !classRegistration,
       typeof init === 'string' ? false : init,
-      universal,
       wait,
       await FeeOpts.fromCli(options, client, log, db),
+      timeout,
       verbose,
       debugLogger,
       log,
@@ -364,7 +379,8 @@ export function injectCommands(
 
     const client = (await pxeWrapper?.getPXE()) ?? (await createCompatibleClient(rpcUrl, debugLogger));
     const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
-    const wallet = await account.getWallet();
+    const originalWallet = await account.getWallet();
+    const wallet = await CopyCatAccountWallet.create(client, originalWallet);
     const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
     const authWitnesses = cleanupAuthWitnesses(authWitness);
     await simulate(
@@ -560,7 +576,16 @@ export function injectCommands(
       const account = await createOrRetrieveAccount(client, parsedFromAddress, db, secretKey);
       const wallet = await account.getWallet();
       const artifactPath = await artifactPathFromPromiseOrAlias(artifactPathPromise, contractAddress, db);
-      await authorizeAction(wallet, functionName, caller, args, artifactPath, contractAddress, log);
+      await authorizeAction(
+        wallet,
+        wallet.getAddress(),
+        functionName,
+        caller,
+        args,
+        artifactPath,
+        contractAddress,
+        log,
+      );
     });
 
   program

package/src/cmds/profile.ts

@@ -31,7 +31,7 @@ export async function profile(
     authWitnesses,
     skipProofGeneration: false,
   });
-  printProfileResult(result.stats, log, result.executionSteps);
+  printProfileResult(result.stats, log, true, result.executionSteps);
   if (debugOutputPath) {
     const ivcInputsPath = path.join(debugOutputPath, 'ivc-inputs.msgpack');
     log(`Debug output written to ${ivcInputsPath}.`);

package/src/cmds/register_contract.ts

@@ -4,7 +4,7 @@ import {
   type AztecNode,
   type Fr,
   PublicKeys,
-  getContractInstanceFromDeployParams,
+  getContractInstanceFromInstantiationParams,
 } from '@aztec/aztec.js';
 import { getContractArtifact } from '@aztec/cli/cli-utils';
 import type { LogFn } from '@aztec/foundation/log';
@@ -28,7 +28,7 @@ export async function registerContract(
   let contractInstance = await node.getContract(address);
   if (!contractInstance) {
     log(`Contract not found in the node at ${address}. Computing instance locally...`);
-    contractInstance = await getContractInstanceFromDeployParams(contractArtifact, {
+    contractInstance = await getContractInstanceFromInstantiationParams(contractArtifact, {
       constructorArtifact,
       publicKeys: publicKeys ?? PublicKeys.default(),
       constructorArgs: rawArgs,

package/src/cmds/simulate.ts

@@ -4,6 +4,7 @@ import type { LogFn } from '@aztec/foundation/log';
 
 import { format } from 'util';
 
+import { printAuthorizations } from '../utils/authorizations.js';
 import type { IFeeOpts } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
 
@@ -28,6 +29,21 @@ export async function simulate(
     includeMetadata: true,
   });
   if (verbose) {
+    await printAuthorizations(
+      simulationResult.offchainEffects!,
+      async (address: AztecAddress) => {
+        const metadata = await wallet.getContractMetadata(address);
+        if (!metadata.contractInstance) {
+          return undefined;
+        }
+        const classMetadata = await wallet.getContractClassMetadata(
+          metadata.contractInstance.currentContractClassId,
+          true,
+        );
+        return classMetadata.artifact;
+      },
+      log,
+    );
     printProfileResult(simulationResult.stats!, log);
   }
   log(format('\nSimulation result: ', simulationResult.result, '\n'));

package/src/utils/authorizations.ts

@@ -0,0 +1,49 @@
+import { type AztecAddress, CallAuthorizationRequest, type ContractArtifact } from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
+import { type AbiDecoded, decodeFromAbi, getFunctionArtifact } from '@aztec/stdlib/abi';
+import type { OffchainEffect } from '@aztec/stdlib/tx';
+
+import { format } from 'util';
+
+export async function printAuthorizations(
+  offchainEffects: OffchainEffect[],
+  artifactRetriever: (address: AztecAddress) => Promise<ContractArtifact | undefined>,
+  log: LogFn,
+) {
+  log(format('\nAuthorizations requested by the tx:\n'));
+  const callAuthorizationSelector = await CallAuthorizationRequest.getSelector();
+  const callAuthorizationEffects = offchainEffects.filter(effect =>
+    effect.data[0].equals(callAuthorizationSelector.toField()),
+  );
+  for (const callAuthorizationEffect of callAuthorizationEffects) {
+    const callAuthorizationRequest = await CallAuthorizationRequest.fromFields(callAuthorizationEffect.data);
+    const artifact = await artifactRetriever(callAuthorizationEffect.contractAddress);
+    if (!artifact) {
+      log(format(' -', `Call authorization. Inner hash: ${callAuthorizationRequest.innerHash.toString()}\n`));
+      log(format('  ', `Contract: unknown@${callAuthorizationEffect.contractAddress}`));
+      log(
+        format(
+          ' ',
+          `${callAuthorizationRequest.functionSelector.toString()}(\n${callAuthorizationRequest.args.map(arg => `    ${arg.toString()}`).join(',\n')}\n  )`,
+        ),
+      );
+    } else {
+      const functionAbi = await getFunctionArtifact(artifact, callAuthorizationRequest.functionSelector);
+      const callData = decodeFromAbi(
+        functionAbi.parameters.map(param => param.type),
+        callAuthorizationRequest.args,
+      ) as AbiDecoded[];
+      const parameters = functionAbi.parameters.map((param, i) => ({ name: param.name, value: callData[i] }));
+      log(format(' -', `Call authorization. Inner hash: ${callAuthorizationRequest.innerHash.toString()}`));
+      log(format('  ', `Contract: ${artifact.name}@${callAuthorizationEffect.contractAddress}`));
+      log(
+        format(
+          '  ',
+          /* eslint-disable-next-line @typescript-eslint/no-base-to-string */
+          `${functionAbi.name}(\n${parameters.map(p => `    ${p.name}: ${p.value}`).join(',\n')}\n  )`,
+        ),
+      );
+    }
+    log(`\n`);
+  }
+}

package/src/utils/options/fees.ts

@@ -157,6 +157,7 @@ export class FeeOpts implements IFeeOpts {
 
   async toSendOpts(sender: AccountWallet): Promise<SendMethodOptions> {
     return {
+      from: sender.getAddress(),
       fee: {
         estimateGas: this.estimateGas,
         gasSettings: this.gasSettings,

package/src/utils/profiling.ts

@@ -4,7 +4,7 @@ import type { ProvingStats, ProvingTimings, SimulationStats, SimulationTimings }
 
 import { format } from 'util';
 
-const FN_NAME_PADDING = 50;
+const FN_NAME_PADDING = 60;
 const COLUMN_MIN_WIDTH = 13;
 const COLUMN_MAX_WIDTH = 15;
 
@@ -13,6 +13,7 @@ const ORACLE_NAME_PADDING = 50;
 export function printProfileResult(
   stats: ProvingStats | SimulationStats,
   log: LogFn,
+  printOracles: boolean = false,
   executionSteps?: PrivateExecutionStep[],
 ) {
   log(format('\nPer circuit breakdown:\n'));
@@ -58,7 +59,7 @@ export function printProfileResult(
         currentExecutionStep ? acc.toLocaleString().padStart(COLUMN_MAX_WIDTH) : '',
       ),
     );
-    if (fn.oracles) {
+    if (printOracles && fn.oracles) {
       log('');
       for (const [oracleName, { times }] of Object.entries(fn.oracles)) {
         const calls = times.length;