@aztec/txe 0.0.0-test.1 → 0.0.1-commit.017a351

package/src/oracle/txe_oracle_top_level_context.ts

@@ -0,0 +1,898 @@
+import {
+  CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
+  MAX_PRIVATE_LOGS_PER_TX,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+} from '@aztec/constants';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Schnorr } from '@aztec/foundation/crypto/schnorr';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { LogLevels, type Logger, applyStringFormatting, createLogger } from '@aztec/foundation/log';
+import { TestDateProvider } from '@aztec/foundation/timer';
+import type { KeyStore } from '@aztec/key-store';
+import {
+  AddressStore,
+  CapsuleService,
+  CapsuleStore,
+  type ContractStore,
+  type ExecutionHooks,
+  NoteStore,
+  ORACLE_VERSION_MAJOR,
+  PrivateEventStore,
+  RecipientTaggingStore,
+  SenderAddressBookStore,
+  SenderTaggingStore,
+  composeHooks,
+  enrichPublicSimulationError,
+} from '@aztec/pxe/server';
+import {
+  ExecutionNoteCache,
+  ExecutionTaggingIndexCache,
+  HashedValuesCache,
+  type IMiscOracle,
+  Oracle,
+  PrivateExecutionOracle,
+  UtilityExecutionOracle,
+  executePrivateFunction,
+  generateSimulatedProvingResult,
+} from '@aztec/pxe/simulator';
+import {
+  ExecutionError,
+  WASMSimulator,
+  createSimulationError,
+  extractCallStack,
+  resolveAssertionMessageFromError,
+  toACVMWitness,
+  witnessMapToFields,
+} from '@aztec/simulator/client';
+import {
+  CppPublicTxSimulator,
+  GuardedMerkleTreeOperations,
+  PublicContractsDB,
+  PublicProcessor,
+} from '@aztec/simulator/server';
+import { type ContractArtifact, EventSelector, FunctionCall, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { AuthWitness } from '@aztec/stdlib/auth-witness';
+import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { type ContractInstanceWithAddress, computePartialAddress } from '@aztec/stdlib/contract';
+import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
+import { computeCalldataHash, computeProtocolNullifier, siloNullifier } from '@aztec/stdlib/hash';
+import {
+  PartialPrivateTailPublicInputsForPublic,
+  PrivateKernelTailCircuitPublicInputs,
+  PrivateToPublicAccumulatedData,
+  PublicCallRequest,
+} from '@aztec/stdlib/kernel';
+import { hashPublicKey } from '@aztec/stdlib/keys';
+import { ChonkProof } from '@aztec/stdlib/proofs';
+import { makeGlobalVariables } from '@aztec/stdlib/testing';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import {
+  CallContext,
+  HashedValues,
+  PrivateCallExecutionResult,
+  PrivateExecutionResult,
+  Tx,
+  TxConstantData,
+  TxContext,
+  TxEffect,
+  TxHash,
+  collectNested,
+} from '@aztec/stdlib/tx';
+import type { UInt64 } from '@aztec/stdlib/types';
+import { ForkCheckpoint } from '@aztec/world-state/native';
+
+import { DEFAULT_ADDRESS, MAX_PRIVATE_EVENTS_PER_TXE_QUERY, MAX_PRIVATE_EVENT_LEN } from '../constants.js';
+import type { TXEStateMachine } from '../state_machine/index.js';
+import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlock } from '../utils/block_creation.js';
+import type { TXEAccountStore } from '../utils/txe_account_store.js';
+import type { TXEArtifactResolver } from '../utils/txe_artifact_resolver.js';
+import { TXEPublicContractDataSource } from '../utils/txe_public_contract_data_source.js';
+import type { ITxeExecutionOracle } from './interfaces.js';
+
+export class TXEOracleTopLevelContext implements IMiscOracle, ITxeExecutionOracle {
+  isMisc = true as const;
+  isTxe = true as const;
+
+  private logger: Logger;
+
+  constructor(
+    private stateMachine: TXEStateMachine,
+    private contractStore: ContractStore,
+    private noteStore: NoteStore,
+    private keyStore: KeyStore,
+    private addressStore: AddressStore,
+    private accountStore: TXEAccountStore,
+    private senderTaggingStore: SenderTaggingStore,
+    private recipientTaggingStore: RecipientTaggingStore,
+    private senderAddressBookStore: SenderAddressBookStore,
+    private capsuleStore: CapsuleStore,
+    private privateEventStore: PrivateEventStore,
+    private nextBlockTimestamp: bigint,
+    private version: Fr,
+    private chainId: Fr,
+    private authwits: Map<string, AuthWitness>,
+    private readonly artifactResolver: TXEArtifactResolver,
+    private readonly rootPath: string,
+    private readonly packageName: string,
+  ) {
+    this.logger = createLogger('txe:top_level_context');
+    this.logger.debug('Entering Top Level Context');
+  }
+
+  private contractOracleVersion: { major: number; minor: number } | undefined;
+
+  assertCompatibleOracleVersion(major: number, minor: number): void {
+    if (major !== ORACLE_VERSION_MAJOR) {
+      const hint =
+        major > ORACLE_VERSION_MAJOR
+          ? 'The contract was compiled with a newer version of Aztec.nr than this aztec cli version supports. Upgrade your aztec cli version to a compatible version.'
+          : 'The contract was compiled with an older version of Aztec.nr than this aztec cli version supports. Recompile the contract with a compatible version of Aztec.nr.';
+      throw new Error(
+        `Incompatible aztec cli version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`,
+      );
+    }
+    this.contractOracleVersion = { major, minor };
+  }
+
+  // Prefixed with "nonOracleFunction" as it is not used as an oracle handler.
+  nonOracleFunctionGetContractOracleVersion(): { major: number; minor: number } | undefined {
+    return this.contractOracleVersion;
+  }
+
+  // This is typically only invoked in private contexts, but it is convenient to also have it in top-level for testing
+  // setup.
+  getRandomField(): Fr {
+    return Fr.random();
+  }
+
+  // We instruct users to debug contracts via this oracle, so it makes sense that they'd expect it to also work in tests
+  log(level: number, message: string, _fieldsSize: number, fields: Fr[]): Promise<void> {
+    if (!LogLevels[level]) {
+      throw new Error(`Invalid log level: ${level}`);
+    }
+    const levelName = LogLevels[level];
+
+    this.logger[levelName](`${applyStringFormatting(message, fields)}`, { module: `${this.logger.module}:debug_log` });
+    return Promise.resolve();
+  }
+
+  getDefaultAddress(): AztecAddress {
+    return DEFAULT_ADDRESS;
+  }
+
+  async getNextBlockNumber(): Promise<BlockNumber> {
+    return BlockNumber((await this.getLastBlockNumber()) + 1);
+  }
+
+  getNextBlockTimestamp(): Promise<bigint> {
+    return Promise.resolve(this.nextBlockTimestamp);
+  }
+
+  async getLastBlockTimestamp() {
+    return (await this.stateMachine.node.getBlockData('latest'))!.header.globalVariables.timestamp;
+  }
+
+  async getLastTxEffects() {
+    const latestBlockNumber = await this.stateMachine.archiver.getBlockNumber();
+    const block = await this.stateMachine.archiver.getBlock({ number: latestBlockNumber });
+
+    if (block!.body.txEffects.length != 1) {
+      // Note that calls like env.mine() will result in blocks with no transactions, hitting this
+      throw new Error(`Expected a single transaction in the last block, found ${block!.body.txEffects.length}`);
+    }
+
+    const txEffects = block!.body.txEffects[0];
+
+    const privateLogs = txEffects.privateLogs;
+    if (privateLogs.length > MAX_PRIVATE_LOGS_PER_TX) {
+      throw new Error(`${privateLogs.length} private logs exceed max ${MAX_PRIVATE_LOGS_PER_TX}`);
+    }
+
+    return {
+      txHash: txEffects.txHash,
+      noteHashes: txEffects.noteHashes,
+      nullifiers: txEffects.nullifiers,
+      privateLogs,
+    };
+  }
+
+  async syncContractNonOracleMethod(contractAddress: AztecAddress, scope: AztecAddress, jobId: string) {
+    if (contractAddress.equals(DEFAULT_ADDRESS)) {
+      this.logger.debug(`Skipping sync in getPrivateEvents because the events correspond to the default address.`);
+      return;
+    }
+
+    const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+    await this.stateMachine.contractSyncService.ensureContractSynced(
+      contractAddress,
+      null,
+      async (call, execScopes) => {
+        await this.executeUtilityCall(call, execScopes, jobId);
+      },
+      blockHeader,
+      jobId,
+      [scope],
+    );
+  }
+
+  async getPrivateEvents(selector: EventSelector, contractAddress: AztecAddress, scope: AztecAddress) {
+    const events = (
+      await this.privateEventStore.getPrivateEvents(selector, {
+        contractAddress,
+        scopes: [scope],
+        fromBlock: 0,
+        toBlock: (await this.getLastBlockNumber()) + 1,
+      })
+    ).map(e => e.packedEvent);
+
+    if (events.length > MAX_PRIVATE_EVENTS_PER_TXE_QUERY) {
+      throw new Error(`Array of length ${events.length} larger than maxLen ${MAX_PRIVATE_EVENTS_PER_TXE_QUERY}`);
+    }
+    if (events.some(e => e.length > MAX_PRIVATE_EVENT_LEN)) {
+      throw new Error(`Some private event has length larger than maxLen ${MAX_PRIVATE_EVENT_LEN}`);
+    }
+
+    return events;
+  }
+
+  async advanceBlocksBy(blocks: number) {
+    this.logger.debug(`time traveling ${blocks} blocks`);
+
+    for (let i = 0; i < blocks; i++) {
+      await this.mineBlock();
+    }
+  }
+
+  advanceTimestampBy(duration: UInt64) {
+    this.logger.debug(`time traveling ${duration} seconds`);
+    this.nextBlockTimestamp += duration;
+  }
+
+  private deploymentNullifier(address: AztecAddress): Promise<Fr> {
+    return siloNullifier(AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS), address.toField());
+  }
+
+  async deploy(
+    contractPath: string,
+    initializer: string,
+    args: Fr[],
+    secret: Fr,
+    salt: Fr,
+    deployer: AztecAddress,
+  ): Promise<Fr[]> {
+    const { artifact, instance } = await this.artifactResolver.resolveDeployArtifact({
+      rootPath: this.rootPath,
+      packageName: this.packageName,
+      contractPath,
+      initializer,
+      args,
+      secret,
+      salt,
+      deployer,
+    });
+
+    // Emit deployment nullifier
+    await this.mineBlock({
+      nullifiers: [await this.deploymentNullifier(instance.address)],
+    });
+
+    if (!secret.equals(Fr.ZERO)) {
+      await this.registerContractAndAddAccount(artifact, instance, secret);
+    } else {
+      await this.contractStore.addContractInstance(instance);
+      await this.contractStore.addContractArtifact(artifact);
+      this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
+    }
+
+    return [
+      instance.salt,
+      instance.deployer.toField(),
+      instance.currentContractClassId,
+      instance.initializationHash,
+      instance.immutablesHash,
+      ...instance.publicKeys.toFields(),
+    ];
+  }
+
+  /**
+   * Mines a single block containing only the deployment nullifiers for the contracts at the given addresses.
+   */
+  async mineDeploymentNullifiers(addresses: AztecAddress[]) {
+    await this.mineBlock({
+      nullifiers: await Promise.all(addresses.map(address => this.deploymentNullifier(address))),
+    });
+  }
+
+  async addAccount(secret: Fr) {
+    const { artifact, instance } = await this.artifactResolver.resolveAccountArtifact(secret);
+    return this.registerContractAndAddAccount(artifact, instance, secret);
+  }
+
+  private async registerContractAndAddAccount(
+    artifact: ContractArtifact,
+    instance: ContractInstanceWithAddress,
+    secret: Fr,
+  ) {
+    const partialAddress = await computePartialAddress(instance);
+
+    this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
+    await this.contractStore.addContractInstance(instance);
+    await this.contractStore.addContractArtifact(artifact);
+
+    const completeAddress = await this.keyStore.addAccount(secret, partialAddress);
+    await this.accountStore.setAccount(completeAddress.address, completeAddress);
+    await this.addressStore.addCompleteAddress(completeAddress);
+    this.logger.debug(`Created account ${completeAddress.address}`);
+
+    return completeAddress;
+  }
+
+  async createAccount(secret: Fr) {
+    // This is a foot gun !
+    const completeAddress = await this.keyStore.addAccount(secret, secret);
+    await this.accountStore.setAccount(completeAddress.address, completeAddress);
+    await this.addressStore.addCompleteAddress(completeAddress);
+    this.logger.debug(`Created account ${completeAddress.address}`);
+
+    return completeAddress;
+  }
+
+  async addAuthWitness(address: AztecAddress, messageHash: Fr) {
+    const account = await this.accountStore.getAccount(address);
+    const ivpkMHash = await hashPublicKey(account.publicKeys.ivpkM);
+    const privateKey = await this.keyStore.getMasterSecretKey(ivpkMHash);
+
+    const schnorr = new Schnorr();
+    const signature = await schnorr.constructSignature(messageHash, privateKey);
+
+    const authWitness = new AuthWitness(messageHash, signature.toLimbFields());
+
+    this.authwits.set(authWitness.requestHash.toString(), authWitness);
+  }
+
+  async mineBlock(options: { nullifiers?: Fr[] } = {}) {
+    const blockNumber = await this.getNextBlockNumber();
+
+    const txEffect = TxEffect.empty();
+    txEffect.nullifiers = [getSingleTxBlockRequestHash(blockNumber), ...(options.nullifiers ?? [])];
+    txEffect.txHash = new TxHash(new Fr(blockNumber));
+
+    const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
+    await insertTxEffectIntoWorldTrees(txEffect, forkedWorldTrees);
+
+    const globals = makeGlobalVariables(undefined, {
+      blockNumber,
+      timestamp: this.nextBlockTimestamp,
+      version: this.version,
+      chainId: this.chainId,
+    });
+    const block = await makeTXEBlock(forkedWorldTrees, globals, [txEffect]);
+
+    await forkedWorldTrees.close();
+
+    this.logger.info(`Created block ${blockNumber} with timestamp ${block.header.globalVariables.timestamp}`);
+
+    await this.stateMachine.handleL2Block(block);
+  }
+
+  async privateCallNewFlow(
+    from: AztecAddress | undefined,
+    targetContractAddress: AztecAddress = AztecAddress.zero(),
+    functionSelector: FunctionSelector = FunctionSelector.empty(),
+    args: Fr[],
+    argsHash: Fr = Fr.zero(),
+    isStaticCall: boolean = false,
+    additionalScopes: AztecAddress[] = [],
+    jobId: string,
+    authorizedUtilityCallTargets: AztecAddress[],
+    gasSettings: GasSettings,
+  ) {
+    this.logger.verbose(
+      `Executing external function ${await this.contractStore.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`,
+    );
+
+    const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
+    if (!artifact) {
+      const message = functionSelector.equals(await FunctionSelector.fromSignature('verify_private_authwit(Field)'))
+        ? 'Found no account contract artifact for a private authwit check - use `create_contract_account` instead of `create_light_account` for authwit support.'
+        : 'Function Artifact does not exist';
+      throw new Error(message);
+    }
+
+    const scopes = from === undefined ? additionalScopes : [from, ...additionalScopes];
+
+    // Sync notes before executing private function to discover notes from previous transactions
+    const utilityExecutor = async (call: FunctionCall, execScopes: AztecAddress[]) => {
+      await this.executeUtilityCall(call, execScopes, jobId);
+    };
+
+    const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+    await this.stateMachine.contractSyncService.ensureContractSynced(
+      targetContractAddress,
+      functionSelector,
+      utilityExecutor,
+      blockHeader,
+      jobId,
+      scopes,
+    );
+
+    const blockNumber = await this.getNextBlockNumber();
+
+    const msgSender = from ?? AztecAddress.NULL_MSG_SENDER;
+    const callContext = new CallContext(msgSender, targetContractAddress, functionSelector, isStaticCall);
+
+    const txContext = new TxContext(this.chainId, this.version, gasSettings);
+
+    const protocolNullifier = await computeProtocolNullifier(getSingleTxBlockRequestHash(blockNumber));
+    const noteCache = new ExecutionNoteCache(protocolNullifier);
+    // In production, the account contract sets the min revertible counter before calling the app function.
+    // Since TXE bypasses the account contract, we simulate this by setting minRevertibleSideEffectCounter to 1,
+    // marking all side effects as revertible.
+    const minRevertibleSideEffectCounter = 1;
+    await noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
+    const taggingIndexCache = new ExecutionTaggingIndexCache();
+
+    const simulator = new WASMSimulator();
+
+    const privateExecutionOracle = new PrivateExecutionOracle({
+      argsHash,
+      txContext,
+      callContext,
+      anchorBlockHeader: blockHeader,
+      utilityExecutor,
+      authWitnesses: Array.from(this.authwits.values()),
+      capsules: [],
+      executionCache: HashedValuesCache.create([new HashedValues(args, argsHash)]),
+      noteCache,
+      taggingIndexCache,
+      contractStore: this.contractStore,
+      noteStore: this.noteStore,
+      keyStore: this.keyStore,
+      addressStore: this.addressStore,
+      aztecNode: this.stateMachine.node,
+      senderTaggingStore: this.senderTaggingStore,
+      recipientTaggingStore: this.recipientTaggingStore,
+      senderAddressBookStore: this.senderAddressBookStore,
+      capsuleService: new CapsuleService(this.capsuleStore, scopes),
+      privateEventStore: this.privateEventStore,
+      contractSyncService: this.stateMachine.contractSyncService,
+      jobId,
+      totalPublicCalldataCount: 0,
+      sideEffectCounter: minRevertibleSideEffectCounter,
+      scopes,
+      // In TXE, the typical transaction entrypoint is skipped, so we need to simulate the actions that such a
+      // contract would perform, including setting senderForTags.
+      senderForTags: from,
+      simulator,
+      messageContextService: this.stateMachine.messageContextService,
+      l2TipsStore: this.stateMachine.l2TipsProvider,
+      hooks: composeHooks({
+        authorizeUtilityCall: this.buildAuthorizeUtilityCallHook(
+          isStaticCall ? 'private view' : 'private',
+          authorizedUtilityCallTargets,
+        ),
+      }),
+    });
+
+    // Note: This is a slight modification of simulator.run without any of the checks. Maybe we should modify simulator.run with a boolean value to skip checks.
+    let result: PrivateExecutionResult;
+    let executionResult: PrivateCallExecutionResult;
+    try {
+      executionResult = await executePrivateFunction(
+        simulator,
+        privateExecutionOracle,
+        artifact,
+        targetContractAddress,
+        functionSelector,
+      );
+
+      const publicCallRequests = collectNested([executionResult], r =>
+        r.publicInputs.publicCallRequests
+          .getActiveItems()
+          .map(r => r.inner)
+          .concat(r.publicInputs.publicTeardownCallRequest.isEmpty() ? [] : [r.publicInputs.publicTeardownCallRequest]),
+      );
+      const publicFunctionsCalldata = await Promise.all(
+        publicCallRequests.map(async r => {
+          const calldata = await privateExecutionOracle.getHashPreimage(r.calldataHash);
+          return new HashedValues(calldata, r.calldataHash);
+        }),
+      );
+
+      noteCache.finish();
+      const nonceGenerator = noteCache.getNonceGenerator();
+      result = new PrivateExecutionResult(executionResult, nonceGenerator, publicFunctionsCalldata);
+    } catch (err) {
+      throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during private execution'));
+    }
+
+    // According to the protocol rules, there must be at least one nullifier in the tx. The first nullifier is used as
+    // the nonce generator for the note hashes.
+    // We pass the non-zero minRevertibleSideEffectCounter to make sure the side effects are split correctly.
+    const { publicInputs } = await generateSimulatedProvingResult(
+      result,
+      (addr, sel) => this.contractStore.getDebugFunctionName(addr, sel),
+      this.stateMachine.node,
+      minRevertibleSideEffectCounter,
+    );
+
+    const globals = makeGlobalVariables();
+    globals.blockNumber = blockNumber;
+    globals.timestamp = this.nextBlockTimestamp;
+    globals.chainId = this.chainId;
+    globals.version = this.version;
+    globals.gasFees = GasFees.empty();
+
+    const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
+
+    const bindings = this.logger.getBindings();
+    const contractsDB = new PublicContractsDB(
+      new TXEPublicContractDataSource(blockNumber, this.contractStore),
+      bindings,
+    );
+    const guardedMerkleTrees = new GuardedMerkleTreeOperations(forkedWorldTrees);
+    const config = PublicSimulatorConfig.from({
+      skipFeeEnforcement: true,
+      collectDebugLogs: true,
+      collectHints: false,
+      collectStatistics: false,
+      collectCallMetadata: true,
+    });
+    const processor = new PublicProcessor(
+      globals,
+      guardedMerkleTrees,
+      contractsDB,
+      new CppPublicTxSimulator(guardedMerkleTrees, contractsDB, globals, config, bindings),
+      new TestDateProvider(),
+      undefined,
+      createLogger('simulator:public-processor', bindings),
+    );
+
+    const tx = await Tx.create({
+      data: publicInputs,
+      chonkProof: ChonkProof.empty(),
+      contractClassLogFields: [],
+      publicFunctionCalldata: result.publicFunctionCalldata,
+    });
+
+    let checkpoint;
+    if (isStaticCall) {
+      checkpoint = await ForkCheckpoint.new(forkedWorldTrees);
+    }
+
+    const results = await processor.process([tx]);
+
+    const [processedTx] = results[0];
+    const failedTxs = results[1];
+
+    if (failedTxs.length !== 0) {
+      throw new Error(`Public execution has failed: ${failedTxs[0].error}`);
+    } else if (!processedTx.revertCode.isOK()) {
+      if (processedTx.revertReason) {
+        try {
+          await enrichPublicSimulationError(processedTx.revertReason, this.contractStore, this.logger);
+          // eslint-disable-next-line no-empty
+        } catch {}
+        throw new Error(`Contract execution has reverted: ${processedTx.revertReason.getMessage()}`);
+      } else {
+        throw new Error('Contract execution has reverted');
+      }
+    }
+
+    // Walk the nested private-call tree and collect every offchain effect the transaction emitted.
+    // PXE stores these on each `PrivateCallExecutionResult` and they never reach TXE via the
+    // `aztec_utl_emitOffchainEffect` foreign-call path (that path only fires at the top-level), so
+    // we pull them out here and the RPC wrapper will hand them to `TXESession` for buffering.
+    const offchainEffects = collectNested([executionResult], r => r.offchainEffects.map(e => e.data));
+
+    if (isStaticCall) {
+      await checkpoint!.revert();
+
+      await forkedWorldTrees.close();
+      return { returnValues: executionResult.returnValues ?? [], offchainEffects };
+    }
+
+    const txEffect = TxEffect.empty();
+
+    txEffect.noteHashes = processedTx!.txEffect.noteHashes;
+    txEffect.nullifiers = processedTx!.txEffect.nullifiers;
+    txEffect.privateLogs = processedTx!.txEffect.privateLogs;
+    txEffect.publicLogs = processedTx!.txEffect.publicLogs;
+    txEffect.publicDataWrites = processedTx!.txEffect.publicDataWrites;
+
+    txEffect.txHash = new TxHash(new Fr(blockNumber));
+
+    const l1ToL2Messages = Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(0).map(Fr.zero);
+    await forkedWorldTrees.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2Messages);
+
+    const l2Block = await makeTXEBlock(forkedWorldTrees, globals, [txEffect]);
+
+    await this.stateMachine.handleL2Block(l2Block);
+
+    await forkedWorldTrees.close();
+
+    return { returnValues: executionResult.returnValues ?? [], offchainEffects };
+  }
+
+  async publicCallNewFlow(
+    from: AztecAddress | undefined,
+    targetContractAddress: AztecAddress,
+    calldata: Fr[],
+    isStaticCall: boolean,
+    gasSettings: GasSettings,
+  ) {
+    this.logger.verbose(
+      `Executing public function ${await this.contractStore.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`,
+    );
+
+    const blockNumber = await this.getNextBlockNumber();
+
+    const txContext = new TxContext(this.chainId, this.version, gasSettings);
+
+    const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+
+    const calldataHash = await computeCalldataHash(calldata);
+    const calldataHashedValues = new HashedValues(calldata, calldataHash);
+
+    const globals = makeGlobalVariables();
+    globals.blockNumber = blockNumber;
+    globals.timestamp = this.nextBlockTimestamp;
+    globals.chainId = this.chainId;
+    globals.version = this.version;
+    globals.gasFees = GasFees.empty();
+
+    const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
+
+    const bindings2 = this.logger.getBindings();
+    const contractsDB = new PublicContractsDB(
+      new TXEPublicContractDataSource(blockNumber, this.contractStore),
+      bindings2,
+    );
+    const guardedMerkleTrees = new GuardedMerkleTreeOperations(forkedWorldTrees);
+    const config = PublicSimulatorConfig.from({
+      skipFeeEnforcement: true,
+      collectDebugLogs: true,
+      collectHints: false,
+      collectStatistics: false,
+      collectCallMetadata: true,
+    });
+    const simulator = new CppPublicTxSimulator(guardedMerkleTrees, contractsDB, globals, config, bindings2);
+    const processor = new PublicProcessor(
+      globals,
+      guardedMerkleTrees,
+      contractsDB,
+      simulator,
+      new TestDateProvider(),
+      undefined,
+      createLogger('simulator:public-processor', bindings2),
+    );
+
+    // We're simulating a scenario in which private execution immediately enqueues a public call and halts. The private
+    // kernel init would in this case inject a nullifier with the transaction request hash as a non-revertible
+    // side-effect, which the AVM then expects to exist in order to use it as the nonce generator when siloing notes as
+    // unique.
+    const nonRevertibleAccumulatedData = PrivateToPublicAccumulatedData.empty();
+    nonRevertibleAccumulatedData.nullifiers[0] = getSingleTxBlockRequestHash(blockNumber);
+
+    // The enqueued public call itself we make be revertible so that the public execution is itself revertible, as tests
+    // may require producing reverts.
+    const revertibleAccumulatedData = PrivateToPublicAccumulatedData.empty();
+    revertibleAccumulatedData.publicCallRequests[0] = new PublicCallRequest(
+      from ?? AztecAddress.NULL_MSG_SENDER,
+      targetContractAddress,
+      isStaticCall,
+      calldataHash,
+    );
+
+    const inputsForPublic = new PartialPrivateTailPublicInputsForPublic(
+      nonRevertibleAccumulatedData,
+      revertibleAccumulatedData,
+      PublicCallRequest.empty(),
+    );
+
+    const constantData = new TxConstantData(anchorBlockHeader, txContext, Fr.zero(), Fr.zero());
+
+    const txData = new PrivateKernelTailCircuitPublicInputs(
+      constantData,
+      /*gasUsed=*/ new Gas(0, 0),
+      /*feePayer=*/ AztecAddress.zero(),
+      /*expirationTimestamp=*/ 0n,
+      inputsForPublic,
+      undefined,
+    );
+
+    const tx = await Tx.create({
+      data: txData,
+      chonkProof: ChonkProof.empty(),
+      contractClassLogFields: [],
+      publicFunctionCalldata: [calldataHashedValues],
+    });
+
+    let checkpoint;
+    if (isStaticCall) {
+      checkpoint = await ForkCheckpoint.new(forkedWorldTrees);
+    }
+
+    const results = await processor.process([tx]);
+
+    const [processedTx] = results[0];
+    const failedTxs = results[1];
+
+    if (failedTxs.length !== 0) {
+      throw new Error(`Public execution has failed: ${failedTxs[0].error}`);
+    } else if (!processedTx.revertCode.isOK()) {
+      if (processedTx.revertReason) {
+        try {
+          await enrichPublicSimulationError(processedTx.revertReason, this.contractStore, this.logger);
+          // eslint-disable-next-line no-empty
+        } catch {}
+        throw new Error(`Contract execution has reverted: ${processedTx.revertReason.getMessage()}`);
+      } else {
+        throw new Error('Contract execution has reverted');
+      }
+    }
+
+    const returnValues = results[3][0].values;
+
+    if (isStaticCall) {
+      await checkpoint!.revert();
+
+      await forkedWorldTrees.close();
+
+      return returnValues ?? [];
+    }
+
+    const txEffect = TxEffect.empty();
+
+    txEffect.noteHashes = processedTx!.txEffect.noteHashes;
+    txEffect.nullifiers = processedTx!.txEffect.nullifiers;
+    txEffect.privateLogs = processedTx!.txEffect.privateLogs;
+    txEffect.publicLogs = processedTx!.txEffect.publicLogs;
+    txEffect.publicDataWrites = processedTx!.txEffect.publicDataWrites;
+
+    txEffect.txHash = new TxHash(new Fr(blockNumber));
+
+    const l1ToL2Messages = Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(0).map(Fr.zero);
+    await forkedWorldTrees.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2Messages);
+
+    const l2Block = await makeTXEBlock(forkedWorldTrees, globals, [txEffect]);
+
+    await this.stateMachine.handleL2Block(l2Block);
+
+    await forkedWorldTrees.close();
+
+    return returnValues ?? [];
+  }
+
+  async executeUtilityFunction(
+    targetContractAddress: AztecAddress,
+    functionSelector: FunctionSelector,
+    args: Fr[],
+    jobId: string,
+    authorizedUtilityCallTargets: AztecAddress[],
+  ) {
+    const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
+    if (!artifact) {
+      throw new Error(`Cannot call ${functionSelector} as there is no artifact found at ${targetContractAddress}.`);
+    }
+
+    // Sync notes before executing utility function to discover notes from previous transactions
+    const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+    await this.stateMachine.contractSyncService.ensureContractSynced(
+      targetContractAddress,
+      functionSelector,
+      async (call, execScopes) => {
+        await this.executeUtilityCall(call, execScopes, jobId);
+      },
+      blockHeader,
+      jobId,
+      await this.keyStore.getAccounts(),
+    );
+
+    const call = FunctionCall.from({
+      name: artifact.name,
+      to: targetContractAddress,
+      selector: functionSelector,
+      type: FunctionType.UTILITY,
+      hideMsgSender: false,
+      isStatic: false,
+      args,
+      returnTypes: [],
+    });
+
+    return this.executeUtilityCall(call, await this.keyStore.getAccounts(), jobId, authorizedUtilityCallTargets);
+  }
+
+  private async executeUtilityCall(
+    call: FunctionCall,
+    scopes: AztecAddress[],
+    jobId: string,
+    authorizedUtilityCallTargets: AztecAddress[] = [],
+  ): Promise<Fr[]> {
+    const entryPointArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(call.to, call.selector);
+    if (entryPointArtifact.functionType !== FunctionType.UTILITY) {
+      throw new Error(`Cannot run ${entryPointArtifact.functionType} function as utility`);
+    }
+
+    this.logger.verbose(`Executing utility function ${entryPointArtifact.name}`, {
+      contract: call.to,
+      selector: call.selector,
+    });
+
+    try {
+      const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+      const simulator = new WASMSimulator();
+      const utilityExecutor = async (syncCall: FunctionCall, execScopes: AztecAddress[]) => {
+        await this.executeUtilityCall(syncCall, execScopes, jobId);
+      };
+      const oracle = new UtilityExecutionOracle({
+        contractAddress: call.to,
+        authWitnesses: [],
+        capsules: [],
+        anchorBlockHeader,
+        contractStore: this.contractStore,
+        noteStore: this.noteStore,
+        keyStore: this.keyStore,
+        addressStore: this.addressStore,
+        aztecNode: this.stateMachine.node,
+        recipientTaggingStore: this.recipientTaggingStore,
+        senderAddressBookStore: this.senderAddressBookStore,
+        capsuleService: new CapsuleService(this.capsuleStore, scopes),
+        privateEventStore: this.privateEventStore,
+        messageContextService: this.stateMachine.messageContextService,
+        contractSyncService: this.stateMachine.contractSyncService,
+        l2TipsStore: this.stateMachine.l2TipsProvider,
+        jobId,
+        scopes,
+        simulator,
+        hooks: composeHooks({
+          authorizeUtilityCall: this.buildAuthorizeUtilityCallHook('utility', authorizedUtilityCallTargets),
+        }),
+        utilityExecutor,
+      });
+      const acirExecutionResult = await simulator
+        .executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback())
+        .catch((err: Error) => {
+          err.message = resolveAssertionMessageFromError(err, entryPointArtifact);
+          throw new ExecutionError(
+            err.message,
+            {
+              contractAddress: call.to,
+              functionSelector: call.selector,
+            },
+            extractCallStack(err, entryPointArtifact.debug),
+            { cause: err },
+          );
+        });
+
+      this.logger.verbose(`Utility execution for ${call.to}.${call.selector} completed`);
+      return witnessMapToFields(acirExecutionResult.returnWitness);
+    } catch (err) {
+      throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during utility execution'));
+    }
+  }
+
+  close(): [bigint, Map<string, AuthWitness>] {
+    this.logger.debug('Exiting Top Level Context');
+    return [this.nextBlockTimestamp, this.authwits];
+  }
+
+  private async getLastBlockNumber(): Promise<BlockNumber> {
+    const block = await this.stateMachine.node.getBlock('latest');
+    return block ? block.header.globalVariables.blockNumber : BlockNumber.ZERO;
+  }
+
+  private buildAuthorizeUtilityCallHook(
+    callerContext: 'private' | 'private view' | 'utility',
+    authorizedTargets: AztecAddress[],
+  ): ExecutionHooks['authorizeUtilityCall'] | undefined {
+    if (authorizedTargets.length === 0) {
+      return undefined;
+    }
+    return req =>
+      Promise.resolve({
+        authorized: req.callerContext === callerContext && authorizedTargets.some(t => t.equals(req.target)),
+      });
+  }
+}