@aztec/simulator 0.31.0 → 0.32.1

package/src/client/execution_result.ts

@@ -1,9 +1,13 @@
-import { FunctionL2Logs, Note } from '@aztec/circuit-types';
-import { NoteHashReadRequestMembershipWitness, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js';
-import { DecodedReturn } from '@aztec/foundation/abi';
-import { Fr } from '@aztec/foundation/fields';
+import { type EncryptedFunctionL2Logs, type Note, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
+import {
+  type NoteHashReadRequestMembershipWitness,
+  type PrivateCallStackItem,
+  type PublicCallRequest,
+} from '@aztec/circuits.js';
+import { type DecodedReturn } from '@aztec/foundation/abi';
+import { type Fr } from '@aztec/foundation/fields';
 
-import { ACVMField } from '../acvm/index.js';
+import { type ACVMField } from '../acvm/index.js';
 
 /**
  * The contents of a new note.
@@ -46,12 +50,12 @@ export interface ExecutionResult {
    * Encrypted logs emitted during execution of this function call.
    * Note: These are preimages to `encryptedLogsHash`.
    */
-  encryptedLogs: FunctionL2Logs;
+  encryptedLogs: EncryptedFunctionL2Logs;
   /**
    * Unencrypted logs emitted during execution of this function call.
    * Note: These are preimages to `unencryptedLogsHash`.
    */
-  unencryptedLogs: FunctionL2Logs;
+  unencryptedLogs: UnencryptedFunctionL2Logs;
 }
 
 /**
@@ -59,7 +63,7 @@ export interface ExecutionResult {
  * @param execResult - The topmost execution result.
  * @returns All encrypted logs.
  */
-export function collectEncryptedLogs(execResult: ExecutionResult): FunctionL2Logs[] {
+export function collectEncryptedLogs(execResult: ExecutionResult): EncryptedFunctionL2Logs[] {
   // without the .reverse(), the logs will be in a queue like fashion which is wrong as the kernel processes it like a stack.
   return [execResult.encryptedLogs, ...[...execResult.nestedExecutions].reverse().flatMap(collectEncryptedLogs)];
 }
@@ -69,7 +73,7 @@ export function collectEncryptedLogs(execResult: ExecutionResult): FunctionL2Log
  * @param execResult - The topmost execution result.
  * @returns All unencrypted logs.
  */
-export function collectUnencryptedLogs(execResult: ExecutionResult): FunctionL2Logs[] {
+export function collectUnencryptedLogs(execResult: ExecutionResult): UnencryptedFunctionL2Logs[] {
   // without the .reverse(), the logs will be in a queue like fashion which is wrong as the kernel processes it like a stack.
   return [execResult.unencryptedLogs, ...[...execResult.nestedExecutions].reverse().flatMap(collectUnencryptedLogs)];
 }

package/src/client/pick_notes.ts

@@ -1,4 +1,4 @@
-import { Comparator, Note } from '@aztec/circuit-types';
+import { Comparator, type Note } from '@aztec/circuit-types';
 import { Fr } from '@aztec/foundation/fields';
 
 export interface PropertySelector {

package/src/client/private_execution.ts

@@ -1,14 +1,14 @@
-import { FunctionData, PrivateCallStackItem, PrivateCircuitPublicInputs } from '@aztec/circuits.js';
-import { FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type FunctionData, PrivateCallStackItem, PrivateCircuitPublicInputs } from '@aztec/circuits.js';
+import { type FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import { extractReturnWitness } from '../acvm/deserialize.js';
 import { Oracle, acvm, extractCallStack } from '../acvm/index.js';
 import { ExecutionError } from '../common/errors.js';
-import { ClientExecutionContext } from './client_execution_context.js';
-import { ExecutionResult } from './execution_result.js';
+import { type ClientExecutionContext } from './client_execution_context.js';
+import { type ExecutionResult } from './execution_result.js';
 import { AcirSimulator } from './simulator.js';
 
 /**

package/src/client/simulator.ts

@@ -1,26 +1,26 @@
-import { AztecNode, FunctionCall, Note, TxExecutionRequest } from '@aztec/circuit-types';
+import { type AztecNode, type FunctionCall, type Note, type TxExecutionRequest } from '@aztec/circuit-types';
 import { CallContext, FunctionData } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import {
-  ArrayType,
-  FunctionArtifactWithDebugMetadata,
+  type ArrayType,
+  type FunctionArtifactWithDebugMetadata,
   FunctionSelector,
   FunctionType,
   encodeArguments,
 } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { EthAddress } from '@aztec/foundation/eth-address';
+import { type EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 
-import { WasmBlackBoxFunctionSolver, createBlackBoxSolver } from '@noir-lang/acvm_js';
+import { type WasmBlackBoxFunctionSolver, createBlackBoxSolver } from '@noir-lang/acvm_js';
 
 import { createSimulationError } from '../common/errors.js';
 import { PackedArgsCache } from '../common/packed_args_cache.js';
 import { ClientExecutionContext } from './client_execution_context.js';
-import { DBOracle } from './db_oracle.js';
+import { type DBOracle } from './db_oracle.js';
 import { ExecutionNoteCache } from './execution_note_cache.js';
-import { ExecutionResult } from './execution_result.js';
+import { type ExecutionResult } from './execution_result.js';
 import { executePrivateFunction } from './private_execution.js';
 import { executeUnconstrainedFunction } from './unconstrained_execution.js';
 import { ViewDataOracle } from './view_data_oracle.js';

package/src/client/unconstrained_execution.ts

@@ -1,14 +1,14 @@
-import { FunctionData } from '@aztec/circuits.js';
-import { DecodedReturn, FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr } from '@aztec/foundation/fields';
+import { type FunctionData } from '@aztec/circuits.js';
+import { type DecodedReturn, type FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import { extractReturnWitness } from '../acvm/deserialize.js';
 import { Oracle, acvm, extractCallStack, toACVMWitness } from '../acvm/index.js';
 import { ExecutionError } from '../common/errors.js';
 import { AcirSimulator } from './simulator.js';
-import { ViewDataOracle } from './view_data_oracle.js';
+import { type ViewDataOracle } from './view_data_oracle.js';
 
 // docs:start:execute_unconstrained_function
 /**

package/src/client/view_data_oracle.ts

@@ -1,21 +1,21 @@
 import {
-  AuthWitness,
-  AztecNode,
-  CompleteAddress,
+  type AuthWitness,
+  type AztecNode,
+  type CompleteAddress,
   MerkleTreeId,
-  NoteStatus,
-  NullifierMembershipWitness,
-  PublicDataWitness,
+  type NoteStatus,
+  type NullifierMembershipWitness,
+  type PublicDataWitness,
 } from '@aztec/circuit-types';
-import { Header } from '@aztec/circuits.js';
+import { type Header } from '@aztec/circuits.js';
 import { siloNullifier } from '@aztec/circuits.js/hash';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { ContractInstance } from '@aztec/types/contracts';
+import { type ContractInstance } from '@aztec/types/contracts';
 
-import { NoteData, TypedOracle } from '../acvm/index.js';
-import { DBOracle } from './db_oracle.js';
+import { type NoteData, TypedOracle } from '../acvm/index.js';
+import { type DBOracle } from './db_oracle.js';
 import { pickNotes } from './pick_notes.js';
 
 /**

package/src/common/errors.ts

@@ -1,4 +1,4 @@
-import { FailingFunction, NoirCallStack, SimulationError } from '@aztec/circuit-types';
+import { type FailingFunction, type NoirCallStack, SimulationError } from '@aztec/circuit-types';
 
 /**
  * An error that occurred during the execution of a function.

package/src/public/db.ts

@@ -1,10 +1,10 @@
-import { NullifierMembershipWitness } from '@aztec/circuit-types';
-import { EthAddress, FunctionSelector, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr } from '@aztec/foundation/fields';
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { type NullifierMembershipWitness } from '@aztec/circuit-types';
+import { type EthAddress, type FunctionSelector, type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type Fr } from '@aztec/foundation/fields';
+import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { MessageLoadOracleInputs } from '../acvm/index.js';
+import { type MessageLoadOracleInputs } from '../acvm/index.js';
 
 /**
  * Database interface for providing access to public state.

package/src/public/execution.ts

@@ -1,16 +1,16 @@
-import { FunctionL2Logs, SimulationError } from '@aztec/circuit-types';
+import { type SimulationError, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import {
-  AztecAddress,
-  ContractStorageRead,
-  ContractStorageUpdateRequest,
-  Fr,
-  L2ToL1Message,
-  PublicCallRequest,
+  type AztecAddress,
+  type ContractStorageRead,
+  type ContractStorageUpdateRequest,
+  type Fr,
+  type L2ToL1Message,
+  type PublicCallRequest,
   PublicDataRead,
   PublicDataUpdateRequest,
-  ReadRequest,
-  SideEffect,
-  SideEffectLinkedToNoteHash,
+  type ReadRequest,
+  type SideEffect,
+  type SideEffectLinkedToNoteHash,
 } from '@aztec/circuits.js';
 import { computePublicDataTreeLeafSlot, computePublicDataTreeValue } from '@aztec/circuits.js/hash';
 
@@ -46,7 +46,7 @@ export interface PublicExecutionResult {
    * Unencrypted logs emitted during execution of this function call.
    * Note: These are preimages to `unencryptedLogsHash`.
    */
-  unencryptedLogs: FunctionL2Logs;
+  unencryptedLogs: UnencryptedFunctionL2Logs;
   /**
    * Whether the execution reverted.
    */
@@ -154,7 +154,7 @@ export function checkValidStaticCall(
   newNullifiers: SideEffectLinkedToNoteHash[],
   contractStorageUpdateRequests: ContractStorageUpdateRequest[],
   newL2ToL1Messages: L2ToL1Message[],
-  unencryptedLogs: FunctionL2Logs,
+  unencryptedLogs: UnencryptedFunctionL2Logs,
 ) {
   if (
     contractStorageUpdateRequests.length > 0 ||

package/src/public/executor.ts

@@ -1,5 +1,5 @@
-import { FunctionL2Logs } from '@aztec/circuit-types';
-import { Fr, GlobalVariables, Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
+import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
+import { Fr, type GlobalVariables, type Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import { spawn } from 'child_process';
@@ -20,8 +20,8 @@ import { AcirSimulator } from '../client/simulator.js';
 import { ExecutionError, createSimulationError } from '../common/errors.js';
 import { SideEffectCounter } from '../common/index.js';
 import { PackedArgsCache } from '../common/packed_args_cache.js';
-import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
-import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js';
+import { type PublicExecution, type PublicExecutionResult, checkValidStaticCall } from './execution.js';
 import { PublicExecutionContext } from './public_execution_context.js';
 
 /**
@@ -92,7 +92,7 @@ export async function executePublicFunction(
       contractStorageReads: [],
       contractStorageUpdateRequests: [],
       nestedExecutions: [],
-      unencryptedLogs: FunctionL2Logs.empty(),
+      unencryptedLogs: UnencryptedFunctionL2Logs.empty(),
       reverted,
       revertReason,
     };

package/src/public/public_execution_context.ts

@@ -1,15 +1,25 @@
-import { FunctionL2Logs, NullifierMembershipWitness, UnencryptedL2Log } from '@aztec/circuit-types';
-import { CallContext, FunctionData, FunctionSelector, GlobalVariables, Header } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import {
+  type NullifierMembershipWitness,
+  UnencryptedFunctionL2Logs,
+  type UnencryptedL2Log,
+} from '@aztec/circuit-types';
+import {
+  CallContext,
+  FunctionData,
+  type FunctionSelector,
+  type GlobalVariables,
+  type Header,
+} from '@aztec/circuits.js';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { ContractInstance } from '@aztec/types/contracts';
+import { type ContractInstance } from '@aztec/types/contracts';
 
 import { TypedOracle, toACVMWitness } from '../acvm/index.js';
-import { PackedArgsCache, SideEffectCounter } from '../common/index.js';
-import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
-import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js';
+import { type PackedArgsCache, type SideEffectCounter } from '../common/index.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js';
+import { type PublicExecution, type PublicExecutionResult, checkValidStaticCall } from './execution.js';
 import { executePublicFunction } from './executor.js';
 import { ContractStorageActionsCollector } from './state_actions.js';
 
@@ -72,7 +82,7 @@ export class PublicExecutionContext extends TypedOracle {
    * Return the encrypted logs emitted during this execution.
    */
   public getUnencryptedLogs() {
-    return new FunctionL2Logs(this.unencryptedLogs.map(log => log.toBuffer()));
+    return new UnencryptedFunctionL2Logs(this.unencryptedLogs);
   }
 
   /**

package/src/public/state_actions.ts

@@ -1,8 +1,8 @@
 import { ContractStorageRead, ContractStorageUpdateRequest } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
-import { PublicStateDB } from './db.js';
+import { type PublicStateDB } from './db.js';
 
 /**
  * Implements read/write operations on a contract public storage, collecting

package/src/simulator/acvm_native.ts

@@ -1,11 +1,11 @@
 import { randomBytes } from '@aztec/foundation/crypto';
-import { NoirCompiledCircuit } from '@aztec/types/noir';
+import { type NoirCompiledCircuit } from '@aztec/types/noir';
 
-import { WitnessMap } from '@noir-lang/types';
+import { type WitnessMap } from '@noir-lang/types';
 import * as proc from 'child_process';
 import fs from 'fs/promises';
 
-import { SimulationProvider } from './simulation_provider.js';
+import { type SimulationProvider } from './simulation_provider.js';
 
 /**
  * Parses a TOML format witness map string into a Map structure

package/src/simulator/acvm_wasm.ts

@@ -1,9 +1,13 @@
-import { NoirCompiledCircuit } from '@aztec/types/noir';
+import { type NoirCompiledCircuit } from '@aztec/types/noir';
 
-import { WasmBlackBoxFunctionSolver, createBlackBoxSolver, executeCircuitWithBlackBoxSolver } from '@noir-lang/acvm_js';
-import { WitnessMap } from '@noir-lang/types';
+import {
+  type WasmBlackBoxFunctionSolver,
+  createBlackBoxSolver,
+  executeCircuitWithBlackBoxSolver,
+} from '@noir-lang/acvm_js';
+import { type WitnessMap } from '@noir-lang/types';
 
-import { SimulationProvider } from './simulation_provider.js';
+import { type SimulationProvider } from './simulation_provider.js';
 
 let solver: Promise<WasmBlackBoxFunctionSolver>;
 

package/src/simulator/simulation_provider.ts

@@ -1,6 +1,6 @@
-import { NoirCompiledCircuit } from '@aztec/types/noir';
+import { type NoirCompiledCircuit } from '@aztec/types/noir';
 
-import { WitnessMap } from '@noir-lang/types';
+import { type WitnessMap } from '@noir-lang/types';
 
 /**
  * Low level simulation interface

package/src/test/utils.ts

@@ -1,5 +1,5 @@
 import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types';
-import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
+import { type AztecAddress, EthAddress, type Fr } from '@aztec/circuits.js';
 import { computeMessageSecretHash } from '@aztec/circuits.js/hash';
 import { sha256ToField } from '@aztec/foundation/crypto';
 
@@ -20,8 +20,7 @@ export const buildL1ToL2Message = (
   // Write the selector into a buffer.
   const selectorBuf = Buffer.from(selector, 'hex');
 
-  const contentBuf = Buffer.concat([selectorBuf, ...contentPreimage.map(field => field.toBuffer())]);
-  const content = sha256ToField(contentBuf);
+  const content = sha256ToField([selectorBuf, ...contentPreimage]);
   const secretHash = computeMessageSecretHash(secret);
 
   // Eventually the kernel will need to prove the kernel portal pair exists within the contract tree,

package/src/utils.ts

@@ -1,5 +1,5 @@
 import { pedersenHash } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { type Fr } from '@aztec/foundation/fields';
 
 /**
  * Computes the resulting storage slot for an entry in a mapping.
@@ -14,5 +14,5 @@ export function computeSlotForMapping(
     toField: () => Fr;
   },
 ) {
-  return pedersenHash([mappingSlot, key.toField()].map(field => field.toBuffer()));
+  return pedersenHash([mappingSlot, key.toField()]);
 }