@aztec/cli-wallet 0.86.0-starknet.1 → 0.87.0

package/src/utils/accounts.ts

@@ -18,7 +18,7 @@ export async function createOrRetrieveAccount(
   secretKey?: Fr,
   type: AccountType = 'schnorr',
   salt?: Fr,
-  publicKey?: string | undefined,
+  publicKey?: string,
 ): Promise<AccountManager> {
   let account;
 

package/src/utils/options/fees.ts

@@ -254,11 +254,14 @@ export function parsePaymentMethod(
   log: LogFn,
   db?: WalletDB,
 ): (sender: AccountWallet) => Promise<FeePaymentMethod> {
-  const parsed = payment.split(',').reduce((acc, item) => {
-    const [dimension, value] = item.split('=');
-    acc[dimension] = value ?? 1;
-    return acc;
-  }, {} as Record<string, string>);
+  const parsed = payment.split(',').reduce(
+    (acc, item) => {
+      const [dimension, value] = item.split('=');
+      acc[dimension] = value ?? 1;
+      return acc;
+    },
+    {} as Record<string, string>,
+  );
 
   const getFpc = () => {
     if (!parsed.fpc) {
@@ -337,11 +340,14 @@ export function parsePaymentMethod(
 }
 
 function parseGasLimits(gasLimits: string): { gasLimits: Gas; teardownGasLimits: Gas } {
-  const parsed = gasLimits.split(',').reduce((acc, limit) => {
-    const [dimension, value] = limit.split('=');
-    acc[dimension] = parseInt(value, 10);
-    return acc;
-  }, {} as Record<string, number>);
+  const parsed = gasLimits.split(',').reduce(
+    (acc, limit) => {
+      const [dimension, value] = limit.split('=');
+      acc[dimension] = parseInt(value, 10);
+      return acc;
+    },
+    {} as Record<string, number>,
+  );
 
   const expected = ['da', 'l2', 'teardownDA', 'teardownL2'];
   for (const dimension of expected) {
@@ -357,11 +363,14 @@ function parseGasLimits(gasLimits: string): { gasLimits: Gas; teardownGasLimits:
 }
 
 export function parseGasFees(gasFees: string): GasFees {
-  const parsed = gasFees.split(',').reduce((acc, fee) => {
-    const [dimension, value] = fee.split('=');
-    acc[dimension] = parseInt(value, 10);
-    return acc;
-  }, {} as Record<string, number>);
+  const parsed = gasFees.split(',').reduce(
+    (acc, fee) => {
+      const [dimension, value] = fee.split('=');
+      acc[dimension] = parseInt(value, 10);
+      return acc;
+    },
+    {} as Record<string, number>,
+  );
 
   const expected = ['da', 'l2'];
   for (const dimension of expected) {

package/src/utils/options/options.ts

@@ -32,7 +32,7 @@ export function integerArgParser(
 export function aliasedTxHashParser(txHash: string, db?: WalletDB) {
   try {
     return parseTxHash(txHash);
-  } catch (err) {
+  } catch {
     const prefixed = txHash.includes(':') ? txHash : `transactions:${txHash}`;
     const rawTxHash = db ? db.tryRetrieveAlias(prefixed) : txHash;
     return parseTxHash(rawTxHash);
@@ -43,7 +43,7 @@ export function aliasedAuthWitParser(witnesses: string, db?: WalletDB) {
   const parsedWitnesses = witnesses.split(',').map(witness => {
     try {
       return AuthWitness.fromString(witness);
-    } catch (err) {
+    } catch {
       const prefixed = witness.includes(':') ? witness : `authwits:${witness}`;
       const rawAuthWitness = db ? db.tryRetrieveAlias(prefixed) : witness;
       return AuthWitness.fromString(rawAuthWitness);
@@ -120,6 +120,13 @@ export function createDebugExecutionStepsDirOption() {
   ).makeOptionMandatory(false);
 }
 
+export function createVerboseOption() {
+  return new Option(
+    '-v, --verbose',
+    'Provide timings on all executed operations (synching, simulating, proving)',
+  ).default(false);
+}
+
 export function artifactPathParser(filePath: string, db?: WalletDB) {
   if (filePath.includes('@')) {
     const [pkg, contractName] = filePath.split('@');
@@ -161,7 +168,7 @@ async function contractArtifactFromWorkspace(pkg?: string, contractName?: string
   const cwd = process.cwd();
   try {
     await stat(`${cwd}/Nargo.toml`);
-  } catch (e) {
+  } catch {
     throw new Error(
       'Invalid contract artifact argument provided. To use this option, command should be called from a nargo workspace',
     );

package/src/utils/profiling.ts

@@ -0,0 +1,87 @@
+import type { LogFn } from '@aztec/foundation/log';
+import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
+import type { ProvingTimings, SimulationTimings } from '@aztec/stdlib/tx';
+
+import { format } from 'util';
+
+export function printProfileResult(
+  timings: ProvingTimings | SimulationTimings,
+  log: LogFn,
+  executionSteps?: PrivateExecutionStep[],
+) {
+  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), '-')));
+  let acc = 0;
+  let biggest: PrivateExecutionStep | undefined = executionSteps?.[0];
+
+  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) : '',
+      ),
+    );
+  });
+
+  if (biggest) {
+    log(
+      format(
+        '\nTotal gates:',
+        acc.toLocaleString(),
+        `(Biggest circuit: ${biggest.functionName} -> ${biggest.gateCount!.toLocaleString()})`,
+      ),
+    );
+  }
+
+  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),
+    ),
+  );
+  if ((timings as ProvingTimings).proving) {
+    log(format('Proving time:'.padEnd(25), `${(timings as ProvingTimings).proving?.toFixed(2)}ms`.padStart(15)));
+  }
+  if ((timings as SimulationTimings).publicSimulation) {
+    log(
+      format(
+        'Public simulation time:'.padEnd(25),
+        `${(timings as SimulationTimings).publicSimulation?.toFixed(2)}ms`.padStart(15),
+      ),
+    );
+  }
+
+  if ((timings as SimulationTimings).validation) {
+    log(
+      format('Validation time:'.padEnd(25), `${(timings as SimulationTimings).validation?.toFixed(2)}ms`.padStart(15)),
+    );
+  }
+
+  log(
+    format(
+      'Total time:'.padEnd(25),
+      `${timings.total.toFixed(2)}ms`.padStart(15),
+      `(${timings.unaccounted.toFixed(2)}ms unaccounted)`,
+    ),
+  );
+  log('\n');
+}