@aztec/simulator 0.80.0 → 0.82.0

package/dest/public/side_effect_trace_interface.d.ts

@@ -1,34 +1,20 @@
 import type { Fr } from '@aztec/foundation/fields';
-import type { AvmPublicDataReadTreeHint } from '@aztec/stdlib/avm';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ContractClassWithCommitment, SerializableContractInstance } from '@aztec/stdlib/contract';
 import type { PublicCallRequest } from '@aztec/stdlib/kernel';
 import type { PublicLog } from '@aztec/stdlib/logs';
-import type { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees';
 export interface PublicSideEffectTraceInterface {
     fork(): PublicSideEffectTraceInterface;
     merge(nestedTrace: PublicSideEffectTraceInterface, reverted?: boolean): void;
     getCounter(): number;
-    tracePublicStorageRead(contractAddress: AztecAddress, slot: Fr, value: Fr, leafPreimage?: PublicDataTreeLeafPreimage, leafIndex?: Fr, path?: Fr[]): void;
     tracePublicStorageWrite(contractAddress: AztecAddress, slot: Fr, // This is the storage slot not the computed leaf slot
-    value: Fr, protocolWrite: boolean, lowLeafPreimage?: PublicDataTreeLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], newLeafPreimage?: PublicDataTreeLeafPreimage, insertionPath?: Fr[]): Promise<void>;
-    traceNoteHashCheck(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr, exists: boolean, path?: Fr[]): void;
-    traceNewNoteHash(uniqueNoteHash: Fr, leafIndex?: Fr, path?: Fr[]): void;
+    value: Fr, protocolWrite: boolean): Promise<void>;
+    traceNewNoteHash(uniqueNoteHash: Fr): void;
     getNoteHashCount(): number;
-    traceNullifierCheck(siloedNullifier: Fr, exists: boolean, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[]): void;
-    traceNewNullifier(siloedNullifier: Fr, lowLeafPreimage?: NullifierLeafPreimage, lowLeafIndex?: Fr, lowLeafPath?: Fr[], insertionPath?: Fr[]): void;
-    traceL1ToL2MessageCheck(contractAddress: AztecAddress, msgHash: Fr, msgLeafIndex: Fr, exists: boolean, path?: Fr[]): void;
+    traceNewNullifier(siloedNullifier: Fr): void;
     traceNewL2ToL1Message(contractAddress: AztecAddress, recipient: Fr, content: Fr): void;
     tracePublicLog(contractAddress: AztecAddress, log: Fr[]): void;
-    traceGetContractInstance(contractAddress: AztecAddress, exists: boolean, instance?: SerializableContractInstance, updateMembershipHint?: AvmPublicDataReadTreeHint, updatePreimage?: Fr[]): void;
-    traceGetContractClass(contractClassId: Fr, exists: boolean, contractClass?: ContractClassWithCommitment): void;
-    traceEnqueuedCall(
-    /** The call request from private that enqueued this call. */
-    publicCallRequest: PublicCallRequest, 
-    /** The call's calldata */
-    calldata: Fr[], 
-    /** Did the call revert? */
-    reverted: boolean): void;
+    traceGetContractClass(contractClassId: Fr, exists: boolean): void;
+    traceEnqueuedCall(publicCallRequest: PublicCallRequest): void;
     getPublicLogs(): PublicLog[];
 }
 //# sourceMappingURL=side_effect_trace_interface.d.ts.map

package/dest/public/side_effect_trace_interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"side_effect_trace_interface.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace_interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,WAAW,8BAA8B;IAC7C,IAAI,IAAI,8BAA8B,CAAC;IACvC,KAAK,CAAC,WAAW,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7E,UAAU,IAAI,MAAM,CAAC;IAErB,uBAAuB,CACrB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,EAAE,EAAE,sDAAsD;IAChE,KAAK,EAAE,EAAE,EACT,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,gBAAgB,CAAC,cAAc,EAAE,EAAE,GAAG,IAAI,CAAC;IAC3C,gBAAgB,IAAI,MAAM,CAAC;IAC3B,iBAAiB,CAAC,eAAe,EAAE,EAAE,GAAG,IAAI,CAAC;IAC7C,qBAAqB,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC;IACvF,cAAc,CAAC,eAAe,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAC/D,qBAAqB,CAAC,eAAe,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IAClE,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAC9D,aAAa,IAAI,SAAS,EAAE,CAAC;CAC9B"}

package/dest/testing.d.ts

@@ -0,0 +1,2 @@
+export { SimulationProviderRecorderWrapper } from './private/providers/circuit_recording/simulation_provider_recorder_wrapper.js';
+//# sourceMappingURL=testing.d.ts.map

package/dest/testing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,+EAA+E,CAAC"}

package/dest/testing.js

@@ -0,0 +1 @@
+export { SimulationProviderRecorderWrapper } from './private/providers/circuit_recording/simulation_provider_recorder_wrapper.js';

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.80.0",
+  "version": "0.82.0",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
     "./client": "./dest/client.js",
+    "./testing": "./dest/testing.js",
     "./public/fixtures": "./dest/public/fixtures/index.js"
   },
   "typedocOptions": {
@@ -59,16 +60,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.80.0",
-    "@aztec/foundation": "0.80.0",
-    "@aztec/noir-acvm_js": "0.80.0",
-    "@aztec/noir-noirc_abi": "0.80.0",
-    "@aztec/noir-protocol-circuits-types": "0.80.0",
-    "@aztec/noir-types": "0.80.0",
-    "@aztec/protocol-contracts": "0.80.0",
-    "@aztec/stdlib": "0.80.0",
-    "@aztec/telemetry-client": "0.80.0",
-    "@aztec/world-state": "0.80.0",
+    "@aztec/constants": "0.82.0",
+    "@aztec/foundation": "0.82.0",
+    "@aztec/noir-acvm_js": "0.82.0",
+    "@aztec/noir-noirc_abi": "0.82.0",
+    "@aztec/noir-protocol-circuits-types": "0.82.0",
+    "@aztec/noir-types": "0.82.0",
+    "@aztec/protocol-contracts": "0.82.0",
+    "@aztec/stdlib": "0.82.0",
+    "@aztec/telemetry-client": "0.82.0",
+    "@aztec/world-state": "0.82.0",
     "levelup": "^5.1.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
@@ -76,9 +77,9 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "0.80.0",
-    "@aztec/merkle-tree": "0.80.0",
-    "@aztec/noir-contracts.js": "0.80.0",
+    "@aztec/kv-store": "0.82.0",
+    "@aztec/merkle-tree": "0.82.0",
+    "@aztec/noir-contracts.js": "0.82.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/levelup": "^5.1.3",

package/src/common/db_interfaces.ts

@@ -2,7 +2,7 @@ import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import type { Fr } from '@aztec/foundation/fields';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { NullifierMembershipWitness } from '@aztec/stdlib/trees';
 
 import type { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
@@ -10,7 +10,7 @@ import type { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
 /**
  * Database interface for providing access to public state.
  */
-export interface PublicStateDB {
+export interface PublicStateDBInterface {
   /**
    * Reads a value from public storage, returning zero if none.
    * @param contract - Owner of the storage.
@@ -31,19 +31,40 @@ export interface PublicStateDB {
 /**
  * Database interface for providing access to public contract data.
  */
-export interface PublicContractsDB {
+export interface PublicContractsDBInterface {
   /**
    * Returns a publicly deployed contract instance.
    * @param address - Address of the contract.
+   * @param blockNumber - The block number at which to retrieve the contract instance.
    * @returns The contract instance or undefined if not found.
    */
-  getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+  getContractInstance(address: AztecAddress, blockNumber: number): Promise<ContractInstanceWithAddress | undefined>;
 
+  /**
+   * Returns a publicly deployed contract class.
+   * @param contractClassId - ID of the contract class.
+   * @returns The contract class or undefined if not found
+   */
+  getContractClass(contractClassId: Fr): Promise<ContractClassPublic | undefined>;
+
+  /**
+   * Returns the commitment to the bytecode of a contract class.
+   * @param contractClassId - ID of the contract class.
+   * @returns The commitment to the bytecode or undefined if not found.
+   */
+  getBytecodeCommitment(contractClassId: Fr): Promise<Fr | undefined>;
+
+  /**
+   * Returns the function name of a contract's function given its selector.
+   * @param contractAddress - Address of the contract.
+   * @param selector - Selector of the function.
+   * @returns The name of the function or undefined if not found.
+   */
   getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
 }
 
-/** Database interface for providing access to commitment tree, l1 to l2 message tree, and nullifier tree. */
-export interface CommitmentsDB {
+/** Database interface for providing access to note hash tree, l1 to l2 message tree, and nullifier tree. */
+export interface CommitmentsDBInterface {
   /**
    * Fetches a message from the db, given its key.
    * @param contractAddress - Address of a contract by which the message was emitted.
@@ -60,23 +81,16 @@ export interface CommitmentsDB {
 
   /**
    * @param leafIndex the leaf to look up
-   * @returns The l1 to l2 leaf value or undefined if not found.
-   */
-  getL1ToL2LeafValue(leafIndex: bigint): Promise<Fr | undefined>;
-
-  /**
-   * Gets the index of a commitment in the note hash tree.
-   * @param commitment - The commitment.
-   * @returns - The index of the commitment. Undefined if it does not exist in the tree.
+   * @returns The l1 to l2 leaf message hash or undefined if not found.
    */
-  getCommitmentIndex(commitment: Fr): Promise<bigint | undefined>;
+  getL1ToL2MessageHash(leafIndex: bigint): Promise<Fr | undefined>;
 
   /**
-   * Gets commitment in the note hash tree given a leaf index.
+   * Gets note hash in the note hash tree at the given leaf index.
    * @param leafIndex - the leaf to look up.
-   * @returns - The commitment at that index. Undefined if leaf index is not found.
+   * @returns - The note hash at that index. Undefined if leaf index is not found.
    */
-  getCommitmentValue(leafIndex: bigint): Promise<Fr | undefined>;
+  getNoteHash(leafIndex: bigint): Promise<Fr | undefined>;
 
   /**
    * Gets the index of a nullifier in the nullifier tree.

package/src/common/debug_fn_name.ts

@@ -2,10 +2,10 @@ import type { Fr } from '@aztec/foundation/fields';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
-import type { WorldStateDB } from '../public/public_db_sources.js';
+import type { PublicContractsDBInterface } from './db_interfaces.js';
 
 export async function getPublicFunctionDebugName(
-  db: WorldStateDB,
+  db: PublicContractsDBInterface,
   contractAddress: AztecAddress,
   calldata: Fr[],
 ): Promise<string> {

package/src/common/message_load_oracle_inputs.ts

@@ -12,4 +12,12 @@ export class MessageLoadOracleInputs<N extends number> {
   toFields(): Fr[] {
     return [new Fr(this.index), ...this.siblingPath.toFields()];
   }
+
+  /**
+   * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
+   */
+  public toNoirRepresentation(): (string | string[])[] {
+    // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
+    return [new Fr(this.index).toString() as string, this.siblingPath.toFields().map(fr => fr.toString()) as string[]];
+  }
 }

package/src/private/acvm/acvm.ts

@@ -15,18 +15,7 @@ import type { ORACLE_NAMES } from './oracle/index.js';
 /**
  * The callback interface for the ACIR.
  */
-export type ACIRCallback = Record<
-  ORACLE_NAMES,
-  (
-    ...args: ForeignCallInput[]
-  ) =>
-    | void
-    | Promise<void>
-    | ForeignCallOutput
-    | ForeignCallOutput[]
-    | Promise<ForeignCallOutput>
-    | Promise<ForeignCallOutput[]>
->;
+export type ACIRCallback = Record<ORACLE_NAMES, (...args: ForeignCallInput[]) => Promise<ForeignCallOutput[]>>;
 
 /**
  * The result of executing an ACIR.
@@ -43,6 +32,11 @@ export interface ACIRExecutionResult {
 
 /**
  * The function call that executes an ACIR.
+ * @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.
+ * @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.
  */
 export async function acvm(
   acir: Buffer,
@@ -54,7 +48,7 @@ export async function acvm(
   const solvedAndReturnWitness = await executeCircuitWithReturnWitness(
     acir,
     initialWitness,
-    async (name: string, args: ForeignCallInput[]) => {
+    (name: string, args: ForeignCallInput[]) => {
       try {
         logger.debug(`Oracle callback ${name}`);
         const oracleFunction = callback[name as ORACLE_NAMES];
@@ -62,17 +56,7 @@ export async function acvm(
           throw new Error(`Oracle callback ${name} not found`);
         }
 
-        const result = await oracleFunction.call(callback, ...args);
-
-        if (typeof result === 'undefined') {
-          return [];
-        } else if (result instanceof Array && !result.every(item => typeof item === 'string')) {
-          // We are dealing with a nested array which means that we do not need it wrap it in another array as to have
-          // the nested array structure it is already "wrapped".
-          return result;
-        } else {
-          return [result] as ForeignCallOutput[];
-        }
+        return oracleFunction.call(callback, ...args);
       } catch (err) {
         let typedError: Error;
         if (err instanceof Error) {

package/src/private/acvm/deserialize.ts

@@ -1,34 +1,8 @@
 import { Fr } from '@aztec/foundation/fields';
+import { hexToBuffer } from '@aztec/foundation/string';
 
 import type { ACVMField, ACVMWitness } from './acvm_types.js';
 
-/**
- * Converts an ACVM field to a Fr.
- * @param field - The ACVM field to convert.
- * @returns The Fr.
- */
-export function fromACVMField(field: ACVMField): Fr {
-  return Fr.fromBuffer(Buffer.from(field.slice(2), 'hex'));
-}
-
-/**
- * Converts a field to a number.
- * @param fr - The field to convert.
- * @returns The number.
- * TODO(#4102): Nuke this once block number is big int.
- */
-export function frToNumber(fr: Fr): number {
-  return Number(fr.value);
-}
-
-/**
- * Converts a field to a boolean.
- * @param fr - The field to convert.
- */
-export function frToBoolean(fr: Fr): boolean {
-  return fr.toBigInt() === BigInt(1);
-}
-
 /**
  * Converts a Noir BoundedVec of Fields into an Fr array. Note that BoundedVecs are structs, and therefore translated as
  * two separate ACVMField values (an array and a single field).
@@ -38,7 +12,25 @@ export function frToBoolean(fr: Fr): boolean {
  * @returns An array with the same content as the Noir version. Elements past the length are discarded.
  */
 export function fromBoundedVec(storage: ACVMField[], length: ACVMField): Fr[] {
-  return storage.slice(0, frToNumber(fromACVMField(length))).map(fromACVMField);
+  return storage.slice(0, Fr.fromString(length).toNumber()).map(Fr.fromString);
+}
+
+/**
+ * Converts a Noir BoundedVec of unsigned integers into a Buffer. Note that BoundedVecs are structs, and therefore
+ * translated as two separate ACVMField values (an array and a single field).
+ *
+ * @param storage The array with the BoundedVec's storage (i.e. BoundedVec::storage())
+ * @param length The length of the BoundedVec (i.e. BoundedVec::len())
+ * @param uintBitSize If it's an array of Noir u8's, put `8`, etc.
+ * @returns A buffer containing the unsigned integers tightly packed
+ */
+export function fromUintBoundedVec(storage: ACVMField[], length: ACVMField, uintBitSize: number): Buffer {
+  if (uintBitSize % 8 !== 0) {
+    throw new Error(`u${uintBitSize} is not a supported type in Noir`);
+  }
+  const uintByteSize = uintBitSize / 8;
+  const boundedStorage = storage.slice(0, Fr.fromString(length).toNumber());
+  return Buffer.concat(boundedStorage.map(str => hexToBuffer(str).subarray(-uintByteSize)));
 }
 
 /**
@@ -48,5 +40,19 @@ export function fromBoundedVec(storage: ACVMField[], length: ACVMField): Fr[] {
  */
 export function witnessMapToFields(witness: ACVMWitness): Fr[] {
   const sortedKeys = [...witness.keys()].sort((a, b) => a - b);
-  return sortedKeys.map(key => witness.get(key)!).map(fromACVMField);
+  return sortedKeys.map(key => witness.get(key)!).map(Fr.fromString);
+}
+
+/**
+ * Converts an array of Noir unsigned integers to a single tightly-packed buffer.
+ * @param uintBitSize If it's an array of Noir u8's, put `8`, etc.
+ * @returns A buffer where each byte is correctly represented as a single byte in the buffer.
+ * Copy of the function in txe/src/util/encoding.ts.
+ */
+export function fromUintArray(obj: ACVMField[], uintBitSize: number): Buffer {
+  if (uintBitSize % 8 !== 0) {
+    throw new Error(`u${uintBitSize} is not a supported type in Noir`);
+  }
+  const uintByteSize = uintBitSize / 8;
+  return Buffer.concat(obj.map(str => hexToBuffer(str).slice(-uintByteSize)));
 }