@aztec/simulator 0.0.1-commit.2ed92850 → 0.0.1-commit.343b43af6

package/dest/public/test_executor_metrics.js

@@ -24,6 +24,7 @@ function createEmptyTxMetrics() {
         totalDurationMs: 0,
         manaUsed: 0,
         totalInstructionsExecuted: 0,
+        bytecodeSizes: [],
         nonRevertiblePrivateInsertionsUs: undefined,
         revertiblePrivateInsertionsUs: undefined,
         enqueuedCalls: [],
@@ -48,8 +49,8 @@ export class TestExecutorMetrics {
     txMetrics = new Map();
     currentTxLabel;
     txTimer;
-    constructor(){
-        this.logger = createLogger(`simulator:test_executor_metrics`);
+    constructor(bindings){
+        this.logger = createLogger(`simulator:test_executor_metrics`, bindings);
     }
     startRecordingTxSimulation(txLabel) {
         assert(!this.currentTxLabel, 'Cannot start recording tx simulation when another is live');
@@ -99,6 +100,14 @@ export class TestExecutorMetrics {
             txMetrics.nonRevertiblePrivateInsertionsUs = durationUs;
         }
     }
+    recordBytecodeSize(txLabel, contractName, sizeBytes) {
+        const txMetrics = this.txMetrics.get(txLabel);
+        assert(txMetrics, `Cannot record bytecode size for unknown tx label: ${txLabel}`);
+        txMetrics.bytecodeSizes.push({
+            contractName,
+            sizeBytes
+        });
+    }
     recordProverMetrics(txLabel, metrics) {
         if (!this.txMetrics.has(txLabel)) {
             this.txMetrics.set(txLabel, createEmptyTxMetrics());
@@ -132,6 +141,12 @@ export class TestExecutorMetrics {
             if (filter === 3 || filter === 1 || filter === 0) {
                 pretty += `${INDENT0}Total instructions executed: ${fmtNum(txMetrics.totalInstructionsExecuted)}\n`;
             }
+            if ((filter === 1 || filter === 0) && txMetrics.bytecodeSizes.length > 0) {
+                pretty += `${INDENT0}Bytecode sizes:\n`;
+                for (const { contractName, sizeBytes } of txMetrics.bytecodeSizes){
+                    pretty += `${INDENT1}${contractName}: ${fmtNum(sizeBytes, 'bytes')}\n`;
+                }
+            }
             if (filter === 2 || filter === 0) {
                 pretty += `${INDENT0}Private insertions:\n`;
                 pretty += `${INDENT1}Non-revertible: ${fmtNum(txMetrics.nonRevertiblePrivateInsertionsUs / 1_000, 'ms')}\n`;
@@ -298,6 +313,13 @@ export class TestExecutorMetrics {
                     });
                 }
             }
+            for (const { contractName, sizeBytes } of txMetrics.bytecodeSizes){
+                data.push({
+                    name: `${txLabel}/bytecodeSizeBytes/${contractName}`,
+                    value: sizeBytes,
+                    unit: 'bytes'
+                });
+            }
         }
         return JSON.stringify(data, null, indent);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.0.1-commit.2ed92850",
+  "version": "0.0.1-commit.343b43af6",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
@@ -64,26 +64,26 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.2ed92850",
-    "@aztec/foundation": "0.0.1-commit.2ed92850",
-    "@aztec/native": "0.0.1-commit.2ed92850",
-    "@aztec/noir-acvm_js": "0.0.1-commit.2ed92850",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.2ed92850",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.2ed92850",
-    "@aztec/noir-types": "0.0.1-commit.2ed92850",
-    "@aztec/protocol-contracts": "0.0.1-commit.2ed92850",
-    "@aztec/stdlib": "0.0.1-commit.2ed92850",
-    "@aztec/telemetry-client": "0.0.1-commit.2ed92850",
-    "@aztec/world-state": "0.0.1-commit.2ed92850",
+    "@aztec/constants": "0.0.1-commit.343b43af6",
+    "@aztec/foundation": "0.0.1-commit.343b43af6",
+    "@aztec/native": "0.0.1-commit.343b43af6",
+    "@aztec/noir-acvm_js": "0.0.1-commit.343b43af6",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.343b43af6",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.343b43af6",
+    "@aztec/noir-types": "0.0.1-commit.343b43af6",
+    "@aztec/protocol-contracts": "0.0.1-commit.343b43af6",
+    "@aztec/stdlib": "0.0.1-commit.343b43af6",
+    "@aztec/telemetry-client": "0.0.1-commit.343b43af6",
+    "@aztec/world-state": "0.0.1-commit.343b43af6",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "0.0.1-commit.2ed92850",
-    "@aztec/merkle-tree": "0.0.1-commit.2ed92850",
-    "@aztec/noir-contracts.js": "0.0.1-commit.2ed92850",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.2ed92850",
+    "@aztec/kv-store": "0.0.1-commit.343b43af6",
+    "@aztec/merkle-tree": "0.0.1-commit.343b43af6",
+    "@aztec/noir-contracts.js": "0.0.1-commit.343b43af6",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.343b43af6",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.clonedeep": "^4.5.7",

package/src/private/acvm/acvm.ts

@@ -1,4 +1,4 @@
-import { createLogger } from '@aztec/foundation/log';
+import { type Logger, type LoggerBindings, resolveLogger } from '@aztec/foundation/log';
 import {
   type ExecutionError,
   type ForeignCallInput,
@@ -37,6 +37,7 @@ export interface ACIRExecutionResult {
  * @param acir - The ACIR circuit bytecode to execute.
  * @param initialWitness - The initial witness map defining all of the inputs to `circuit`.
  * @param callback - A callback to process any foreign calls from the circuit.
+ * @param logger - Optional logger for ACVM execution logs.
  * @returns The solved witness calculated by executing the circuit on the provided inputs, as well as the return
  * witness indices as specified by the circuit.
  */
@@ -44,9 +45,9 @@ export async function acvm(
   acir: Buffer,
   initialWitness: ACVMWitness,
   callback: ACIRCallback,
+  loggerOrBindings?: Logger | LoggerBindings,
 ): Promise<ACIRExecutionResult> {
-  const logger = createLogger('simulator:acvm');
-
+  const logger = resolveLogger('simulator:acvm', loggerOrBindings);
   const solvedAndReturnWitness = await executeCircuitWithReturnWitness(
     acir,
     initialWitness,

package/src/private/acvm_native.ts

@@ -1,5 +1,5 @@
 import { runInDirectory } from '@aztec/foundation/fs';
-import { createLogger } from '@aztec/foundation/log';
+import { type Logger, type LoggerBindings, resolveLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import type { ForeignCallHandler, WitnessMap } from '@aztec/noir-acvm_js';
 import type { FunctionArtifactWithContractName } from '@aztec/stdlib/abi';
@@ -12,8 +12,6 @@ import type { ACIRCallback, ACIRExecutionResult } from './acvm/acvm.js';
 import type { ACVMWitness } from './acvm/acvm_types.js';
 import type { CircuitSimulator } from './circuit_simulator.js';
 
-const logger = createLogger('simulator:acvm-native');
-
 export enum ACVM_RESULT {
   SUCCESS,
   FAILURE,
@@ -64,7 +62,9 @@ export async function executeNativeCircuit(
   workingDirectory: string,
   pathToAcvm: string,
   outputFilename?: string,
+  loggerOrBindings?: Logger | LoggerBindings,
 ): Promise<ACVMResult> {
+  const logger = resolveLogger('simulator:acvm-native', loggerOrBindings);
   const bytecodeFilename = 'bytecode';
   const witnessFilename = 'input_witness.toml';
 
@@ -145,11 +145,16 @@ export async function executeNativeCircuit(
 }
 
 export class NativeACVMSimulator implements CircuitSimulator {
+  private logger: Logger;
+
   constructor(
     private workingDirectory: string,
     private pathToAcvm: string,
     private witnessFilename?: string,
-  ) {}
+    loggerOrBindings?: Logger | LoggerBindings,
+  ) {
+    this.logger = resolveLogger('simulator:acvm-native', loggerOrBindings);
+  }
 
   async executeProtocolCircuit(
     input: ACVMWitness,
@@ -172,6 +177,7 @@ export class NativeACVMSimulator implements CircuitSimulator {
         directory,
         this.pathToAcvm,
         this.witnessFilename,
+        this.logger,
       );
 
       if (result.status == ACVM_RESULT.FAILURE) {
@@ -181,7 +187,7 @@ export class NativeACVMSimulator implements CircuitSimulator {
       return result;
     };
 
-    return await runInDirectory(this.workingDirectory, operation, false, logger);
+    return await runInDirectory(this.workingDirectory, operation, false, this.logger);
   }
 
   executeUserCircuit(

package/src/private/acvm_wasm.ts

@@ -1,4 +1,4 @@
-import { createLogger } from '@aztec/foundation/log';
+import { type Logger, type LoggerBindings, resolveLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import initACVM, { type ExecutionError, type ForeignCallHandler, executeCircuit } from '@aztec/noir-acvm_js';
 import initAbi from '@aztec/noir-noirc_abi';
@@ -11,7 +11,11 @@ import type { ACVMSuccess } from './acvm_native.js';
 import { type CircuitSimulator, enrichNoirError } from './circuit_simulator.js';
 
 export class WASMSimulator implements CircuitSimulator {
-  constructor(protected log = createLogger('wasm-simulator')) {}
+  protected log: Logger;
+
+  constructor(loggerOrBindings?: Logger | LoggerBindings) {
+    this.log = resolveLogger('wasm-simulator', loggerOrBindings);
+  }
 
   async init(): Promise<void> {
     // If these are available, then we are in the
@@ -67,6 +71,6 @@ export class WASMSimulator implements CircuitSimulator {
     callback: ACIRCallback,
   ): Promise<ACIRExecutionResult> {
     await this.init();
-    return acvm(artifact.bytecode, input, callback);
+    return acvm(artifact.bytecode, input, callback, this.log.createChild('acvm'));
   }
 }

package/src/private/circuit_recording/circuit_recorder.ts

@@ -1,5 +1,5 @@
 import { sha512 } from '@aztec/foundation/crypto/sha512';
-import { createLogger } from '@aztec/foundation/log';
+import { type Logger, type LoggerBindings, resolveLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import type { ForeignCallHandler, ForeignCallInput, ForeignCallOutput } from '@aztec/noir-acvm_js';
 
@@ -89,14 +89,16 @@ export class CircuitRecording {
  * ```
  */
 export class CircuitRecorder {
-  protected readonly logger = createLogger('simulator:acvm:recording');
+  protected readonly logger: Logger;
 
   protected recording?: CircuitRecording;
 
   private stackDepth: number = 0;
   private newCircuit: boolean = true;
 
-  protected constructor() {}
+  protected constructor(loggerOrBindings?: Logger | LoggerBindings) {
+    this.logger = resolveLogger('simulator:acvm:recording', loggerOrBindings);
+  }
 
   /**
    * Initializes a new circuit recording session.
@@ -159,11 +161,11 @@ export class CircuitRecorder {
         throw new Error(`Oracle method ${name} not found when setting up recording callback`);
       }
 
-      const isExternalCall = (name as keyof ACIRCallback) === 'privateCallPrivateFunction';
+      const isExternalCall = (name as keyof ACIRCallback) === 'aztec_prv_callPrivateFunction';
 
       recordingCallback[name as keyof ACIRCallback] = (...args: ForeignCallInput[]): ReturnType<typeof fn> => {
         const timer = new Timer();
-        // If we're entering another circuit via `privateCallPrivateFunction`, we increase the stack depth and set the
+        // If we're entering another circuit via `aztec_prv_callPrivateFunction`, we increase the stack depth and set the
         // newCircuit variable to ensure we are creating a new recording object.
         if (isExternalCall) {
           this.stackDepth++;

package/src/private/circuit_recording/file_circuit_recorder.ts

@@ -1,3 +1,5 @@
+import type { Logger } from '@aztec/foundation/log';
+
 import fs from 'fs/promises';
 import path from 'path';
 
@@ -7,8 +9,11 @@ import { CircuitRecorder, type CircuitRecording } from './circuit_recorder.js';
 export class FileCircuitRecorder extends CircuitRecorder {
   declare recording?: CircuitRecording & { filePath: string; isFirstCall: boolean };
 
-  constructor(private readonly recordDir: string) {
-    super();
+  constructor(
+    private readonly recordDir: string,
+    logger?: Logger,
+  ) {
+    super(logger);
   }
 
   override async start(

package/src/private/circuit_recording/memory_circuit_recorder.ts

@@ -1,11 +1,13 @@
+import type { Logger } from '@aztec/foundation/log';
+
 import { CircuitRecorder } from './circuit_recorder.js';
 
-/*
+/**
  * In memory circuit recorder uses the default implementation. This is kept
- * while we decide the fate of the FileCircuitRecorder
+ * while we decide the fate of the FileCircuitRecorder.
  */
 export class MemoryCircuitRecorder extends CircuitRecorder {
-  constructor() {
-    super();
+  constructor(logger?: Logger) {
+    super(logger);
   }
 }

package/src/private/factory.ts

@@ -1,4 +1,4 @@
-import { type Logger, createLogger } from '@aztec/foundation/log';
+import { type Logger, type LoggerBindings, resolveLogger } from '@aztec/foundation/log';
 
 import { promises as fs } from 'fs';
 
@@ -21,18 +21,21 @@ export function getSimulatorConfigFromEnv() {
 
 export async function createSimulator(
   config: SimulatorConfig,
-  logger: Logger = createLogger('simulator'),
+  loggerOrBindings?: Logger | LoggerBindings,
 ): Promise<CircuitSimulator> {
+  const logger = resolveLogger('simulator', loggerOrBindings);
   if (config.acvmBinaryPath && config.acvmWorkingDirectory) {
     try {
       await fs.access(config.acvmBinaryPath, fs.constants.R_OK);
       await fs.mkdir(config.acvmWorkingDirectory, { recursive: true });
       logger.info(`Using native ACVM at ${config.acvmBinaryPath} and working directory ${config.acvmWorkingDirectory}`);
-      return new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath);
+      const acvmLogger = logger.createChild('acvm-native');
+      return new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath, undefined, acvmLogger);
     } catch {
       logger.warn(`Failed to access ACVM at ${config.acvmBinaryPath}, falling back to WASM`);
     }
   }
   logger.info('Using WASM ACVM simulation');
-  return new WASMSimulator();
+  const wasmLogger = logger.createChild('wasm');
+  return new WASMSimulator(wasmLogger);
 }

package/src/public/avm/avm_gas.ts

@@ -110,7 +110,7 @@ const BASE_GAS_COSTS: Record<Opcode, Gas> = {
   [Opcode.NULLIFIEREXISTS]: makeCost(c.AVM_NULLIFIEREXISTS_BASE_L2_GAS, 0),
   [Opcode.EMITNULLIFIER]: makeCost(c.AVM_EMITNULLIFIER_BASE_L2_GAS, c.AVM_EMITNULLIFIER_BASE_DA_GAS),
   [Opcode.L1TOL2MSGEXISTS]: makeCost(c.AVM_L1TOL2MSGEXISTS_BASE_L2_GAS, 0),
-  [Opcode.EMITUNENCRYPTEDLOG]: makeCost(c.AVM_EMITUNENCRYPTEDLOG_BASE_L2_GAS, c.AVM_EMITUNENCRYPTEDLOG_BASE_DA_GAS),
+  [Opcode.EMITPUBLICLOG]: makeCost(c.AVM_EMITPUBLICLOG_BASE_L2_GAS, c.AVM_EMITPUBLICLOG_BASE_DA_GAS),
   [Opcode.SENDL2TOL1MSG]: makeCost(c.AVM_SENDL2TOL1MSG_BASE_L2_GAS, c.AVM_SENDL2TOL1MSG_BASE_DA_GAS),
   [Opcode.GETCONTRACTINSTANCE]: makeCost(c.AVM_GETCONTRACTINSTANCE_BASE_L2_GAS, 0),
   [Opcode.CALL]: makeCost(c.AVM_CALL_BASE_L2_GAS, 0),
@@ -130,7 +130,7 @@ const DYNAMIC_GAS_COSTS = new Map<Opcode, Gas>([
   [Opcode.CALLDATACOPY, makeCost(c.AVM_CALLDATACOPY_DYN_L2_GAS, 0)],
   [Opcode.RETURNDATACOPY, makeCost(c.AVM_RETURNDATACOPY_DYN_L2_GAS, 0)],
   // TODO: Call and static call based on bytecode length
-  [Opcode.EMITUNENCRYPTEDLOG, makeCost(c.AVM_EMITUNENCRYPTEDLOG_DYN_L2_GAS, c.AVM_EMITUNENCRYPTEDLOG_DYN_DA_GAS)],
+  [Opcode.EMITPUBLICLOG, makeCost(c.AVM_EMITPUBLICLOG_DYN_L2_GAS, c.AVM_EMITPUBLICLOG_DYN_DA_GAS)],
   [Opcode.TORADIXBE, makeCost(c.AVM_TORADIXBE_DYN_L2_GAS, 0)],
   [Opcode.AND_8, makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)],
   [Opcode.AND_16, makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)],