@aztec/cli-wallet 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/cmds/create_account.js

@@ -1,11 +1,14 @@
+import { NO_FROM } from '@aztec/aztec.js/account';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
+import { waitForTx } from '@aztec/aztec.js/node';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
-import { Fr } from '@aztec/foundation/fields';
-import { createOrRetrieveAccount } from '../utils/accounts.js';
-import { printGasEstimates } from '../utils/options/fees.js';
-export async function createAccount(client, accountType, secretKey, publicKey, alias, registerOnly, publicDeploy, skipInitialization, wait, feeOpts, json, debugLogger, log) {
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
+import { printProfileResult } from '../utils/profiling.js';
+export async function createAccount(wallet, aztecNode, accountType, secretKey, salt, publicKey, alias, deployer, registerOnly, skipInitialization, publicDeploy, registerClass, wait, feeOpts, waitForStatus, json, verbose, debugLogger, log) {
     secretKey ??= Fr.random();
-    const account = await createOrRetrieveAccount(client, undefined /* address, we don't have it yet */ , undefined /* db, as we want to create from scratch */ , secretKey, accountType, Fr.ZERO, publicKey);
-    const salt = account.getInstance().salt;
+    const account = await wallet.createOrRetrieveAccount(undefined /* address, we don't have it yet */ , secretKey, accountType, salt, publicKey);
+    const instanceSalt = account.getInstance().salt;
     const { address, publicKeys, partialAddress } = await account.getCompleteAddress();
     const out = {};
     if (json) {
@@ -15,9 +18,8 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
             out.secretKey = secretKey;
         }
         out.partialAddress = partialAddress;
-        out.salt = salt;
+        out.salt = instanceSalt;
         out.initHash = account.getInstance().initializationHash;
-        out.deployer = account.getInstance().deployer;
     } else {
         log(`\nNew account:\n`);
         log(`Address:         ${address.toString()}`);
@@ -26,60 +28,94 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
             log(`Secret key:     ${secretKey.toString()}`);
         }
         log(`Partial address: ${partialAddress.toString()}`);
-        log(`Salt:            ${salt.toString()}`);
+        log(`Salt:            ${instanceSalt.toString()}`);
         log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
-        log(`Deployer:        ${account.getInstance().deployer.toString()}`);
     }
-    let tx;
+    let txHash;
     let txReceipt;
-    if (registerOnly) {
-        await account.register();
-    } else {
-        const wallet = await account.getWallet();
-        const deployOpts = {
-            skipClassRegistration: !publicDeploy,
-            skipPublicDeployment: !publicDeploy,
-            skipInitialization: skipInitialization,
-            ...await feeOpts.toDeployAccountOpts(wallet)
+    if (!registerOnly) {
+        const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
+        const delegatedDeployment = deployer && !account.address.equals(deployer);
+        const from = delegatedDeployment ? deployer : NO_FROM;
+        const deployAccountOpts = {
+            skipClassPublication: !registerClass,
+            skipInstancePublication: !publicDeploy,
+            skipInitialization,
+            from,
+            fee: {
+                paymentMethod,
+                gasSettings
+            }
         };
+        const localStart = performance.now();
+        const deployMethod = await account.getDeployMethod();
+        const sim = await deployMethod.simulate({
+            ...deployAccountOpts,
+            fee: {
+                ...deployAccountOpts.fee,
+                estimateGas: true
+            }
+        });
+        // estimateGas: true guarantees these fields are present
+        const estimatedGas = sim.estimatedGas;
+        const stats = sim.stats;
         if (feeOpts.estimateOnly) {
-            const gas = await (await account.getDeployMethod(deployOpts.deployWallet)).estimateGas(deployOpts);
             if (json) {
                 out.fee = {
                     gasLimits: {
-                        da: gas.gasLimits.daGas,
-                        l2: gas.gasLimits.l2Gas
+                        da: estimatedGas.gasLimits.daGas,
+                        l2: estimatedGas.gasLimits.l2Gas
                     },
                     teardownGasLimits: {
-                        da: gas.teardownGasLimits.daGas,
-                        l2: gas.teardownGasLimits
+                        da: estimatedGas.teardownGasLimits.daGas,
+                        l2: estimatedGas.teardownGasLimits
                     }
                 };
-            } else {
-                printGasEstimates(feeOpts, gas, log);
             }
         } else {
-            tx = account.deploy(deployOpts);
-            const txHash = await tx.getTxHash();
-            debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
-            out.txHash = txHash;
+            if (verbose) {
+                printProfileResult(stats, log);
+            }
+            if (!json) {
+                log(`\nWaiting for account contract deployment...`);
+            }
+            const sendOpts = {
+                ...deployAccountOpts,
+                fee: deployAccountOpts.fee ? {
+                    ...deployAccountOpts.fee,
+                    gasSettings: estimatedGas
+                } : undefined
+            };
+            ({ txHash } = await deployMethod.send({
+                ...sendOpts,
+                wait: NO_WAIT
+            }));
+            const localTimeMs = performance.now() - localStart;
             if (wait) {
-                if (!json) {
-                    log(`\nWaiting for account contract deployment...`);
-                }
-                txReceipt = await tx.wait();
+                const nodeStart = performance.now();
+                txReceipt = await waitForTx(aztecNode, txHash, {
+                    timeout: DEFAULT_TX_TIMEOUT_S,
+                    waitForStatus
+                });
+                const nodeTimeMs = performance.now() - nodeStart;
                 out.txReceipt = {
                     status: txReceipt.status,
                     transactionFee: txReceipt.transactionFee
                 };
+                if (!json) {
+                    log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
+                    log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
+                }
             }
+            debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
+            out.txHash = txHash;
         }
     }
     if (json) {
         log(prettyPrintJSON(out));
     } else {
-        if (tx) {
-            log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+        if (txHash) {
+            log(`Deploy tx hash:  ${txHash.toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);
@@ -89,6 +125,6 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
         alias,
         address,
         secretKey,
-        salt
+        salt: instanceSalt
     };
 }

package/dest/cmds/create_authwit.d.ts

@@ -1,4 +1,5 @@
-import { type AccountWalletWithSecretKey, type AztecAddress } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function createAuthwit(wallet: AccountWalletWithSecretKey, functionName: string, caller: AztecAddress, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, log: LogFn): Promise<import("@aztec/aztec.js").AuthWitness>;
-//# sourceMappingURL=create_authwit.d.ts.map
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function createAuthwit(wallet: CLIWallet, from: AztecAddress, functionName: string, caller: AztecAddress, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, log: LogFn): Promise<import("@aztec/stdlib/auth-witness").AuthWitness>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX2F1dGh3aXQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbWRzL2NyZWF0ZV9hdXRod2l0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRzlELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELHdCQUFzQixhQUFhLENBQ2pDLE1BQU0sRUFBRSxTQUFTLEVBQ2pCLElBQUksRUFBRSxZQUFZLEVBQ2xCLFlBQVksRUFBRSxNQUFNLEVBQ3BCLE1BQU0sRUFBRSxZQUFZLEVBQ3BCLGNBQWMsRUFBRSxHQUFHLEVBQUUsRUFDckIsb0JBQW9CLEVBQUUsTUFBTSxFQUM1QixlQUFlLEVBQUUsWUFBWSxFQUM3QixHQUFHLEVBQUUsS0FBSyw2REF1QlgifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"create_authwit.d.ts","sourceRoot":"","sources":["../../src/cmds/create_authwit.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;AAEnD,wBAAsB,aAAa,CACjC,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,kDAuBX"}
+{"version":3,"file":"create_authwit.d.ts","sourceRoot":"","sources":["../../src/cmds/create_authwit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,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,6DAuBX"}

package/dest/cmds/create_authwit.js

@@ -1,15 +1,15 @@
-import { Contract } from '@aztec/aztec.js';
+import { Contract } from '@aztec/aztec.js/contracts';
 import { prepTx } from '@aztec/cli/utils';
-export async function createAuthwit(wallet, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
+export async function createAuthwit(wallet, from, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
     const { functionArgs, contractArtifact, isPrivate } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     if (!isPrivate) {
         throw new Error('Cannot create an authwit for a public function. To allow a third party to call a public function, please authorize the action via the authorize-action command');
     }
-    const contract = await Contract.at(contractAddress, contractArtifact, wallet);
-    const action = contract.methods[functionName](...functionArgs);
-    const witness = await wallet.createAuthWit({
+    const contract = Contract.at(contractAddress, contractArtifact, wallet);
+    const call = await contract.methods[functionName](...functionArgs).getFunctionCall();
+    const witness = await wallet.createAuthWit(from, {
         caller,
-        action
+        call
     });
     log(`Created authorization witness for action ${functionName} on contract ${contractAddress} for caller ${caller}`);
     return witness;

package/dest/cmds/deploy.d.ts

@@ -1,6 +1,10 @@
-import { type AccountWalletWithSecretKey, Fr, type PXE } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import { type AztecNode } from '@aztec/aztec.js/node';
 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(client: PXE, 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, debugLogger: Logger, log: LogFn, logJson: (output: any) => void): Promise<import("@aztec/aztec.js").AztecAddress | undefined>;
-//# sourceMappingURL=deploy.d.ts.map
+import type { TxStatus } from '@aztec/stdlib/tx';
+import { CLIFeeArgs } from '../utils/options/fees.js';
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function deploy(wallet: CLIWallet, node: AztecNode, deployer: AztecAddress, 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: CLIFeeArgs, waitForStatus: TxStatus, verbose: boolean, timeout: number | undefined, debugLogger: Logger, log: LogFn, universal?: boolean): Promise<AztecAddress>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY21kcy9kZXBsb3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVDLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBYSxNQUFNLHNCQUFzQixDQUFDO0FBRWpFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHakQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXRELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELHdCQUFzQixNQUFNLENBQzFCLE1BQU0sRUFBRSxTQUFTLEVBQ2pCLElBQUksRUFBRSxTQUFTLEVBQ2YsUUFBUSxFQUFFLFlBQVksRUFDdEIsWUFBWSxFQUFFLE1BQU0sRUFDcEIsSUFBSSxFQUFFLE9BQU8sRUFDYixVQUFVLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDbEMsT0FBTyxFQUFFLEdBQUcsRUFBRSxFQUNkLElBQUksRUFBRSxFQUFFLEdBQUcsU0FBUyxFQUNwQixXQUFXLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDL0IsdUJBQXVCLEVBQUUsT0FBTyxFQUNoQyxvQkFBb0IsRUFBRSxPQUFPLEVBQzdCLGtCQUFrQixFQUFFLE9BQU8sR0FBRyxTQUFTLEVBQ3ZDLElBQUksRUFBRSxPQUFPLEVBQ2IsT0FBTyxFQUFFLFVBQVUsRUFDbkIsYUFBYSxFQUFFLFFBQVEsRUFDdkIsT0FBTyxFQUFFLE9BQU8sRUFDaEIsT0FBTyxvQkFBK0IsRUFDdEMsV0FBVyxFQUFFLE1BQU0sRUFDbkIsR0FBRyxFQUFFLEtBQUssRUFDVixTQUFTLENBQUMsRUFBRSxPQUFPLHlCQXNIcEIifQ==

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,EAAuC,EAAE,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAErH,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;AAE5E,wBAAsB,MAAM,CAC1B,MAAM,EAAE,GAAG,EACX,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,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":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAI9D,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAEjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,MAAM,CAC1B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,YAAY,EACtB,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,UAAU,EACnB,aAAa,EAAE,QAAQ,EACvB,OAAO,EAAE,OAAO,EAChB,OAAO,oBAA+B,EACtC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,EACV,SAAS,CAAC,EAAE,OAAO,yBAsHpB"}

package/dest/cmds/deploy.js

@@ -1,18 +1,21 @@
-import { ContractDeployer, Fr } from '@aztec/aztec.js';
-import { GITHUB_TAG_PREFIX, encodeArgs, getContractArtifact } from '@aztec/cli/utils';
-import { getInitializer } from '@aztec/stdlib/abi';
+import { NO_FROM } from '@aztec/aztec.js/account';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
+import { ContractDeployer } from '@aztec/aztec.js/deployment';
+import { Fr } from '@aztec/aztec.js/fields';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { encodeArgs, getContractArtifact, prettyPrintJSON } from '@aztec/cli/utils';
+import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
-import { printGasEstimates } from '../utils/options/fees.js';
-export async function deploy(client, wallet, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipPublicDeployment, skipClassRegistration, skipInitialization, universalDeploy, wait, feeOpts, debugLogger, log, logJson) {
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
+import { printProfileResult } from '../utils/profiling.js';
+export async function deploy(wallet, node, deployer, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipInstancePublication, skipClassPublication, skipInitialization, wait, feeOpts, waitForStatus, verbose, timeout = DEFAULT_TX_TIMEOUT_S, debugLogger, log, universal) {
+    const out = {};
     salt ??= Fr.random();
     const contractArtifact = await getContractArtifact(artifactPath, log);
-    const constructorArtifact = getInitializer(contractArtifact, initializer);
-    const nodeInfo = await client.getNodeInfo();
-    const expectedAztecNrVersion = `${GITHUB_TAG_PREFIX}-v${nodeInfo.nodeVersion}`;
-    if (contractArtifact.aztecNrVersion && contractArtifact.aztecNrVersion !== expectedAztecNrVersion) {
-        log(`\nWarning: Contract was compiled with a different version of Aztec.nr: ${contractArtifact.aztecNrVersion}. Consider updating Aztec.nr to ${expectedAztecNrVersion}\n`);
-    }
-    const deployer = new ContractDeployer(contractArtifact, wallet, publicKeys ?? PublicKeys.default(), initializer);
+    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 contractDeployer = new ContractDeployer(contractArtifact, wallet, initializer);
     let args = [];
     if (rawArgs.length > 0) {
         if (!constructorArtifact) {
@@ -22,62 +25,108 @@ export async function deploy(client, wallet, artifactPath, json, publicKeys, raw
         args = encodeArgs(rawArgs, constructorArtifact.parameters);
         debugLogger.debug(`Encoded arguments: ${args.join(', ')}`);
     }
-    const deploy = deployer.deploy(...args);
+    const deployInteraction = contractDeployer.deploy(args, {
+        salt,
+        publicKeys: publicKeys ?? PublicKeys.default(),
+        ...universal ? {
+            universalDeploy: true
+        } : {}
+    });
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, deployer);
     const deployOpts = {
-        ...await feeOpts.toSendOpts(wallet),
-        contractAddressSalt: salt,
-        universalDeploy,
-        skipClassRegistration,
+        fee: {
+            gasSettings,
+            paymentMethod
+        },
+        from: deployer ?? NO_FROM,
+        skipClassPublication,
         skipInitialization,
-        skipPublicDeployment
+        skipInstancePublication
     };
+    const localStart = performance.now();
+    const sim = await deployInteraction.simulate({
+        ...deployOpts,
+        fee: {
+            ...deployOpts.fee,
+            estimateGas: true
+        }
+    });
+    // estimateGas: true guarantees these fields are present
+    const estimatedGas = sim.estimatedGas;
+    const stats = sim.stats;
     if (feeOpts.estimateOnly) {
-        const gas = await deploy.estimateGas(deployOpts);
-        printGasEstimates(feeOpts, gas, log);
-        return;
-    }
-    const tx = deploy.send(deployOpts);
-    const txHash = await tx.getTxHash();
-    debugLogger.debug(`Deploy tx sent with hash ${txHash}`);
-    if (wait) {
-        const deployed = await tx.wait();
-        const { address, partialAddress, instance } = deployed.contract;
         if (json) {
-            logJson({
-                address: address.toString(),
-                partialAddress: (await partialAddress).toString(),
-                initializationHash: instance.initializationHash.toString(),
-                salt: salt.toString(),
-                transactionFee: deployed.transactionFee?.toString()
-            });
-        } else {
-            log(`Contract deployed at ${address.toString()}`);
-            log(`Contract partial address ${(await partialAddress).toString()}`);
-            log(`Contract init hash ${instance.initializationHash.toString()}`);
-            log(`Deployment tx hash: ${txHash.toString()}`);
-            log(`Deployment salt: ${salt.toString()}`);
-            log(`Deployment fee: ${deployed.transactionFee}`);
+            out.fee = {
+                gasLimits: {
+                    da: estimatedGas.gasLimits.daGas,
+                    l2: estimatedGas.gasLimits.l2Gas
+                },
+                teardownGasLimits: {
+                    da: estimatedGas.teardownGasLimits.daGas,
+                    l2: estimatedGas.teardownGasLimits
+                }
+            };
         }
     } else {
-        const { address, partialAddress } = deploy;
-        const instance = await deploy.getInstance();
-        if (json) {
-            logJson({
-                address: address?.toString() ?? 'N/A',
-                partialAddress: (await partialAddress)?.toString() ?? 'N/A',
-                txHash: txHash.toString(),
-                initializationHash: instance.initializationHash.toString(),
-                salt: salt.toString(),
-                deployer: instance.deployer.toString()
+        if (verbose) {
+            printProfileResult(stats, log);
+        }
+        const instance = await deployInteraction.getInstance();
+        const address = instance.address;
+        const partialAddress = await deployInteraction.getPartialAddress();
+        const { txHash } = await deployInteraction.send({
+            ...deployOpts,
+            wait: NO_WAIT
+        });
+        const localTimeMs = performance.now() - localStart;
+        debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
+        out.hash = txHash;
+        if (wait) {
+            const nodeStart = performance.now();
+            const receipt = await waitForTx(node, txHash, {
+                timeout,
+                waitForStatus
             });
+            const nodeTimeMs = performance.now() - nodeStart;
+            if (!json) {
+                log(`Contract deployed at ${address.toString()}`);
+                log(`Contract partial address ${partialAddress.toString()}`);
+                log(`Contract init hash ${instance.initializationHash.toString()}`);
+                log(`Deployment tx hash: ${txHash.toString()}`);
+                log(`Deployment salt: ${salt.toString()}`);
+                log(`Deployer: ${instance.deployer.toString()}`);
+                log(`Transaction fee: ${receipt.transactionFee?.toString()}`);
+                log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
+                log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
+            } else {
+                out.contract = {
+                    address: address.toString(),
+                    partialAddress: partialAddress.toString(),
+                    initializationHash: instance.initializationHash.toString(),
+                    salt: salt.toString(),
+                    transactionFee: receipt.transactionFee?.toString()
+                };
+            }
         } else {
-            log(`Contract deployed at ${address?.toString()}`);
-            log(`Contract partial address ${(await partialAddress)?.toString()}`);
-            log(`Contract init hash ${instance.initializationHash.toString()}`);
-            log(`Deployment tx hash: ${txHash.toString()}`);
-            log(`Deployment salt: ${salt.toString()}`);
-            log(`Deployer: ${instance.deployer.toString()}`);
+            if (!json) {
+                log(`Contract deployed at ${address.toString()}`);
+                log(`Contract partial address ${partialAddress.toString()}`);
+                log(`Contract init hash ${instance.initializationHash.toString()}`);
+                log(`Deployment tx hash: ${txHash.toString()}`);
+                log(`Deployment salt: ${salt.toString()}`);
+                log(`Deployer: ${instance.deployer.toString()}`);
+            } else {
+                out.contract = {
+                    address: address.toString(),
+                    partialAddress: partialAddress.toString(),
+                    initializationHash: instance.initializationHash.toString(),
+                    salt: salt.toString()
+                };
+            }
         }
     }
-    return deploy.address;
+    if (json) {
+        log(prettyPrintJSON(out));
+    }
+    return await deployInteraction.getAddress();
 }

package/dest/cmds/deploy_account.d.ts

@@ -1,9 +1,8 @@
-import type { AccountManager } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type AztecNode } from '@aztec/aztec.js/node';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import { type IFeeOpts } from '../utils/options/fees.js';
-export declare function deployAccount(account: AccountManager, wait: boolean, feeOpts: IFeeOpts, json: boolean, debugLogger: Logger, log: LogFn): Promise<{
-    address: import("@aztec/aztec.js").AztecAddress;
-    secretKey: import("@aztec/aztec.js").Fr;
-    salt: import("@aztec/aztec.js").Fr;
-}>;
-//# sourceMappingURL=deploy_account.d.ts.map
+import type { TxStatus } from '@aztec/stdlib/tx';
+import type { CLIFeeArgs } from '../utils/options/fees.js';
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function deployAccount(wallet: CLIWallet, aztecNode: AztecNode, address: AztecAddress, wait: boolean, deployer: AztecAddress | undefined, registerClass: boolean, publicDeploy: boolean, skipInitialization: boolean, feeOpts: CLIFeeArgs, waitForStatus: TxStatus, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2FjY291bnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbWRzL2RlcGxveV9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWEsTUFBTSxzQkFBc0IsQ0FBQztBQUdqRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQXFCLFFBQVEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR3BFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTNELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELHdCQUFzQixhQUFhLENBQ2pDLE1BQU0sRUFBRSxTQUFTLEVBQ2pCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE9BQU8sRUFBRSxZQUFZLEVBQ3JCLElBQUksRUFBRSxPQUFPLEVBQ2IsUUFBUSxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQ2xDLGFBQWEsRUFBRSxPQUFPLEVBQ3RCLFlBQVksRUFBRSxPQUFPLEVBQ3JCLGtCQUFrQixFQUFFLE9BQU8sRUFDM0IsT0FBTyxFQUFFLFVBQVUsRUFDbkIsYUFBYSxFQUFFLFFBQVEsRUFDdkIsSUFBSSxFQUFFLE9BQU8sRUFDYixPQUFPLEVBQUUsT0FBTyxFQUNoQixXQUFXLEVBQUUsTUFBTSxFQUNuQixHQUFHLEVBQUUsS0FBSyxpQkErR1gifQ==

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;AAE5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GA+EX"}
+{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAGjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAqB,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,OAAO,EACb,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,OAAO,EAAE,UAAU,EACnB,aAAa,EAAE,QAAQ,EACvB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,iBA+GX"}

package/dest/cmds/deploy_account.js

@@ -1,11 +1,14 @@
+import { NO_FROM } from '@aztec/aztec.js/account';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
+import { waitForTx } from '@aztec/aztec.js/node';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
-import { printGasEstimates } from '../utils/options/fees.js';
-export async function deployAccount(account, wait, feeOpts, json, debugLogger, log) {
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
+import { printProfileResult } from '../utils/profiling.js';
+export async function deployAccount(wallet, aztecNode, address, wait, deployer, registerClass, publicDeploy, skipInitialization, feeOpts, waitForStatus, json, verbose, debugLogger, log) {
     const out = {};
-    const { address, partialAddress, publicKeys } = await account.getCompleteAddress();
-    const { initializationHash, deployer, salt } = account.getInstance();
-    const wallet = await account.getWallet();
-    const secretKey = wallet.getSecretKey();
+    const account = await wallet.createOrRetrieveAccount(address);
+    const { partialAddress, publicKeys } = await account.getCompleteAddress();
+    const { initializationHash, salt } = account.getInstance();
     if (json) {
         out.address = address;
         out.partialAddress = partialAddress;
@@ -16,65 +19,96 @@ export async function deployAccount(account, wait, feeOpts, json, debugLogger, l
         log(`\nNew account:\n`);
         log(`Address:         ${address.toString()}`);
         log(`Public key:      ${publicKeys.toString()}`);
-        if (secretKey) {
-            log(`Secret key:     ${secretKey.toString()}`);
-        }
         log(`Partial address: ${partialAddress.toString()}`);
         log(`Salt:            ${salt.toString()}`);
         log(`Init hash:       ${initializationHash.toString()}`);
-        log(`Deployer:        ${deployer.toString()}`);
     }
-    let tx;
+    let txHash;
     let txReceipt;
-    const deployOpts = {
-        ...await feeOpts.toDeployAccountOpts(wallet),
-        skipInitialization: false
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
+    const delegatedDeployment = deployer && !account.address.equals(deployer);
+    const from = delegatedDeployment ? deployer : NO_FROM;
+    const deployAccountOpts = {
+        skipClassPublication: !registerClass,
+        skipInstancePublication: !publicDeploy,
+        skipInitialization,
+        from,
+        fee: {
+            paymentMethod,
+            gasSettings
+        }
     };
+    const localStart = performance.now();
+    const deployMethod = await account.getDeployMethod();
+    const sim = await deployMethod.simulate({
+        ...deployAccountOpts,
+        fee: {
+            ...deployAccountOpts.fee,
+            estimateGas: true
+        }
+    });
+    // estimateGas: true guarantees these fields are present
+    const estimatedGas = sim.estimatedGas;
+    const stats = sim.stats;
     if (feeOpts.estimateOnly) {
-        const gas = await (await account.getDeployMethod(deployOpts.deployWallet)).estimateGas(deployOpts);
         if (json) {
             out.fee = {
                 gasLimits: {
-                    da: gas.gasLimits.daGas,
-                    l2: gas.gasLimits.l2Gas
+                    da: estimatedGas.gasLimits.daGas,
+                    l2: estimatedGas.gasLimits.l2Gas
                 },
                 teardownGasLimits: {
-                    da: gas.teardownGasLimits.daGas,
-                    l2: gas.teardownGasLimits
+                    da: estimatedGas.teardownGasLimits.daGas,
+                    l2: estimatedGas.teardownGasLimits
                 }
             };
-        } else {
-            printGasEstimates(feeOpts, gas, log);
         }
     } else {
-        tx = account.deploy(deployOpts);
-        const txHash = await tx.getTxHash();
-        debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
-        out.txHash = txHash;
+        if (verbose) {
+            printProfileResult(stats, log);
+        }
+        if (!json) {
+            log(`\nWaiting for account contract deployment...`);
+        }
+        const sendOpts = {
+            ...deployAccountOpts,
+            fee: deployAccountOpts.fee ? {
+                ...deployAccountOpts.fee,
+                gasSettings: estimatedGas
+            } : undefined
+        };
+        ({ txHash } = await deployMethod.send({
+            ...sendOpts,
+            wait: NO_WAIT
+        }));
+        const localTimeMs = performance.now() - localStart;
         if (wait) {
-            if (!json) {
-                log(`\nWaiting for account contract deployment...`);
-            }
-            txReceipt = await tx.wait();
+            const nodeStart = performance.now();
+            txReceipt = await waitForTx(aztecNode, txHash, {
+                timeout: DEFAULT_TX_TIMEOUT_S,
+                waitForStatus
+            });
+            const nodeTimeMs = performance.now() - nodeStart;
             out.txReceipt = {
                 status: txReceipt.status,
                 transactionFee: txReceipt.transactionFee
             };
+            if (!json) {
+                log(` Local processing time: ${(localTimeMs / 1000).toFixed(1)}s`);
+                log(` Node inclusion time: ${(nodeTimeMs / 1000).toFixed(1)}s`);
+            }
         }
+        debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
+        out.txHash = txHash;
     }
     if (json) {
         log(prettyPrintJSON(out));
     } else {
-        if (tx) {
-            log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+        if (txHash) {
+            log(`Deploy tx hash:  ${txHash.toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);
         }
     }
-    return {
-        address,
-        secretKey,
-        salt
-    };
 }

package/dest/cmds/get_fee_juice_balance.d.ts

@@ -0,0 +1,5 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { LogFn } from '@aztec/foundation/log';
+export declare function getFeeJuiceBalanceCmd(node: AztecNode, address: AztecAddress, json: boolean, exact: boolean, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2ZlZV9qdWljZV9iYWxhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY21kcy9nZXRfZmVlX2p1aWNlX2JhbGFuY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHdEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFtQm5ELHdCQUFzQixxQkFBcUIsQ0FDekMsSUFBSSxFQUFFLFNBQVMsRUFDZixPQUFPLEVBQUUsWUFBWSxFQUNyQixJQUFJLEVBQUUsT0FBTyxFQUNiLEtBQUssRUFBRSxPQUFPLEVBQ2QsR0FBRyxFQUFFLEtBQUssaUJBUVgifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"get_fee_juice_balance.d.ts","sourceRoot":"","sources":["../../src/cmds/get_fee_juice_balance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAmBnD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,KAAK,iBAQX"}