@aztec/cli-wallet 0.0.0-test.1 → 0.0.1-commit.0208eb9

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,9 @@
-import { type AccountWalletWithSecretKey, Fr, type PXE } from '@aztec/aztec.js';
+import { 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 { 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, verbose: boolean, timeout: number | undefined, debugLogger: Logger, log: LogFn): Promise<AztecAddress | undefined>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY21kcy9kZXBsb3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSXpELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV0RCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBR2hELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV0RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVwRCx3QkFBc0IsTUFBTSxDQUMxQixNQUFNLEVBQUUsU0FBUyxFQUNqQixJQUFJLEVBQUUsU0FBUyxFQUNmLFFBQVEsRUFBRSxZQUFZLEVBQ3RCLFlBQVksRUFBRSxNQUFNLEVBQ3BCLElBQUksRUFBRSxPQUFPLEVBQ2IsVUFBVSxFQUFFLFVBQVUsR0FBRyxTQUFTLEVBQ2xDLE9BQU8sRUFBRSxHQUFHLEVBQUUsRUFDZCxJQUFJLEVBQUUsRUFBRSxHQUFHLFNBQVMsRUFDcEIsV0FBVyxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQy9CLHVCQUF1QixFQUFFLE9BQU8sRUFDaEMsb0JBQW9CLEVBQUUsT0FBTyxFQUM3QixrQkFBa0IsRUFBRSxPQUFPLEdBQUcsU0FBUyxFQUN2QyxJQUFJLEVBQUUsT0FBTyxFQUNiLE9BQU8sRUFBRSxVQUFVLEVBQ25CLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLE9BQU8sb0JBQStCLEVBQ3RDLFdBQVcsRUFBRSxNQUFNLEVBQ25CLEdBQUcsRUFBRSxLQUFLLHFDQWtIWCJ9

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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,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,OAAO,EAAE,OAAO,EAChB,OAAO,oBAA+B,EACtC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,qCAkHX"}

package/dest/cmds/deploy.js

@@ -1,18 +1,20 @@
-import { ContractDeployer, Fr } from '@aztec/aztec.js';
-import { GITHUB_TAG_PREFIX, encodeArgs, getContractArtifact } from '@aztec/cli/utils';
-import { getInitializer } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
+import { ContractDeployer } from '@aztec/aztec.js/deployment';
+import { Fr } from '@aztec/aztec.js/fields';
+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, verbose, timeout = DEFAULT_TX_TIMEOUT_S, debugLogger, log) {
+    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, publicKeys ?? PublicKeys.default(), initializer);
     let args = [];
     if (rawArgs.length > 0) {
         if (!constructorArtifact) {
@@ -22,62 +24,100 @@ 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 deploy1 = contractDeployer.deploy(...args);
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, deployer);
     const deployOpts = {
-        ...await feeOpts.toSendOpts(wallet),
+        fee: {
+            gasSettings,
+            paymentMethod
+        },
+        from: deployer ?? AztecAddress.ZERO,
         contractAddressSalt: salt,
-        universalDeploy,
-        skipClassRegistration,
+        universalDeploy: !deployer,
+        skipClassPublication,
         skipInitialization,
-        skipPublicDeployment
+        skipInstancePublication
     };
+    const { estimatedGas, stats } = await deploy1.simulate({
+        ...deployOpts,
+        fee: {
+            ...deployOpts.fee,
+            estimateGas: true
+        }
+    });
     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 { address, partialAddress } = deploy1;
+        const instance = await deploy1.getInstance();
+        if (wait) {
+            const receipt = await deploy1.send({
+                ...deployOpts,
+                wait: {
+                    timeout,
+                    returnReceipt: true
+                }
             });
+            const txHash = receipt.txHash;
+            debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
+            out.hash = txHash;
+            if (!json) {
+                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()}`);
+                log(`Transaction fee: ${receipt.transactionFee?.toString()}`);
+            } else {
+                out.contract = {
+                    address: address?.toString(),
+                    partialAddress: (await 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()}`);
+            const txHash = await deploy1.send({
+                ...deployOpts,
+                wait: NO_WAIT
+            });
+            debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
+            out.hash = txHash;
+            if (!json) {
+                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()}`);
+            } else {
+                out.contract = {
+                    address: address?.toString(),
+                    partialAddress: (await partialAddress)?.toString(),
+                    initializationHash: instance.initializationHash.toString(),
+                    salt: salt.toString()
+                };
+            }
         }
     }
-    return deploy.address;
+    if (json) {
+        log(prettyPrintJSON(out));
+    }
+    return deploy1.address;
 }

package/dest/cmds/deploy_account.d.ts

@@ -1,9 +1,7 @@
-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 { 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, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2FjY291bnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbWRzL2RlcGxveV9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd0RCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFJM0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQsd0JBQXNCLGFBQWEsQ0FDakMsTUFBTSxFQUFFLFNBQVMsRUFDakIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsT0FBTyxFQUFFLFlBQVksRUFDckIsSUFBSSxFQUFFLE9BQU8sRUFDYixRQUFRLEVBQUUsWUFBWSxHQUFHLFNBQVMsRUFDbEMsYUFBYSxFQUFFLE9BQU8sRUFDdEIsWUFBWSxFQUFFLE9BQU8sRUFDckIsa0JBQWtCLEVBQUUsT0FBTyxFQUMzQixPQUFPLEVBQUUsVUFBVSxFQUNuQixJQUFJLEVBQUUsT0FBTyxFQUNiLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFdBQVcsRUFBRSxNQUFNLEVBQ25CLEdBQUcsRUFBRSxLQUFLLGlCQW9HWCJ9

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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,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,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,iBAoGX"}

package/dest/cmds/deploy_account.js

@@ -1,11 +1,13 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
 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, 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 +18,86 @@ 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 : AztecAddress.ZERO;
+    const deployAccountOpts = {
+        skipClassPublication: !registerClass,
+        skipInstancePublication: !publicDeploy,
+        skipInitialization,
+        from,
+        fee: {
+            paymentMethod,
+            gasSettings
+        }
     };
+    const deployMethod = await account.getDeployMethod();
+    const { estimatedGas, stats } = await deployMethod.simulate({
+        ...deployAccountOpts,
+        fee: {
+            ...deployAccountOpts.fee,
+            estimateGas: true
+        }
+    });
     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 (wait) {
-            if (!json) {
-                log(`\nWaiting for account contract deployment...`);
-            }
-            txReceipt = await tx.wait();
+        if (verbose) {
+            printProfileResult(stats, log);
+        }
+        if (!json) {
+            log(`\nWaiting for account contract deployment...`);
+        }
+        const result = await deployMethod.send({
+            ...deployAccountOpts,
+            fee: deployAccountOpts.fee ? {
+                ...deployAccountOpts.fee,
+                gasSettings: estimatedGas
+            } : undefined,
+            wait: wait ? {
+                timeout: DEFAULT_TX_TIMEOUT_S,
+                returnReceipt: true
+            } : NO_WAIT
+        });
+        const isReceipt = (data)=>'txHash' in data;
+        if (isReceipt(result)) {
+            txReceipt = result;
+            txHash = result.txHash;
             out.txReceipt = {
                 status: txReceipt.status,
                 transactionFee: txReceipt.transactionFee
             };
+        } else {
+            txHash = result;
         }
+        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/import_test_accounts.d.ts

@@ -1,5 +1,5 @@
-import { type PXE } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
 import type { WalletDB } from '../storage/wallet_db.js';
-export declare function importTestAccounts(client: PXE, db: WalletDB, json: boolean, log: LogFn): Promise<void>;
-//# sourceMappingURL=import_test_accounts.d.ts.map
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function importTestAccounts(wallet: CLIWallet, db: WalletDB, json: boolean, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wb3J0X3Rlc3RfYWNjb3VudHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbWRzL2ltcG9ydF90ZXN0X2FjY291bnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELHdCQUFzQixrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkFrQ2xHIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"import_test_accounts.d.ts","sourceRoot":"","sources":["../../src/cmds/import_test_accounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAM,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAsC5F"}
+{"version":3,"file":"import_test_accounts.d.ts","sourceRoot":"","sources":["../../src/cmds/import_test_accounts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAkClG"}

package/dest/cmds/import_test_accounts.js

@@ -1,17 +1,14 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import { Fr } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { Fr } from '@aztec/aztec.js/fields';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
-export async function importTestAccounts(client, db, json, log) {
-    const testAccounts = await getInitialTestAccounts();
-    const accounts = await Promise.all(testAccounts.map(({ secret, signingKey, salt })=>getSchnorrAccount(client, secret, signingKey, salt)));
+export async function importTestAccounts(wallet, db, json, log) {
+    const testAccounts = await getInitialTestAccountsData();
     const out = {};
-    await Promise.all(accounts.map(async (account, i)=>{
+    await Promise.all(testAccounts.map(async (account, i)=>{
         const alias = `test${i}`;
         const secret = testAccounts[i].secret;
         const salt = new Fr(account.salt);
-        const address = account.getAddress();
-        await account.register();
+        const address = account.address;
         await db.storeAccount(address, {
             type: 'schnorr',
             secretKey: secret,

package/dest/cmds/index.d.ts

@@ -1,6 +1,6 @@
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { type Command } from 'commander';
 import type { WalletDB } from '../storage/wallet_db.js';
-import type { PXEWrapper } from '../utils/pxe_wrapper.js';
-export declare function injectCommands(program: Command, log: LogFn, debugLogger: Logger, db?: WalletDB, pxeWrapper?: PXEWrapper): Command;
-//# sourceMappingURL=index.d.ts.map
+import type { CliWalletAndNodeWrapper } from '../utils/cli_wallet_and_node_wrapper.js';
+export declare function injectCommands(program: Command, log: LogFn, debugLogger: Logger, walletAndNodeWrapper: CliWalletAndNodeWrapper, db: WalletDB): Command;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbWRzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWFBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQVUsTUFBTSxXQUFXLENBQUM7QUFHakQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQXdCdkYsd0JBQWdCLGNBQWMsQ0FDNUIsT0FBTyxFQUFFLE9BQU8sRUFDaEIsR0FBRyxFQUFFLEtBQUssRUFDVixXQUFXLEVBQUUsTUFBTSxFQUNuQixvQkFBb0IsRUFBRSx1QkFBdUIsRUFDN0MsRUFBRSxFQUFFLFFBQVEsV0FvbkJiIn0=

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

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