@aztec/cli-wallet 0.87.5 → 0.87.7

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,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,5 +1,6 @@
 import { Contract } from '@aztec/aztec.js';
 import { prepTx } from '@aztec/cli/utils';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 export async function authorizeAction(wallet, functionName, caller, functionArgsIn, contractArtifactPath, contractAddress, log) {
     const { functionArgs, contractArtifact, isPrivate } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     if (isPrivate) {
@@ -11,7 +12,9 @@ export async function authorizeAction(wallet, functionName, caller, functionArgs
         caller,
         action
     }, true);
-    const witness = await setAuthwitnessInteraction.send().wait();
+    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/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;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;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,iBA0CX"}
+{"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,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,iBA0CX"}

package/dest/cmds/cancel_tx.js

@@ -1,6 +1,7 @@
 import { SentTx, TxStatus } from '@aztec/aztec.js';
 import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings, nonce, cancellable }, paymentMethod, increasedFees, maxFeesPerGas, log) {
     const receipt = await wallet.getTxReceipt(txHash);
     if (receipt.status !== TxStatus.PENDING || !cancellable) {
@@ -24,7 +25,9 @@ export async function cancelTx(wallet, { txHash, gasSettings: prevTxGasSettings,
     const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
     const sentTx = new SentTx(wallet, wallet.sendTx(txProvingResult.toTx()));
     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.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;AAG5E,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;;;;;GAsHX"}
+{"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;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;;;;;GAsHX"}

package/dest/cmds/create_account.js

@@ -3,6 +3,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { createOrRetrieveAccount } from '../utils/accounts.js';
 import { printGasEstimates } from '../utils/options/fees.js';
 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);
@@ -82,7 +83,7 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
                 contractAddressSalt: salt
             });
             if (verbose) {
-                printProfileResult(provenTx.timings, log);
+                printProfileResult(provenTx.stats, log);
             }
             tx = provenTx.send();
             const txHash = await tx.getTxHash();
@@ -92,7 +93,9 @@ export async function createAccount(client, accountType, secretKey, publicKey, a
                 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

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,EAAwC,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAE5G,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;AAG5E,wBAAsB,MAAM,CAC1B,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,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,+DAuF/B"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cmds/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAwC,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAE5G,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,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,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,+DAuF/B"}

package/dest/cmds/deploy.js

@@ -4,6 +4,7 @@ import { getAllFunctionAbis, getInitializer } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import { printGasEstimates } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 export async function deploy(wallet, artifactPath, json, publicKeys, rawArgs, salt, initializer, skipPublicDeployment, skipClassRegistration, skipInitialization, universalDeploy, wait, feeOpts, verbose, debugLogger, log, logJson) {
     salt ??= Fr.random();
     const contractArtifact = await getContractArtifact(artifactPath, log);
@@ -36,13 +37,15 @@ export async function deploy(wallet, artifactPath, json, publicKeys, rawArgs, sa
     }
     const provenTx = await deploy.prove(deployOpts);
     if (verbose) {
-        printProfileResult(provenTx.timings, log);
+        printProfileResult(provenTx.stats, log);
     }
     const tx = provenTx.send();
     const txHash = await tx.getTxHash();
     debugLogger.debug(`Deploy tx sent with hash ${txHash}`);
     if (wait) {
-        const deployed = await tx.wait();
+        const deployed = await tx.wait({
+            timeout: DEFAULT_TX_TIMEOUT_S
+        });
         const { address, partialAddress, instance } = deployed.contract;
         if (json) {
             logJson({

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;AAG5E,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;;;;GAqGX"}
+{"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;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;;;;GAqGX"}

package/dest/cmds/deploy_account.js

@@ -1,6 +1,7 @@
 import { prettyPrintJSON } from '@aztec/cli/cli-utils';
 import { printGasEstimates } from '../utils/options/fees.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) {
     const out = {};
     const { address, partialAddress, publicKeys } = await account.getCompleteAddress();
@@ -71,7 +72,7 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
             contractAddressSalt: salt
         });
         if (verbose) {
-            printProfileResult(provenTx.timings, log);
+            printProfileResult(provenTx.stats, log);
         }
         tx = provenTx.send();
         const txHash = await tx.getTxHash();
@@ -81,7 +82,9 @@ export async function deployAccount(account, wait, registerClass, publicDeploy,
             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

package/dest/cmds/profile.js

@@ -14,7 +14,7 @@ export async function profile(wallet, functionName, functionArgsIn, contractArti
         authWitnesses,
         skipProofGeneration: false
     });
-    printProfileResult(result.timings, log, result.executionSteps);
+    printProfileResult(result.stats, log, result.executionSteps);
     if (debugOutputPath) {
         const ivcInputsPath = path.join(debugOutputPath, 'ivc-inputs.msgpack');
         log(`Debug output written to ${ivcInputsPath}.`);

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,EACL,KAAK,0BAA0B,EAC/B,WAAW,EACX,KAAK,YAAY,EAEjB,EAAE,EAEH,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAG5E,wBAAsB,IAAI,CACxB,MAAM,EAAE,0BAA0B,EAClC,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,QAAQ,EACjB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK;;;;;eA0DX"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/cmds/send.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAC/B,WAAW,EACX,KAAK,YAAY,EAEjB,EAAE,EAEH,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AAI5E,wBAAsB,IAAI,CACxB,MAAM,EAAE,0BAA0B,EAClC,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,QAAQ,EACjB,aAAa,EAAE,WAAW,EAAE,EAC5B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,KAAK;;;;;eA0DX"}

package/dest/cmds/send.js

@@ -3,6 +3,7 @@ import { prepTx } from '@aztec/cli/utils';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { printGasEstimates } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 export async function send(wallet, functionName, functionArgsIn, contractArtifactPath, contractAddress, wait, cancellable, feeOpts, authWitnesses, verbose, log) {
     const { functionArgs, contractArtifact } = await prepTx(contractArtifactPath, functionName, functionArgsIn, log);
     const contract = await Contract.at(contractAddress, contractArtifact, wallet);
@@ -21,14 +22,16 @@ export async function send(wallet, functionName, functionArgsIn, contractArtifac
     }
     const provenTx = await call.prove(sendOptions);
     if (verbose) {
-        printProfileResult(provenTx.timings, log);
+        printProfileResult(provenTx.stats, log);
     }
     const tx = provenTx.send();
     const txHash = await tx.getTxHash();
     log(`\nTransaction hash: ${txHash.toString()}`);
     if (wait) {
         try {
-            await tx.wait();
+            await tx.wait({
+                timeout: DEFAULT_TX_TIMEOUT_S
+            });
             log('Transaction has been mined');
             const receipt = await tx.getReceipt();
             log(` Tx fee: ${receipt.transactionFee}`);

package/dest/cmds/simulate.js

@@ -9,10 +9,10 @@ export async function simulate(wallet, functionName, functionArgsIn, contractArt
     const simulationResult = await call.simulate({
         ...await feeOpts.toSendOpts(wallet),
         authWitnesses,
-        includeMetadata: true
+        includeStats: true
     });
     if (verbose) {
-        printProfileResult(simulationResult.meta.timings, log);
+        printProfileResult(simulationResult.stats, log);
     }
     log(format('\nSimulation result: ', simulationResult.result, '\n'));
 }

package/dest/utils/profiling.d.ts

@@ -1,5 +1,5 @@
 import type { LogFn } from '@aztec/foundation/log';
 import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
-import type { ProvingTimings, SimulationTimings } from '@aztec/stdlib/tx';
-export declare function printProfileResult(timings: ProvingTimings | SimulationTimings, log: LogFn, executionSteps?: PrivateExecutionStep[]): void;
+import type { ProvingStats, SimulationStats } from '@aztec/stdlib/tx';
+export declare function printProfileResult(stats: ProvingStats | SimulationStats, log: LogFn, executionSteps?: PrivateExecutionStep[]): void;
 //# sourceMappingURL=profiling.d.ts.map

package/dest/utils/profiling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/utils/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAI1E,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,cAAc,GAAG,iBAAiB,EAC3C,GAAG,EAAE,KAAK,EACV,cAAc,CAAC,EAAE,oBAAoB,EAAE,QA6ExC"}
+{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/utils/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAkB,eAAe,EAAqB,MAAM,kBAAkB,CAAC;AAUzG,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,YAAY,GAAG,eAAe,EACrC,GAAG,EAAE,KAAK,EACV,cAAc,CAAC,EAAE,oBAAoB,EAAE,QA6IxC"}

package/dest/utils/profiling.js

@@ -1,32 +1,60 @@
 import { format } from 'util';
-export function printProfileResult(timings, log, executionSteps) {
+const FN_NAME_PADDING = 50;
+const COLUMN_MIN_WIDTH = 13;
+const COLUMN_MAX_WIDTH = 15;
+const ORACLE_NAME_PADDING = 50;
+export function printProfileResult(stats, log, executionSteps) {
     log(format('\nPer circuit breakdown:\n'));
-    log(format('  ', 'Function name'.padEnd(50), 'Time'.padStart(13).padEnd(15), executionSteps ? 'Gates'.padStart(13).padEnd(15) : '', executionSteps ? 'Subtotal'.padStart(13).padEnd(15) : ''));
-    log(format(''.padEnd(50 + 15 + 15 + (executionSteps ? 15 + 15 : 0), '-')));
+    log(format('  ', 'Function name'.padEnd(FN_NAME_PADDING), 'Time'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), executionSteps ? 'Gates'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '', executionSteps ? 'Subtotal'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : ''));
+    log(format(''.padEnd(FN_NAME_PADDING + COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH + (executionSteps ? COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH : 0), '-')));
     let acc = 0;
     let biggest = executionSteps?.[0];
+    const timings = stats.timings;
     timings.perFunction.forEach((fn, i)=>{
         const currentExecutionStep = executionSteps?.[i];
         if (currentExecutionStep && biggest && currentExecutionStep.gateCount > biggest.gateCount) {
             biggest = currentExecutionStep;
         }
         acc += currentExecutionStep ? currentExecutionStep.gateCount : 0;
-        log(format('  ', fn.functionName.padEnd(50), `${fn.time.toFixed(2)}ms`.padStart(13).padEnd(15), currentExecutionStep ? currentExecutionStep.gateCount.toLocaleString().padStart(13).padEnd(15) : '', currentExecutionStep ? acc.toLocaleString().padStart(15) : ''));
+        log(format(' - ', fn.functionName.padEnd(FN_NAME_PADDING), `${fn.time.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), currentExecutionStep ? currentExecutionStep.gateCount.toLocaleString().padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '', currentExecutionStep ? acc.toLocaleString().padStart(COLUMN_MAX_WIDTH) : ''));
+        if (fn.oracles) {
+            log('');
+            for (const [oracleName, { times }] of Object.entries(fn.oracles)){
+                const calls = times.length;
+                const min = Math.min(...times);
+                const max = Math.max(...times);
+                const total = times.reduce((acc, time)=>acc + time, 0);
+                const avg = total / calls;
+                log(format('    ', oracleName.padEnd(ORACLE_NAME_PADDING), `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH)));
+            }
+        }
+        log('');
     });
     if (biggest) {
         log(format('\nTotal gates:', acc.toLocaleString(), `(Biggest circuit: ${biggest.functionName} -> ${biggest.gateCount.toLocaleString()})`));
     }
+    if (stats.nodeRPCCalls) {
+        log(format('\nRPC calls:\n'));
+        for (const [method, { times }] of Object.entries(stats.nodeRPCCalls)){
+            const calls = times.length;
+            const total = times.reduce((acc, time)=>acc + time, 0);
+            const avg = total / calls;
+            const min = Math.min(...times);
+            const max = Math.max(...times);
+            log(format(method.padEnd(ORACLE_NAME_PADDING), `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH), `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH)));
+        }
+    }
     log(format('\nSync time:'.padEnd(25), `${timings.sync?.toFixed(2)}ms`.padStart(16)));
-    log(format('Private simulation time:'.padEnd(25), `${timings.perFunction.reduce((acc, { time })=>acc + time, 0).toFixed(2)}ms`.padStart(15)));
+    log(format('Private simulation time:'.padEnd(25), `${timings.perFunction.reduce((acc, { time })=>acc + time, 0).toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
     if (timings.proving) {
-        log(format('Proving time:'.padEnd(25), `${timings.proving?.toFixed(2)}ms`.padStart(15)));
+        log(format('Proving time:'.padEnd(25), `${timings.proving?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
     }
     if (timings.publicSimulation) {
-        log(format('Public simulation time:'.padEnd(25), `${timings.publicSimulation?.toFixed(2)}ms`.padStart(15)));
+        log(format('Public simulation time:'.padEnd(25), `${timings.publicSimulation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
     }
     if (timings.validation) {
-        log(format('Validation time:'.padEnd(25), `${timings.validation?.toFixed(2)}ms`.padStart(15)));
+        log(format('Validation time:'.padEnd(25), `${timings.validation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH)));
     }
-    log(format('Total time:'.padEnd(25), `${timings.total.toFixed(2)}ms`.padStart(15), `(${timings.unaccounted.toFixed(2)}ms unaccounted)`));
+    log(format('Total time:'.padEnd(25), `${timings.total.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH), `(${timings.unaccounted.toFixed(2)}ms unaccounted)`));
     log('\n');
 }

package/dest/utils/pxe_wrapper.d.ts

@@ -1,5 +1,6 @@
 import { type PXEServiceConfig } from '@aztec/pxe/server';
 import { type AztecNode, type PXE } from '@aztec/stdlib/interfaces/client';
+export declare const DEFAULT_TX_TIMEOUT_S = 180;
 export declare class PXEWrapper {
     private static pxeConfig;
     private static pxe;

package/dest/utils/pxe_wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pxe_wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/pxe_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,GAAG,EAAyB,MAAM,iCAAiC,CAAC;AAMlG,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,SAAS,CAA+B;IACvD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAwB;IAErC,MAAM;IAOZ,OAAO,IAAI,SAAS,GAAG,SAAS;IAIhC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;CAM/F"}
+{"version":3,"file":"pxe_wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/pxe_wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,GAAG,EAAyB,MAAM,iCAAiC,CAAC;AAElG,eAAO,MAAM,oBAAoB,MAAM,CAAC;AAMxC,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,SAAS,CAA+B;IACvD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAkB;IACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAwB;IAErC,MAAM;IAOZ,OAAO,IAAI,SAAS,GAAG,SAAS;IAIhC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;CAM/F"}

package/dest/utils/pxe_wrapper.js

@@ -1,5 +1,6 @@
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
+export const DEFAULT_TX_TIMEOUT_S = 180;
 /*
  * Wrapper class for PXE service, avoids initialization issues due to
  * closures when providing PXE service to injected commander.js commands

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.87.5",
+  "version": "0.87.7",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -63,17 +63,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.87.5",
-    "@aztec/aztec.js": "0.87.5",
-    "@aztec/cli": "0.87.5",
-    "@aztec/entrypoints": "0.87.5",
-    "@aztec/ethereum": "0.87.5",
-    "@aztec/foundation": "0.87.5",
-    "@aztec/kv-store": "0.87.5",
-    "@aztec/noir-contracts.js": "0.87.5",
-    "@aztec/noir-noirc_abi": "0.87.5",
-    "@aztec/pxe": "0.87.5",
-    "@aztec/stdlib": "0.87.5",
+    "@aztec/accounts": "0.87.7",
+    "@aztec/aztec.js": "0.87.7",
+    "@aztec/cli": "0.87.7",
+    "@aztec/entrypoints": "0.87.7",
+    "@aztec/ethereum": "0.87.7",
+    "@aztec/foundation": "0.87.7",
+    "@aztec/kv-store": "0.87.7",
+    "@aztec/noir-contracts.js": "0.87.7",
+    "@aztec/noir-noirc_abi": "0.87.7",
+    "@aztec/pxe": "0.87.7",
+    "@aztec/stdlib": "0.87.7",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/cmds/authorize_action.ts

@@ -2,6 +2,8 @@ import { type AccountWalletWithSecretKey, type AztecAddress, Contract } from '@a
 import { prepTx } from '@aztec/cli/utils';
 import type { LogFn } from '@aztec/foundation/log';
 
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
+
 export async function authorizeAction(
   wallet: AccountWalletWithSecretKey,
   functionName: string,
@@ -28,7 +30,7 @@ export async function authorizeAction(
   const action = contract.methods[functionName](...functionArgs);
 
   const setAuthwitnessInteraction = await wallet.setPublicAuthWit({ caller, action }, true);
-  const witness = await setAuthwitnessInteraction.send().wait();
+  const witness = await setAuthwitnessInteraction.send().wait({ timeout: DEFAULT_TX_TIMEOUT_S });
 
   log(`Authorized action ${functionName} on contract ${contractAddress} for caller ${caller}`);
 

package/src/cmds/cancel_tx.ts

@@ -5,6 +5,8 @@ import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 import { GasFees, GasSettings } from '@aztec/stdlib/gas';
 
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
+
 export async function cancelTx(
   wallet: AccountWalletWithSecretKey,
   {
@@ -46,7 +48,7 @@ export async function cancelTx(
   const txProvingResult = await wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
   const sentTx = new SentTx(wallet, wallet.sendTx(txProvingResult.toTx()));
   try {
-    await sentTx.wait();
+    await sentTx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
 
     log('Transaction has been cancelled');
 

package/src/cmds/create_account.ts

@@ -6,6 +6,7 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 import { type AccountType, createOrRetrieveAccount } from '../utils/accounts.js';
 import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 
 export async function createAccount(
   client: PXE,
@@ -107,7 +108,7 @@ export async function createAccount(
     } else {
       const provenTx = await deployMethod.prove({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
       if (verbose) {
-        printProfileResult(provenTx.timings!, log);
+        printProfileResult(provenTx.stats!, log);
       }
       tx = provenTx.send();
 
@@ -118,7 +119,7 @@ export async function createAccount(
         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,

package/src/cmds/deploy.ts

@@ -6,6 +6,7 @@ import { PublicKeys } from '@aztec/stdlib/keys';
 
 import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 
 export async function deploy(
   wallet: AccountWalletWithSecretKey,
@@ -63,7 +64,7 @@ export async function deploy(
 
   const provenTx = await deploy.prove(deployOpts);
   if (verbose) {
-    printProfileResult(provenTx.timings!, log);
+    printProfileResult(provenTx.stats!, log);
   }
 
   const tx = provenTx.send();
@@ -71,7 +72,7 @@ export async function deploy(
   const txHash = await tx.getTxHash();
   debugLogger.debug(`Deploy tx sent with hash ${txHash}`);
   if (wait) {
-    const deployed = await tx.wait();
+    const deployed = await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
     const { address, partialAddress, instance } = deployed.contract;
     if (json) {
       logJson({

package/src/cmds/deploy_account.ts

@@ -4,6 +4,7 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 
 export async function deployAccount(
   account: AccountManager,
@@ -84,7 +85,7 @@ export async function deployAccount(
   } else {
     const provenTx = await deployMethod.prove({ ...deployOpts, universalDeploy: true, contractAddressSalt: salt });
     if (verbose) {
-      printProfileResult(provenTx.timings!, log);
+      printProfileResult(provenTx.stats!, log);
     }
     tx = provenTx.send();
 
@@ -95,7 +96,7 @@ export async function deployAccount(
       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,

package/src/cmds/profile.ts

@@ -31,7 +31,7 @@ export async function profile(
     authWitnesses,
     skipProofGeneration: false,
   });
-  printProfileResult(result.timings, log, result.executionSteps);
+  printProfileResult(result.stats, log, result.executionSteps);
   if (debugOutputPath) {
     const ivcInputsPath = path.join(debugOutputPath, 'ivc-inputs.msgpack');
     log(`Debug output written to ${ivcInputsPath}.`);

package/src/cmds/send.ts

@@ -12,6 +12,7 @@ import { GasSettings } from '@aztec/stdlib/gas';
 
 import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js';
 import { printProfileResult } from '../utils/profiling.js';
+import { DEFAULT_TX_TIMEOUT_S } from '../utils/pxe_wrapper.js';
 
 export async function send(
   wallet: AccountWalletWithSecretKey,
@@ -49,7 +50,7 @@ export async function send(
 
   const provenTx = await call.prove(sendOptions);
   if (verbose) {
-    printProfileResult(provenTx.timings!, log);
+    printProfileResult(provenTx.stats!, log);
   }
 
   const tx = provenTx.send();
@@ -57,7 +58,7 @@ export async function send(
   log(`\nTransaction hash: ${txHash.toString()}`);
   if (wait) {
     try {
-      await tx.wait();
+      await tx.wait({ timeout: DEFAULT_TX_TIMEOUT_S });
 
       log('Transaction has been mined');
 

package/src/cmds/simulate.ts

@@ -25,10 +25,10 @@ export async function simulate(
   const simulationResult = await call.simulate({
     ...(await feeOpts.toSendOpts(wallet)),
     authWitnesses,
-    includeMetadata: true,
+    includeStats: true,
   });
   if (verbose) {
-    printProfileResult(simulationResult.meta.timings!, log);
+    printProfileResult(simulationResult.stats!, log);
   }
   log(format('\nSimulation result: ', simulationResult.result, '\n'));
 }

package/src/utils/profiling.ts

@@ -1,11 +1,17 @@
 import type { LogFn } from '@aztec/foundation/log';
 import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
-import type { ProvingTimings, SimulationTimings } from '@aztec/stdlib/tx';
+import type { ProvingStats, ProvingTimings, SimulationStats, SimulationTimings } from '@aztec/stdlib/tx';
 
 import { format } from 'util';
 
+const FN_NAME_PADDING = 50;
+const COLUMN_MIN_WIDTH = 13;
+const COLUMN_MAX_WIDTH = 15;
+
+const ORACLE_NAME_PADDING = 50;
+
 export function printProfileResult(
-  timings: ProvingTimings | SimulationTimings,
+  stats: ProvingStats | SimulationStats,
   log: LogFn,
   executionSteps?: PrivateExecutionStep[],
 ) {
@@ -13,16 +19,27 @@ export function printProfileResult(
   log(
     format(
       '  ',
-      'Function name'.padEnd(50),
-      'Time'.padStart(13).padEnd(15),
-      executionSteps ? 'Gates'.padStart(13).padEnd(15) : '',
-      executionSteps ? 'Subtotal'.padStart(13).padEnd(15) : '',
+      'Function name'.padEnd(FN_NAME_PADDING),
+      'Time'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+      executionSteps ? 'Gates'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '',
+      executionSteps ? 'Subtotal'.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH) : '',
+    ),
+  );
+  log(
+    format(
+      ''.padEnd(
+        FN_NAME_PADDING +
+          COLUMN_MAX_WIDTH +
+          COLUMN_MAX_WIDTH +
+          (executionSteps ? COLUMN_MAX_WIDTH + COLUMN_MAX_WIDTH : 0),
+        '-',
+      ),
     ),
   );
-  log(format(''.padEnd(50 + 15 + 15 + (executionSteps ? 15 + 15 : 0), '-')));
   let acc = 0;
   let biggest: PrivateExecutionStep | undefined = executionSteps?.[0];
 
+  const timings = stats.timings;
   timings.perFunction.forEach((fn, i) => {
     const currentExecutionStep = executionSteps?.[i];
     if (currentExecutionStep && biggest && currentExecutionStep.gateCount! > biggest.gateCount!) {
@@ -32,13 +49,37 @@ export function printProfileResult(
 
     log(
       format(
-        '  ',
-        fn.functionName.padEnd(50),
-        `${fn.time.toFixed(2)}ms`.padStart(13).padEnd(15),
-        currentExecutionStep ? currentExecutionStep.gateCount!.toLocaleString().padStart(13).padEnd(15) : '',
-        currentExecutionStep ? acc.toLocaleString().padStart(15) : '',
+        ' - ',
+        fn.functionName.padEnd(FN_NAME_PADDING),
+        `${fn.time.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+        currentExecutionStep
+          ? currentExecutionStep.gateCount!.toLocaleString().padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH)
+          : '',
+        currentExecutionStep ? acc.toLocaleString().padStart(COLUMN_MAX_WIDTH) : '',
       ),
     );
+    if (fn.oracles) {
+      log('');
+      for (const [oracleName, { times }] of Object.entries(fn.oracles)) {
+        const calls = times.length;
+        const min = Math.min(...times);
+        const max = Math.max(...times);
+        const total = times.reduce((acc, time) => acc + time, 0);
+        const avg = total / calls;
+        log(
+          format(
+            '    ',
+            oracleName.padEnd(ORACLE_NAME_PADDING),
+            `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+            `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+            `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+            `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+            `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+          ),
+        );
+      }
+    }
+    log('');
   });
 
   if (biggest) {
@@ -51,35 +92,64 @@ export function printProfileResult(
     );
   }
 
+  if (stats.nodeRPCCalls) {
+    log(format('\nRPC calls:\n'));
+    for (const [method, { times }] of Object.entries(stats.nodeRPCCalls)) {
+      const calls = times.length;
+      const total = times.reduce((acc, time) => acc + time, 0);
+      const avg = total / calls;
+      const min = Math.min(...times);
+      const max = Math.max(...times);
+      log(
+        format(
+          method.padEnd(ORACLE_NAME_PADDING),
+          `${calls} calls`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+          `${total.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+          `min: ${min.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+          `avg: ${avg.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+          `max: ${max.toFixed(2)}ms`.padStart(COLUMN_MIN_WIDTH).padEnd(COLUMN_MAX_WIDTH),
+        ),
+      );
+    }
+  }
+
   log(format('\nSync time:'.padEnd(25), `${timings.sync?.toFixed(2)}ms`.padStart(16)));
   log(
     format(
       'Private simulation time:'.padEnd(25),
-      `${timings.perFunction.reduce((acc, { time }) => acc + time, 0).toFixed(2)}ms`.padStart(15),
+      `${timings.perFunction.reduce((acc, { time }) => acc + time, 0).toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH),
     ),
   );
   if ((timings as ProvingTimings).proving) {
-    log(format('Proving time:'.padEnd(25), `${(timings as ProvingTimings).proving?.toFixed(2)}ms`.padStart(15)));
+    log(
+      format(
+        'Proving time:'.padEnd(25),
+        `${(timings as ProvingTimings).proving?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH),
+      ),
+    );
   }
   if ((timings as SimulationTimings).publicSimulation) {
     log(
       format(
         'Public simulation time:'.padEnd(25),
-        `${(timings as SimulationTimings).publicSimulation?.toFixed(2)}ms`.padStart(15),
+        `${(timings as SimulationTimings).publicSimulation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH),
       ),
     );
   }
 
   if ((timings as SimulationTimings).validation) {
     log(
-      format('Validation time:'.padEnd(25), `${(timings as SimulationTimings).validation?.toFixed(2)}ms`.padStart(15)),
+      format(
+        'Validation time:'.padEnd(25),
+        `${(timings as SimulationTimings).validation?.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH),
+      ),
     );
   }
 
   log(
     format(
       'Total time:'.padEnd(25),
-      `${timings.total.toFixed(2)}ms`.padStart(15),
+      `${timings.total.toFixed(2)}ms`.padStart(COLUMN_MAX_WIDTH),
       `(${timings.unaccounted.toFixed(2)}ms unaccounted)`,
     ),
   );

package/src/utils/pxe_wrapper.ts

@@ -1,6 +1,8 @@
 import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import { type AztecNode, type PXE, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 
+export const DEFAULT_TX_TIMEOUT_S = 180;
+
 /*
  * Wrapper class for PXE service, avoids initialization issues due to
  * closures when providing PXE service to injected commander.js commands