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

package/src/cmds/deploy_account.ts

@@ -1,22 +1,36 @@
-import type { AccountManager, DeployAccountOptions } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { NO_WAIT } from '@aztec/aztec.js/contracts';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { DeployAccountOptions } from '@aztec/aztec.js/wallet';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
-import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
+import type { CLIFeeArgs } from '../utils/options/fees.js';
+import { printProfileResult } from '../utils/profiling.js';
+import type { CLIWallet } from '../utils/wallet.js';
 
 export async function deployAccount(
-  account: AccountManager,
+  wallet: CLIWallet,
+  aztecNode: AztecNode,
+  address: AztecAddress,
   wait: boolean,
-  feeOpts: IFeeOpts,
+  deployer: AztecAddress | undefined,
+  registerClass: boolean,
+  publicDeploy: boolean,
+  skipInitialization: boolean,
+  feeOpts: CLIFeeArgs,
   json: boolean,
+  verbose: boolean,
   debugLogger: Logger,
   log: LogFn,
 ) {
   const out: Record<string, any> = {};
-  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;
@@ -28,65 +42,86 @@ export async function deployAccount(
     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;
+  let txHash: TxHash | undefined;
+  let txReceipt: TxReceipt | undefined;
+  const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
-  const deployOpts: DeployAccountOptions = {
-    ...(await feeOpts.toDeployAccountOpts(wallet)),
-    skipInitialization: false,
+  const delegatedDeployment = deployer && !account.address.equals(deployer);
+  const from = delegatedDeployment ? deployer : AztecAddress.ZERO;
+
+  const deployAccountOpts: DeployAccountOptions = {
+    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: TxReceipt | TxHash): data is TxReceipt => '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/src/cmds/import_test_accounts.ts

@@ -1,25 +1,21 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import { Fr, type PXE } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { Fr } from '@aztec/aztec.js/fields';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import type { LogFn } from '@aztec/foundation/log';
 
 import type { WalletDB } from '../storage/wallet_db.js';
+import type { CLIWallet } from '../utils/wallet.js';
 
-export async function importTestAccounts(client: PXE, db: WalletDB, json: boolean, log: LogFn) {
-  const testAccounts = await getInitialTestAccounts();
-  const accounts = await Promise.all(
-    testAccounts.map(({ secret, signingKey, salt }) => getSchnorrAccount(client, secret, signingKey, salt)),
-  );
+export async function importTestAccounts(wallet: CLIWallet, db: WalletDB, json: boolean, log: LogFn) {
+  const testAccounts = await getInitialTestAccountsData();
 
   const out: Record<string, any> = {};
   await Promise.all(
-    accounts.map(async (account, i) => {
+    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, salt, alias, publicKey: undefined }, log);
 
       if (json) {