@aztec/cli-wallet 0.0.1-commit.d1f2d6c → 0.0.1-commit.d431d1c

package/dest/cmds/authorize_action.js

@@ -13,10 +13,8 @@ export async function authorizeAction(wallet, from, functionName, caller, functi
         caller,
         action
     }, true);
-    const witness = await setAuthwitnessInteraction.send({
-        wait: {
-            timeout: DEFAULT_TX_TIMEOUT_S
-        }
+    const witness = await setAuthwitnessInteraction.send().wait({
+        timeout: DEFAULT_TX_TIMEOUT_S
     });
     log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
     return witness;

package/dest/cmds/check_tx.js

@@ -17,10 +17,7 @@ async function inspectTx(wallet, aztecNode, txHash, log) {
     ]);
     // Base tx data
     log(`Tx ${txHash.toString()}`);
-    log(` Status: ${receipt.status}`);
-    if (receipt.executionResult) {
-        log(` Execution result: ${receipt.executionResult}`);
-    }
+    log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
     if (receipt.error) {
         log(` Error: ${receipt.error}`);
     }

package/dest/cmds/create_account.d.ts

@@ -11,4 +11,4 @@ export declare function createAccount(wallet: CLIWallet, aztecNode: AztecNode, a
     secretKey: Fr;
     salt: Fr;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX2FjY291bnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbWRzL2NyZWF0ZV9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd0RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSTNELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFL0Msd0JBQXNCLGFBQWEsQ0FDakMsTUFBTSxFQUFFLFNBQVMsRUFDakIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsV0FBVyxFQUFFLFdBQVcsRUFDeEIsU0FBUyxFQUFFLEVBQUUsR0FBRyxTQUFTLEVBQ3pCLFNBQVMsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUM3QixLQUFLLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDekIsUUFBUSxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQ2xDLFlBQVksRUFBRSxPQUFPLEVBQ3JCLGtCQUFrQixFQUFFLE9BQU8sRUFDM0IsWUFBWSxFQUFFLE9BQU8sRUFDckIsYUFBYSxFQUFFLE9BQU8sRUFDdEIsSUFBSSxFQUFFLE9BQU8sRUFDYixPQUFPLEVBQUUsVUFBVSxFQUNuQixJQUFJLEVBQUUsT0FBTyxFQUNiLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFdBQVcsRUFBRSxNQUFNLEVBQ25CLEdBQUcsRUFBRSxLQUFLOzs7OztHQXFIWCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX2FjY291bnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbWRzL2NyZWF0ZV9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd0RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRzNELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFL0Msd0JBQXNCLGFBQWEsQ0FDakMsTUFBTSxFQUFFLFNBQVMsRUFDakIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsV0FBVyxFQUFFLFdBQVcsRUFDeEIsU0FBUyxFQUFFLEVBQUUsR0FBRyxTQUFTLEVBQ3pCLFNBQVMsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUM3QixLQUFLLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDekIsUUFBUSxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQ2xDLFlBQVksRUFBRSxPQUFPLEVBQ3JCLGtCQUFrQixFQUFFLE9BQU8sRUFDM0IsWUFBWSxFQUFFLE9BQU8sRUFDckIsYUFBYSxFQUFFLE9BQU8sRUFDdEIsSUFBSSxFQUFFLE9BQU8sRUFDYixPQUFPLEVBQUUsVUFBVSxFQUNuQixJQUFJLEVBQUUsT0FBTyxFQUNiLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFdBQVcsRUFBRSxNQUFNLEVBQ25CLEdBQUcsRUFBRSxLQUFLOzs7OztHQWlIWCJ9

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,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,EACtB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAqHX"}
+{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/cmds/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,wBAAsB,aAAa,CACjC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,EAAE,GAAG,SAAS,EACzB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,YAAY,EAAE,OAAO,EACrB,kBAAkB,EAAE,OAAO,EAC3B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,EACtB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK;;;;;GAiHX"}

package/dest/cmds/create_account.js

@@ -1,5 +1,4 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
@@ -30,7 +29,7 @@ export async function createAccount(wallet, aztecNode, accountType, secretKey, p
         log(`Salt:            ${salt.toString()}`);
         log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
     }
-    let txHash;
+    let tx;
     let txReceipt;
     if (!registerOnly) {
         const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
@@ -68,43 +67,38 @@ export async function createAccount(wallet, aztecNode, accountType, secretKey, p
                 };
             }
         } else {
-            if (verbose) {
-                printProfileResult(stats, log);
-            }
-            if (!json) {
-                log(`\nWaiting for account contract deployment...`);
-            }
-            const result = await deployMethod.send({
+            tx = deployMethod.send({
                 ...deployAccountOpts,
                 fee: deployAccountOpts.fee ? {
                     ...deployAccountOpts.fee,
                     gasSettings: estimatedGas
-                } : undefined,
-                wait: wait ? {
-                    timeout: DEFAULT_TX_TIMEOUT_S,
-                    returnReceipt: true
-                } : NO_WAIT
+                } : undefined
             });
-            const isReceipt = (data)=>'txHash' in data;
-            if (isReceipt(result)) {
-                txReceipt = result;
-                txHash = result.txHash;
+            if (verbose) {
+                printProfileResult(stats, log);
+            }
+            const txHash = await tx.getTxHash();
+            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({
+                    timeout: DEFAULT_TX_TIMEOUT_S
+                });
                 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 (txHash) {
-            log(`Deploy tx hash:  ${txHash.toString()}`);
+        if (tx) {
+            log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/dest/cmds/deploy.d.ts

@@ -6,4 +6,4 @@ import { PublicKeys } from '@aztec/stdlib/keys';
 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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY21kcy9kZXBsb3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR3pELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV0RCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBR2hELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV0RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVwRCx3QkFBc0IsTUFBTSxDQUMxQixNQUFNLEVBQUUsU0FBUyxFQUNqQixJQUFJLEVBQUUsU0FBUyxFQUNmLFFBQVEsRUFBRSxZQUFZLEVBQ3RCLFlBQVksRUFBRSxNQUFNLEVBQ3BCLElBQUksRUFBRSxPQUFPLEVBQ2IsVUFBVSxFQUFFLFVBQVUsR0FBRyxTQUFTLEVBQ2xDLE9BQU8sRUFBRSxHQUFHLEVBQUUsRUFDZCxJQUFJLEVBQUUsRUFBRSxHQUFHLFNBQVMsRUFDcEIsV0FBVyxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQy9CLHVCQUF1QixFQUFFLE9BQU8sRUFDaEMsb0JBQW9CLEVBQUUsT0FBTyxFQUM3QixrQkFBa0IsRUFBRSxPQUFPLEdBQUcsU0FBUyxFQUN2QyxJQUFJLEVBQUUsT0FBTyxFQUNiLE9BQU8sRUFBRSxVQUFVLEVBQ25CLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLE9BQU8sb0JBQStCLEVBQ3RDLFdBQVcsRUFBRSxNQUFNLEVBQ25CLEdBQUcsRUFBRSxLQUFLLHFDQWdHWCJ9

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,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"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,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,qCAgGX"}

package/dest/cmds/deploy.js

@@ -1,5 +1,4 @@
 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';
@@ -59,60 +58,38 @@ export async function deploy(wallet, node, deployer, artifactPath, json, publicK
             };
         }
     } 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 (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()
-                };
-            }
+        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 {
-            const txHash = await deploy1.send({
-                ...deployOpts,
-                wait: NO_WAIT
+            out.contract = {
+                address: address?.toString(),
+                partialAddress: (await partialAddress)?.toString(),
+                initializationHash: instance.initializationHash.toString(),
+                salt: salt.toString()
+            };
+        }
+        if (wait) {
+            const deployed = await tx.wait({
+                timeout
             });
-            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: ${deployed.transactionFee?.toString()}`);
             } else {
-                out.contract = {
-                    address: address?.toString(),
-                    partialAddress: (await partialAddress)?.toString(),
-                    initializationHash: instance.initializationHash.toString(),
-                    salt: salt.toString()
-                };
+                out.contract.transactionFee = deployed.transactionFee?.toString();
             }
         }
     }

package/dest/cmds/deploy_account.d.ts

@@ -4,4 +4,4 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2FjY291bnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbWRzL2RlcGxveV9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd0RCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHM0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQsd0JBQXNCLGFBQWEsQ0FDakMsTUFBTSxFQUFFLFNBQVMsRUFDakIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsT0FBTyxFQUFFLFlBQVksRUFDckIsSUFBSSxFQUFFLE9BQU8sRUFDYixRQUFRLEVBQUUsWUFBWSxHQUFHLFNBQVMsRUFDbEMsYUFBYSxFQUFFLE9BQU8sRUFDdEIsWUFBWSxFQUFFLE9BQU8sRUFDckIsa0JBQWtCLEVBQUUsT0FBTyxFQUMzQixPQUFPLEVBQUUsVUFBVSxFQUNuQixJQUFJLEVBQUUsT0FBTyxFQUNiLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFdBQVcsRUFBRSxNQUFNLEVBQ25CLEdBQUcsRUFBRSxLQUFLLGlCQWdHWCJ9

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,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"}
+{"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,5 +1,4 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { printProfileResult } from '../utils/profiling.js';
@@ -22,7 +21,7 @@ export async function deployAccount(wallet, aztecNode, address, wait, deployer,
         log(`Salt:            ${salt.toString()}`);
         log(`Init hash:       ${initializationHash.toString()}`);
     }
-    let txHash;
+    let tx;
     let txReceipt;
     const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
     const delegatedDeployment = deployer && !account.address.equals(deployer);
@@ -59,42 +58,37 @@ export async function deployAccount(wallet, aztecNode, address, wait, deployer,
             };
         }
     } else {
-        if (verbose) {
-            printProfileResult(stats, log);
-        }
-        if (!json) {
-            log(`\nWaiting for account contract deployment...`);
-        }
-        const result = await deployMethod.send({
+        tx = deployMethod.send({
             ...deployAccountOpts,
             fee: deployAccountOpts.fee ? {
                 ...deployAccountOpts.fee,
                 gasSettings: estimatedGas
-            } : undefined,
-            wait: wait ? {
-                timeout: DEFAULT_TX_TIMEOUT_S,
-                returnReceipt: true
-            } : NO_WAIT
+            } : undefined
         });
-        const isReceipt = (data)=>'txHash' in data;
-        if (isReceipt(result)) {
-            txReceipt = result;
-            txHash = result.txHash;
+        if (verbose) {
+            printProfileResult(stats, log);
+        }
+        const txHash = await tx.getTxHash();
+        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({
+                timeout: DEFAULT_TX_TIMEOUT_S
+            });
             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 (txHash) {
-            log(`Deploy tx hash:  ${txHash.toString()}`);
+        if (tx) {
+            log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
         }
         if (txReceipt) {
             log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/dest/cmds/send.d.ts

@@ -7,4 +7,4 @@ import type { CLIWallet } from '../utils/wallet.js';
 export declare function send(wallet: CLIWallet, node: AztecNode, from: AztecAddress, functionName: string, functionArgsIn: any[], contractArtifactPath: string, contractAddress: AztecAddress, wait: boolean, cancellable: boolean, feeOpts: CLIFeeArgs, authWitnesses: AuthWitness[], verbose: boolean, log: LogFn): Promise<{
     txHash: import("@aztec/stdlib/tx").TxHash;
 } | undefined>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VuZC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NtZHMvc2VuZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFdEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXRELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELHdCQUFzQixJQUFJLENBQ3hCLE1BQU0sRUFBRSxTQUFTLEVBQ2pCLElBQUksRUFBRSxTQUFTLEVBQ2YsSUFBSSxFQUFFLFlBQVksRUFDbEIsWUFBWSxFQUFFLE1BQU0sRUFDcEIsY0FBYyxFQUFFLEdBQUcsRUFBRSxFQUNyQixvQkFBb0IsRUFBRSxNQUFNLEVBQzVCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLElBQUksRUFBRSxPQUFPLEVBQ2IsV0FBVyxFQUFFLE9BQU8sRUFDcEIsT0FBTyxFQUFFLFVBQVUsRUFDbkIsYUFBYSxFQUFFLFdBQVcsRUFBRSxFQUM1QixPQUFPLEVBQUUsT0FBTyxFQUNoQixHQUFHLEVBQUUsS0FBSzs7ZUE4RFgifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VuZC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NtZHMvc2VuZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFdEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXRELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXBELHdCQUFzQixJQUFJLENBQ3hCLE1BQU0sRUFBRSxTQUFTLEVBQ2pCLElBQUksRUFBRSxTQUFTLEVBQ2YsSUFBSSxFQUFFLFlBQVksRUFDbEIsWUFBWSxFQUFFLE1BQU0sRUFDcEIsY0FBYyxFQUFFLEdBQUcsRUFBRSxFQUNyQixvQkFBb0IsRUFBRSxNQUFNLEVBQzVCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLElBQUksRUFBRSxPQUFPLEVBQ2IsV0FBVyxFQUFFLE9BQU8sRUFDcEIsT0FBTyxFQUFFLFVBQVUsRUFDbkIsYUFBYSxFQUFFLFdBQVcsRUFBRSxFQUM1QixPQUFPLEVBQUUsT0FBTyxFQUNoQixHQUFHLEVBQUUsS0FBSzs7ZUFrRFgifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,IAAI,CACxB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,UAAU,EACnB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK;;eA8DX"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,wBAAsB,IAAI,CACxB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,GAAG,EAAE,EACrB,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,UAAU,EACnB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK;;eAkDX"}

package/dest/cmds/send.js

@@ -1,4 +1,4 @@
-import { Contract, NO_WAIT } from '@aztec/aztec.js/contracts';
+import { Contract } from '@aztec/aztec.js/contracts';
 import { prepTx } from '@aztec/cli/utils';
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import { printProfileResult } from '../utils/profiling.js';
@@ -25,48 +25,36 @@ export async function send(wallet, node, from, functionName, functionArgsIn, con
     if (feeOpts.estimateOnly) {
         return;
     }
+    const tx = call.send({
+        ...sendOptions,
+        fee: {
+            ...sendOptions.fee,
+            gasSettings: estimatedGas
+        }
+    });
     if (verbose) {
         printProfileResult(stats, log);
     }
+    const txHash = await tx.getTxHash();
+    log(`\nTransaction hash: ${txHash.toString()}`);
     if (wait) {
         try {
-            const receipt = await call.send({
-                ...sendOptions,
-                fee: {
-                    ...sendOptions.fee,
-                    gasSettings: estimatedGas
-                },
-                wait: {
-                    timeout: DEFAULT_TX_TIMEOUT_S
-                }
+            await tx.wait({
+                timeout: DEFAULT_TX_TIMEOUT_S
             });
-            const txHash = receipt.txHash;
-            log(`\nTransaction hash: ${txHash.toString()}`);
             log('Transaction has been mined');
+            const receipt = await tx.getReceipt();
             log(` Tx fee: ${receipt.transactionFee}`);
             log(` Status: ${receipt.status}`);
             log(` Block number: ${receipt.blockNumber}`);
             log(` Block hash: ${receipt.blockHash?.toString()}`);
-            return {
-                txHash
-            };
         } catch (err) {
             log(`Transaction failed\n ${err.message}`);
-            throw err;
         }
     } else {
-        const txHash = await call.send({
-            ...sendOptions,
-            fee: {
-                ...sendOptions.fee,
-                gasSettings: estimatedGas
-            },
-            wait: NO_WAIT
-        });
-        log(`\nTransaction hash: ${txHash.toString()}`);
         log('Transaction pending. Check status with check-tx');
-        return {
-            txHash
-        };
     }
+    return {
+        txHash
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.0.1-commit.d1f2d6c",
+  "version": "0.0.1-commit.d431d1c",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -67,19 +67,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.d1f2d6c",
-    "@aztec/aztec.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/bb.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/cli": "0.0.1-commit.d1f2d6c",
-    "@aztec/entrypoints": "0.0.1-commit.d1f2d6c",
-    "@aztec/ethereum": "0.0.1-commit.d1f2d6c",
-    "@aztec/foundation": "0.0.1-commit.d1f2d6c",
-    "@aztec/kv-store": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-contracts.js": "0.0.1-commit.d1f2d6c",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.d1f2d6c",
-    "@aztec/pxe": "0.0.1-commit.d1f2d6c",
-    "@aztec/stdlib": "0.0.1-commit.d1f2d6c",
-    "@aztec/wallet-sdk": "0.0.1-commit.d1f2d6c",
+    "@aztec/accounts": "0.0.1-commit.d431d1c",
+    "@aztec/aztec.js": "0.0.1-commit.d431d1c",
+    "@aztec/bb.js": "0.0.1-commit.d431d1c",
+    "@aztec/cli": "0.0.1-commit.d431d1c",
+    "@aztec/entrypoints": "0.0.1-commit.d431d1c",
+    "@aztec/ethereum": "0.0.1-commit.d431d1c",
+    "@aztec/foundation": "0.0.1-commit.d431d1c",
+    "@aztec/kv-store": "0.0.1-commit.d431d1c",
+    "@aztec/noir-contracts.js": "0.0.1-commit.d431d1c",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.d431d1c",
+    "@aztec/pxe": "0.0.1-commit.d431d1c",
+    "@aztec/stdlib": "0.0.1-commit.d431d1c",
+    "@aztec/wallet-sdk": "0.0.1-commit.d431d1c",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/cmds/authorize_action.ts

@@ -39,7 +39,7 @@ export async function authorizeAction(
     { caller, action },
     true,
   );
-  const witness = await setAuthwitnessInteraction.send({ wait: { timeout: DEFAULT_TX_TIMEOUT_S } });
+  const witness = await setAuthwitnessInteraction.send().wait({ timeout: DEFAULT_TX_TIMEOUT_S });
 
   log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
 

package/src/cmds/check_tx.ts

@@ -32,10 +32,7 @@ async function inspectTx(wallet: CLIWallet, aztecNode: AztecNode, txHash: TxHash
   const [receipt, effectsInBlock] = await Promise.all([aztecNode.getTxReceipt(txHash), aztecNode.getTxEffect(txHash)]);
   // Base tx data
   log(`Tx ${txHash.toString()}`);
-  log(` Status: ${receipt.status}`);
-  if (receipt.executionResult) {
-    log(` Execution result: ${receipt.executionResult}`);
-  }
+  log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
   if (receipt.error) {
     log(` Error: ${receipt.error}`);
   }

package/src/cmds/create_account.ts

@@ -1,11 +1,9 @@
 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 { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import type { TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
 import { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import type { AccountType } from '../utils/constants.js';
@@ -66,8 +64,8 @@ export async function createAccount(
     log(`Init hash:       ${account.getInstance().initializationHash.toString()}`);
   }
 
-  let txHash: TxHash | undefined;
-  let txReceipt: TxReceipt | undefined;
+  let tx;
+  let txReceipt;
   if (!registerOnly) {
     const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
@@ -102,14 +100,7 @@ export async function createAccount(
         };
       }
     } else {
-      if (verbose) {
-        printProfileResult(stats, log);
-      }
-
-      if (!json) {
-        log(`\nWaiting for account contract deployment...`);
-      }
-      const result = await deployMethod.send({
+      tx = deployMethod.send({
         ...deployAccountOpts,
         fee: deployAccountOpts.fee
           ? {
@@ -117,29 +108,32 @@ export async function createAccount(
               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;
+      if (verbose) {
+        printProfileResult(stats, log);
+      }
+
+      const txHash = await tx.getTxHash();
+      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({ timeout: DEFAULT_TX_TIMEOUT_S });
         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 (txHash) {
-      log(`Deploy tx hash:  ${txHash.toString()}`);
+    if (tx) {
+      log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
     }
     if (txReceipt) {
       log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/src/cmds/deploy.ts

@@ -1,6 +1,5 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { DeployOptions } from '@aztec/aztec.js/contracts';
-import { NO_WAIT } from '@aztec/aztec.js/contracts';
 import { ContractDeployer } from '@aztec/aztec.js/deployment';
 import { Fr } from '@aztec/aztec.js/fields';
 import type { AztecNode } from '@aztec/aztec.js/node';
@@ -90,55 +89,37 @@ export async function deploy(
       };
     }
   } else {
+    const tx = deploy.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 } = deploy;
     const instance = await deploy.getInstance();
-
-    if (wait) {
-      const receipt = await deploy.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(),
-        };
-      }
+    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 {
-      const txHash = await deploy.send({ ...deployOpts, wait: NO_WAIT });
-      debugLogger.debug(`Deploy tx sent with hash ${txHash.toString()}`);
-      out.hash = txHash;
-
+      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(`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: ${deployed.transactionFee?.toString()}`);
       } else {
-        out.contract = {
-          address: address?.toString(),
-          partialAddress: (await partialAddress)?.toString(),
-          initializationHash: instance.initializationHash.toString(),
-          salt: salt.toString(),
-        };
+        out.contract.transactionFee = deployed.transactionFee?.toString();
       }
     }
   }

package/src/cmds/deploy_account.ts

@@ -1,10 +1,8 @@
 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 { DEFAULT_TX_TIMEOUT_S } from '../utils/cli_wallet_and_node_wrapper.js';
 import type { CLIFeeArgs } from '../utils/options/fees.js';
@@ -47,8 +45,8 @@ export async function deployAccount(
     log(`Init hash:       ${initializationHash.toString()}`);
   }
 
-  let txHash: TxHash | undefined;
-  let txReceipt: TxReceipt | undefined;
+  let tx;
+  let txReceipt;
   const { paymentMethod, gasSettings } = await feeOpts.toUserFeeOptions(aztecNode, wallet, address);
 
   const delegatedDeployment = deployer && !account.address.equals(deployer);
@@ -82,14 +80,7 @@ export async function deployAccount(
       };
     }
   } else {
-    if (verbose) {
-      printProfileResult(stats, log);
-    }
-
-    if (!json) {
-      log(`\nWaiting for account contract deployment...`);
-    }
-    const result = await deployMethod.send({
+    tx = deployMethod.send({
       ...deployAccountOpts,
       fee: deployAccountOpts.fee
         ? {
@@ -97,28 +88,31 @@ export async function deployAccount(
             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;
+    if (verbose) {
+      printProfileResult(stats, log);
+    }
+
+    const txHash = await tx.getTxHash();
+    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({ timeout: DEFAULT_TX_TIMEOUT_S });
       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 (txHash) {
-      log(`Deploy tx hash:  ${txHash.toString()}`);
+    if (tx) {
+      log(`Deploy tx hash:  ${(await tx.getTxHash()).toString()}`);
     }
     if (txReceipt) {
       log(`Deploy tx fee:   ${txReceipt.transactionFee}`);

package/src/cmds/send.ts

@@ -1,6 +1,6 @@
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import { AuthWitness } from '@aztec/aztec.js/authorization';
-import { Contract, NO_WAIT, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
+import { Contract, type SendInteractionOptions } from '@aztec/aztec.js/contracts';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
@@ -46,43 +46,31 @@ export async function send(
     return;
   }
 
+  const tx = call.send({ ...sendOptions, fee: { ...sendOptions.fee, gasSettings: estimatedGas } });
   if (verbose) {
     printProfileResult(stats!, log);
   }
 
+  const txHash = await tx.getTxHash();
+  log(`\nTransaction hash: ${txHash.toString()}`);
   if (wait) {
     try {
-      const receipt = await call.send({
-        ...sendOptions,
-        fee: { ...sendOptions.fee, gasSettings: estimatedGas },
-        wait: { timeout: DEFAULT_TX_TIMEOUT_S },
-      });
+      await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
 
-      const txHash = receipt.txHash;
-      log(`\nTransaction hash: ${txHash.toString()}`);
       log('Transaction has been mined');
+
+      const receipt = await tx.getReceipt();
       log(` Tx fee: ${receipt.transactionFee}`);
       log(` Status: ${receipt.status}`);
       log(` Block number: ${receipt.blockNumber}`);
       log(` Block hash: ${receipt.blockHash?.toString()}`);
-
-      return {
-        txHash,
-      };
     } catch (err: any) {
       log(`Transaction failed\n ${err.message}`);
-      throw err;
     }
   } else {
-    const txHash = await call.send({
-      ...sendOptions,
-      fee: { ...sendOptions.fee, gasSettings: estimatedGas },
-      wait: NO_WAIT,
-    });
-    log(`\nTransaction hash: ${txHash.toString()}`);
     log('Transaction pending. Check status with check-tx');
-    return {
-      txHash,
-    };
   }
+  return {
+    txHash,
+  };
 }