@aztec/simulator 0.41.0 → 0.42.0

package/dest/public/transitional_adaptors.js

@@ -1,6 +1,6 @@
 // All code in this file needs to die once the public executor is phased out in favor of the AVM.
 import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import { CallContext, FunctionData, } from '@aztec/circuits.js';
+import { CallContext } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { promisify } from 'util';
 import { gunzip } from 'zlib';
@@ -16,7 +16,7 @@ import { createSimulationError } from '../common/errors.js';
  */
 export function createAvmExecutionEnvironment(current, header, globalVariables, gasSettings, transactionFee) {
     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);
+    /*contractCallDepth=*/ Fr.zero(), header, globalVariables, current.callContext.isStaticCall, current.callContext.isDelegateCall, current.args, gasSettings, transactionFee, current.functionSelector);
 }
 export function createPublicExecution(startSideEffectCounter, avmEnvironment, calldata) {
     const callContext = CallContext.from({
@@ -27,16 +27,15 @@ export function createPublicExecution(startSideEffectCounter, avmEnvironment, ca
         isStaticCall: avmEnvironment.isStaticCall,
         sideEffectCounter: startSideEffectCounter,
     });
-    const functionData = new FunctionData(avmEnvironment.temporaryFunctionSelector, /*isPrivate=*/ false);
     const execution = {
         contractAddress: avmEnvironment.address,
         callContext,
         args: calldata,
-        functionData,
+        functionSelector: avmEnvironment.temporaryFunctionSelector,
     };
     return execution;
 }
-export function convertAvmResultsToPxResult(avmResult, startSideEffectCounter, fromPx, startGas, endAvmContext) {
+export function convertAvmResultsToPxResult(avmResult, startSideEffectCounter, fromPx, startGas, endAvmContext, bytecode) {
     const endPersistableState = endAvmContext.persistableState;
     const endMachineState = endAvmContext.machineState;
     return {
@@ -52,6 +51,9 @@ export function convertAvmResultsToPxResult(avmResult, startSideEffectCounter, f
         startGasLeft: startGas,
         endGasLeft: endMachineState.gasLeft,
         transactionFee: endAvmContext.environment.transactionFee,
+        bytecode: bytecode,
+        calldata: endAvmContext.environment.calldata,
+        avmHints: endPersistableState.trace.toHints(),
     };
 }
 const AVM_MAGIC_SUFFIX = Buffer.from([
@@ -79,4 +81,4 @@ export async function isAvmBytecode(bytecode) {
     const magicSize = AVM_MAGIC_SUFFIX.length;
     return decompressedBytecode.subarray(-magicSize).equals(AVM_MAGIC_SUFFIX);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNpdGlvbmFsX2FkYXB0b3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy90cmFuc2l0aW9uYWxfYWRhcHRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaUdBQWlHO0FBQ2pHLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pFLE9BQU8sRUFDTCxXQUFXLEVBQ1gsWUFBWSxHQUtiLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDakMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUc5QixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUU5RSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0MsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFHNUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLDZCQUE2QixDQUMzQyxPQUF3QixFQUN4QixNQUFjLEVBQ2QsZUFBZ0MsRUFDaEMsV0FBd0IsRUFDeEIsY0FBa0I7SUFFbEIsT0FBTyxJQUFJLHVCQUF1QixDQUNoQyxPQUFPLENBQUMsZUFBZSxFQUN2QixPQUFPLENBQUMsV0FBVyxDQUFDLHNCQUFzQixFQUMxQyxPQUFPLENBQUMsV0FBVyxDQUFDLFNBQVMsRUFDN0IsZUFBZSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQ25DLGVBQWUsQ0FBQyxPQUFPLENBQUMsV0FBVztJQUNuQyxzQkFBc0IsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQ2hDLE1BQU0sRUFDTixlQUFlLEVBQ2YsT0FBTyxDQUFDLFdBQVcsQ0FBQyxZQUFZLEVBQ2hDLE9BQU8sQ0FBQyxXQUFXLENBQUMsY0FBYyxFQUNs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNpdGlvbmFsX2FkYXB0b3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy90cmFuc2l0aW9uYWxfYWRhcHRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaUdBQWlHO0FBQ2pHLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQWlFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEgsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDakMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUc5QixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUU5RSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0MsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFHNUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLDZCQUE2QixDQUMzQyxPQUF3QixFQUN4QixNQUFjLEVBQ2QsZUFBZ0MsRUFDaEMsV0FBd0IsRUFDeEIsY0FBa0I7SUFFbEIsT0FBTyxJQUFJLHVCQUF1QixDQUNoQyxPQUFPLENBQUMsZUFBZSxFQUN2QixPQUFPLENBQUMsV0FBVyxDQUFDLHNCQUFzQixFQUMxQyxPQUFPLENBQUMsV0FBVyxDQUFDLFNBQVMsRUFDN0IsZUFBZSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQ25DLGVBQWUsQ0FBQyxPQUFPLENBQUMsV0FBVztJQUNuQyxzQkFBc0IsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQ2hDLE1BQU0sRUFDTixlQUFlLEVBQ2YsT0FBTyxDQUFDLFdBQVcsQ0FBQyxZQUFZLEVBQ2hDLE9BQU8sQ0FBQyxXQUFXLENBQUMsY0FBYyxFQUNsQyxPQUFPLENB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

package/dest/public/utils.d.ts

@@ -1,8 +1,8 @@
-import { type Tx } from '@aztec/circuit-types';
+import { type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
 /**
  * Looks at the side effects of a transaction and returns the highest counter
  * @param tx - A transaction
  * @returns The highest side effect counter in the transaction so far
  */
-export declare function lastSideEffectCounter(tx: Tx): number;
+export declare function lastSideEffectCounter(inputs: PublicKernelCircuitPublicInputs): number;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/public/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAG/C;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAwBpD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/public/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAE1E;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,+BAA+B,GAAG,MAAM,CA+BrF"}

package/dest/public/utils.js

@@ -1,31 +1,38 @@
-import { CallRequest } from '@aztec/circuits.js';
 /**
  * Looks at the side effects of a transaction and returns the highest counter
  * @param tx - A transaction
  * @returns The highest side effect counter in the transaction so far
  */
-export function lastSideEffectCounter(tx) {
-    const data = tx.data.forPublic;
+export function lastSideEffectCounter(inputs) {
     const sideEffectCounters = [
-        ...data.endNonRevertibleData.newNoteHashes,
-        ...data.endNonRevertibleData.newNullifiers,
-        ...data.endNonRevertibleData.unencryptedLogsHashes,
-        ...data.endNonRevertibleData.publicCallStack,
-        ...data.end.newNoteHashes,
-        ...data.end.newNullifiers,
-        ...data.end.unencryptedLogsHashes,
-        ...data.end.publicCallStack,
+        ...inputs.endNonRevertibleData.newNoteHashes,
+        ...inputs.endNonRevertibleData.newNullifiers,
+        ...inputs.endNonRevertibleData.noteEncryptedLogsHashes,
+        ...inputs.endNonRevertibleData.encryptedLogsHashes,
+        ...inputs.endNonRevertibleData.unencryptedLogsHashes,
+        ...inputs.endNonRevertibleData.publicCallStack,
+        ...inputs.endNonRevertibleData.publicDataUpdateRequests,
+        ...inputs.end.newNoteHashes,
+        ...inputs.end.newNullifiers,
+        ...inputs.end.noteEncryptedLogsHashes,
+        ...inputs.end.encryptedLogsHashes,
+        ...inputs.end.unencryptedLogsHashes,
+        ...inputs.end.publicCallStack,
+        ...inputs.end.publicDataUpdateRequests,
     ];
     let max = 0;
     for (const sideEffect of sideEffectCounters) {
-        if (sideEffect instanceof CallRequest) {
+        if ('startSideEffectCounter' in sideEffect) {
             // look at both start and end counters because for enqueued public calls start > 0 while end === 0
             max = Math.max(max, sideEffect.startSideEffectCounter.toNumber(), sideEffect.endSideEffectCounter.toNumber());
         }
-        else {
+        else if ('counter' in sideEffect) {
             max = Math.max(max, sideEffect.counter);
         }
+        else {
+            throw new Error('Unknown side effect type');
+        }
     }
     return max;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVqRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLEVBQU07SUFDMUMsTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFVLENBQUM7SUFDaEMsTUFBTSxrQkFBa0IsR0FBRztRQUN6QixHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxhQUFhO1FBQzFDLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixDQUFDLGFBQWE7UUFDMUMsR0FBRyxJQUFJLENBQUMsb0JBQW9CLENBQUMscUJBQXFCO1FBQ2xELEdBQUcsSUFBSSxDQUFDLG9CQUFvQixDQUFDLGVBQWU7UUFDNUMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWE7UUFDekIsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWE7UUFDekIsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLHFCQUFxQjtRQUNqQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsZUFBZTtLQUM1QixDQUFDO0lBRUYsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDO0lBQ1osS0FBSyxNQUFNLFVBQVUsSUFBSSxrQkFBa0IsRUFBRSxDQUFDO1FBQzVDLElBQUksVUFBVSxZQUFZLFdBQVcsRUFBRSxDQUFDO1lBQ3RDLGtHQUFrRztZQUNsRyxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsVUFBVSxDQUFDLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxFQUFFLFVBQVUsQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQ2hILENBQUM7YUFBTSxDQUFDO1lBQ04sR0FBRyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMxQyxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUscUJBQXFCLENBQUMsTUFBdUM7SUFDM0UsTUFBTSxrQkFBa0IsR0FBRztRQUN6QixHQUFHLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxhQUFhO1FBQzVDLEdBQUcsTUFBTSxDQUFDLG9CQUFvQixDQUFDLGFBQWE7UUFDNUMsR0FBRyxNQUFNLENBQUMsb0JBQW9CLENBQUMsdUJBQXVCO1FBQ3RELEdBQUcsTUFBTSxDQUFDLG9CQUFvQixDQUFDLG1CQUFtQjtRQUNsRCxHQUFHLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxxQkFBcUI7UUFDcEQsR0FBRyxNQUFNLENBQUMsb0JBQW9CLENBQUMsZUFBZTtRQUM5QyxHQUFHLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyx3QkFBd0I7UUFDdkQsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLGFBQWE7UUFDM0IsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLGFBQWE7UUFDM0IsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLHVCQUF1QjtRQUNyQyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsbUJBQW1CO1FBQ2pDLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUI7UUFDbkMsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLGVBQWU7UUFDN0IsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLHdCQUF3QjtLQUN2QyxDQUFDO0lBRUYsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDO0lBQ1osS0FBSyxNQUFNLFVBQVUsSUFBSSxrQkFBa0IsRUFBRSxDQUFDO1FBQzVDLElBQUksd0JBQXdCLElBQUksVUFBVSxFQUFFLENBQUM7WUFDM0Msa0dBQWtHO1lBQ2xHLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsc0JBQXNCLENBQUMsUUFBUSxFQUFFLEVBQUUsVUFBVSxDQUFDLG9CQUFvQixDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDaEgsQ0FBQzthQUFNLElBQUksU0FBUyxJQUFJLFVBQVUsRUFBRSxDQUFDO1lBQ25DLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDMUMsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLElBQUksS0FBSyxDQUFDLDBCQUEwQixDQUFDLENBQUM7UUFDOUMsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUMifQ==

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "type": "module",
-  "exports": "./dest/index.js",
+  "exports": {
+    ".": "./dest/index.js",
+    "./avm/fixtures": "./dest/avm/fixtures/index.js"
+  },
   "typedocOptions": {
     "entryPoints": [
       "./src/index.ts"
@@ -45,13 +48,13 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.41.0",
-    "@aztec/circuits.js": "0.41.0",
-    "@aztec/foundation": "0.41.0",
-    "@aztec/noir-protocol-circuits-types": "0.41.0",
-    "@aztec/protocol-contracts": "0.41.0",
-    "@aztec/types": "0.41.0",
-    "@aztec/world-state": "0.41.0",
+    "@aztec/circuit-types": "0.42.0",
+    "@aztec/circuits.js": "0.42.0",
+    "@aztec/foundation": "0.42.0",
+    "@aztec/noir-protocol-circuits-types": "0.42.0",
+    "@aztec/protocol-contracts": "0.42.0",
+    "@aztec/types": "0.42.0",
+    "@aztec/world-state": "0.42.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

@@ -6,7 +6,6 @@ import {
   type ExecutionError,
   type ForeignCallInput,
   type ForeignCallOutput,
-  type WasmBlackBoxFunctionSolver,
   executeCircuitWithReturnWitness,
 } from '@noir-lang/acvm_js';
 
@@ -85,7 +84,6 @@ export function resolveOpcodeLocations(
  * The function call that executes an ACIR.
  */
 export async function acvm(
-  solver: WasmBlackBoxFunctionSolver,
   acir: Buffer,
   initialWitness: ACVMWitness,
   callback: ACIRCallback,
@@ -93,7 +91,6 @@ export async function acvm(
   const logger = createDebugLogger('aztec:simulator:acvm');
 
   const solvedAndReturnWitness = await executeCircuitWithReturnWitness(
-    solver,
     acir,
     initialWitness,
     async (name: string, args: ForeignCallInput[]) => {

package/src/acvm/oracle/oracle.ts

@@ -1,4 +1,5 @@
 import { MerkleTreeId, UnencryptedL2Log } from '@aztec/circuit-types';
+import { KeyValidationRequest } 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';
@@ -40,12 +41,18 @@ export class Oracle {
     return unpacked.map(toACVMField);
   }
 
-  async getKeyValidationRequest([masterPublicKeyHash]: ACVMField[]): Promise<ACVMField[]> {
-    const { masterPublicKey, appSecretKey } = await this.typedOracle.getKeyValidationRequest(
-      fromACVMField(masterPublicKeyHash),
-    );
+  async getBlockNumber(): Promise<ACVMField> {
+    return toACVMField(await this.typedOracle.getBlockNumber());
+  }
+
+  async getContractAddress(): Promise<ACVMField> {
+    return toACVMField(await this.typedOracle.getContractAddress());
+  }
+
+  async getKeyValidationRequest([pkMHash]: ACVMField[]): Promise<ACVMField[]> {
+    const { pkM, skApp } = await this.typedOracle.getKeyValidationRequest(fromACVMField(pkMHash));
 
-    return [toACVMField(masterPublicKey.x), toACVMField(masterPublicKey.y), toACVMField(appSecretKey)];
+    return [toACVMField(pkM.x), toACVMField(pkM.y), toACVMField(skApp)];
   }
 
   async getContractInstance([address]: ACVMField[]) {
@@ -282,32 +289,48 @@ export class Oracle {
     return newValues.map(toACVMField);
   }
 
-  emitEncryptedLog(encryptedLog: ACVMField[], [counter]: ACVMField[]): void {
+  emitEncryptedLog(
+    [contractAddress]: ACVMField[],
+    [randomness]: ACVMField[],
+    encryptedLog: 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(processedInput, +counter);
+    this.typedOracle.emitEncryptedLog(
+      AztecAddress.fromString(contractAddress),
+      Fr.fromString(randomness),
+      processedInput,
+      +counter,
+    );
   }
 
-  emitEncryptedNoteLog([noteHash]: ACVMField[], encryptedNote: ACVMField[], [counter]: ACVMField[]): void {
+  emitEncryptedNoteLog([noteHashCounter]: ACVMField[], encryptedNote: 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(encryptedNote.map(fromACVMField).map(f => f.toNumber()));
-    this.typedOracle.emitEncryptedNoteLog(fromACVMField(noteHash), processedInput, +counter);
+    this.typedOracle.emitEncryptedNoteLog(+noteHashCounter, processedInput, +counter);
   }
 
   computeEncryptedLog(
     [contractAddress]: ACVMField[],
     [storageSlot]: ACVMField[],
     [noteTypeId]: ACVMField[],
-    [publicKeyX]: ACVMField[],
-    [publicKeyY]: ACVMField[],
+    [ovskApp]: ACVMField[],
+    [ovpkMX]: ACVMField[],
+    [ovpkMY]: ACVMField[],
+    [ivpkMX]: ACVMField[],
+    [ivpkMY]: ACVMField[],
     preimage: ACVMField[],
   ): ACVMField[] {
-    const publicKey = new Point(fromACVMField(publicKeyX), fromACVMField(publicKeyY));
+    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(
       AztecAddress.fromString(contractAddress),
       Fr.fromString(storageSlot),
       Fr.fromString(noteTypeId),
-      publicKey,
+      ovKeys,
+      ivpkM,
       preimage.map(fromACVMField),
     );
     const bytes: ACVMField[] = [];

package/src/acvm/oracle/typed_oracle.ts

@@ -82,6 +82,14 @@ export abstract class TypedOracle {
     throw new OracleMethodNotAvailableError('unpackReturns');
   }
 
+  getBlockNumber(): Promise<number> {
+    throw new OracleMethodNotAvailableError('getBlockNumber');
+  }
+
+  getContractAddress(): Promise<AztecAddress> {
+    throw new OracleMethodNotAvailableError('getContractAddress');
+  }
+
   getKeyValidationRequest(_pkMHash: Fr): Promise<KeyValidationRequest> {
     throw new OracleMethodNotAvailableError('getKeyValidationRequest');
   }
@@ -176,11 +184,11 @@ export abstract class TypedOracle {
     throw new OracleMethodNotAvailableError('storageWrite');
   }
 
-  emitEncryptedLog(_encryptedNote: Buffer, _counter: number): void {
+  emitEncryptedLog(_contractAddress: AztecAddress, _randomness: Fr, _encryptedNote: Buffer, _counter: number): void {
     throw new OracleMethodNotAvailableError('emitEncryptedLog');
   }
 
-  emitEncryptedNoteLog(_noteHash: Fr, _encryptedNote: Buffer, _counter: number): void {
+  emitEncryptedNoteLog(_noteHashCounter: number, _encryptedNote: Buffer, _counter: number): void {
     throw new OracleMethodNotAvailableError('emitEncryptedNoteLog');
   }
 
@@ -188,7 +196,8 @@ export abstract class TypedOracle {
     _contractAddress: AztecAddress,
     _storageSlot: Fr,
     _noteTypeId: Fr,
-    _publicKey: PublicKey,
+    _ovKeys: KeyValidationRequest,
+    _ivpkM: PublicKey,
     _preimage: Fr[],
   ): Buffer {
     throw new OracleMethodNotAvailableError('computeEncryptedLog');

package/src/acvm/serialize.ts

@@ -55,7 +55,7 @@ export function toACVMField(
 export function toAcvmEnqueuePublicFunctionResult(item: PublicCallRequest): ACVMField[] {
   const fields = [
     item.contractAddress.toField(),
-    ...item.functionData.toFields(),
+    item.functionSelector.toField(),
     ...item.callContext.toFields(),
     item.getArgsHash(),
   ];

package/src/avm/avm_gas.ts

@@ -49,93 +49,86 @@ export const EmptyGas: Gas = {
 /** Dimensions of gas usage: L1, L2, and DA. */
 export const GasDimensions = ['l2Gas', 'daGas'] as const;
 
-/** Null object to represent a gas cost that's dynamic instead of fixed for a given instruction. */
-export const DynamicGasCost = Symbol('DynamicGasCost');
-
-/** Temporary default gas cost. We should eventually remove all usage of this variable in favor of actual gas for each opcode. */
-const TemporaryDefaultGasCost = { l2Gas: 10, daGas: 0 };
+/** Default gas cost for an opcode. */
+const DefaultBaseGasCost: Gas = { l2Gas: 10, daGas: 0 };
 
 /** Base gas costs for each instruction. Additional gas cost may be added on top due to memory or storage accesses, etc. */
-export const GasCosts: Record<Opcode, Gas | typeof DynamicGasCost> = {
-  [Opcode.ADD]: TemporaryDefaultGasCost,
-  [Opcode.SUB]: TemporaryDefaultGasCost,
-  [Opcode.MUL]: TemporaryDefaultGasCost,
-  [Opcode.DIV]: TemporaryDefaultGasCost,
-  [Opcode.FDIV]: TemporaryDefaultGasCost,
-  [Opcode.EQ]: TemporaryDefaultGasCost,
-  [Opcode.LT]: TemporaryDefaultGasCost,
-  [Opcode.LTE]: TemporaryDefaultGasCost,
-  [Opcode.AND]: TemporaryDefaultGasCost,
-  [Opcode.OR]: TemporaryDefaultGasCost,
-  [Opcode.XOR]: TemporaryDefaultGasCost,
-  [Opcode.NOT]: TemporaryDefaultGasCost,
-  [Opcode.SHL]: TemporaryDefaultGasCost,
-  [Opcode.SHR]: TemporaryDefaultGasCost,
-  [Opcode.CAST]: TemporaryDefaultGasCost,
+const BaseGasCosts: Record<Opcode, Gas> = {
+  [Opcode.ADD]: DefaultBaseGasCost,
+  [Opcode.SUB]: DefaultBaseGasCost,
+  [Opcode.MUL]: DefaultBaseGasCost,
+  [Opcode.DIV]: DefaultBaseGasCost,
+  [Opcode.FDIV]: DefaultBaseGasCost,
+  [Opcode.EQ]: DefaultBaseGasCost,
+  [Opcode.LT]: DefaultBaseGasCost,
+  [Opcode.LTE]: DefaultBaseGasCost,
+  [Opcode.AND]: DefaultBaseGasCost,
+  [Opcode.OR]: DefaultBaseGasCost,
+  [Opcode.XOR]: DefaultBaseGasCost,
+  [Opcode.NOT]: DefaultBaseGasCost,
+  [Opcode.SHL]: DefaultBaseGasCost,
+  [Opcode.SHR]: DefaultBaseGasCost,
+  [Opcode.CAST]: DefaultBaseGasCost,
   // Execution environment
-  [Opcode.ADDRESS]: TemporaryDefaultGasCost,
-  [Opcode.STORAGEADDRESS]: TemporaryDefaultGasCost,
-  [Opcode.SENDER]: TemporaryDefaultGasCost,
-  [Opcode.FEEPERL2GAS]: TemporaryDefaultGasCost,
-  [Opcode.FEEPERDAGAS]: TemporaryDefaultGasCost,
-  [Opcode.TRANSACTIONFEE]: TemporaryDefaultGasCost,
-  [Opcode.CONTRACTCALLDEPTH]: TemporaryDefaultGasCost,
-  [Opcode.CHAINID]: TemporaryDefaultGasCost,
-  [Opcode.VERSION]: TemporaryDefaultGasCost,
-  [Opcode.BLOCKNUMBER]: TemporaryDefaultGasCost,
-  [Opcode.TIMESTAMP]: TemporaryDefaultGasCost,
-  [Opcode.COINBASE]: TemporaryDefaultGasCost,
-  [Opcode.BLOCKL2GASLIMIT]: TemporaryDefaultGasCost,
-  [Opcode.BLOCKDAGASLIMIT]: TemporaryDefaultGasCost,
-  [Opcode.CALLDATACOPY]: TemporaryDefaultGasCost,
+  [Opcode.ADDRESS]: DefaultBaseGasCost,
+  [Opcode.STORAGEADDRESS]: DefaultBaseGasCost,
+  [Opcode.SENDER]: DefaultBaseGasCost,
+  [Opcode.FEEPERL2GAS]: DefaultBaseGasCost,
+  [Opcode.FEEPERDAGAS]: DefaultBaseGasCost,
+  [Opcode.TRANSACTIONFEE]: DefaultBaseGasCost,
+  [Opcode.CONTRACTCALLDEPTH]: DefaultBaseGasCost,
+  [Opcode.CHAINID]: DefaultBaseGasCost,
+  [Opcode.VERSION]: DefaultBaseGasCost,
+  [Opcode.BLOCKNUMBER]: DefaultBaseGasCost,
+  [Opcode.TIMESTAMP]: DefaultBaseGasCost,
+  [Opcode.COINBASE]: DefaultBaseGasCost,
+  [Opcode.BLOCKL2GASLIMIT]: DefaultBaseGasCost,
+  [Opcode.BLOCKDAGASLIMIT]: DefaultBaseGasCost,
+  [Opcode.CALLDATACOPY]: DefaultBaseGasCost,
   // Gas
-  [Opcode.L2GASLEFT]: TemporaryDefaultGasCost,
-  [Opcode.DAGASLEFT]: TemporaryDefaultGasCost,
+  [Opcode.L2GASLEFT]: DefaultBaseGasCost,
+  [Opcode.DAGASLEFT]: DefaultBaseGasCost,
   // Control flow
-  [Opcode.JUMP]: TemporaryDefaultGasCost,
-  [Opcode.JUMPI]: TemporaryDefaultGasCost,
-  [Opcode.INTERNALCALL]: TemporaryDefaultGasCost,
-  [Opcode.INTERNALRETURN]: TemporaryDefaultGasCost,
+  [Opcode.JUMP]: DefaultBaseGasCost,
+  [Opcode.JUMPI]: DefaultBaseGasCost,
+  [Opcode.INTERNALCALL]: DefaultBaseGasCost,
+  [Opcode.INTERNALRETURN]: DefaultBaseGasCost,
   // Memory
-  [Opcode.SET]: TemporaryDefaultGasCost,
-  [Opcode.MOV]: TemporaryDefaultGasCost,
-  [Opcode.CMOV]: TemporaryDefaultGasCost,
+  [Opcode.SET]: DefaultBaseGasCost,
+  [Opcode.MOV]: DefaultBaseGasCost,
+  [Opcode.CMOV]: DefaultBaseGasCost,
   // World state
-  [Opcode.SLOAD]: TemporaryDefaultGasCost,
-  [Opcode.SSTORE]: TemporaryDefaultGasCost,
-  [Opcode.NOTEHASHEXISTS]: TemporaryDefaultGasCost,
-  [Opcode.EMITNOTEHASH]: TemporaryDefaultGasCost,
-  [Opcode.NULLIFIEREXISTS]: TemporaryDefaultGasCost,
-  [Opcode.EMITNULLIFIER]: TemporaryDefaultGasCost,
-  [Opcode.L1TOL2MSGEXISTS]: TemporaryDefaultGasCost,
-  [Opcode.HEADERMEMBER]: TemporaryDefaultGasCost,
-  [Opcode.EMITUNENCRYPTEDLOG]: TemporaryDefaultGasCost,
-  [Opcode.SENDL2TOL1MSG]: TemporaryDefaultGasCost,
-  [Opcode.GETCONTRACTINSTANCE]: TemporaryDefaultGasCost,
+  [Opcode.SLOAD]: DefaultBaseGasCost,
+  [Opcode.SSTORE]: DefaultBaseGasCost,
+  [Opcode.NOTEHASHEXISTS]: DefaultBaseGasCost,
+  [Opcode.EMITNOTEHASH]: DefaultBaseGasCost,
+  [Opcode.NULLIFIEREXISTS]: DefaultBaseGasCost,
+  [Opcode.EMITNULLIFIER]: DefaultBaseGasCost,
+  [Opcode.L1TOL2MSGEXISTS]: DefaultBaseGasCost,
+  [Opcode.HEADERMEMBER]: DefaultBaseGasCost,
+  [Opcode.EMITUNENCRYPTEDLOG]: DefaultBaseGasCost,
+  [Opcode.SENDL2TOL1MSG]: DefaultBaseGasCost,
+  [Opcode.GETCONTRACTINSTANCE]: DefaultBaseGasCost,
   // External calls
-  [Opcode.CALL]: TemporaryDefaultGasCost,
-  [Opcode.STATICCALL]: TemporaryDefaultGasCost,
-  [Opcode.DELEGATECALL]: TemporaryDefaultGasCost,
-  [Opcode.RETURN]: TemporaryDefaultGasCost,
-  [Opcode.REVERT]: TemporaryDefaultGasCost,
+  [Opcode.CALL]: DefaultBaseGasCost,
+  [Opcode.STATICCALL]: DefaultBaseGasCost,
+  [Opcode.DELEGATECALL]: DefaultBaseGasCost,
+  [Opcode.RETURN]: DefaultBaseGasCost,
+  [Opcode.REVERT]: DefaultBaseGasCost,
   // Misc
-  [Opcode.DEBUGLOG]: TemporaryDefaultGasCost,
+  [Opcode.DEBUGLOG]: DefaultBaseGasCost,
   // Gadgets
-  [Opcode.KECCAK]: TemporaryDefaultGasCost,
-  [Opcode.POSEIDON2]: TemporaryDefaultGasCost,
-  [Opcode.SHA256]: TemporaryDefaultGasCost, // temp - may be removed, but alot of contracts rely on i: TemporaryDefaultGasCost,
-  [Opcode.PEDERSEN]: TemporaryDefaultGasCost, // temp - may be removed, but alot of contracts rely on i: TemporaryDefaultGasCost,t
+  [Opcode.KECCAK]: DefaultBaseGasCost,
+  [Opcode.POSEIDON2]: DefaultBaseGasCost,
+  [Opcode.SHA256]: DefaultBaseGasCost,
+  [Opcode.PEDERSEN]: DefaultBaseGasCost,
   // Conversions
-  [Opcode.TORADIXLE]: TemporaryDefaultGasCost,
+  [Opcode.TORADIXLE]: DefaultBaseGasCost,
 };
 
-/** Returns the fixed base gas cost for a given opcode, or throws if set to dynamic. */
+/** Returns the fixed base gas cost for a given opcode. */
 export function getBaseGasCost(opcode: Opcode): Gas {
-  const cost = GasCosts[opcode];
-  if (cost === DynamicGasCost) {
-    throw new Error(`Opcode ${Opcode[opcode]} has dynamic gas cost`);
-  }
-  return cost;
+  return BaseGasCosts[opcode];
 }
 
 /** Returns the gas cost associated with the memory operations performed. */

package/src/avm/avm_simulator.ts

@@ -17,6 +17,7 @@ import { decodeFromBytecode } from './serialization/bytecode_serialization.js';
 
 export class AvmSimulator {
   private log: DebugLogger;
+  private bytecode: Buffer | undefined;
 
   constructor(private context: AvmContext) {
     this.log = createDebugLogger(
@@ -43,6 +44,13 @@ export class AvmSimulator {
     return await this.executeBytecode(bytecode);
   }
 
+  /**
+   * Return the bytecode used for execution, if any.
+   */
+  public getBytecode(): Buffer | undefined {
+    return this.bytecode;
+  }
+
   /**
    * Executes the provided bytecode in the current context.
    * This method is useful for testing and debugging.
@@ -51,6 +59,7 @@ export class AvmSimulator {
     const decompressedBytecode = await decompressBytecodeIfCompressed(bytecode);
     assert(isAvmBytecode(decompressedBytecode), "AVM simulator can't execute non-AVM bytecode");
 
+    this.bytecode = decompressedBytecode;
     return await this.executeInstructions(decodeFromBytecode(decompressedBytecode));
   }
 

package/src/avm/fixtures/index.ts

@@ -3,7 +3,9 @@ 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 { strict as assert } from 'assert';
 import { mock } from 'jest-mock-extended';
 import merge from 'lodash.merge';
 
@@ -125,3 +127,21 @@ export function randomMemoryBytes(length: number): Uint8[] {
 export function randomMemoryFields(length: number): Field[] {
   return [...Array(length)].map(_ => new Field(Fr.random()));
 }
+
+export function getAvmTestContractBytecode(functionName: string): Buffer {
+  const artifact = AvmTestContractArtifact.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;
+}
+
+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;
+}

package/src/avm/index.ts

@@ -0,0 +1 @@
+export * from './avm_simulator.js';

package/src/avm/journal/host_storage.ts

@@ -1,4 +1,4 @@
-import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../public/db.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../public/db_interfaces.js';
 
 /**
  * Host storage

package/src/avm/journal/journal.ts

@@ -56,8 +56,10 @@ export type JournalData = {
 
 // TRANSITIONAL: This should be removed once the kernel handles and entire enqueued call per circuit
 type PartialPublicExecutionResult = {
+  noteHashReadRequests: ReadRequest[];
   nullifierReadRequests: ReadRequest[];
   nullifierNonExistentReadRequests: ReadRequest[];
+  l1ToL2MsgReadRequests: ReadRequest[];
   newNoteHashes: NoteHash[];
   newL2ToL1Messages: L2ToL1Message[];
   startSideEffectCounter: number;
@@ -108,8 +110,10 @@ export class AvmPersistableStateManager {
     this.trace = new WorldStateAccessTrace(parent?.trace);
 
     this.transitionalExecutionResult = {
+      noteHashReadRequests: [],
       nullifierReadRequests: [],
       nullifierNonExistentReadRequests: [],
+      l1ToL2MsgReadRequests: [],
       newNoteHashes: [],
       newL2ToL1Messages: [],
       startSideEffectCounter: this.trace.accessCounter,
@@ -308,7 +312,8 @@ export class AvmPersistableStateManager {
     this.transitionalExecutionResult.allUnencryptedLogs.push(ulog);
     // this duplicates exactly what happens in the trace just for the purpose of transitional integration with the kernel
     this.transitionalExecutionResult.unencryptedLogsHashes.push(
-      new LogHash(logHash, this.trace.accessCounter, new Fr(ulog.length)),
+      // TODO(6578): explain magic number 4 here
+      new LogHash(logHash, this.trace.accessCounter, new Fr(ulog.length + 4)),
     );
     // TODO(6206): likely need to track this here and not just in the transitional logic.
 

package/src/avm/journal/trace.ts

@@ -1,3 +1,4 @@
+import { AvmExecutionHints, AvmHint, Vector } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
 import {
@@ -131,6 +132,7 @@ export class WorldStateAccessTrace {
       leafIndex: msgLeafIndex,
       msgHash: msgHash,
       exists: exists,
+      counter: new Fr(this.accessCounter),
       //endLifetime: Fr.ZERO, // FIXME
     };
     this.l1ToL2MessageChecks.push(traced);
@@ -169,4 +171,14 @@ export class WorldStateAccessTrace {
     // it is assumed that the incoming trace was initialized with this as parent, so accept counter
     this.accessCounter = incomingTrace.accessCounter;
   }
+
+  // TODO(dbanks12): should only return hints for one call.... shouldn't include nested calls (merged in traces)
+  public toHints(): AvmExecutionHints {
+    return new AvmExecutionHints(
+      new Vector(this.publicStorageReads.map(read => new AvmHint(read.counter, read.value))),
+      new Vector(this.noteHashChecks.map(check => new AvmHint(check.counter, new Fr(check.exists ? 1 : 0)))),
+      new Vector(this.nullifierChecks.map(check => new AvmHint(check.counter, new Fr(check.exists ? 1 : 0)))),
+      new Vector(this.l1ToL2MessageChecks.map(check => new AvmHint(check.counter, new Fr(check.exists ? 1 : 0)))),
+    );
+  }
 }

package/src/avm/journal/trace_types.ts

@@ -71,6 +71,7 @@ export type TracedL1toL2MessageCheck = {
   leafIndex: Fr;
   msgHash: Fr;
   exists: boolean;
+  counter: Fr;
   //endLifetime: Fr;
 };