@aztec/cli-wallet 0.87.4 → 0.87.6

package/dest/cmds/create_account.js

@@ -83,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();

package/dest/cmds/deploy.js

@@ -37,7 +37,7 @@ 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();

package/dest/cmds/deploy_account.js

@@ -72,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();

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.js

@@ -22,7 +22,7 @@ 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();

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;AAU1E,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,cAAc,GAAG,iBAAiB,EAC3C,GAAG,EAAE,KAAK,EACV,cAAc,CAAC,EAAE,oBAAoB,EAAE,QAuHxC"}
+{"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

@@ -3,12 +3,13 @@ const FN_NAME_PADDING = 50;
 const COLUMN_MIN_WIDTH = 13;
 const COLUMN_MAX_WIDTH = 15;
 const ORACLE_NAME_PADDING = 50;
-export function printProfileResult(timings, log, executionSteps) {
+export function printProfileResult(stats, log, executionSteps) {
     log(format('\nPer circuit breakdown:\n'));
     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) {
@@ -32,6 +33,17 @@ export function printProfileResult(timings, log, executionSteps) {
     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(COLUMN_MAX_WIDTH)));
     if (timings.proving) {

package/package.json

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

package/src/cmds/create_account.ts

@@ -108,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();
 

package/src/cmds/deploy.ts

@@ -64,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();

package/src/cmds/deploy_account.ts

@@ -85,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();
 

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

@@ -50,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();

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,6 +1,6 @@
 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';
 
@@ -11,7 +11,7 @@ const COLUMN_MAX_WIDTH = 15;
 const ORACLE_NAME_PADDING = 50;
 
 export function printProfileResult(
-  timings: ProvingTimings | SimulationTimings,
+  stats: ProvingStats | SimulationStats,
   log: LogFn,
   executionSteps?: PrivateExecutionStep[],
 ) {
@@ -39,6 +39,7 @@ export function printProfileResult(
   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!) {
@@ -91,6 +92,27 @@ 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(