@aztec/simulator 0.59.0 → 0.61.0

package/src/avm/serialization/bytecode_serialization.ts

@@ -19,7 +19,6 @@ import {
   InternalReturn,
   Jump,
   JumpI,
-  Keccak,
   KeccakF1600,
   L1ToL2MessageExists,
   Lt,
@@ -30,10 +29,10 @@ import {
   NoteHashExists,
   NullifierExists,
   Or,
-  Pedersen,
-  PedersenCommitment,
   Poseidon2,
   Return,
+  ReturndataCopy,
+  ReturndataSize,
   Revert,
   SLoad,
   SStore,
@@ -44,7 +43,7 @@ import {
   Shr,
   StaticCall,
   Sub,
-  ToRadixLE,
+  ToRadixBE,
   Xor,
 } from '../opcodes/index.js';
 import { MultiScalarMul } from '../opcodes/multi_scalar_mul.js';
@@ -99,6 +98,8 @@ const INSTRUCTION_SET = () =>
     // Execution Environment
     [Opcode.GETENVVAR_16, GetEnvVar.as(GetEnvVar.wireFormat16).deserialize],
     [CalldataCopy.opcode, Instruction.deserialize.bind(CalldataCopy)],
+    [Opcode.RETURNDATASIZE, Instruction.deserialize.bind(ReturndataSize)],
+    [Opcode.RETURNDATACOPY, Instruction.deserialize.bind(ReturndataCopy)],
 
     // Machine State - Internal Control Flow
     [Jump.opcode, Instruction.deserialize.bind(Jump)],
@@ -131,7 +132,6 @@ const INSTRUCTION_SET = () =>
     // Control Flow - Contract Calls
     [Call.opcode, Instruction.deserialize.bind(Call)],
     [StaticCall.opcode, Instruction.deserialize.bind(StaticCall)],
-    //[DelegateCall.opcode, Instruction.deserialize.bind(DelegateCall)],
     [Return.opcode, Instruction.deserialize.bind(Return)],
     [Opcode.REVERT_8, Revert.as(Revert.wireFormat8).deserialize],
     [Opcode.REVERT_16, Revert.as(Revert.wireFormat16).deserialize],
@@ -141,14 +141,11 @@ const INSTRUCTION_SET = () =>
 
     // Gadgets
     [EcAdd.opcode, Instruction.deserialize.bind(EcAdd)],
-    [Keccak.opcode, Instruction.deserialize.bind(Keccak)],
     [Poseidon2.opcode, Instruction.deserialize.bind(Poseidon2)],
     [Sha256Compression.opcode, Instruction.deserialize.bind(Sha256Compression)],
-    [Pedersen.opcode, Instruction.deserialize.bind(Pedersen)],
     [MultiScalarMul.opcode, Instruction.deserialize.bind(MultiScalarMul)],
-    [PedersenCommitment.opcode, Instruction.deserialize.bind(PedersenCommitment)],
     // Conversions
-    [ToRadixLE.opcode, Instruction.deserialize.bind(ToRadixLE)],
+    [ToRadixBE.opcode, Instruction.deserialize.bind(ToRadixBE)],
     // Future Gadgets -- pending changes in noir
     // SHA256COMPRESSION,
     [KeccakF1600.opcode, Instruction.deserialize.bind(KeccakF1600)],

package/src/avm/serialization/instruction_serialization.ts

@@ -41,6 +41,8 @@ export enum Opcode {
   // Execution environment
   GETENVVAR_16,
   CALLDATACOPY,
+  RETURNDATASIZE,
+  RETURNDATACOPY,
   // Control flow
   JUMP_16,
   JUMPI_16,
@@ -69,23 +71,19 @@ export enum Opcode {
   // External calls
   CALL,
   STATICCALL,
-  DELEGATECALL,
   RETURN,
   REVERT_8,
   REVERT_16,
   // Misc
   DEBUGLOG,
   // Gadgets
-  KECCAK,
   POSEIDON2,
   SHA256COMPRESSION,
   KECCAKF1600,
-  PEDERSEN, // temp - may be removed, but alot of contracts rely on it
   ECADD,
   MSM,
-  PEDERSENCOMMITMENT,
   // Conversion
-  TORADIXLE,
+  TORADIXBE,
 }
 
 // Possible types for an instruction's operand in its wire format. (Keep in sync with CPP code.

package/src/avm/test_utils.ts

@@ -1,4 +1,4 @@
-import { type ContractInstanceWithAddress, Fr } from '@aztec/circuits.js';
+import { type ContractClassPublic, type ContractInstanceWithAddress, Fr } from '@aztec/circuits.js';
 
 import { type jest } from '@jest/globals';
 import { mock } from 'jest-mock-extended';
@@ -61,3 +61,7 @@ export function mockL1ToL2MessageExists(
 export function mockGetContractInstance(worldStateDB: WorldStateDB, contractInstance: ContractInstanceWithAddress) {
   (worldStateDB as jest.Mocked<WorldStateDB>).getContractInstance.mockResolvedValue(contractInstance);
 }
+
+export function mockGetContractClass(worldStateDB: WorldStateDB, contractClass: ContractClassPublic) {
+  (worldStateDB as jest.Mocked<WorldStateDB>).getContractClass.mockResolvedValue(contractClass);
+}

package/src/client/client_execution_context.ts

@@ -68,7 +68,6 @@ export class ClientExecutionContext extends ViewDataOracle {
   private publicTeardownFunctionCall: PublicExecutionRequest = PublicExecutionRequest.empty();
 
   constructor(
-    contractAddress: AztecAddress,
     private readonly argsHash: Fr,
     private readonly txContext: TxContext,
     private readonly callContext: CallContext,
@@ -84,7 +83,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     log = createDebugLogger('aztec:simulator:client_execution_context'),
     scopes?: AztecAddress[],
   ) {
-    super(contractAddress, authWitnesses, db, node, log, scopes);
+    super(callContext.contractAddress, authWitnesses, db, node, log, scopes);
   }
 
   // We still need this function until we can get user-defined ordering of structs for fn arguments
@@ -240,10 +239,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.callContext.storageContractAddress, storageSlot);
+    const pendingNotes = this.noteCache.getNotes(this.callContext.contractAddress, storageSlot);
 
-    const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.storageContractAddress);
-    const dbNotes = await this.db.getNotes(this.callContext.storageContractAddress, storageSlot, status, this.scopes);
+    const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.contractAddress);
+    const dbNotes = await this.db.getNotes(this.callContext.contractAddress, storageSlot, status, this.scopes);
     const dbNotesFiltered = dbNotes.filter(n => !pendingNullifiers.has((n.siloedNullifier as Fr).value));
 
     const notes = pickNotes<NoteData>([...dbNotesFiltered, ...pendingNotes], {
@@ -261,7 +260,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     });
 
     this.log.debug(
-      `Returning ${notes.length} notes for ${this.callContext.storageContractAddress} at ${storageSlot}: ${notes
+      `Returning ${notes.length} notes for ${this.callContext.contractAddress} at ${storageSlot}: ${notes
         .map(n => `${n.nonce.toString()}:[${n.note.items.map(i => i.toString()).join(',')}]`)
         .join(', ')}`,
     );
@@ -297,7 +296,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     const note = new Note(noteItems);
     this.noteCache.addNewNote(
       {
-        contractAddress: this.callContext.storageContractAddress,
+        contractAddress: this.callContext.contractAddress,
         storageSlot,
         nonce: Fr.ZERO, // Nonce cannot be known during private execution.
         note,
@@ -317,7 +316,7 @@ export class ClientExecutionContext extends ViewDataOracle {
    */
   public override notifyNullifiedNote(innerNullifier: Fr, noteHash: Fr, counter: number) {
     const nullifiedNoteHashCounter = this.noteCache.nullifyNote(
-      this.callContext.storageContractAddress,
+      this.callContext.contractAddress,
       innerNullifier,
       noteHash,
     );
@@ -391,11 +390,11 @@ export class ClientExecutionContext extends ViewDataOracle {
 
   #checkValidStaticCall(childExecutionResult: PrivateExecutionResult) {
     if (
-      childExecutionResult.callStackItem.publicInputs.noteHashes.some(item => !item.isEmpty()) ||
-      childExecutionResult.callStackItem.publicInputs.nullifiers.some(item => !item.isEmpty()) ||
-      childExecutionResult.callStackItem.publicInputs.l2ToL1Msgs.some(item => !item.isEmpty()) ||
-      childExecutionResult.callStackItem.publicInputs.encryptedLogsHashes.some(item => !item.isEmpty()) ||
-      childExecutionResult.callStackItem.publicInputs.unencryptedLogsHashes.some(item => !item.isEmpty())
+      childExecutionResult.publicInputs.noteHashes.some(item => !item.isEmpty()) ||
+      childExecutionResult.publicInputs.nullifiers.some(item => !item.isEmpty()) ||
+      childExecutionResult.publicInputs.l2ToL1Msgs.some(item => !item.isEmpty()) ||
+      childExecutionResult.publicInputs.encryptedLogsHashes.some(item => !item.isEmpty()) ||
+      childExecutionResult.publicInputs.unencryptedLogsHashes.some(item => !item.isEmpty())
     ) {
       throw new Error(`Static call cannot update the state, emit L2->L1 messages or generate logs`);
     }
@@ -408,7 +407,6 @@ export class ClientExecutionContext extends ViewDataOracle {
    * @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 isDelegateCall - Whether the call is a delegate call.
    * @returns The execution result.
    */
   override async callPrivateFunction(
@@ -417,10 +415,9 @@ export class ClientExecutionContext extends ViewDataOracle {
     argsHash: Fr,
     sideEffectCounter: number,
     isStaticCall: boolean,
-    isDelegateCall: boolean,
   ) {
     this.log.debug(
-      `Calling private function ${this.contractAddress}:${functionSelector} from ${this.callContext.storageContractAddress}`,
+      `Calling private function ${this.contractAddress}:${functionSelector} from ${this.callContext.contractAddress}`,
     );
 
     isStaticCall = isStaticCall || this.callContext.isStaticCall;
@@ -429,15 +426,9 @@ export class ClientExecutionContext extends ViewDataOracle {
 
     const derivedTxContext = this.txContext.clone();
 
-    const derivedCallContext = this.deriveCallContext(
-      targetContractAddress,
-      targetArtifact,
-      isDelegateCall,
-      isStaticCall,
-    );
+    const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
 
     const context = new ClientExecutionContext(
-      targetContractAddress,
       argsHash,
       derivedTxContext,
       derivedCallContext,
@@ -465,7 +456,7 @@ export class ClientExecutionContext extends ViewDataOracle {
 
     this.nestedExecutions.push(childExecutionResult);
 
-    const publicInputs = childExecutionResult.callStackItem.publicInputs;
+    const publicInputs = childExecutionResult.publicInputs;
     return {
       endSideEffectCounter: publicInputs.endSideEffectCounter,
       returnsHash: publicInputs.returnsHash,
@@ -473,7 +464,7 @@ export class ClientExecutionContext extends ViewDataOracle {
   }
 
   /**
-   * Creates a PublicCallStackItem object representing the request to call a public function.
+   * Creates a PublicExecutionRequest object representing the request to call a public function.
    * @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.
@@ -488,15 +479,9 @@ export class ClientExecutionContext extends ViewDataOracle {
     argsHash: Fr,
     sideEffectCounter: number,
     isStaticCall: boolean,
-    isDelegateCall: boolean,
   ) {
     const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
-    const derivedCallContext = this.deriveCallContext(
-      targetContractAddress,
-      targetArtifact,
-      isDelegateCall,
-      isStaticCall,
-    );
+    const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, isStaticCall);
     const args = this.packedValuesCache.unpack(argsHash);
 
     this.log.verbose(
@@ -506,7 +491,6 @@ export class ClientExecutionContext extends ViewDataOracle {
     const request = PublicExecutionRequest.from({
       args,
       callContext: derivedCallContext,
-      contractAddress: targetContractAddress,
     });
 
     if (callType === 'enqueued') {
@@ -517,7 +501,7 @@ export class ClientExecutionContext extends ViewDataOracle {
   }
 
   /**
-   * Creates and enqueues a PublicCallStackItem object representing the request to call a public function. No function
+   * Creates and enqueues a PublicExecutionRequest object representing the request to call a public function. No function
    * is actually called, since that must happen on the sequencer side. All the fields related to the result
    * of the execution are empty.
    * @param targetContractAddress - The address of the contract to call.
@@ -533,7 +517,6 @@ export class ClientExecutionContext extends ViewDataOracle {
     argsHash: Fr,
     sideEffectCounter: number,
     isStaticCall: boolean,
-    isDelegateCall: boolean,
   ): Promise<Fr> {
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Fix this.
     // WARNING: This is insecure and should be temporary!
@@ -552,13 +535,12 @@ export class ClientExecutionContext extends ViewDataOracle {
       newArgsHash,
       sideEffectCounter,
       isStaticCall,
-      isDelegateCall,
     );
     return newArgsHash;
   }
 
   /**
-   * Creates a PublicCallStackItem and sets it as the public teardown function. No function
+   * Creates a PublicExecutionRequest and sets it as the public teardown function. No function
    * is actually called, since that must happen on the sequencer side. All the fields related to the result
    * of the execution are empty.
    * @param targetContractAddress - The address of the contract to call.
@@ -574,7 +556,6 @@ export class ClientExecutionContext extends ViewDataOracle {
     argsHash: Fr,
     sideEffectCounter: number,
     isStaticCall: boolean,
-    isDelegateCall: boolean,
   ): Promise<Fr> {
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Fix this.
     // WARNING: This is insecure and should be temporary!
@@ -593,7 +574,6 @@ export class ClientExecutionContext extends ViewDataOracle {
       newArgsHash,
       sideEffectCounter,
       isStaticCall,
-      isDelegateCall,
     );
     return newArgsHash;
   }
@@ -606,52 +586,22 @@ export class ClientExecutionContext extends ViewDataOracle {
    * Derives the call context for a nested execution.
    * @param targetContractAddress - The address of the contract being called.
    * @param targetArtifact - The artifact of the function being called.
-   * @param isDelegateCall - Whether the call is a delegate call.
    * @param isStaticCall - Whether the call is a static call.
    * @returns The derived call context.
    */
   private deriveCallContext(
     targetContractAddress: AztecAddress,
     targetArtifact: FunctionArtifact,
-    isDelegateCall = false,
     isStaticCall = false,
   ) {
     return new CallContext(
-      isDelegateCall ? this.callContext.msgSender : this.contractAddress,
-      isDelegateCall ? this.contractAddress : targetContractAddress,
+      this.contractAddress,
+      targetContractAddress,
       FunctionSelector.fromNameAndParameters(targetArtifact.name, targetArtifact.parameters),
-      isDelegateCall,
       isStaticCall,
     );
   }
 
-  /**
-   * Read the public storage data.
-   * @param contractAddress - The address to read storage from.
-   * @param startStorageSlot - The starting storage slot.
-   * @param blockNumber - The block number to read storage at.
-   * @param numberOfElements - Number of elements to read from the starting storage slot.
-   */
-  public override async storageRead(
-    contractAddress: Fr,
-    startStorageSlot: Fr,
-    blockNumber: number,
-    numberOfElements: number,
-  ): Promise<Fr[]> {
-    const values = [];
-    for (let i = 0n; i < numberOfElements; i++) {
-      const storageSlot = new Fr(startStorageSlot.value + i);
-
-      const value = await this.aztecNode.getPublicStorageAt(contractAddress, storageSlot, blockNumber);
-      this.log.debug(
-        `Oracle storage read: slot=${storageSlot.toString()} address-${contractAddress.toString()} value=${value}`,
-      );
-
-      values.push(value);
-    }
-    return values;
-  }
-
   public override debugLog(message: string, fields: Fr[]) {
     this.log.verbose(`debug_log ${applyStringFormatting(message, fields)}`);
   }

package/src/client/db_oracle.ts

@@ -9,6 +9,7 @@ import {
   type CompleteAddress,
   type ContractInstance,
   type Header,
+  type IndexedTaggingSecret,
   type KeyValidationRequest,
 } from '@aztec/circuits.js';
 import { type FunctionArtifact, type FunctionSelector } from '@aztec/foundation/abi';
@@ -193,4 +194,29 @@ export interface DBOracle extends CommitmentsDB {
    * @returns The block number.
    */
   getBlockNumber(): Promise<number>;
+
+  /**
+   * Returns the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
+   * Includes the last known index used for tagging with this secret.
+   * @param contractAddress - The contract address to silo the secret for
+   * @param sender - The address sending the note
+   * @param recipient - The address receiving the note
+   * @returns A tagging secret that can be used to tag notes.
+   */
+  getAppTaggingSecret(
+    contractAddress: AztecAddress,
+    sender: AztecAddress,
+    recipient: AztecAddress,
+  ): Promise<IndexedTaggingSecret>;
+
+  /**
+   * Returns the siloed tagging secrets for a given recipient and all the senders in the address book
+   * @param contractAddress - The contract address to silo the secret for
+   * @param recipient - The address receiving the notes
+   * @returns A list of siloed tagging secrets
+   */
+  getAppTaggingSecretsForSenders(
+    contractAddress: AztecAddress,
+    recipient: AztecAddress,
+  ): Promise<IndexedTaggingSecret[]>;
 }

package/src/client/private_execution.ts

@@ -2,10 +2,8 @@ import { PrivateExecutionResult } from '@aztec/circuit-types';
 import { type CircuitWitnessGenerationStats } from '@aztec/circuit-types/stats';
 import {
   Fr,
-  FunctionData,
   PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH,
   PRIVATE_CONTEXT_INPUTS_LENGTH,
-  PrivateCallStackItem,
   PrivateCircuitPublicInputs,
 } from '@aztec/circuits.js';
 import { type FunctionArtifact, type FunctionSelector, countArgumentsSize } from '@aztec/foundation/abi';
@@ -64,12 +62,6 @@ export async function executePrivateFunction(
   const encryptedLogs = context.getEncryptedLogs();
   const unencryptedLogs = context.getUnencryptedLogs();
 
-  const callStackItem = new PrivateCallStackItem(
-    contractAddress,
-    new FunctionData(functionSelector, true),
-    publicInputs,
-  );
-
   const rawReturnValues = await context.unpackReturns(publicInputs.returnsHash);
 
   const noteHashLeafIndexMap = context.getNoteHashLeafIndexMap();
@@ -85,7 +77,7 @@ export async function executePrivateFunction(
     acir,
     Buffer.from(artifact.verificationKey!, 'hex'),
     partialWitness,
-    callStackItem,
+    publicInputs,
     noteHashLeafIndexMap,
     newNotes,
     noteHashNullifierCounterMap,

package/src/client/simulator.ts

@@ -66,14 +66,12 @@ export class AcirSimulator {
       msgSender,
       contractAddress,
       FunctionSelector.fromNameAndParameters(entryPointArtifact.name, entryPointArtifact.parameters),
-      false,
       entryPointArtifact.isStatic,
     );
 
     const txHash = request.toTxRequest().hash();
 
     const context = new ClientExecutionContext(
-      contractAddress,
       request.firstCallArgsHash,
       request.txContext,
       callContext,

package/src/client/view_data_oracle.ts

@@ -7,7 +7,12 @@ import {
   type NullifierMembershipWitness,
   type PublicDataWitness,
 } from '@aztec/circuit-types';
-import { type ContractInstance, type Header, type KeyValidationRequest } from '@aztec/circuits.js';
+import {
+  type ContractInstance,
+  type Header,
+  type IndexedTaggingSecret,
+  type KeyValidationRequest,
+} from '@aztec/circuits.js';
 import { siloNullifier } from '@aztec/circuits.js/hash';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -288,4 +293,29 @@ export class ViewDataOracle extends TypedOracle {
     const formattedStr = applyStringFormatting(message, fields);
     this.log.verbose(`debug_log ${formattedStr}`);
   }
+
+  /**
+   * Returns the tagging secret for a given sender and recipient pair, siloed to the current contract address.
+   * Includes the last known index used for tagging with this secret.
+   * For this to work, the ivpsk_m of the sender must be known.
+   * @param sender - The address sending the note
+   * @param recipient - The address receiving the note
+   * @returns A tagging secret that can be used to tag notes.
+   */
+  public override async getAppTaggingSecret(
+    sender: AztecAddress,
+    recipient: AztecAddress,
+  ): Promise<IndexedTaggingSecret> {
+    return await this.db.getAppTaggingSecret(this.contractAddress, sender, recipient);
+  }
+
+  /**
+   * Returns the siloed tagging secrets for a given recipient and all the senders in the address book
+   * @param contractAddress - The contract address to silo the secret for
+   * @param recipient - The address receiving the notes
+   * @returns A list of siloed tagging secrets
+   */
+  public override async getAppTaggingSecretsForSenders(recipient: AztecAddress): Promise<IndexedTaggingSecret[]> {
+    return await this.db.getAppTaggingSecretsForSenders(this.contractAddress, recipient);
+  }
 }

package/src/common/index.ts

@@ -1,3 +1,2 @@
 export * from './packed_values_cache.js';
 export * from './errors.js';
-export * from './side_effect_counter.js';

package/src/mocks/fixtures.ts

@@ -79,7 +79,7 @@ export class PublicExecutionResultBuilder {
     revertReason?: SimulationError;
   }) {
     const builder = new PublicExecutionResultBuilder(
-      new PublicExecutionRequest(tx.to, new CallContext(from, tx.to, tx.selector, false, false), tx.args),
+      new PublicExecutionRequest(new CallContext(from, tx.to, tx.selector, false), tx.args),
     );
 
     builder.withNestedExecutions(...nestedExecutions);

package/src/public/dual_side_effect_trace.ts

@@ -1,7 +1,8 @@
 import {
   type CombinedConstantData,
-  type ContractInstanceWithAddress,
+  type ContractClassIdPreimage,
   type Gas,
+  type SerializableContractInstance,
   type VMCircuitPublicInputs,
 } from '@aztec/circuits.js';
 import { type Fr } from '@aztec/foundation/fields';
@@ -15,8 +16,6 @@ import { type PublicExecutionResult } from './execution.js';
 import { type PublicSideEffectTrace } from './side_effect_trace.js';
 import { type PublicSideEffectTraceInterface } from './side_effect_trace_interface.js';
 
-export type TracedContractInstance = { exists: boolean } & ContractInstanceWithAddress;
-
 export class DualSideEffectTrace implements PublicSideEffectTraceInterface {
   constructor(
     public readonly innerCallTrace: PublicSideEffectTrace,
@@ -32,35 +31,35 @@ export class DualSideEffectTrace implements PublicSideEffectTraceInterface {
     return this.innerCallTrace.getCounter();
   }
 
-  public tracePublicStorageRead(storageAddress: Fr, slot: Fr, value: Fr, exists: boolean, cached: boolean) {
-    this.innerCallTrace.tracePublicStorageRead(storageAddress, slot, value, exists, cached);
-    this.enqueuedCallTrace.tracePublicStorageRead(storageAddress, slot, value, exists, cached);
+  public tracePublicStorageRead(contractAddress: Fr, slot: Fr, value: Fr, exists: boolean, cached: boolean) {
+    this.innerCallTrace.tracePublicStorageRead(contractAddress, slot, value, exists, cached);
+    this.enqueuedCallTrace.tracePublicStorageRead(contractAddress, slot, value, exists, cached);
   }
 
-  public tracePublicStorageWrite(storageAddress: Fr, slot: Fr, value: Fr) {
-    this.innerCallTrace.tracePublicStorageWrite(storageAddress, slot, value);
-    this.enqueuedCallTrace.tracePublicStorageWrite(storageAddress, slot, value);
+  public tracePublicStorageWrite(contractAddress: Fr, slot: Fr, value: Fr) {
+    this.innerCallTrace.tracePublicStorageWrite(contractAddress, slot, value);
+    this.enqueuedCallTrace.tracePublicStorageWrite(contractAddress, slot, value);
   }
 
   // TODO(8287): _exists can be removed once we have the vm properly handling the equality check
-  public traceNoteHashCheck(_storageAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean) {
-    this.innerCallTrace.traceNoteHashCheck(_storageAddress, noteHash, leafIndex, exists);
-    this.enqueuedCallTrace.traceNoteHashCheck(_storageAddress, noteHash, leafIndex, exists);
+  public traceNoteHashCheck(_contractAddress: Fr, noteHash: Fr, leafIndex: Fr, exists: boolean) {
+    this.innerCallTrace.traceNoteHashCheck(_contractAddress, noteHash, leafIndex, exists);
+    this.enqueuedCallTrace.traceNoteHashCheck(_contractAddress, noteHash, leafIndex, exists);
   }
 
-  public traceNewNoteHash(_storageAddress: Fr, noteHash: Fr) {
-    this.innerCallTrace.traceNewNoteHash(_storageAddress, noteHash);
-    this.enqueuedCallTrace.traceNewNoteHash(_storageAddress, noteHash);
+  public traceNewNoteHash(_contractAddress: Fr, noteHash: Fr) {
+    this.innerCallTrace.traceNewNoteHash(_contractAddress, noteHash);
+    this.enqueuedCallTrace.traceNewNoteHash(_contractAddress, noteHash);
   }
 
-  public traceNullifierCheck(storageAddress: Fr, nullifier: Fr, leafIndex: Fr, exists: boolean, isPending: boolean) {
-    this.innerCallTrace.traceNullifierCheck(storageAddress, nullifier, leafIndex, exists, isPending);
-    this.enqueuedCallTrace.traceNullifierCheck(storageAddress, nullifier, leafIndex, exists, isPending);
+  public traceNullifierCheck(contractAddress: Fr, nullifier: Fr, leafIndex: Fr, exists: boolean, isPending: boolean) {
+    this.innerCallTrace.traceNullifierCheck(contractAddress, nullifier, leafIndex, exists, isPending);
+    this.enqueuedCallTrace.traceNullifierCheck(contractAddress, nullifier, leafIndex, exists, isPending);
   }
 
-  public traceNewNullifier(storageAddress: Fr, nullifier: Fr) {
-    this.innerCallTrace.traceNewNullifier(storageAddress, nullifier);
-    this.enqueuedCallTrace.traceNewNullifier(storageAddress, nullifier);
+  public traceNewNullifier(contractAddress: Fr, nullifier: Fr) {
+    this.innerCallTrace.traceNewNullifier(contractAddress, nullifier);
+    this.enqueuedCallTrace.traceNewNullifier(contractAddress, nullifier);
   }
 
   public traceL1ToL2MessageCheck(contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
@@ -78,9 +77,24 @@ export class DualSideEffectTrace implements PublicSideEffectTraceInterface {
     this.enqueuedCallTrace.traceUnencryptedLog(contractAddress, log);
   }
 
-  public traceGetContractInstance(instance: TracedContractInstance) {
-    this.innerCallTrace.traceGetContractInstance(instance);
-    this.enqueuedCallTrace.traceGetContractInstance(instance);
+  public traceGetContractInstance(
+    contractAddress: Fr,
+    exists: boolean,
+    instance: SerializableContractInstance | undefined,
+  ) {
+    this.innerCallTrace.traceGetContractInstance(contractAddress, exists, instance);
+    this.enqueuedCallTrace.traceGetContractInstance(contractAddress, exists, instance);
+  }
+
+  public traceGetBytecode(
+    contractAddress: Fr,
+    exists: boolean,
+    bytecode: Buffer,
+    contractInstance: SerializableContractInstance | undefined,
+    contractClass: ContractClassIdPreimage | undefined,
+  ) {
+    this.innerCallTrace.traceGetBytecode(contractAddress, exists, bytecode, contractInstance, contractClass);
+    this.enqueuedCallTrace.traceGetBytecode(contractAddress, exists, bytecode, contractInstance, contractClass);
   }
 
   /**