@aztec/simulator 0.42.0 → 0.44.0

package/src/acvm/oracle/oracle.ts

@@ -1,6 +1,6 @@
 import { MerkleTreeId, UnencryptedL2Log } from '@aztec/circuit-types';
 import { KeyValidationRequest } from '@aztec/circuits.js';
-import { EventSelector, FunctionSelector } from '@aztec/foundation/abi';
+import { EventSelector, FunctionSelector, NoteSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
 
@@ -49,6 +49,14 @@ export class Oracle {
     return toACVMField(await this.typedOracle.getContractAddress());
   }
 
+  async getVersion(): Promise<ACVMField> {
+    return toACVMField(await this.typedOracle.getVersion());
+  }
+
+  async getChainId(): Promise<ACVMField> {
+    return toACVMField(await this.typedOracle.getChainId());
+  }
+
   async getKeyValidationRequest([pkMHash]: ACVMField[]): Promise<ACVMField[]> {
     const { pkM, skApp } = await this.typedOracle.getKeyValidationRequest(fromACVMField(pkMHash));
 
@@ -244,7 +252,7 @@ export class Oracle {
   ): ACVMField {
     this.typedOracle.notifyCreatedNote(
       fromACVMField(storageSlot),
-      fromACVMField(noteTypeId),
+      NoteSelector.fromField(fromACVMField(noteTypeId)),
       note.map(fromACVMField),
       fromACVMField(innerNoteHash),
       +counter,
@@ -289,15 +297,15 @@ export class Oracle {
     return newValues.map(toACVMField);
   }
 
-  emitEncryptedLog(
+  emitEncryptedEventLog(
     [contractAddress]: ACVMField[],
     [randomness]: ACVMField[],
-    encryptedLog: ACVMField[],
+    encryptedEvent: ACVMField[],
     [counter]: ACVMField[],
   ): void {
     // Convert each field to a number and then to a buffer (1 byte is stored in 1 field)
-    const processedInput = Buffer.from(encryptedLog.map(fromACVMField).map(f => f.toNumber()));
-    this.typedOracle.emitEncryptedLog(
+    const processedInput = Buffer.from(encryptedEvent.map(fromACVMField).map(f => f.toNumber()));
+    this.typedOracle.emitEncryptedEventLog(
       AztecAddress.fromString(contractAddress),
       Fr.fromString(randomness),
       processedInput,
@@ -311,7 +319,36 @@ export class Oracle {
     this.typedOracle.emitEncryptedNoteLog(+noteHashCounter, processedInput, +counter);
   }
 
-  computeEncryptedLog(
+  computeEncryptedEventLog(
+    [contractAddress]: ACVMField[],
+    [randomness]: ACVMField[],
+    [eventTypeId]: ACVMField[],
+    [ovskApp]: ACVMField[],
+    [ovpkMX]: ACVMField[],
+    [ovpkMY]: ACVMField[],
+    [ivpkMX]: ACVMField[],
+    [ivpkMY]: ACVMField[],
+    preimage: ACVMField[],
+  ): ACVMField[] {
+    const ovpkM = new Point(fromACVMField(ovpkMX), fromACVMField(ovpkMY));
+    const ovKeys = new KeyValidationRequest(ovpkM, Fr.fromString(ovskApp));
+    const ivpkM = new Point(fromACVMField(ivpkMX), fromACVMField(ivpkMY));
+    const encLog = this.typedOracle.computeEncryptedEventLog(
+      AztecAddress.fromString(contractAddress),
+      Fr.fromString(randomness),
+      Fr.fromString(eventTypeId),
+      ovKeys,
+      ivpkM,
+      preimage.map(fromACVMField),
+    );
+    const bytes: ACVMField[] = [];
+    encLog.forEach(v => {
+      bytes.push(toACVMField(v));
+    });
+    return bytes;
+  }
+
+  computeEncryptedNoteLog(
     [contractAddress]: ACVMField[],
     [storageSlot]: ACVMField[],
     [noteTypeId]: ACVMField[],
@@ -325,10 +362,10 @@ export class Oracle {
     const ovpkM = new Point(fromACVMField(ovpkMX), fromACVMField(ovpkMY));
     const ovKeys = new KeyValidationRequest(ovpkM, Fr.fromString(ovskApp));
     const ivpkM = new Point(fromACVMField(ivpkMX), fromACVMField(ivpkMY));
-    const encLog = this.typedOracle.computeEncryptedLog(
+    const encLog = this.typedOracle.computeEncryptedNoteLog(
       AztecAddress.fromString(contractAddress),
       Fr.fromString(storageSlot),
-      Fr.fromString(noteTypeId),
+      NoteSelector.fromField(Fr.fromString(noteTypeId)),
       ovKeys,
       ivpkM,
       preimage.map(fromACVMField),

package/src/acvm/oracle/typed_oracle.ts

@@ -16,7 +16,7 @@ import {
   type PrivateCallStackItem,
   type PublicCallRequest,
 } from '@aztec/circuits.js';
-import { type FunctionSelector } from '@aztec/foundation/abi';
+import { type FunctionSelector, type NoteSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type ContractInstance } from '@aztec/types/contracts';
@@ -90,6 +90,14 @@ export abstract class TypedOracle {
     throw new OracleMethodNotAvailableError('getContractAddress');
   }
 
+  getChainId(): Promise<Fr> {
+    throw new OracleMethodNotAvailableError('getChainId');
+  }
+
+  getVersion(): Promise<Fr> {
+    throw new OracleMethodNotAvailableError('getVersion');
+  }
+
   getKeyValidationRequest(_pkMHash: Fr): Promise<KeyValidationRequest> {
     throw new OracleMethodNotAvailableError('getKeyValidationRequest');
   }
@@ -156,7 +164,13 @@ export abstract class TypedOracle {
     throw new OracleMethodNotAvailableError('getNotes');
   }
 
-  notifyCreatedNote(_storageSlot: Fr, _noteTypeId: Fr, _note: Fr[], _innerNoteHash: Fr, _counter: number): void {
+  notifyCreatedNote(
+    _storageSlot: Fr,
+    _noteTypeId: NoteSelector,
+    _note: Fr[],
+    _innerNoteHash: Fr,
+    _counter: number,
+  ): void {
     throw new OracleMethodNotAvailableError('notifyCreatedNote');
   }
 
@@ -184,23 +198,39 @@ export abstract class TypedOracle {
     throw new OracleMethodNotAvailableError('storageWrite');
   }
 
-  emitEncryptedLog(_contractAddress: AztecAddress, _randomness: Fr, _encryptedNote: Buffer, _counter: number): void {
-    throw new OracleMethodNotAvailableError('emitEncryptedLog');
+  emitEncryptedEventLog(
+    _contractAddress: AztecAddress,
+    _randomness: Fr,
+    _encryptedEvent: Buffer,
+    _counter: number,
+  ): void {
+    throw new OracleMethodNotAvailableError('emitEncryptedEventLog');
   }
 
   emitEncryptedNoteLog(_noteHashCounter: number, _encryptedNote: Buffer, _counter: number): void {
     throw new OracleMethodNotAvailableError('emitEncryptedNoteLog');
   }
 
-  computeEncryptedLog(
+  computeEncryptedEventLog(
+    _contractAddress: AztecAddress,
+    _randomness: Fr,
+    _eventTypeId: Fr,
+    _ovKeys: KeyValidationRequest,
+    _ivpkM: PublicKey,
+    _preimage: Fr[],
+  ): Buffer {
+    throw new OracleMethodNotAvailableError('computeEncryptedEventLog');
+  }
+
+  computeEncryptedNoteLog(
     _contractAddress: AztecAddress,
     _storageSlot: Fr,
-    _noteTypeId: Fr,
+    _noteTypeId: NoteSelector,
     _ovKeys: KeyValidationRequest,
     _ivpkM: PublicKey,
     _preimage: Fr[],
   ): Buffer {
-    throw new OracleMethodNotAvailableError('computeEncryptedLog');
+    throw new OracleMethodNotAvailableError('computeEncryptedNoteLog');
   }
 
   emitUnencryptedLog(_log: UnencryptedL2Log, _counter: number): void {

package/src/avm/avm_execution_environment.ts

@@ -19,6 +19,7 @@ export class AvmContextInputs {
  */
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3992): gas not implemented
 export class AvmExecutionEnvironment {
+  private readonly calldataPrefixLength;
   constructor(
     public readonly address: AztecAddress,
     public readonly storageAddress: AztecAddress,
@@ -45,8 +46,9 @@ export class AvmExecutionEnvironment {
       temporaryFunctionSelector.toField(),
       computeVarArgsHash(calldata),
       isStaticCall,
-    );
-    this.calldata = [...inputs.toFields(), ...calldata];
+    ).toFields();
+    this.calldata = [...inputs, ...calldata];
+    this.calldataPrefixLength = inputs.length;
   }
 
   private deriveEnvironmentForNestedCallInternal(
@@ -62,7 +64,7 @@ export class AvmExecutionEnvironment {
       /*sender=*/ this.address,
       this.feePerL2Gas,
       this.feePerDaGas,
-      this.contractCallDepth,
+      this.contractCallDepth.add(Fr.ONE),
       this.header,
       this.globals,
       isStaticCall,
@@ -109,4 +111,9 @@ export class AvmExecutionEnvironment {
   ): AvmExecutionEnvironment {
     throw new Error('Delegate calls not supported!');
   }
+
+  public getCalldataWithoutPrefix(): Fr[] {
+    // clip off the first few entries
+    return this.calldata.slice(this.calldataPrefixLength);
+  }
 }

package/src/avm/avm_gas.ts

@@ -122,6 +122,8 @@ const BaseGasCosts: Record<Opcode, Gas> = {
   [Opcode.POSEIDON2]: DefaultBaseGasCost,
   [Opcode.SHA256]: DefaultBaseGasCost,
   [Opcode.PEDERSEN]: DefaultBaseGasCost,
+  [Opcode.ECADD]: DefaultBaseGasCost,
+  [Opcode.MSM]: DefaultBaseGasCost,
   // Conversions
   [Opcode.TORADIXLE]: DefaultBaseGasCost,
 };

package/src/avm/avm_memory_types.ts

@@ -298,9 +298,7 @@ export class TaggedMemory implements TaggedMemoryInterface {
   }
 
   public checkIsValidMemoryOffsetTag(offset: number) {
-    if (this.getTag(offset) > TypeTag.UINT64) {
-      throw TagCheckError.forOffset(offset, TypeTag[this.getTag(offset)], 'UINT64');
-    }
+    this.checkTag(TypeTag.UINT32, offset);
   }
 
   public static checkIsIntegralTag(tag: TypeTag) {

package/src/avm/avm_simulator.ts

@@ -29,10 +29,9 @@ export class AvmSimulator {
    * Fetch the bytecode and execute it in the current context.
    */
   public async execute(): Promise<AvmContractCallResults> {
-    const selector = this.context.environment.temporaryFunctionSelector;
-    const bytecode = await this.context.persistableState.hostStorage.contractsDb.getBytecode(
+    const bytecode = await this.context.persistableState.getBytecode(
       this.context.environment.address,
-      selector,
+      this.context.environment.temporaryFunctionSelector,
     );
 
     // This assumes that we will not be able to send messages to accounts without code

package/src/avm/fixtures/index.ts

@@ -3,19 +3,22 @@ import { FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { AvmNestedCallsTestContractArtifact, AvmTestContractArtifact } from '@aztec/noir-contracts.js';
+import { AvmTestContractArtifact } from '@aztec/noir-contracts.js';
 
 import { strict as assert } from 'assert';
 import { mock } from 'jest-mock-extended';
 import merge from 'lodash.merge';
 
 import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../index.js';
+import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js';
 import { AvmContext } from '../avm_context.js';
 import { AvmContextInputs, AvmExecutionEnvironment } from '../avm_execution_environment.js';
 import { AvmMachineState } from '../avm_machine_state.js';
 import { Field, Uint8 } from '../avm_memory_types.js';
 import { HostStorage } from '../journal/host_storage.js';
 import { AvmPersistableStateManager } from '../journal/journal.js';
+import { NullifierManager } from '../journal/nullifiers.js';
+import { PublicStorage } from '../journal/public_storage.js';
 
 /**
  * Create a new AVM context with default values.
@@ -26,7 +29,7 @@ export function initContext(overrides?: {
   machineState?: AvmMachineState;
 }): AvmContext {
   return new AvmContext(
-    overrides?.persistableState || initMockPersistableStateManager(),
+    overrides?.persistableState || initPersistableStateManager(),
     overrides?.env || initExecutionEnvironment(),
     overrides?.machineState || initMachineState(),
   );
@@ -45,9 +48,20 @@ export function initHostStorage(overrides?: {
   );
 }
 
-/** Creates an empty state manager with mocked storage. */
-export function initMockPersistableStateManager(): AvmPersistableStateManager {
-  return new AvmPersistableStateManager(initHostStorage());
+/** Creates an empty state manager with mocked host storage. */
+export function initPersistableStateManager(overrides?: {
+  hostStorage?: HostStorage;
+  trace?: PublicSideEffectTraceInterface;
+  publicStorage?: PublicStorage;
+  nullifiers?: NullifierManager;
+}): AvmPersistableStateManager {
+  const hostStorage = overrides?.hostStorage || initHostStorage();
+  return new AvmPersistableStateManager(
+    hostStorage,
+    overrides?.trace || mock<PublicSideEffectTraceInterface>(),
+    overrides?.publicStorage || new PublicStorage(hostStorage.publicStateDb),
+    overrides?.nullifiers || new NullifierManager(hostStorage.commitmentsDb),
+  );
 }
 
 /**
@@ -136,12 +150,3 @@ export function getAvmTestContractBytecode(functionName: string): Buffer {
   );
   return artifact.bytecode;
 }
-
-export function getAvmNestedCallsTestContractBytecode(functionName: string): Buffer {
-  const artifact = AvmNestedCallsTestContractArtifact.functions.find(f => f.name === functionName)!;
-  assert(
-    !!artifact?.bytecode,
-    `No bytecode found for function ${functionName}. Try re-running bootstrap.sh on the repository root.`,
-  );
-  return artifact.bytecode;
-}