@aztec/cli-wallet 3.0.0-canary.a9708bd → 3.0.0-devnet.3

package/dest/cmds/deploy.js

@@ -1,11 +1,13 @@
-import { AztecAddress, ContractDeployer, Fr } from '@aztec/aztec.js';
-import { encodeArgs, getContractArtifact } from '@aztec/cli/utils';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+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';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { printProfileResult } from '../utils/profiling.js';
-import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
-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) {
+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 hasInitializer = getAllFunctionAbis(contractArtifact).some((fn)=>fn.isInitializer);
@@ -22,8 +24,12 @@ export async function deploy(wallet, deployer, artifactPath, json, publicKeys, r
         debugLogger.debug(`Encoded arguments: ${args.join(', ')}`);
     }
     const deploy1 = contractDeployer.deploy(...args);
+    const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(node, wallet, deployer);
     const deployOpts = {
-        ...await feeOpts.toDeployAccountOpts(wallet),
+        fee: {
+            gasSettings,
+            paymentMethod
+        },
         from: deployer ?? AztecAddress.ZERO,
         contractAddressSalt: salt,
         universalDeploy: !deployer,
@@ -31,59 +37,64 @@ export async function deploy(wallet, deployer, artifactPath, json, publicKeys, r
         skipInitialization,
         skipInstancePublication
     };
+    const { estimatedGas, stats } = await deploy1.simulate({
+        ...deployOpts,
+        fee: {
+            ...deployOpts.fee,
+            estimateGas: true
+        }
+    });
     if (feeOpts.estimateOnly) {
-        const gas = await deploy1.estimateGas(deployOpts);
-        printGasEstimates(feeOpts, gas, log);
-        return;
-    }
-    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.toString()}`);
-    if (wait) {
-        const deployed = await tx.wait({
-            timeout
-        });
-        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 tx = deploy1.send(deployOpts);
+        if (verbose) {
+            printProfileResult(stats, log);
+        }
+        const txHash = await tx.getTxHash();
+        debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
+        out.hash = txHash;
         const { address, partialAddress } = deploy1;
         const instance = await deploy1.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()
-            });
-        } else {
+        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()
+            };
+        }
+        if (wait) {
+            const deployed = await tx.wait({
+                timeout
+            });
+            if (!json) {
+                log(`Transaction fee: ${deployed.transactionFee?.toString()}`);
+            } else {
+                out.contract.transactionFee = deployed.transactionFee?.toString();
+            }
         }
     }
+    if (json) {
+        log(prettyPrintJSON(out));
+    }
     return deploy1.address;
 }

package/dest/cmds/deploy_account.d.ts

@@ -1,9 +1,7 @@
-import { type AccountManager, AztecAddress } 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, registerClass: boolean, publicDeploy: boolean, feeOpts: IFeeOpts, json: boolean, verbose: boolean, debugLogger: Logger, log: LogFn): Promise<{
-    address: AztecAddress;
-    secretKey: import("@aztec/aztec.js").Fr;
-    salt: import("@aztec/aztec.js").Fr;
-}>;
+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=deploy_account.d.ts.map

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,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"}
+{"version":3,"file":"deploy_account.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,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,iBAgGX"}

package/dest/cmds/deploy_account.js

@@ -1,14 +1,12 @@
-import { AztecAddress } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
-import { printGasEstimates } from '../utils/options/fees.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { printProfileResult } from '../utils/profiling.js';
-import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
-export async function deployAccount(account, wait, registerClass, publicDeploy, feeOpts, json, verbose, debugLogger, log) {
+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;
@@ -19,65 +17,57 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
         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 txReceipt;
-    const deployOpts = {
-        skipInstancePublication: !publicDeploy,
+    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,
-        ...await feeOpts.toDeployAccountOpts(wallet)
+        skipInstancePublication: !publicDeploy,
+        skipInitialization,
+        from,
+        fee: {
+            paymentMethod,
+            gasSettings
+        }
     };
-    /*
-   * This is usually handled by accountManager.deploy(), 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,
-   * 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()
-   * Also, salt and universalDeploy have to be explicitly provided
-   */ deployOpts.fee = !deployOpts?.deployWallet && deployOpts?.fee ? {
-        ...deployOpts.fee,
-        paymentMethod: await account.getSelfPaymentMethod(deployOpts.fee.paymentMethod)
-    } : deployOpts?.fee;
-    const deployMethod = await account.getDeployMethod(deployOpts.deployWallet);
+    const deployMethod = await account.getDeployMethod();
+    const { estimatedGas, stats } = await deployMethod.simulate({
+        ...deployAccountOpts,
+        fee: {
+            ...deployAccountOpts.fee,
+            estimateGas: true
+        }
+    });
     if (feeOpts.estimateOnly) {
-        const gas = await deployMethod.estimateGas({
-            ...deployOpts,
-            from: AztecAddress.ZERO,
-            universalDeploy: true,
-            contractAddressSalt: salt
-        });
         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 {
-        const provenTx = await deployMethod.prove({
-            ...deployOpts,
-            from: AztecAddress.ZERO,
-            universalDeploy: true,
-            contractAddressSalt: salt
+        tx = deployMethod.send({
+            ...deployAccountOpts,
+            fee: deployAccountOpts.fee ? {
+                ...deployAccountOpts.fee,
+                gasSettings: estimatedGas
+            } : undefined
         });
         if (verbose) {
-            printProfileResult(provenTx.stats, log);
+            printProfileResult(stats, log);
         }
-        tx = provenTx.send();
         const txHash = await tx.getTxHash();
         debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
         out.txHash = txHash;
@@ -104,9 +94,4 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
             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>;
+import type { CLIWallet } from '../utils/wallet.js';
+export declare function importTestAccounts(wallet: CLIWallet, db: WalletDB, json: boolean, log: LogFn): Promise<void>;
 //# sourceMappingURL=import_test_accounts.d.ts.map

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;
+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=index.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"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"}