@aztec/pxe 0.87.5 → 0.87.7

package/dest/pxe_service/pxe_service.js

@@ -5,7 +5,6 @@ import { Timer } from '@aztec/foundation/timer';
 import { KeyStore } from '@aztec/key-store';
 import { L2TipsKVStore } from '@aztec/kv-store/stores';
 import { ProtocolContractAddress, protocolContractNames } from '@aztec/protocol-contracts';
-import { AcirSimulator, readCurrentClassId } from '@aztec/simulator/client';
 import { EventSelector, FunctionSelector, FunctionType, decodeFromAbi, decodeFunctionSignature, encodeArguments } from '@aztec/stdlib/abi';
 import { computeContractAddressFromInstance, getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { SimulationError } from '@aztec/stdlib/errors';
@@ -16,9 +15,12 @@ import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { PrivateSimulationResult, TxProfileResult, TxProvingResult, TxSimulationResult } from '@aztec/stdlib/tx';
 import { inspect } from 'util';
 import { getPackageInfo } from '../config/package_info.js';
+import { ContractFunctionSimulator } from '../contract_function_simulator/contract_function_simulator.js';
+import { readCurrentClassId } from '../contract_function_simulator/oracle/private_execution.js';
+import { ProxiedNodeFactory } from '../contract_function_simulator/proxied_node.js';
+import { PXEOracleInterface } from '../contract_function_simulator/pxe_oracle_interface.js';
 import { PrivateKernelExecutionProver } from '../private_kernel/private_kernel_execution_prover.js';
 import { PrivateKernelOracleImpl } from '../private_kernel/private_kernel_oracle_impl.js';
-import { PXEOracleInterface } from '../pxe_oracle_interface/pxe_oracle_interface.js';
 import { AddressDataProvider } from '../storage/address_data_provider/address_data_provider.js';
 import { CapsuleDataProvider } from '../storage/capsule_data_provider/capsule_data_provider.js';
 import { ContractDataProvider } from '../storage/contract_data_provider/contract_data_provider.js';
@@ -74,7 +76,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
    * can be contacted.
    *
    * @returns A promise that resolves PXE service is ready to be used.
-   */ static async create(node, store, proofCreator, simulationProvider, protocolContractsProvider, config, loggerOrSuffix) {
+   */ static async create(node, store, proofCreator, simulator, protocolContractsProvider, config, loggerOrSuffix) {
         const log = !loggerOrSuffix || typeof loggerOrSuffix === 'string' ? createLogger(loggerOrSuffix ? `pxe:service:${loggerOrSuffix}` : `pxe:service`) : loggerOrSuffix;
         const packageVersion = getPackageInfo().version;
         const proverEnabled = !!config.proverEnabled;
@@ -88,8 +90,6 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         const keyStore = new KeyStore(store);
         const tipsStore = new L2TipsKVStore(store, 'pxe');
         const synchronizer = new Synchronizer(node, syncDataProvider, noteDataProvider, taggingDataProvider, tipsStore, config, loggerOrSuffix);
-        const pxeOracleInterface = new PXEOracleInterface(node, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, privateEventDataProvider, log);
-        const simulator = new AcirSimulator(pxeOracleInterface, simulationProvider);
         const jobQueue = new SerialQueue();
         const pxeService = new PXEService(node, synchronizer, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, privateEventDataProvider, simulator, packageVersion, proverEnabled, proofCreator, protocolContractsProvider, log, jobQueue);
         pxeService.jobQueue.start();
@@ -130,6 +130,10 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         return await getNonNullifiedL1ToL2MessageWitness(this.node, contractAddress, messageHash, secret);
     }
     // Internal methods
+    #getSimulatorForTx() {
+        const pxeOracleInterface = new PXEOracleInterface(ProxiedNodeFactory.create(this.node), this.keyStore, this.contractDataProvider, this.noteDataProvider, this.capsuleDataProvider, this.syncDataProvider, this.taggingDataProvider, this.addressDataProvider, this.privateEventDataProvider, this.log);
+        return new ContractFunctionSimulator(pxeOracleInterface, this.simulator);
+    }
     #contextualizeError(err, ...context) {
         let contextStr = '';
         if (context.length > 0) {
@@ -194,10 +198,10 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
             returnTypes: functionDao.returnTypes
         };
     }
-    async #executePrivate(txRequest, msgSender, scopes) {
+    async #executePrivate(contractFunctionSimulator, txRequest, msgSender, scopes) {
         const { origin: contractAddress, functionSelector } = txRequest;
         try {
-            const result = await this.simulator.run(txRequest, contractAddress, functionSelector, msgSender, scopes);
+            const result = await contractFunctionSimulator.run(txRequest, contractAddress, functionSelector, msgSender, scopes);
             this.log.debug(`Private simulation completed for ${contractAddress.toString()}:${functionSelector}`);
             return result;
         } catch (err) {
@@ -209,14 +213,15 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
     }
     /**
    * Simulate a utility function call on the given contract.
+   * @param contractFunctionSimulator - The simulator to use for the function call.
    * @param call - The function call to execute.
    * @param authWitnesses - Authentication witnesses required for the function call.
    * @param scopes - Optional array of account addresses whose notes can be accessed in this call. Defaults to all
    * accounts if not specified.
    * @returns The simulation result containing the outputs of the utility function.
-   */ async #simulateUtility(call, authWitnesses, scopes) {
+   */ async #simulateUtility(contractFunctionSimulator, call, authWitnesses, scopes) {
         try {
-            return this.simulator.runUtility(call, authWitnesses ?? [], scopes);
+            return contractFunctionSimulator.runUtility(call, authWitnesses ?? [], scopes);
         } catch (err) {
             if (err instanceof SimulationError) {
                 await enrichSimulationError(err, this.contractDataProvider, this.log);
@@ -447,11 +452,13 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
             const totalTimer = new Timer();
             try {
                 let syncTime;
+                let contractFunctionSimulator;
                 if (!privateExecutionResult) {
                     const syncTimer = new Timer();
                     await this.synchronizer.sync();
                     syncTime = syncTimer.ms();
-                    privateExecutionResult = await this.#executePrivate(txRequest);
+                    contractFunctionSimulator = this.#getSimulatorForTx();
+                    privateExecutionResult = await this.#executePrivate(contractFunctionSimulator, txRequest);
                 }
                 const { publicInputs, clientIvcProof, executionSteps, timings: { proving } = {} } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
                     simulate: false,
@@ -459,9 +466,10 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     profileMode: 'none'
                 });
                 const totalTime = totalTimer.ms();
-                const perFunction = executionSteps.map(({ functionName, timings: { witgen } })=>({
+                const perFunction = executionSteps.map(({ functionName, timings: { witgen, oracles } })=>({
                         functionName,
-                        time: witgen
+                        time: witgen,
+                        oracles
                     }));
                 const timings = {
                     total: totalTime,
@@ -473,7 +481,10 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                 this.log.info(`Proving completed in ${totalTime}ms`, {
                     timings
                 });
-                return new TxProvingResult(privateExecutionResult, publicInputs, clientIvcProof, timings);
+                return new TxProvingResult(privateExecutionResult, publicInputs, clientIvcProof, {
+                    timings,
+                    nodeRPCCalls: contractFunctionSimulator?.getStats().nodeRPCCalls
+                });
             } catch (err) {
                 throw this.#contextualizeError(err, inspect(txRequest), inspect(privateExecutionResult));
             }
@@ -497,27 +508,36 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                 const syncTimer = new Timer();
                 await this.synchronizer.sync();
                 const syncTime = syncTimer.ms();
-                const privateExecutionResult = await this.#executePrivate(txRequest, msgSender);
+                const contractFunctionSimulator = this.#getSimulatorForTx();
+                const privateExecutionResult = await this.#executePrivate(contractFunctionSimulator, txRequest, msgSender);
                 const { executionSteps, timings: { proving } = {} } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
                     simulate: skipProofGeneration,
                     skipFeeEnforcement: false,
                     profileMode
                 });
                 const totalTime = totalTimer.ms();
-                const perFunction = executionSteps.map(({ functionName, timings: { witgen } })=>({
+                const perFunction = executionSteps.map(({ functionName, timings: { witgen, oracles } })=>{
+                    return {
                         functionName,
-                        time: witgen
-                    }));
+                        time: witgen,
+                        oracles
+                    };
+                });
                 // Gate computation is time is not relevant for profiling, so we subtract it from the total time.
                 const gateCountComputationTime = executionSteps.reduce((acc, { timings })=>acc + (timings.gateCount ?? 0), 0) ?? 0;
+                const total = totalTime - gateCountComputationTime;
                 const timings = {
-                    total: totalTime - gateCountComputationTime,
+                    total,
                     sync: syncTime,
                     proving,
                     perFunction,
-                    unaccounted: totalTime - ((syncTime ?? 0) + (proving ?? 0) + perFunction.reduce((acc, { time })=>acc + time, 0) + gateCountComputationTime)
+                    unaccounted: total - ((syncTime ?? 0) + (proving ?? 0) + perFunction.reduce((acc, { time })=>acc + time, 0))
                 };
-                return new TxProfileResult(executionSteps, timings);
+                const simulatorStats = contractFunctionSimulator.getStats();
+                return new TxProfileResult(executionSteps, {
+                    timings,
+                    nodeRPCCalls: simulatorStats.nodeRPCCalls
+                });
             } catch (err) {
                 throw this.#contextualizeError(err, inspect(txRequest), `profileMode=${profileMode}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`);
             }
@@ -544,7 +564,8 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                 const syncTimer = new Timer();
                 await this.synchronizer.sync();
                 const syncTime = syncTimer.ms();
-                const privateExecutionResult = await this.#executePrivate(txRequest, msgSender, scopes);
+                const contractFunctionSimulator = this.#getSimulatorForTx();
+                const privateExecutionResult = await this.#executePrivate(contractFunctionSimulator, txRequest, msgSender, scopes);
                 const { publicInputs, executionSteps } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
                     simulate: true,
                     skipFeeEnforcement,
@@ -573,9 +594,10 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                 }
                 const txHash = await simulatedTx.getTxHash();
                 const totalTime = totalTimer.ms();
-                const perFunction = executionSteps.map(({ functionName, timings: { witgen } })=>({
+                const perFunction = executionSteps.map(({ functionName, timings: { witgen, oracles } })=>({
                         functionName,
-                        time: witgen
+                        time: witgen,
+                        oracles
                     }));
                 const timings = {
                     total: totalTime,
@@ -592,10 +614,13 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                         gasUsed: publicOutput.gasUsed,
                         revertCode: publicOutput.txEffect.revertCode.getCode(),
                         revertReason: publicOutput.revertReason
-                    } : {},
-                    timings
+                    } : {}
+                });
+                const simulatorStats = contractFunctionSimulator.getStats();
+                return TxSimulationResult.fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, {
+                    timings,
+                    nodeRPCCalls: simulatorStats.nodeRPCCalls
                 });
-                return TxSimulationResult.fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, timings);
             } catch (err) {
                 throw this.#contextualizeError(err, inspect(txRequest), `simulatePublic=${simulatePublic}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`, `skipTxValidation=${skipTxValidation}`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
             }
@@ -626,7 +651,8 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                 // TODO - Should check if `from` has the permission to call the view function.
                 const functionCall = await this.#getFunctionCall(functionName, args, to);
                 const functionTimer = new Timer();
-                const executionResult = await this.#simulateUtility(functionCall, authwits ?? [], scopes);
+                const contractFunctionSimulator = this.#getSimulatorForTx();
+                const executionResult = await this.#simulateUtility(contractFunctionSimulator, functionCall, authwits ?? [], scopes);
                 const functionTime = functionTimer.ms();
                 const totalTime = totalTimer.ms();
                 const perFunction = [
@@ -641,9 +667,13 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
                     perFunction,
                     unaccounted: totalTime - (syncTime + perFunction.reduce((acc, { time })=>acc + time, 0))
                 };
+                const simulationStats = contractFunctionSimulator.getStats();
                 return {
                     result: executionResult,
-                    timings
+                    stats: {
+                        timings,
+                        nodeRPCCalls: simulationStats.nodeRPCCalls
+                    }
                 };
             } catch (err) {
                 const stringifiedArgs = args.map((arg)=>arg.toString()).join(', ');

package/dest/storage/note_data_provider/note_dao.d.ts

@@ -1,9 +1,9 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
-import type { NoteData } from '@aztec/simulator/client';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Note } from '@aztec/stdlib/note';
 import { TxHash } from '@aztec/stdlib/tx';
+import type { NoteData } from '../../contract_function_simulator/oracle/typed_oracle.js';
 /**
  * A Note Data Access Object, representing a note that was committed to the note hash tree, holding all of the
  * information required to use it during execution and manage its state.

package/dest/storage/note_data_provider/note_dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_dao.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IAIpC,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;;IAzC9B,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;IAGhC,QAAQ,IAAI,MAAM;IAgBlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA8B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;WAMD,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,KAAmB,EACnB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC9B,SAAqB,GACtB,GAAE,OAAO,CAAC,OAAO,CAAM;CAezB"}
+{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_dao.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0DAA0D,CAAC;AAEzF;;;GAGG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IAIpC,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;;IAzC9B,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;IAGhC,QAAQ,IAAI,MAAM;IAgBlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA8B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;WAMD,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,KAAmB,EACnB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC9B,SAAqB,GACtB,GAAE,OAAO,CAAC,OAAO,CAAM;CAezB"}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.87.5",
+  "version": "0.87.7",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
     "./client/lazy": "./dest/entrypoints/client/lazy/index.js",
     "./client/bundle": "./dest/entrypoints/client/bundle/index.js",
+    "./simulator": "./dest/contract_function_simulator/index.js",
     "./config": "./dest/config/index.js",
     "./testing": "./dest/test/pxe_test_suite.js"
   },
@@ -57,19 +58,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.87.5",
-    "@aztec/bb.js": "0.87.5",
-    "@aztec/builder": "0.87.5",
-    "@aztec/constants": "0.87.5",
-    "@aztec/ethereum": "0.87.5",
-    "@aztec/foundation": "0.87.5",
-    "@aztec/key-store": "0.87.5",
-    "@aztec/kv-store": "0.87.5",
-    "@aztec/noir-protocol-circuits-types": "0.87.5",
-    "@aztec/noir-types": "0.87.5",
-    "@aztec/protocol-contracts": "0.87.5",
-    "@aztec/simulator": "0.87.5",
-    "@aztec/stdlib": "0.87.5",
+    "@aztec/bb-prover": "0.87.7",
+    "@aztec/bb.js": "0.87.7",
+    "@aztec/builder": "0.87.7",
+    "@aztec/constants": "0.87.7",
+    "@aztec/ethereum": "0.87.7",
+    "@aztec/foundation": "0.87.7",
+    "@aztec/key-store": "0.87.7",
+    "@aztec/kv-store": "0.87.7",
+    "@aztec/noir-protocol-circuits-types": "0.87.7",
+    "@aztec/noir-types": "0.87.7",
+    "@aztec/protocol-contracts": "0.87.7",
+    "@aztec/simulator": "0.87.7",
+    "@aztec/stdlib": "0.87.7",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",
@@ -78,7 +79,8 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/noir-test-contracts.js": "0.87.5",
+    "@aztec/merkle-tree": "0.87.7",
+    "@aztec/noir-test-contracts.js": "0.87.7",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.omit": "^4.5.7",

package/src/config/package_info.ts

@@ -1,3 +1,3 @@
 export function getPackageInfo() {
-  return { version: '0.87.1', name: '@aztec/pxe' };
+  return { version: '0.87.6', name: '@aztec/pxe' };
 }

package/src/contract_function_simulator/contract_function_simulator.ts

@@ -0,0 +1,193 @@
+import { Fr } from '@aztec/foundation/fields';
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import { Timer } from '@aztec/foundation/timer';
+import {
+  type CircuitSimulator,
+  ExecutionError,
+  createSimulationError,
+  extractCallStack,
+  resolveAssertionMessageFromError,
+  toACVMWitness,
+  witnessMapToFields,
+} from '@aztec/simulator/client';
+import type { AbiDecoded, FunctionCall } from '@aztec/stdlib/abi';
+import { FunctionSelector, FunctionType, decodeFromAbi } from '@aztec/stdlib/abi';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { CallContext, HashedValues, PrivateExecutionResult, TxExecutionRequest, collectNested } from '@aztec/stdlib/tx';
+
+import type { ExecutionDataProvider } from './execution_data_provider.js';
+import { ExecutionNoteCache } from './execution_note_cache.js';
+import { HashedValuesCache } from './hashed_values_cache.js';
+import { Oracle } from './oracle/oracle.js';
+import { executePrivateFunction, verifyCurrentClassId } from './oracle/private_execution.js';
+import { PrivateExecutionOracle } from './oracle/private_execution_oracle.js';
+import { UtilityExecutionOracle } from './oracle/utility_execution_oracle.js';
+
+/**
+ * The contract function simulator.
+ */
+export class ContractFunctionSimulator {
+  private log: Logger;
+
+  constructor(
+    private executionDataProvider: ExecutionDataProvider,
+    private simulator: CircuitSimulator,
+  ) {
+    this.log = createLogger('simulator');
+  }
+
+  /**
+   * Runs a private function.
+   * @param request - The transaction request.
+   * @param entryPointArtifact - The artifact of the entry point function.
+   * @param contractAddress - The address of the contract (should match request.origin)
+   * @param msgSender - The address calling the function. This can be replaced to simulate a call from another contract or a specific account.
+   * @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
+   * @returns The result of the execution.
+   */
+  public async run(
+    request: TxExecutionRequest,
+    contractAddress: AztecAddress,
+    selector: FunctionSelector,
+    msgSender = AztecAddress.fromField(Fr.MAX_FIELD_VALUE),
+    scopes?: AztecAddress[],
+  ): Promise<PrivateExecutionResult> {
+    const simulatorSetupTimer = new Timer();
+    const header = await this.executionDataProvider.getBlockHeader();
+
+    await verifyCurrentClassId(contractAddress, this.executionDataProvider);
+    const entryPointArtifact = await this.executionDataProvider.getFunctionArtifact(contractAddress, selector);
+
+    if (entryPointArtifact.functionType !== FunctionType.PRIVATE) {
+      throw new Error(`Cannot run ${entryPointArtifact.functionType} function as private`);
+    }
+
+    if (request.origin !== contractAddress) {
+      this.log.warn(
+        `Request origin does not match contract address in simulation. Request origin: ${request.origin}, contract address: ${contractAddress}`,
+      );
+    }
+
+    // reserve the first side effect for the tx hash (inserted by the private kernel)
+    const startSideEffectCounter = 1;
+
+    const callContext = new CallContext(
+      msgSender,
+      contractAddress,
+      await FunctionSelector.fromNameAndParameters(entryPointArtifact.name, entryPointArtifact.parameters),
+      entryPointArtifact.isStatic,
+    );
+
+    const txRequestHash = await request.toTxRequest().hash();
+    const noteCache = new ExecutionNoteCache(txRequestHash);
+
+    const context = new PrivateExecutionOracle(
+      request.firstCallArgsHash,
+      request.txContext,
+      callContext,
+      header,
+      request.authWitnesses,
+      request.capsules,
+      HashedValuesCache.create(request.argsOfCalls),
+      noteCache,
+      this.executionDataProvider,
+      this.simulator,
+      /*totalPublicArgsCount=*/ 0,
+      startSideEffectCounter,
+      undefined,
+      scopes,
+    );
+
+    const setupTime = simulatorSetupTimer.ms();
+
+    try {
+      const executionResult = await executePrivateFunction(
+        this.simulator,
+        context,
+        entryPointArtifact,
+        contractAddress,
+        request.functionSelector,
+      );
+      const simulatorTeardownTimer = new Timer();
+      const { usedTxRequestHashForNonces } = noteCache.finish();
+      const firstNullifierHint = usedTxRequestHashForNonces ? Fr.ZERO : noteCache.getAllNullifiers()[0];
+
+      const publicCallRequests = collectNested([executionResult], r => [
+        ...r.publicInputs.publicCallRequests.map(r => r.inner),
+        r.publicInputs.publicTeardownCallRequest,
+      ]).filter(r => !r.isEmpty());
+      const publicFunctionsCalldata = await Promise.all(
+        publicCallRequests.map(async r => {
+          const calldata = await context.loadFromExecutionCache(r.calldataHash);
+          return new HashedValues(calldata, r.calldataHash);
+        }),
+      );
+
+      const teardownTime = simulatorTeardownTimer.ms();
+
+      // Add simulator overhead to topmost call in the stack
+      if (executionResult.profileResult) {
+        executionResult.profileResult.timings.witgen += setupTime + teardownTime;
+      }
+
+      return new PrivateExecutionResult(executionResult, firstNullifierHint, publicFunctionsCalldata);
+    } catch (err) {
+      throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during private execution'));
+    }
+  }
+
+  // docs:start:execute_utility_function
+  /**
+   * Runs a utility function.
+   * @param call - The function call to execute.
+   * @param authwits - Authentication witnesses required for the function call.
+   * @param scopes - Optional array of account addresses whose notes can be accessed in this call. Defaults to all
+   * accounts if not specified.
+   * @returns A decoded ABI value containing the function's return data.
+   */
+  public async runUtility(call: FunctionCall, authwits: AuthWitness[], scopes?: AztecAddress[]): Promise<AbiDecoded> {
+    await verifyCurrentClassId(call.to, this.executionDataProvider);
+    const entryPointArtifact = await this.executionDataProvider.getFunctionArtifact(call.to, call.selector);
+
+    if (entryPointArtifact.functionType !== FunctionType.UTILITY) {
+      throw new Error(`Cannot run ${entryPointArtifact.functionType} function as utility`);
+    }
+
+    const oracle = new UtilityExecutionOracle(call.to, authwits, [], this.executionDataProvider, undefined, scopes);
+
+    try {
+      this.log.verbose(`Executing utility function ${entryPointArtifact.name}`, {
+        contract: call.to,
+        selector: call.selector,
+      });
+
+      const initialWitness = toACVMWitness(0, call.args);
+      const acirExecutionResult = await this.simulator
+        .executeUserCircuit(initialWitness, 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 },
+          );
+        });
+
+      const returnWitness = witnessMapToFields(acirExecutionResult.returnWitness);
+      this.log.verbose(`Utility simulation for ${call.to}.${call.selector} completed`);
+      return decodeFromAbi(entryPointArtifact.returnTypes, returnWitness);
+    } catch (err) {
+      throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during private execution'));
+    }
+  }
+  // docs:end:execute_utility_function
+
+  getStats() {
+    return this.executionDataProvider.getStats();
+  }
+}