@aztec/simulator 0.36.0 → 0.38.0

package/dest/public/transitional_adaptors.js

@@ -1,13 +1,10 @@
 // All code in this file needs to die once the public executor is phased out in favor of the AVM.
-import { UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
-import { CallContext, ContractStorageRead, ContractStorageUpdateRequest, FunctionData, Gas, L2ToL1Message, NoteHash, Nullifier, ReadRequest, SideEffect, } from '@aztec/circuits.js';
+import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
+import { CallContext, FunctionData, } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
-import { AvmContractCallResults } from '../avm/avm_message_call_result.js';
 import { Mov } from '../avm/opcodes/memory.js';
 import { createSimulationError } from '../common/errors.js';
-import { PackedValuesCache, SideEffectCounter } from '../index.js';
-import { PublicExecutionContext } from './public_execution_context.js';
 /**
  * Convert a PublicExecution(Environment) object to an AvmExecutionEnvironment
  *
@@ -19,131 +16,42 @@ export function createAvmExecutionEnvironment(current, header, globalVariables,
     return new AvmExecutionEnvironment(current.contractAddress, current.callContext.storageContractAddress, current.callContext.msgSender, globalVariables.gasFees.feePerL2Gas, globalVariables.gasFees.feePerDaGas, 
     /*contractCallDepth=*/ Fr.zero(), header, globalVariables, current.callContext.isStaticCall, current.callContext.isDelegateCall, current.args, gasSettings, transactionFee, current.functionData.selector);
 }
-export function createPublicExecutionContext(avmContext, calldata) {
-    const sideEffectCounter = avmContext.persistableState.trace.accessCounter;
+export function createPublicExecution(startSideEffectCounter, avmEnvironment, calldata) {
     const callContext = CallContext.from({
-        msgSender: avmContext.environment.sender,
-        storageContractAddress: avmContext.environment.storageAddress,
-        functionSelector: avmContext.environment.temporaryFunctionSelector,
-        isDelegateCall: avmContext.environment.isDelegateCall,
-        isStaticCall: avmContext.environment.isStaticCall,
-        sideEffectCounter: sideEffectCounter,
+        msgSender: avmEnvironment.sender,
+        storageContractAddress: avmEnvironment.storageAddress,
+        functionSelector: avmEnvironment.temporaryFunctionSelector,
+        isDelegateCall: avmEnvironment.isDelegateCall,
+        isStaticCall: avmEnvironment.isStaticCall,
+        sideEffectCounter: startSideEffectCounter,
     });
-    const functionData = new FunctionData(avmContext.environment.temporaryFunctionSelector, /*isPrivate=*/ false);
+    const functionData = new FunctionData(avmEnvironment.temporaryFunctionSelector, /*isPrivate=*/ false);
     const execution = {
-        contractAddress: avmContext.environment.address,
+        contractAddress: avmEnvironment.address,
         callContext,
         args: calldata,
         functionData,
     };
-    const packedArgs = PackedValuesCache.create([]);
-    const context = new PublicExecutionContext(execution, avmContext.environment.header, avmContext.environment.globals, packedArgs, new SideEffectCounter(sideEffectCounter), avmContext.persistableState.hostStorage.publicStateDb, avmContext.persistableState.hostStorage.contractsDb, avmContext.persistableState.hostStorage.commitmentsDb, Gas.from(avmContext.machineState.gasLeft), avmContext.environment.transactionFee, avmContext.environment.gasSettings);
-    return context;
+    return execution;
 }
-/**
- * Convert the result of an AVM contract call to a PublicExecutionResult for the public kernel
- *
- * @param execution
- * @param newWorldState
- * @param result
- * @returns
- */
-export async function convertAvmResults(executionContext, newWorldState, result, endMachineState) {
-    const execution = executionContext.execution;
-    const contractStorageReads = newWorldState.storageReads.map(read => new ContractStorageRead(read.slot, read.value, read.counter.toNumber(), read.storageAddress));
-    const contractStorageUpdateRequests = newWorldState.storageWrites.map(write => new ContractStorageUpdateRequest(write.slot, write.value, write.counter.toNumber(), write.storageAddress));
-    // We need to write the storage updates to the DB, because that's what the ACVM expects.
-    // Assumes the updates are in the right order.
-    for (const write of newWorldState.storageWrites) {
-        await executionContext.stateDb.storageWrite(write.storageAddress, write.slot, write.value);
-    }
-    const newNoteHashes = newWorldState.newNoteHashes.map(noteHash => new NoteHash(noteHash.noteHash, noteHash.counter.toNumber()));
-    const nullifierReadRequests = newWorldState.nullifierChecks
-        .filter(nullifierCheck => nullifierCheck.exists)
-        .map(nullifierCheck => new ReadRequest(nullifierCheck.nullifier, nullifierCheck.counter.toNumber()));
-    const nullifierNonExistentReadRequests = newWorldState.nullifierChecks
-        .filter(nullifierCheck => !nullifierCheck.exists)
-        .map(nullifierCheck => new ReadRequest(nullifierCheck.nullifier, nullifierCheck.counter.toNumber()));
-    const newNullifiers = newWorldState.newNullifiers.map(tracedNullifier => new Nullifier(
-    /*value=*/ tracedNullifier.nullifier, tracedNullifier.counter.toNumber(), 
-    /*noteHash=*/ Fr.ZERO));
-    const unencryptedLogs = new UnencryptedFunctionL2Logs(newWorldState.newLogs.map(log => new UnencryptedL2Log(log.contractAddress, log.selector, log.data)));
-    const unencryptedLogsHashes = newWorldState.newLogsHashes.map(logHash => new SideEffect(logHash.logHash, logHash.counter));
-    const newL2ToL1Messages = newWorldState.newL1Messages.map(m => new L2ToL1Message(m.recipient, m.content));
-    const returnValues = result.output;
-    // TODO: Support nested executions.
-    const nestedExecutions = [];
-    // TODO keep track of side effect counters
-    const startSideEffectCounter = Fr.ZERO;
-    const endSideEffectCounter = Fr.ZERO;
+export function convertAvmResultsToPxResult(avmResult, startSideEffectCounter, fromPx, startGas, endAvmContext) {
+    const endPersistableState = endAvmContext.persistableState;
+    const endMachineState = endAvmContext.machineState;
     return {
-        execution,
-        nullifierReadRequests,
-        nullifierNonExistentReadRequests,
-        newNoteHashes,
-        newL2ToL1Messages,
-        startSideEffectCounter,
-        endSideEffectCounter,
-        newNullifiers,
-        contractStorageReads,
-        contractStorageUpdateRequests,
-        returnValues,
-        nestedExecutions,
-        unencryptedLogsHashes,
-        unencryptedLogs,
-        reverted: result.reverted,
-        revertReason: result.revertReason ? createSimulationError(result.revertReason) : undefined,
-        startGasLeft: executionContext.availableGas,
+        ...endPersistableState.transitionalExecutionResult, // includes nestedExecutions
+        execution: fromPx,
+        returnValues: avmResult.output,
+        startSideEffectCounter: new Fr(startSideEffectCounter),
+        endSideEffectCounter: new Fr(endPersistableState.trace.accessCounter),
+        unencryptedLogs: new UnencryptedFunctionL2Logs(endPersistableState.transitionalExecutionResult.unencryptedLogs),
+        allUnencryptedLogs: new UnencryptedFunctionL2Logs(endPersistableState.transitionalExecutionResult.allUnencryptedLogs),
+        reverted: avmResult.reverted,
+        revertReason: avmResult.revertReason ? createSimulationError(avmResult.revertReason) : undefined,
+        startGasLeft: startGas,
         endGasLeft: endMachineState.gasLeft,
-        transactionFee: executionContext.transactionFee,
+        transactionFee: endAvmContext.environment.transactionFee,
     };
 }
-export function convertPublicExecutionResult(res) {
-    return new AvmContractCallResults(res.reverted, res.returnValues, res.revertReason);
-}
-export function updateAvmContextFromPublicExecutionResult(ctx, result) {
-    // We have to push these manually and not use the trace* functions
-    // so that we respect the side effect counters.
-    for (const readRequest of result.contractStorageReads) {
-        ctx.persistableState.trace.publicStorageReads.push({
-            storageAddress: ctx.environment.storageAddress,
-            exists: true, // FIXME
-            slot: readRequest.storageSlot,
-            value: readRequest.currentValue,
-            counter: new Fr(readRequest.sideEffectCounter ?? Fr.ZERO),
-        });
-    }
-    for (const updateRequest of result.contractStorageUpdateRequests) {
-        ctx.persistableState.trace.publicStorageWrites.push({
-            storageAddress: ctx.environment.storageAddress,
-            slot: updateRequest.storageSlot,
-            value: updateRequest.newValue,
-            counter: new Fr(updateRequest.sideEffectCounter ?? Fr.ZERO),
-        });
-        // We need to manually populate the cache.
-        ctx.persistableState.publicStorage.write(ctx.environment.storageAddress, updateRequest.storageSlot, updateRequest.newValue);
-    }
-    for (const nullifier of result.newNullifiers) {
-        ctx.persistableState.trace.newNullifiers.push({
-            storageAddress: ctx.environment.storageAddress,
-            nullifier: nullifier.value,
-            counter: new Fr(nullifier.counter),
-        });
-    }
-    for (const noteHash of result.newNoteHashes) {
-        ctx.persistableState.trace.newNoteHashes.push({
-            storageAddress: ctx.environment.storageAddress,
-            noteHash: noteHash.value,
-            counter: new Fr(noteHash.counter),
-        });
-    }
-    for (const message of result.newL2ToL1Messages) {
-        ctx.persistableState.newL1Messages.push(message);
-    }
-    for (const log of result.unencryptedLogs.logs) {
-        ctx.persistableState.newLogs.push(new UnencryptedL2Log(log.contractAddress, log.selector, log.data));
-    }
-}
 const AVM_MAGIC_SUFFIX = Buffer.from([
     Mov.opcode, // opcode
     0x00, // indirect
@@ -157,4 +65,4 @@ export function isAvmBytecode(bytecode) {
     const magicSize = AVM_MAGIC_SUFFIX.length;
     return bytecode.subarray(-magicSize).equals(AVM_MAGIC_SUFFIX);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transitional_adaptors.js","sourceRoot":"","sources":["../../src/public/transitional_adaptors.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNpdGlvbmFsX2FkYXB0b3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy90cmFuc2l0aW9uYWxfYWRhcHRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaUdBQWlHO0FBQ2pHLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pFLE9BQU8sRUFDTCxXQUFXLEVBQ1gsWUFBWSxHQUtiLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRzlDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRTlFLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMvQyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUc1RDs7Ozs7O0dBTUc7QUFDSCxNQUFNLFVBQVUsNkJBQTZCLENBQzNDLE9BQXdCLEVBQ3hCLE1BQWMsRUFDZCxlQUFnQyxFQUNoQyxXQUF3QixFQUN4QixjQUFrQjtJQUVsQixPQUFPLElBQUksdUJBQXVCLENBQ2hDLE9BQU8sQ0FBQyxlQUFlLEVBQ3ZCLE9BQU8sQ0FBQyxXQUFXLENBQUMsc0JBQXNCLEVBQzFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsU0FBUyxFQUM3QixlQUFlLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFDbkMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxXQUFXO0lBQ25DLHNCQUFzQixDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFDaEMsTUFBTSxFQUNOLGVBQWUsRUFDZixPQUFPLENBQUMsV0FBVyxDQUFDLFlBQVksRUFDaEMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLEVBQ2xDLE9BQU8sQ0FBQyxJQUFJLEVBQ1osV0FBVyxFQUNYLGNBQWMsRUFDZCxPQUFPLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FDOUIsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUscUJBQXFCLENBQ25DLHNCQUE4QixFQUM5QixjQUF1QyxFQUN2QyxRQUFjO0lBRWQsTUFBTSxXQUFXLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQztRQUNuQyxTQUFTLEVBQUUsY0FBYyxDQUFDLE1BQU07UUFDaEMsc0JBQXNCLEVBQUUsY0FBYyxDQUFDLGNBQWM7UUFDckQsZ0JBQWdCLEVBQUUsY0FBYyxDQUFDLHlCQUF5QjtRQUMxRCxjQUFjLEVBQUUsY0FBYyxDQUFDLGNBQWM7UUFDN0MsWUFBWSxFQUFFLGNBQWMsQ0FBQyxZQUFZO1FBQ3pDLGlCQUFpQixFQUFFLHNCQUFzQjtLQUMxQyxDQUFDLENBQUM7SUFDSCxNQUFNLFlBQVksR0FBRyxJQUFJLFlBQVksQ0FBQyxjQUFjLENBQUMseUJBQXlCLEVBQUUsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3RHLE1BQU0sU0FBUyxHQUFvQjtRQUNqQyxlQUFlLEVBQUUsY0FBYyxDQUFDLE9BQU87UUFDdkMsV0FBVztRQUNYLElBQUksRUFBRSxRQUFRO1FBQ2QsWUFBWTtLQUNiLENBQUM7SUFDRixPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDO0FBRUQsTUFBTSxVQUFVLDJCQUEyQixDQUN6QyxTQUFpQyxFQUNqQyxzQkFBOEIsRUFDOUIsTUFBdUIsRUFDdkIsUUFBYSxFQUNiLGFBQXlCO0lBRXpCLE1BQU0sbUJBQW1CLEdBQUcsYUFBYSxDQUFDLGdCQUFnQixDQUFDO0lBQzNELE1BQU0sZUFBZSxHQUFHLGFBQWEsQ0FBQyxZQUFZLENBQUM7SUFDbkQsT0FBTztRQUNMLEdBQUcsbUJBQW1CLENBQUMsMkJBQTJCLEVBQUUsNEJBQTRCO1FBQ2hGLFNBQVMsRUFBRSxNQUFNO1FBQ2pCLFlBQVksRUFBRSxTQUFTLENBQUMsTUFBTTtRQUM5QixzQkFBc0IsRUFBRSxJQUFJLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQztRQUN0RCxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDO1FBQ3JFLGVBQWUsRUFBRSxJQUFJLHlCQUF5QixDQUFDLG1CQUFtQixDQUFDLDJCQUEyQixDQUFDLGVBQWUsQ0FBQztRQUMvRyxrQkFBa0IsRUFBRSxJQUFJLHlCQUF5QixDQUMvQyxtQkFBbUIsQ0FBQywyQkFBMkIsQ0FBQyxrQkFBa0IsQ0FDbkU7UUFDRCxRQUFRLEVBQUUsU0FBUyxDQUFDLFFBQVE7UUFDNUIsWUFBWSxFQUFFLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLHFCQUFxQixDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUztRQUNoRyxZQUFZLEVBQUUsUUFBUTtRQUN0QixVQUFVLEVBQUUsZUFBZSxDQUFDLE9BQU87UUFDbkMsY0FBYyxFQUFFLGFBQWEsQ0FBQyxXQUFXLENBQUMsY0FBYztLQUN6RCxDQUFDO0FBQ0osQ0FBQztBQUVELE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQztJQUNuQyxHQUFHLENBQUMsTUFBTSxFQUFFLFNBQVM7SUFDckIsSUFBSSxFQUFFLFdBQVc7SUFDakIsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsRUFBRSxZQUFZO0lBQy9DLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLEVBQUUsWUFBWTtDQUNoRCxDQUFDLENBQUM7QUFFSCxNQUFNLFVBQVUsaUJBQWlCLENBQUMsUUFBZ0I7SUFDaEQsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQztBQUNyRCxDQUFDO0FBRUQsTUFBTSxVQUFVLGFBQWEsQ0FBQyxRQUFnQjtJQUM1QyxNQUFNLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUM7SUFDMUMsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFDaEUsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.36.0",
+  "version": "0.38.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -45,13 +45,13 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.36.0",
-    "@aztec/circuits.js": "0.36.0",
-    "@aztec/foundation": "0.36.0",
-    "@aztec/noir-protocol-circuits-types": "0.36.0",
-    "@aztec/protocol-contracts": "0.36.0",
-    "@aztec/types": "0.36.0",
-    "@aztec/world-state": "0.36.0",
+    "@aztec/circuit-types": "0.38.0",
+    "@aztec/circuits.js": "0.38.0",
+    "@aztec/foundation": "0.38.0",
+    "@aztec/noir-protocol-circuits-types": "0.38.0",
+    "@aztec/protocol-contracts": "0.38.0",
+    "@aztec/types": "0.38.0",
+    "@aztec/world-state": "0.38.0",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "levelup": "^5.1.1",

package/src/acvm/acvm.ts

@@ -19,7 +19,7 @@ import { type ORACLE_NAMES } from './oracle/index.js';
  */
 type ACIRCallback = Record<
   ORACLE_NAMES,
-  (...args: ForeignCallInput[]) => ForeignCallOutput | Promise<ForeignCallOutput>
+  (...args: ForeignCallInput[]) => void | ForeignCallOutput | Promise<ForeignCallOutput>
 >;
 
 /**
@@ -105,7 +105,7 @@ export async function acvm(
         }
 
         const result = await oracleFunction.call(callback, ...args);
-        return [result];
+        return typeof result === 'undefined' ? [] : [result];
       } catch (err) {
         let typedError: Error;
         if (err instanceof Error) {

package/src/acvm/oracle/oracle.ts

@@ -1,5 +1,5 @@
 import { MerkleTreeId, UnencryptedL2Log } from '@aztec/circuit-types';
-import { acvmFieldMessageToString, oracleDebugCallToFormattedStr } from '@aztec/circuits.js';
+import { type PartialAddress, acvmFieldMessageToString, oracleDebugCallToFormattedStr } from '@aztec/circuits.js';
 import { EventSelector, FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
@@ -53,6 +53,7 @@ export class Oracle {
     ];
   }
 
+  // TODO: #5834 Nuke this
   async getPublicKeyAndPartialAddress([address]: ACVMField[]) {
     const { publicKey, partialAddress } = await this.typedOracle.getCompleteAddress(
       AztecAddress.fromField(fromACVMField(address)),
@@ -171,6 +172,28 @@ export class Oracle {
     return capsule.map(toACVMField);
   }
 
+  async getPublicKeysAndPartialAddress([address]: ACVMField[]): Promise<ACVMField[]> {
+    let publicKeys: Point[] | undefined;
+    let partialAddress: PartialAddress;
+
+    // TODO #5834: This should be reworked to return the public keys as well
+    try {
+      ({ partialAddress } = await this.typedOracle.getCompleteAddress(AztecAddress.fromField(fromACVMField(address))));
+    } catch (err) {
+      partialAddress = Fr.ZERO;
+    }
+
+    try {
+      publicKeys = await this.typedOracle.getPublicKeysForAddress(AztecAddress.fromField(fromACVMField(address)));
+    } catch (err) {
+      publicKeys = Array(4).fill(Point.ZERO);
+    }
+
+    const acvmPublicKeys = publicKeys.flatMap(key => key.toFields());
+
+    return [...acvmPublicKeys, partialAddress].map(toACVMField);
+  }
+
   async getNotes(
     [storageSlot]: ACVMField[],
     [numSelects]: ACVMField[],
@@ -294,19 +317,51 @@ export class Oracle {
     [publicKeyX]: ACVMField[],
     [publicKeyY]: ACVMField[],
     log: ACVMField[],
-  ): ACVMField {
+    [counter]: ACVMField[],
+  ): ACVMField[] {
     const publicKey = new Point(fromACVMField(publicKeyX), fromACVMField(publicKeyY));
-    const logHash = this.typedOracle.emitEncryptedLog(
+    const encLog = this.typedOracle.emitEncryptedLog(
       AztecAddress.fromString(contractAddress),
       Fr.fromString(storageSlot),
       Fr.fromString(noteTypeId),
       publicKey,
       log.map(fromACVMField),
+      +counter,
     );
-    return toACVMField(logHash);
+    // TODO(1139): We should encrypt in the circuit, but instead we inject here
+    // encryption output is 112 + 32 * (N + 3) bytes, for log len N
+    // so split into N + 7 fields (gross but avoids 300+ ACVMFields)
+    const encLogFields = [];
+    for (let i = 0; i < Math.ceil(encLog.length / 31); i++) {
+      encLogFields.push(toACVMField(encLog.subarray(31 * i, Math.min(31 * (i + 1), encLog.length))));
+    }
+
+    return encLogFields;
+  }
+
+  emitUnencryptedLog(
+    [contractAddress]: ACVMField[],
+    [eventSelector]: ACVMField[],
+    message: ACVMField[],
+    [counter]: ACVMField[],
+  ): ACVMField {
+    const logPayload = Buffer.concat(message.map(fromACVMField).map(f => f.toBuffer()));
+    const log = new UnencryptedL2Log(
+      AztecAddress.fromString(contractAddress),
+      EventSelector.fromField(fromACVMField(eventSelector)),
+      logPayload,
+    );
+
+    this.typedOracle.emitUnencryptedLog(log, +counter);
+    return toACVMField(0);
   }
 
-  emitUnencryptedLog([contractAddress]: ACVMField[], [eventSelector]: ACVMField[], message: ACVMField[]): ACVMField {
+  emitContractClassUnencryptedLog(
+    [contractAddress]: ACVMField[],
+    [eventSelector]: ACVMField[],
+    message: ACVMField[],
+    [counter]: ACVMField[],
+  ): ACVMField {
     const logPayload = Buffer.concat(message.map(fromACVMField).map(f => f.toBuffer()));
     const log = new UnencryptedL2Log(
       AztecAddress.fromString(contractAddress),
@@ -314,18 +369,16 @@ export class Oracle {
       logPayload,
     );
 
-    const logHash = this.typedOracle.emitUnencryptedLog(log);
+    const logHash = this.typedOracle.emitContractClassUnencryptedLog(log, +counter);
     return toACVMField(logHash);
   }
 
-  debugLog(...args: ACVMField[][]): ACVMField {
+  debugLog(...args: ACVMField[][]): void {
     this.log.verbose(oracleDebugCallToFormattedStr(args));
-    return toACVMField(0);
   }
 
-  debugLogWithPrefix(arg0: ACVMField[], ...args: ACVMField[][]): ACVMField {
+  debugLogWithPrefix(arg0: ACVMField[], ...args: ACVMField[][]): void {
     this.log.verbose(`${acvmFieldMessageToString(arg0)}: ${oracleDebugCallToFormattedStr(args)}`);
-    return toACVMField(0);
   }
 
   async callPrivateFunction(

package/src/acvm/oracle/typed_oracle.ts

@@ -17,7 +17,7 @@ import {
 } from '@aztec/circuits.js';
 import { type FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr, type Point } from '@aztec/foundation/fields';
 import { type ContractInstance } from '@aztec/types/contracts';
 
 /** Nullifier keys which both correspond to the same master nullifier secret key. */
@@ -140,6 +140,10 @@ export abstract class TypedOracle {
     throw new OracleMethodNotAvailableError('popCapsule');
   }
 
+  getPublicKeysForAddress(_address: AztecAddress): Promise<Point[]> {
+    throw new OracleMethodNotAvailableError('getPublicKeysForAddress');
+  }
+
   getNotes(
     _storageSlot: Fr,
     _numSelects: number,
@@ -193,14 +197,19 @@ export abstract class TypedOracle {
     _noteTypeId: Fr,
     _publicKey: PublicKey,
     _log: Fr[],
-  ): Fr {
+    _counter: number,
+  ): Buffer {
     throw new OracleMethodNotAvailableError('emitEncryptedLog');
   }
 
-  emitUnencryptedLog(_log: UnencryptedL2Log): Fr {
+  emitUnencryptedLog(_log: UnencryptedL2Log, _counter: number): void {
     throw new OracleMethodNotAvailableError('emitUnencryptedLog');
   }
 
+  emitContractClassUnencryptedLog(_log: UnencryptedL2Log, _counter: number): Fr {
+    throw new OracleMethodNotAvailableError('emitContractClassUnencryptedLog');
+  }
+
   callPrivateFunction(
     _targetContractAddress: AztecAddress,
     _functionSelector: FunctionSelector,

package/src/avm/avm_gas.ts

@@ -78,6 +78,7 @@ export const GasCosts: Record<Opcode, Gas | typeof DynamicGasCost> = {
   [Opcode.SENDER]: TemporaryDefaultGasCost,
   [Opcode.FEEPERL2GAS]: TemporaryDefaultGasCost,
   [Opcode.FEEPERDAGAS]: TemporaryDefaultGasCost,
+  [Opcode.TRANSACTIONFEE]: TemporaryDefaultGasCost,
   [Opcode.CONTRACTCALLDEPTH]: TemporaryDefaultGasCost,
   [Opcode.CHAINID]: TemporaryDefaultGasCost,
   [Opcode.VERSION]: TemporaryDefaultGasCost,

package/src/avm/avm_memory_types.ts

@@ -225,7 +225,7 @@ export class TaggedMemory implements TaggedMemoryInterface {
   }
 
   /** Returns a MeteredTaggedMemory instance to track the number of reads and writes if TRACK_MEMORY_ACCESSES is set. */
-  public track(type: string = 'instruction') {
+  public track(type: string = 'instruction'): TaggedMemoryInterface {
     return TaggedMemory.TRACK_MEMORY_ACCESSES ? new MeteredTaggedMemory(this, type) : this;
   }
 

package/src/avm/avm_simulator.ts

@@ -2,6 +2,7 @@ import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 
 import { strict as assert } from 'assert';
 
+import { isAvmBytecode } from '../public/transitional_adaptors.js';
 import type { AvmContext } from './avm_context.js';
 import { AvmContractCallResults } from './avm_message_call_result.js';
 import { AvmExecutionError, InvalidProgramCounterError, NoBytecodeForContractError } from './errors.js';
@@ -32,6 +33,7 @@ export class AvmSimulator {
     if (!bytecode) {
       throw new NoBytecodeForContractError(this.context.environment.address);
     }
+    assert(isAvmBytecode(bytecode), "AVM simulator can't execute non-AVM bytecode");
 
     return await this.executeBytecode(bytecode);
   }