@aztec/cli-wallet 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/bin/index.js

@@ -1,9 +1,10 @@
-import { Fr, computeSecretHash, fileURLToPath } from '@aztec/aztec.js';
+import { Fr, ProtocolContractAddress, computeSecretHash, fileURLToPath } from '@aztec/aztec.js';
 import { LOCALHOST } from '@aztec/cli/cli-utils';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 import { openStoreAt } from '@aztec/kv-store/lmdb-v2';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { Argument, Command, Option } from 'commander';
-import { mkdirSync, readFileSync } from 'fs';
+import { mkdirSync } from 'fs';
 import { homedir } from 'os';
 import { dirname, join, resolve } from 'path';
 import { injectCommands } from '../cmds/index.js';
@@ -12,7 +13,7 @@ import { createAliasOption } from '../utils/options/index.js';
 import { PXEWrapper } from '../utils/pxe_wrapper.js';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('wallet');
-const { WALLET_DATA_DIRECTORY = join(homedir(), '.aztec/wallet'), PXE_PROVER = 'none' } = process.env;
+const { WALLET_DATA_DIRECTORY = join(homedir(), '.aztec/wallet') } = process.env;
 function injectInternalCommands(program, log, db) {
     program.command('alias').description('Aliases information for easy reference.').addArgument(new Argument('<type>', 'Type of alias to create').choices(Aliases)).argument('<key>', 'Key to alias.').argument('<value>', 'Value to assign to the alias.').action(async (type, key, value)=>{
         value = db.tryRetrieveAlias(value) || value;
@@ -33,19 +34,22 @@ function injectInternalCommands(program, log, db) {
         const options = command.optsWithGlobals();
         const { alias } = options;
         const value = Fr.random();
-        const hash = computeSecretHash(value);
+        const hash = await computeSecretHash(value);
         await db.storeAlias('secrets', alias, Buffer.from(value.toString()), log);
         await db.storeAlias('secrets', `${alias}:hash`, Buffer.from(hash.toString()), log);
     });
     return program;
 }
 /** CLI wallet main entrypoint */ async function main() {
-    const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-    const walletVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+    const walletVersion = getPackageVersion() ?? '0.0.0';
     const db = WalletDB.getInstance();
     const pxeWrapper = new PXEWrapper();
     const program = new Command('wallet');
-    program.description('Aztec wallet').version(walletVersion).option('-d, --data-dir <string>', 'Storage directory for wallet data', WALLET_DATA_DIRECTORY).option('-p, --prover <string>', 'wasm|native|none', PXE_PROVER).addOption(new Option('--remote-pxe', 'Connect to an external PXE RPC server, instead of the local one').env('REMOTE_PXE').default(false).conflicts('rpc-url')).addOption(new Option('-n, --node-url <string>', 'URL of the Aztec node to connect to').env('AZTEC_NODE_URL').default(`http://${LOCALHOST}:8080`)).hook('preSubcommand', async (command)=>{
+    program.description('Aztec wallet').version(walletVersion).option('-d, --data-dir <string>', 'Storage directory for wallet data', WALLET_DATA_DIRECTORY).addOption(new Option('-p, --prover <string>', 'The type of prover the wallet uses (only applies if not using a remote PXE)').choices([
+        'wasm',
+        'native',
+        'none'
+    ]).env('PXE_PROVER').default('native')).addOption(new Option('--remote-pxe', 'Connect to an external PXE RPC server instead of the local one').env('REMOTE_PXE').default(false).conflicts('rpc-url')).addOption(new Option('-n, --node-url <string>', 'URL of the Aztec node to connect to').env('AZTEC_NODE_URL').default(`http://${LOCALHOST}:8080`)).hook('preSubcommand', async (command)=>{
         const { dataDir, remotePxe, nodeUrl, prover } = command.optsWithGlobals();
         if (!remotePxe) {
             debugLogger.info('Using local PXE service');
@@ -60,9 +64,21 @@ function injectInternalCommands(program, log, db) {
                 bbBinaryPath: prover === 'native' ? bbBinaryPath : undefined,
                 bbWorkingDirectory: prover === 'native' ? bbWorkingDirectory : undefined
             };
-            await pxeWrapper.init(nodeUrl, join(dataDir, 'pxe'), overridePXEConfig);
+            pxeWrapper.prepare(nodeUrl, join(dataDir, 'pxe'), overridePXEConfig);
         }
         await db.init(await openStoreAt(dataDir));
+        let protocolContractsRegistered;
+        try {
+            protocolContractsRegistered = !!await db.retrieveAlias('contracts:ContractClassRegistry');
+        // eslint-disable-next-line no-empty
+        } catch  {}
+        if (!protocolContractsRegistered) {
+            userLog('Registering protocol contract aliases...');
+            for (const [name, address] of Object.entries(ProtocolContractAddress)){
+                await db.storeAlias('contracts', name, Buffer.from(address.toString()), userLog);
+                await db.storeAlias('artifacts', address.toString(), Buffer.from(`${name.slice(0, 1).toUpperCase()}${name.slice(1)}`), userLog);
+            }
+        }
     });
     injectCommands(program, userLog, debugLogger, db, pxeWrapper);
     injectInternalCommands(program, userLog, db);

package/dest/cmds/authorize_action.d.ts

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

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

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

package/dest/cmds/authorize_action.js

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

package/dest/cmds/bridge_fee_juice.js

@@ -1,14 +1,14 @@
 import { L1FeeJuicePortalManager } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 export async function bridgeL1FeeJuice(amount, recipient, pxe, l1RpcUrls, chainId, privateKey, mnemonic, mint, json, wait, interval = 60_000, log, debugLogger) {
     // Prepare L1 client
     const chain = createEthereumChain(l1RpcUrls, chainId);
-    const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
+    const client = createExtendedL1Client(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
     const { protocolContractAddresses: { feeJuice: feeJuiceAddress } } = await pxe.getPXEInfo();
     // Setup portal manager
-    const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, debugLogger);
+    const portal = await L1FeeJuicePortalManager.new(pxe, client, debugLogger);
     const { claimAmount, claimSecret, messageHash, messageLeafIndex } = await portal.bridgeTokensPublic(recipient, amount, mint);
     if (json) {
         const out = {

package/dest/cmds/cancel_tx.d.ts

@@ -2,10 +2,10 @@ import { type AccountWalletWithSecretKey, type FeePaymentMethod, type TxHash } f
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
-export declare function cancelTx(wallet: AccountWalletWithSecretKey, { txHash, gasSettings: prevTxGasSettings, nonce, cancellable, }: {
+export declare function cancelTx(wallet: AccountWalletWithSecretKey, { txHash, gasSettings: prevTxGasSettings, txNonce, cancellable, }: {
     txHash: TxHash;
     gasSettings: GasSettings;
-    nonce: Fr;
+    txNonce: Fr;
     cancellable: boolean;
 }, paymentMethod: FeePaymentMethod, increasedFees: GasFees, maxFeesPerGas: GasFees | undefined, log: LogFn): Promise<void>;
 //# sourceMappingURL=cancel_tx.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,gBAAgB,EAAU,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAExH,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEzD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,KAAK,EACL,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAChF,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBA4CX"}
+{"version":3,"file":"cancel_tx.d.ts","sourceRoot":"","sources":["../../src/cmds/cancel_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,gBAAgB,EAAU,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAGxH,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIzD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,0BAA0B,EAClC,EACE,MAAM,EACN,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EACP,WAAW,GACZ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAClF,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,GAAG,EAAE,KAAK,iBA6CX"}

package/dest/cmds/cancel_tx.js

@@ -1,12 +1,14 @@
 import { SentTx, TxStatus } from '@aztec/aztec.js';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
-export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings, nonce, cancellable }, paymentMethod, increasedFees, maxFeesPerGas, log) {
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
+export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings, txNonce, cancellable }, paymentMethod, increasedFees, maxFeesPerGas, log) {
     const receipt = await wallet.getTxReceipt(txHash);
     if (receipt.status !== TxStatus.PENDING || !cancellable) {
         log(`Transaction is in status ${receipt.status} and cannot be cancelled`);
         return;
     }
-    const maxPriorityFeesPerGas = new GasFees(prevTxGasSettings.maxPriorityFeesPerGas.feePerDaGas.add(increasedFees.feePerDaGas), prevTxGasSettings.maxPriorityFeesPerGas.feePerL2Gas.add(increasedFees.feePerL2Gas));
+    const maxPriorityFeesPerGas = new GasFees(prevTxGasSettings.maxPriorityFeesPerGas.feePerDaGas + increasedFees.feePerDaGas, prevTxGasSettings.maxPriorityFeesPerGas.feePerL2Gas + increasedFees.feePerL2Gas);
     const fee = {
         paymentMethod,
         gasSettings: GasSettings.from({
@@ -15,17 +17,20 @@ export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings,
             maxFeesPerGas: maxFeesPerGas ?? prevTxGasSettings.maxFeesPerGas
         })
     };
-    const txRequest = await wallet.createTxExecutionRequest({
-        calls: [],
-        fee,
-        nonce,
+    const txRequest = await wallet.createTxExecutionRequest(ExecutionPayload.empty(), fee, {
+        txNonce,
         cancellable: true
     });
     const txSimulationResult = await wallet.simulateTx(txRequest, true);
     const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
-    const sentTx = new SentTx(wallet, wallet.sendTx(txProvingResult.toTx()));
+    const sentTx = new SentTx(wallet, async ()=>{
+        const tx = await txProvingResult.toTx();
+        return wallet.sendTx(tx);
+    });
     try {
-        await sentTx.wait();
+        await sentTx.wait({
+            timeout: DEFAULT_TX_TIMEOUT_S
+        });
         log('Transaction has been cancelled');
         const cancelReceipt = await sentTx.getReceipt();
         log(` Tx fee: ${cancelReceipt.transactionFee}`);

package/dest/cmds/create_account.d.ts

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

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

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

package/dest/cmds/create_account.js

@@ -1,11 +1,14 @@
+import { AztecAddress } from '@aztec/aztec.js';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { Fr } from '@aztec/foundation/fields';
 import { createOrRetrieveAccount } from '../utils/accounts.js';
 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 { printProfileResult } from '../utils/profiling.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
+export async function createAccount(client, accountType, secretKey, publicKey, alias, registerOnly, publicDeploy, skipInitialization, wait, feeOpts, 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 { salt } = account.getInstance();
     const { address, publicKeys, partialAddress } = await account.getCompleteAddress();
     const out = {};
     if (json) {
@@ -37,13 +40,30 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
     } else {
         const wallet = await account.getWallet();
         const deployOpts = {
-            skipClassRegistration: !publicDeploy,
-            skipPublicDeployment: !publicDeploy,
+            skipClassPublication: !publicDeploy,
+            skipInstancePublication: !publicDeploy,
             skipInitialization: skipInitialization,
             ...await feeOpts.toDeployAccountOpts(wallet)
         };
+        /*
+     * This is usually handled by accountManager.create(), but we're accessing the lower
+     * level method to get gas and timings. That means we have to replicate some of the logic here.
+     * In case we're initializing and/or publishing our own account, we need to hijack the payment method for the fee,
+     * wrapping it in the one that will make use of the freshly deployed account's
+     * entrypoint. For reference, see aztec.js/src/account_manager.ts:sendAccountContractSetupTx()
+     * 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);
         if (feeOpts.estimateOnly) {
-            const gas = await (await account.getDeployMethod(deployOpts.deployWallet)).estimateGas(deployOpts);
+            const gas = await deployMethod.estimateGas({
+                ...deployOpts,
+                from: AztecAddress.ZERO,
+                universalDeploy: true,
+                contractAddressSalt: salt
+            });
             if (json) {
                 out.fee = {
                     gasLimits: {
@@ -59,15 +79,26 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
                 printGasEstimates(feeOpts, gas, log);
             }
         } else {
-            tx = account.deploy(deployOpts);
+            const provenTx = await deployMethod.prove({
+                ...deployOpts,
+                from: AztecAddress.ZERO,
+                universalDeploy: true,
+                contractAddressSalt: salt
+            });
+            if (verbose) {
+                printProfileResult(provenTx.stats, log);
+            }
+            tx = provenTx.send();
             const txHash = await tx.getTxHash();
-            debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
+            debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
             out.txHash = txHash;
             if (wait) {
                 if (!json) {
                     log(`\nWaiting for account contract deployment...`);
                 }
-                txReceipt = await tx.wait();
+                txReceipt = await tx.wait({
+                    timeout: DEFAULT_TX_TIMEOUT_S
+                });
                 out.txReceipt = {
                     status: txReceipt.status,
                     transactionFee: txReceipt.transactionFee
@@ -79,7 +110,7 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
         log(prettyPrintJSON(out));
     } else {
         if (tx) {
-            log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+            log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/dest/cmds/deploy.d.ts

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

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

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

package/dest/cmds/deploy.js

@@ -1,18 +1,17 @@
-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, ContractDeployer, Fr } from '@aztec/aztec.js';
+import { encodeArgs, getContractArtifact } from '@aztec/cli/utils';
+import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import { printGasEstimates } from '../utils/options/fees.js';
-export async function deploy(client, wallet, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipPublicDeployment, skipClassRegistration, skipInitialization, universalDeploy, wait, feeOpts, debugLogger, log, logJson) {
+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) {
     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,25 +21,32 @@ 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 deployOpts = {
-        ...await feeOpts.toSendOpts(wallet),
+        ...await feeOpts.toDeployAccountOpts(wallet),
+        from: deployer ?? AztecAddress.ZERO,
         contractAddressSalt: salt,
-        universalDeploy,
-        skipClassRegistration,
+        universalDeploy: !deployer,
+        skipClassPublication,
         skipInitialization,
-        skipPublicDeployment
+        skipInstancePublication
     };
     if (feeOpts.estimateOnly) {
-        const gas = await deploy.estimateGas(deployOpts);
+        const gas = await deploy1.estimateGas(deployOpts);
         printGasEstimates(feeOpts, gas, log);
         return;
     }
-    const tx = deploy.send(deployOpts);
+    const provenTx = await deploy1.prove(deployOpts);
+    if (verbose) {
+        printProfileResult(provenTx.stats, log);
+    }
+    const tx = provenTx.send();
     const txHash = await tx.getTxHash();
-    debugLogger.debug(`Deploy tx sent with hash ${txHash}`);
+    debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
     if (wait) {
-        const deployed = await tx.wait();
+        const deployed = await tx.wait({
+            timeout
+        });
         const { address, partialAddress, instance } = deployed.contract;
         if (json) {
             logJson({
@@ -59,8 +65,8 @@ export async function deploy(client, wallet, artifactPath, json, publicKeys, raw
             log(`Deployment fee: ${deployed.transactionFee}`);
         }
     } else {
-        const { address, partialAddress } = deploy;
-        const instance = await deploy.getInstance();
+        const { address, partialAddress } = deploy1;
+        const instance = await deploy1.getInstance();
         if (json) {
             logJson({
                 address: address?.toString() ?? 'N/A',
@@ -79,5 +85,5 @@ export async function deploy(client, wallet, artifactPath, json, publicKeys, raw
             log(`Deployer: ${instance.deployer.toString()}`);
         }
     }
-    return deploy.address;
+    return deploy1.address;
 }

package/dest/cmds/deploy_account.d.ts

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

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,KAAK,cAAc,EAAE,YAAY,EAA6B,MAAM,iBAAiB,CAAC;AAE/F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAI5E,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,OAAO,EACrB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;GA+GX"}

package/dest/cmds/deploy_account.js

@@ -1,6 +1,9 @@
+import { AztecAddress } from '@aztec/aztec.js';
 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 { 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) {
     const out = {};
     const { address, partialAddress, publicKeys } = await account.getCompleteAddress();
     const { initializationHash, deployer, salt } = account.getInstance();
@@ -27,11 +30,29 @@ export async function deployAccount(account, wait, feeOpts, json, debugLogger, l
     let tx;
     let txReceipt;
     const deployOpts = {
-        ...await feeOpts.toDeployAccountOpts(wallet),
-        skipInitialization: false
+        skipInstancePublication: !publicDeploy,
+        skipClassPublication: !registerClass,
+        ...await feeOpts.toDeployAccountOpts(wallet)
     };
+    /*
+   * 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);
     if (feeOpts.estimateOnly) {
-        const gas = await (await account.getDeployMethod(deployOpts.deployWallet)).estimateGas(deployOpts);
+        const gas = await deployMethod.estimateGas({
+            ...deployOpts,
+            from: AztecAddress.ZERO,
+            universalDeploy: true,
+            contractAddressSalt: salt
+        });
         if (json) {
             out.fee = {
                 gasLimits: {
@@ -47,15 +68,26 @@ export async function deployAccount(account, wait, feeOpts, json, debugLogger, l
             printGasEstimates(feeOpts, gas, log);
         }
     } else {
-        tx = account.deploy(deployOpts);
+        const provenTx = await deployMethod.prove({
+            ...deployOpts,
+            from: AztecAddress.ZERO,
+            universalDeploy: true,
+            contractAddressSalt: salt
+        });
+        if (verbose) {
+            printProfileResult(provenTx.stats, log);
+        }
+        tx = provenTx.send();
         const txHash = await tx.getTxHash();
-        debugLogger.debug(`Account contract tx sent with hash ${txHash}`);
+        debugLogger.debug(`Account contract tx sent with hash ${txHash.toString()}`);
         out.txHash = txHash;
         if (wait) {
             if (!json) {
                 log(`\nWaiting for account contract deployment...`);
             }
-            txReceipt = await tx.wait();
+            txReceipt = await tx.wait({
+                timeout: DEFAULT_TX_TIMEOUT_S
+            });
             out.txReceipt = {
                 status: txReceipt.status,
                 transactionFee: txReceipt.transactionFee
@@ -66,7 +98,7 @@ export async function deployAccount(account, wait, feeOpts, json, debugLogger, l
         log(prettyPrintJSON(out));
     } else {
         if (tx) {
-            log(`Deploy tx hash:  ${await tx.getTxHash()}`);
+            log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;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":"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"}