@aztec/simulator 0.81.0 → 0.82.0

package/src/private/unconstrained_execution_oracle.ts

@@ -103,11 +103,11 @@ export class UnconstrainedExecutionOracle extends TypedOracle {
    * @param leafSlot - The slot of the public data tree to get the witness for.
    * @returns - The witness
    */
-  public override async getPublicDataTreeWitness(
+  public override async getPublicDataWitness(
     blockNumber: number,
     leafSlot: Fr,
   ): Promise<PublicDataWitness | undefined> {
-    return await this.executionDataProvider.getPublicDataTreeWitness(blockNumber, leafSlot);
+    return await this.executionDataProvider.getPublicDataWitness(blockNumber, leafSlot);
   }
 
   /**
@@ -149,10 +149,7 @@ export class UnconstrainedExecutionOracle extends TypedOracle {
    * @returns Authentication witness for the requested message hash.
    */
   public override getAuthWitness(messageHash: Fr): Promise<Fr[] | undefined> {
-    return Promise.resolve(
-      this.authWitnesses.find(w => w.requestHash.equals(messageHash))?.witness ??
-        this.executionDataProvider.getAuthWitness(messageHash),
-    );
+    return Promise.resolve(this.authWitnesses.find(w => w.requestHash.equals(messageHash))?.witness);
   }
 
   /**

package/src/public/avm/avm_simulator.ts

@@ -12,7 +12,6 @@ import { AvmContractCallResult } from './avm_contract_call_result.js';
 import { AvmExecutionEnvironment } from './avm_execution_environment.js';
 import type { Gas } from './avm_gas.js';
 import { AvmMachineState } from './avm_machine_state.js';
-import { isAvmBytecode } from './bytecode_utils.js';
 import {
   AvmExecutionError,
   AvmRevertReason,
@@ -139,7 +138,6 @@ export class AvmSimulator {
    */
   public async executeBytecode(bytecode: Buffer): Promise<AvmContractCallResult> {
     const startTotalTime = performance.now();
-    assert(isAvmBytecode(bytecode), "AVM simulator can't execute non-AVM bytecode");
     assert(bytecode.length > 0, "AVM simulator can't execute empty bytecode");
 
     this.bytecode = bytecode;

package/src/public/avm/journal/journal.ts

@@ -194,7 +194,7 @@ export class AvmPersistableStateManager {
    * @returns true if the note hash exists at the given leaf index, false otherwise
    */
   public async checkNoteHashExists(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr): Promise<boolean> {
-    const gotLeafValue = (await this.treesDB.getCommitmentValue(leafIndex.toBigInt())) ?? Fr.ZERO;
+    const gotLeafValue = (await this.treesDB.getNoteHash(leafIndex.toBigInt())) ?? Fr.ZERO;
     const exists = gotLeafValue.equals(noteHash);
     this.log.trace(
       `noteHashes(${contractAddress})@${noteHash} ?? leafIndex: ${leafIndex} | gotLeafValue: ${gotLeafValue}, exists: ${exists}.`,

package/src/public/avm/test_utils.ts

@@ -28,7 +28,7 @@ export function mockStorageReadWithMap(worldStateDB: PublicTreesDB, mockedStorag
 }
 
 export function mockNoteHashExists(worldStateDB: PublicTreesDB, _leafIndex: Fr, value?: Fr) {
-  (worldStateDB as jest.Mocked<PublicTreesDB>).getCommitmentValue.mockImplementation((index: bigint) => {
+  (worldStateDB as jest.Mocked<PublicTreesDB>).getNoteHash.mockImplementation((index: bigint) => {
     if (index == _leafIndex.toBigInt()) {
       return Promise.resolve(value);
     } else {

package/src/public/public_db_sources.ts

@@ -431,13 +431,13 @@ export class PublicTreesDB extends ForwardMerkleTree implements PublicStateDBInt
     return leafValue;
   }
 
-  public async getCommitmentValue(leafIndex: bigint): Promise<Fr | undefined> {
+  public async getNoteHash(leafIndex: bigint): Promise<Fr | undefined> {
     const timer = new Timer();
     const leafValue = await this.db.getLeafValue(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
-    this.logger.debug(`[DB] Fetched commitment leaf value`, {
+    this.logger.debug(`[DB] Fetched note hash leaf value`, {
       eventName: 'public-db-access',
       duration: timer.ms(),
-      operation: 'get-commitment-leaf-value',
+      operation: 'get-note-hash',
     } satisfies PublicDBAccessStats);
     return leafValue;
   }

package/src/testing.ts

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

package/dest/public/avm/bytecode_utils.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-export declare function markBytecodeAsAvm(bytecode: Buffer): Buffer;
-export declare function isAvmBytecode(bytecode: Buffer): boolean;
-//# sourceMappingURL=bytecode_utils.d.ts.map

package/dest/public/avm/bytecode_utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bytecode_utils.d.ts","sourceRoot":"","sources":["../../../src/public/avm/bytecode_utils.ts"],"names":[],"mappings":";;AASA,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGvD"}

package/dest/public/avm/bytecode_utils.js

@@ -1,17 +0,0 @@
-import { Opcode } from './serialization/instruction_serialization.js';
-const AVM_MAGIC_SUFFIX = Buffer.from([
-    Opcode.MOV_16,
-    0x00,
-    ...Buffer.from('18ca', 'hex'),
-    ...Buffer.from('18ca', 'hex')
-]);
-export function markBytecodeAsAvm(bytecode) {
-    return Buffer.concat([
-        bytecode,
-        AVM_MAGIC_SUFFIX
-    ]);
-}
-export function isAvmBytecode(bytecode) {
-    const magicSize = AVM_MAGIC_SUFFIX.length;
-    return bytecode.subarray(-magicSize).equals(AVM_MAGIC_SUFFIX);
-}

package/src/public/avm/bytecode_utils.ts

@@ -1,17 +0,0 @@
-import { Opcode } from './serialization/instruction_serialization.js';
-
-const AVM_MAGIC_SUFFIX = Buffer.from([
-  Opcode.MOV_16, // opcode
-  0x00, // indirect
-  ...Buffer.from('18ca', 'hex'), // srcOffset
-  ...Buffer.from('18ca', 'hex'), // dstOffset
-]);
-
-export function markBytecodeAsAvm(bytecode: Buffer): Buffer {
-  return Buffer.concat([bytecode, AVM_MAGIC_SUFFIX]);
-}
-
-export function isAvmBytecode(bytecode: Buffer): boolean {
-  const magicSize = AVM_MAGIC_SUFFIX.length;
-  return bytecode.subarray(-magicSize).equals(AVM_MAGIC_SUFFIX);
-}