@aztec/simulator 0.24.0 → 0.26.1

package/src/client/client_execution_context.ts

@@ -5,6 +5,7 @@ import {
   L1NotePayload,
   Note,
   NoteStatus,
+  TaggedNote,
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
 import {
@@ -13,13 +14,13 @@ import {
   FunctionData,
   FunctionSelector,
   Header,
+  NoteHashReadRequestMembershipWitness,
   PublicCallRequest,
-  ReadRequestMembershipWitness,
   SideEffect,
   TxContext,
 } from '@aztec/circuits.js';
-import { computePublicDataTreeLeafSlot, computeUniqueCommitment, siloCommitment } from '@aztec/circuits.js/abis';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
+import { computePublicDataTreeLeafSlot, computeUniqueCommitment, siloNoteHash } from '@aztec/circuits.js/hash';
 import { FunctionAbi, FunctionArtifact, countArgumentsSize } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
@@ -118,17 +119,17 @@ export class ClientExecutionContext extends ViewDataOracle {
    * or to flag non-transient reads with their leafIndex.
    * The KernelProver will use this to fully populate witnesses and provide hints to
    * the kernel regarding which commitments each transient read request corresponds to.
-   * @param readRequests - SideEffect containing Note hashed of the notes being read and counter.
+   * @param noteHashReadRequests - SideEffect containing Note hashed of the notes being read and counter.
    * @returns An array of partially filled in read request membership witnesses.
    */
-  public getReadRequestPartialWitnesses(readRequests: SideEffect[]) {
-    return readRequests
+  public getNoteHashReadRequestPartialWitnesses(noteHashReadRequests: SideEffect[]) {
+    return noteHashReadRequests
       .filter(r => !r.isEmpty())
       .map(r => {
         const index = this.gotNotes.get(r.value.toBigInt());
         return index !== undefined
-          ? ReadRequestMembershipWitness.empty(index)
-          : ReadRequestMembershipWitness.emptyTransient();
+          ? NoteHashReadRequestMembershipWitness.empty(index)
+          : NoteHashReadRequestMembershipWitness.emptyTransient();
       });
   }
 
@@ -209,10 +210,10 @@ export class ClientExecutionContext extends ViewDataOracle {
     status: NoteStatus,
   ): Promise<NoteData[]> {
     // Nullified pending notes are already removed from the list.
-    const pendingNotes = this.noteCache.getNotes(this.contractAddress, storageSlot);
+    const pendingNotes = this.noteCache.getNotes(this.callContext.storageContractAddress, storageSlot);
 
-    const pendingNullifiers = this.noteCache.getNullifiers(this.contractAddress);
-    const dbNotes = await this.db.getNotes(this.contractAddress, storageSlot, status);
+    const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.storageContractAddress);
+    const dbNotes = await this.db.getNotes(this.callContext.storageContractAddress, storageSlot, status);
     const dbNotesFiltered = dbNotes.filter(n => !pendingNullifiers.has((n.siloedNullifier as Fr).value));
 
     const notes = pickNotes<NoteData>([...dbNotesFiltered, ...pendingNotes], {
@@ -225,14 +226,14 @@ export class ClientExecutionContext extends ViewDataOracle {
     });
 
     this.log(
-      `Returning ${notes.length} notes for ${this.contractAddress} at ${storageSlot}: ${notes
+      `Returning ${notes.length} notes for ${this.callContext.storageContractAddress} at ${storageSlot}: ${notes
         .map(n => `${n.nonce.toString()}:[${n.note.items.map(i => i.toString()).join(',')}]`)
         .join(', ')}`,
     );
 
     notes.forEach(n => {
       if (n.index !== undefined) {
-        const siloedNoteHash = siloCommitment(n.contractAddress, n.innerNoteHash);
+        const siloedNoteHash = siloNoteHash(n.contractAddress, n.innerNoteHash);
         const uniqueSiloedNoteHash = computeUniqueCommitment(n.nonce, siloedNoteHash);
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386)
         // Should always be uniqueSiloedNoteHash when publicly created notes include nonces.
@@ -257,7 +258,7 @@ export class ClientExecutionContext extends ViewDataOracle {
   public notifyCreatedNote(storageSlot: Fr, noteTypeId: Fr, noteItems: Fr[], innerNoteHash: Fr) {
     const note = new Note(noteItems);
     this.noteCache.addNewNote({
-      contractAddress: this.contractAddress,
+      contractAddress: this.callContext.storageContractAddress,
       storageSlot,
       nonce: Fr.ZERO, // Nonce cannot be known during private execution.
       note,
@@ -278,7 +279,7 @@ export class ClientExecutionContext extends ViewDataOracle {
    * @param innerNoteHash - The inner note hash of the new note.
    */
   public notifyNullifiedNote(innerNullifier: Fr, innerNoteHash: Fr) {
-    this.noteCache.nullifyNote(this.contractAddress, innerNullifier, innerNoteHash);
+    this.noteCache.nullifyNote(this.callContext.storageContractAddress, innerNullifier, innerNoteHash);
     return Promise.resolve();
   }
 
@@ -293,7 +294,8 @@ export class ClientExecutionContext extends ViewDataOracle {
   public emitEncryptedLog(contractAddress: AztecAddress, storageSlot: Fr, noteTypeId: Fr, publicKey: Point, log: Fr[]) {
     const note = new Note(log);
     const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
-    const encryptedNote = l1NotePayload.toEncryptedBuffer(publicKey, this.curve);
+    const taggedNote = new TaggedNote(l1NotePayload);
+    const encryptedNote = taggedNote.toEncryptedBuffer(publicKey, this.curve);
     this.encryptedLogs.push(encryptedNote);
   }
 
@@ -307,12 +309,26 @@ export class ClientExecutionContext extends ViewDataOracle {
     this.log(`Emitted unencrypted log: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`);
   }
 
+  #checkValidStaticCall(childExecutionResult: ExecutionResult) {
+    if (
+      childExecutionResult.callStackItem.publicInputs.newNoteHashes.some(item => !item.isEmpty()) ||
+      childExecutionResult.callStackItem.publicInputs.newNullifiers.some(item => !item.isEmpty()) ||
+      childExecutionResult.callStackItem.publicInputs.newL2ToL1Msgs.some(item => !item.isEmpty()) ||
+      !childExecutionResult.callStackItem.publicInputs.encryptedLogPreimagesLength.equals(new Fr(4)) ||
+      !childExecutionResult.callStackItem.publicInputs.unencryptedLogPreimagesLength.equals(new Fr(4))
+    ) {
+      throw new Error(`Static call cannot create new notes, emit L2->L1 messages or generate logs`);
+    }
+  }
+
   /**
    * Calls a private function as a nested execution.
    * @param targetContractAddress - The address of the contract to call.
    * @param functionSelector - The function selector of the function to call.
    * @param argsHash - The packed arguments to pass to the function.
    * @param sideEffectCounter - The side effect counter at the start of the call.
+   * @param isStaticCall - Whether the call is a static call.
+   * @param isStaticCall - Whether the call is a delegate call.
    * @returns The execution result.
    */
   async callPrivateFunction(
@@ -320,11 +336,15 @@ export class ClientExecutionContext extends ViewDataOracle {
     functionSelector: FunctionSelector,
     argsHash: Fr,
     sideEffectCounter: number,
+    isStaticCall: boolean,
+    isDelegateCall: boolean,
   ) {
     this.log(
       `Calling private function ${this.contractAddress}:${functionSelector} from ${this.callContext.storageContractAddress}`,
     );
 
+    isStaticCall = isStaticCall || this.callContext.isStaticCall;
+
     const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
     const targetFunctionData = FunctionData.fromAbi(targetArtifact);
 
@@ -341,8 +361,8 @@ export class ClientExecutionContext extends ViewDataOracle {
       targetContractAddress,
       targetArtifact,
       sideEffectCounter,
-      false,
-      false,
+      isDelegateCall,
+      isStaticCall,
     );
 
     const context = new ClientExecutionContext(
@@ -366,6 +386,10 @@ export class ClientExecutionContext extends ViewDataOracle {
       targetFunctionData,
     );
 
+    if (isStaticCall) {
+      this.#checkValidStaticCall(childExecutionResult);
+    }
+
     this.nestedExecutions.push(childExecutionResult);
 
     return childExecutionResult.callStackItem;
@@ -379,6 +403,7 @@ export class ClientExecutionContext extends ViewDataOracle {
    * @param functionSelector - The function selector of the function to call.
    * @param argsHash - The packed arguments to pass to the function.
    * @param sideEffectCounter - The side effect counter at the start of the call.
+   * @param isStaticCall - Whether the call is a static call.
    * @returns The public call stack item with the request information.
    */
   public async enqueuePublicFunctionCall(
@@ -386,19 +411,24 @@ export class ClientExecutionContext extends ViewDataOracle {
     functionSelector: FunctionSelector,
     argsHash: Fr,
     sideEffectCounter: number,
+    isStaticCall: boolean,
+    isDelegateCall: boolean,
   ): Promise<PublicCallRequest> {
+    isStaticCall = isStaticCall || this.callContext.isStaticCall;
+
     const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
     const derivedCallContext = await this.deriveCallContext(
       targetContractAddress,
       targetArtifact,
       sideEffectCounter,
-      false,
-      false,
+      isDelegateCall,
+      isStaticCall,
     );
     const args = this.packedArgsCache.unpack(argsHash);
     const enqueuedRequest = PublicCallRequest.from({
       args,
       callContext: derivedCallContext,
+      parentCallContext: this.callContext,
       functionData: FunctionData.fromAbi(targetArtifact),
       contractAddress: targetContractAddress,
     });
@@ -408,7 +438,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     // side-effects occurred in the TX. Ultimately the private kernel should
     // just output everything in the proper order without any counters.
     this.log(
-      `Enqueued call to public function (with side-effect counter #${sideEffectCounter}) ${targetContractAddress}:${functionSelector}`,
+      `Enqueued call to public function (with side-effect counter #${sideEffectCounter}) ${targetContractAddress}:${functionSelector}(${targetArtifact.name})`,
     );
 
     this.enqueuedPublicFunctionCalls.push(enqueuedRequest);
@@ -434,8 +464,8 @@ export class ClientExecutionContext extends ViewDataOracle {
   ) {
     const portalContractAddress = await this.db.getPortalContractAddress(targetContractAddress);
     return new CallContext(
-      this.contractAddress,
-      targetContractAddress,
+      isDelegateCall ? this.callContext.msgSender : this.contractAddress,
+      isDelegateCall ? this.contractAddress : targetContractAddress,
       portalContractAddress,
       FunctionSelector.fromNameAndParameters(targetArtifact.name, targetArtifact.parameters),
       isDelegateCall,
@@ -458,7 +488,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     const values = [];
     for (let i = 0n; i < numberOfElements; i++) {
       const storageSlot = new Fr(startStorageSlot.value + i);
-      const leafSlot = computePublicDataTreeLeafSlot(this.contractAddress, storageSlot);
+      const leafSlot = computePublicDataTreeLeafSlot(this.callContext.storageContractAddress, storageSlot);
       const witness = await this.db.getPublicDataTreeWitness(bn, leafSlot);
       if (!witness) {
         throw new Error(`No witness for slot ${storageSlot.toString()}`);

package/src/client/db_oracle.ts

@@ -4,6 +4,7 @@ import { FunctionArtifactWithDebugMetadata, FunctionSelector } from '@aztec/foun
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
+import { ContractInstance } from '@aztec/types/contracts';
 
 import { KeyPair, NoteData } from '../acvm/index.js';
 import { CommitmentsDB } from '../public/db.js';
@@ -30,6 +31,13 @@ export class ContractClassNotFoundError extends Error {
  * The database oracle interface.
  */
 export interface DBOracle extends CommitmentsDB {
+  /**
+   * Returns a contract instance associated with an address, if available.
+   * @param address - Address.
+   * @returns A contract instance.
+   */
+  getContractInstance(address: AztecAddress): Promise<ContractInstance>;
+
   /**
    * Retrieve the complete address associated to a given address.
    * @param address - Address to fetch the pubkey for.

package/src/client/execution_note_cache.ts

@@ -1,4 +1,4 @@
-import { siloNullifier } from '@aztec/circuits.js/abis';
+import { siloNullifier } from '@aztec/circuits.js/hash';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 

package/src/client/execution_result.ts

@@ -1,5 +1,5 @@
 import { FunctionL2Logs, Note } from '@aztec/circuit-types';
-import { PrivateCallStackItem, PublicCallRequest, ReadRequestMembershipWitness } from '@aztec/circuits.js';
+import { NoteHashReadRequestMembershipWitness, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js';
 import { DecodedReturn } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -32,7 +32,7 @@ export interface ExecutionResult {
   /** The call stack item. */
   callStackItem: PrivateCallStackItem;
   /** The partially filled-in read request membership witnesses for commitments being read. */
-  readRequestPartialWitnesses: ReadRequestMembershipWitness[];
+  noteHashReadRequestPartialWitnesses: NoteHashReadRequestMembershipWitness[];
   // Needed when we enable chained txs. The new notes can be cached and used in a later transaction.
   /** The notes created in the executed function. */
   newNotes: NoteAndSlot[];

package/src/client/private_execution.ts

@@ -23,8 +23,7 @@ export async function executePrivateFunction(
   log = createDebugLogger('aztec:simulator:secret_execution'),
 ): Promise<ExecutionResult> {
   const functionSelector = functionData.selector;
-  log(`Executing external function ${contractAddress}:${functionSelector}`);
-
+  log(`Executing external function ${contractAddress}:${functionSelector}(${artifact.name})`);
   const acir = Buffer.from(artifact.bytecode, 'base64');
   const initialWitness = context.getInitialWitness(artifact);
   const acvmCallback = new Oracle(context);
@@ -55,7 +54,9 @@ export async function executePrivateFunction(
 
   const callStackItem = new PrivateCallStackItem(contractAddress, functionData, publicInputs);
   const returnValues = decodeReturnValues(artifact, publicInputs.returnValues);
-  const readRequestPartialWitnesses = context.getReadRequestPartialWitnesses(publicInputs.readRequests);
+  const noteHashReadRequestPartialWitnesses = context.getNoteHashReadRequestPartialWitnesses(
+    publicInputs.noteHashReadRequests,
+  );
   const newNotes = context.getNewNotes();
   const nestedExecutions = context.getNestedExecutions();
   const enqueuedPublicFunctionCalls = context.getEnqueuedPublicFunctionCalls();
@@ -67,7 +68,7 @@ export async function executePrivateFunction(
     partialWitness,
     callStackItem,
     returnValues,
-    readRequestPartialWitnesses,
+    noteHashReadRequestPartialWitnesses,
     newNotes,
     vk: Buffer.from(artifact.verificationKey!, 'hex'),
     nestedExecutions,

package/src/client/simulator.ts

@@ -94,7 +94,8 @@ export class AcirSimulator {
       false,
       request.functionData.isConstructor,
       // TODO: when contract deployment is done in-app, we should only reserve one counter for the tx hash
-      2, // 2 counters are reserved for tx hash and contract deployment nullifier
+      // 2 counters are reserved for tx hash and contract deployment nullifier
+      request.txContext.isContractDeploymentTx ? 2 : 1,
     );
     const context = new ClientExecutionContext(
       contractAddress,

package/src/client/view_data_oracle.ts

@@ -8,10 +8,11 @@ import {
   PublicDataWitness,
 } from '@aztec/circuit-types';
 import { Header } from '@aztec/circuits.js';
-import { siloNullifier } from '@aztec/circuits.js/abis';
+import { siloNullifier } from '@aztec/circuits.js/hash';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
+import { ContractInstance } from '@aztec/types/contracts';
 
 import { NoteData, TypedOracle } from '../acvm/index.js';
 import { DBOracle } from './db_oracle.js';
@@ -129,6 +130,15 @@ export class ViewDataOracle extends TypedOracle {
     return this.db.getCompleteAddress(address);
   }
 
+  /**
+   * Returns a contract instance associated with an address or throws if not found.
+   * @param address - Address.
+   * @returns A contract instance.
+   */
+  public getContractInstance(address: AztecAddress): Promise<ContractInstance> {
+    return this.db.getContractInstance(address);
+  }
+
   /**
    * Returns an auth witness for the given message hash. Checks on the list of transient witnesses
    * for this transaction first, and falls back to the local database if not found.
@@ -207,11 +217,11 @@ export class ViewDataOracle extends TypedOracle {
 
   /**
    * Fetches the a message from the db, given its key.
-   * @param msgKey - A buffer representing the message key.
+   * @param entryKey - A buffer representing the entry key.
    * @returns The l1 to l2 message data
    */
-  public async getL1ToL2Message(msgKey: Fr) {
-    return await this.db.getL1ToL2Message(msgKey);
+  public async getL1ToL2MembershipWitness(entryKey: Fr) {
+    return await this.db.getL1ToL2MembershipWitness(entryKey);
   }
 
   /**

package/src/public/db.ts

@@ -1,3 +1,4 @@
+import { NullifierMembershipWitness } from '@aztec/circuit-types';
 import { EthAddress, FunctionSelector, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -66,15 +67,15 @@ export interface PublicContractsDB {
   getPortalContractAddress(address: AztecAddress): Promise<EthAddress | undefined>;
 }
 
-/** Database interface for providing access to commitment tree and l1 to l2 message tree (append only data trees). */
+/** Database interface for providing access to commitment tree, l1 to l2 message tree, and nullifier tree. */
 export interface CommitmentsDB {
   /**
-   * Gets a confirmed L1 to L2 message for the given message key.
+   * Gets a confirmed L1 to L2 message for the given entry key.
    * TODO(Maddiaa): Can be combined with aztec-node method that does the same thing.
-   * @param msgKey - The message Key.
+   * @param entryKey - The entry key.
    * @returns - The l1 to l2 message object
    */
-  getL1ToL2Message(msgKey: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
+  getL1ToL2MembershipWitness(entryKey: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
 
   /**
    * Gets the index of a commitment in the note hash tree.
@@ -82,4 +83,18 @@ export interface CommitmentsDB {
    * @returns - The index of the commitment. Undefined if it does not exist in the tree.
    */
   getCommitmentIndex(commitment: Fr): Promise<bigint | undefined>;
+
+  /**
+   * Gets the index of a nullifier in the nullifier tree.
+   * @param nullifier - The nullifier.
+   * @returns - The index of the nullifier. Undefined if it does not exist in the tree.
+   */
+  getNullifierIndex(nullifier: Fr): Promise<bigint | undefined>;
+
+  /**
+   * Returns a nullifier membership witness for the given nullifier or undefined if not found.
+   * REFACTOR: Same as getL1ToL2MembershipWitness, can be combined with aztec-node method that does almost the same thing.
+   * @param nullifier - Nullifier we're looking for.
+   */
+  getNullifierMembershipWitnessAtLatestBlock(nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
 }

package/src/public/execution.ts

@@ -6,12 +6,13 @@ import {
   ContractStorageUpdateRequest,
   Fr,
   FunctionData,
+  L2ToL1Message,
   PublicDataRead,
   PublicDataUpdateRequest,
   SideEffect,
   SideEffectLinkedToNoteHash,
 } from '@aztec/circuits.js';
-import { computePublicDataTreeLeafSlot, computePublicDataTreeValue } from '@aztec/circuits.js/abis';
+import { computePublicDataTreeLeafSlot, computePublicDataTreeValue } from '@aztec/circuits.js/hash';
 
 /**
  * The public function execution result.
@@ -21,10 +22,10 @@ export interface PublicExecutionResult {
   execution: PublicExecution;
   /** The return values of the function. */
   returnValues: Fr[];
-  /** The new commitments to be inserted into the commitments tree. */
-  newCommitments: SideEffect[];
+  /** The new note hashes to be inserted into the note hashes tree. */
+  newNoteHashes: SideEffect[];
   /** The new l2 to l1 messages generated in this call. */
-  newL2ToL1Messages: Fr[];
+  newL2ToL1Messages: L2ToL1Message[];
   /** The new nullifiers to be inserted into the nullifier tree. */
   newNullifiers: SideEffectLinkedToNoteHash[];
   /** The contract storage reads performed by the function. */
@@ -73,7 +74,7 @@ export function isPublicExecutionResult(
  */
 export function collectPublicDataReads(execResult: PublicExecutionResult): PublicDataRead[] {
   // HACK(#1622): part of temporary hack - may be able to remove this function after public state ordering is fixed
-  const contractAddress = execResult.execution.contractAddress;
+  const contractAddress = execResult.execution.callContext.storageContractAddress;
 
   const thisExecPublicDataReads = execResult.contractStorageReads.map(read =>
     contractStorageReadToPublicDataRead(read, contractAddress),
@@ -93,7 +94,7 @@ export function collectPublicDataReads(execResult: PublicExecutionResult): Publi
  */
 export function collectPublicDataUpdateRequests(execResult: PublicExecutionResult): PublicDataUpdateRequest[] {
   // HACK(#1622): part of temporary hack - may be able to remove this function after public state ordering is fixed
-  const contractAddress = execResult.execution.contractAddress;
+  const contractAddress = execResult.execution.callContext.storageContractAddress;
 
   const thisExecPublicDataUpdateRequests = execResult.contractStorageUpdateRequests.map(update =>
     contractStorageUpdateRequestToPublicDataUpdateRequest(update, contractAddress),
@@ -135,3 +136,26 @@ function contractStorageUpdateRequestToPublicDataUpdateRequest(
     update.sideEffectCounter!,
   );
 }
+
+/**
+ * Checks whether the child execution result is valid for a static call (no state modifications).
+ * @param executionResult - The execution result of a public function
+ */
+
+export function checkValidStaticCall(
+  newNoteHashes: SideEffect[],
+  newNullifiers: SideEffectLinkedToNoteHash[],
+  contractStorageUpdateRequests: ContractStorageUpdateRequest[],
+  newL2ToL1Messages: L2ToL1Message[],
+  unencryptedLogs: FunctionL2Logs,
+) {
+  if (
+    contractStorageUpdateRequests.length > 0 ||
+    newNoteHashes.length > 0 ||
+    newNullifiers.length > 0 ||
+    newL2ToL1Messages.length > 0 ||
+    unencryptedLogs.logs.length > 0
+  ) {
+    throw new Error('Static call cannot update the state, emit L2->L1 messages or generate logs');
+  }
+}

package/src/public/executor.ts

@@ -6,7 +6,7 @@ import { AvmContext } from '../avm/avm_context.js';
 import { AvmMachineState } from '../avm/avm_machine_state.js';
 import { AvmSimulator } from '../avm/avm_simulator.js';
 import { HostStorage } from '../avm/journal/host_storage.js';
-import { AvmWorldStateJournal } from '../avm/journal/index.js';
+import { AvmPersistableStateManager } from '../avm/journal/index.js';
 import {
   temporaryConvertAvmResults,
   temporaryCreateAvmExecutionEnvironment,
@@ -16,7 +16,7 @@ import { SideEffectCounter } from '../common/index.js';
 import { PackedArgsCache } from '../common/packed_args_cache.js';
 import { AcirSimulator } from '../index.js';
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
-import { PublicExecution, PublicExecutionResult } from './execution.js';
+import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js';
 import { PublicExecutionContext } from './public_execution_context.js';
 
 /**
@@ -52,27 +52,33 @@ export async function executePublicFunction(
   const {
     returnValues,
     newL2ToL1Msgs,
-    newCommitments: newCommitmentsPadded,
+    newNoteHashes: newNoteHashesPadded,
     newNullifiers: newNullifiersPadded,
   } = PublicCircuitPublicInputs.fromFields(returnWitness);
 
-  const newL2ToL1Messages = newL2ToL1Msgs.filter(v => !v.isZero());
-  const newCommitments = newCommitmentsPadded.filter(v => !v.isEmpty());
+  const newL2ToL1Messages = newL2ToL1Msgs.filter(v => !v.isEmpty());
+  const newNoteHashes = newNoteHashesPadded.filter(v => !v.isEmpty());
   const newNullifiers = newNullifiersPadded.filter(v => !v.isEmpty());
 
   const { contractStorageReads, contractStorageUpdateRequests } = context.getStorageActionData();
+
   log(
     `Contract storage reads: ${contractStorageReads
       .map(r => r.toFriendlyJSON() + ` - sec: ${r.sideEffectCounter}`)
       .join(', ')}`,
   );
+  log(
+    `Contract storage update requests: ${contractStorageUpdateRequests
+      .map(r => r.toFriendlyJSON() + ` - sec: ${r.sideEffectCounter}`)
+      .join(', ')}`,
+  );
 
   const nestedExecutions = context.getNestedExecutions();
   const unencryptedLogs = context.getUnencryptedLogs();
 
   return {
     execution,
-    newCommitments,
+    newNoteHashes,
     newL2ToL1Messages,
     newNullifiers,
     contractStorageReads,
@@ -124,11 +130,25 @@ export class PublicExecutor {
       this.commitmentsDb,
     );
 
+    let executionResult;
+
     try {
-      return await executePublicFunction(context, acir);
+      executionResult = await executePublicFunction(context, acir);
     } catch (err) {
       throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during public execution'));
     }
+
+    if (executionResult.execution.callContext.isStaticCall) {
+      checkValidStaticCall(
+        executionResult.newNoteHashes,
+        executionResult.newNullifiers,
+        executionResult.contractStorageUpdateRequests,
+        executionResult.newL2ToL1Messages,
+        executionResult.unencryptedLogs,
+      );
+    }
+
+    return executionResult;
   }
 
   /**
@@ -144,7 +164,7 @@ export class PublicExecutor {
     // Temporary code to construct the AVM context
     // These data structures will permiate across the simulator when the public executor is phased out
     const hostStorage = new HostStorage(this.stateDb, this.contractsDb, this.commitmentsDb);
-    const worldStateJournal = new AvmWorldStateJournal(hostStorage);
+    const worldStateJournal = new AvmPersistableStateManager(hostStorage);
     const executionEnv = temporaryCreateAvmExecutionEnvironment(execution, globalVariables);
     const machineState = new AvmMachineState(0, 0, 0);
 
@@ -152,7 +172,7 @@ export class PublicExecutor {
     const simulator = new AvmSimulator(context);
 
     const result = await simulator.execute();
-    const newWorldState = context.worldState.flush();
+    const newWorldState = context.persistableState.flush();
     return temporaryConvertAvmResults(execution, newWorldState, result);
   }
 }