@aztec/txe 0.0.1-commit.b655e406 → 0.0.1-commit.c0b82b2

package/dest/oracle/txe_oracle_top_level_context.js

@@ -1,34 +1,41 @@
 import { CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS, DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT, DEFAULT_TEARDOWN_DA_GAS_LIMIT, DEFAULT_TEARDOWN_L2_GAS_LIMIT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
-import { Schnorr } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Schnorr } from '@aztec/foundation/crypto/schnorr';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { LogLevels, applyStringFormatting, createLogger } from '@aztec/foundation/log';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import { ORACLE_VERSION, enrichPublicSimulationError } from '@aztec/pxe/server';
 import { ExecutionNoteCache, ExecutionTaggingIndexCache, HashedValuesCache, Oracle, PrivateExecutionOracle, UtilityExecutionOracle, executePrivateFunction, generateSimulatedProvingResult } from '@aztec/pxe/simulator';
 import { ExecutionError, WASMSimulator, createSimulationError, extractCallStack, resolveAssertionMessageFromError, toACVMWitness, witnessMapToFields } from '@aztec/simulator/client';
-import { GuardedMerkleTreeOperations, PublicContractsDB, PublicProcessor, PublicTxSimulator } from '@aztec/simulator/server';
-import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { CppPublicTxSimulator, GuardedMerkleTreeOperations, PublicContractsDB, PublicProcessor } from '@aztec/simulator/server';
+import { 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 { Body, L2Block } from '@aztec/stdlib/block';
 import { computePartialAddress } from '@aztec/stdlib/contract';
 import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
-import { computeCalldataHash, siloNullifier } from '@aztec/stdlib/hash';
+import { computeCalldataHash, computeProtocolNullifier, siloNullifier } from '@aztec/stdlib/hash';
 import { PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, PrivateToPublicAccumulatedData, PublicCallRequest } from '@aztec/stdlib/kernel';
 import { ChonkProof } from '@aztec/stdlib/proofs';
-import { makeAppendOnlyTreeSnapshot, makeGlobalVariables } from '@aztec/stdlib/testing';
+import { makeGlobalVariables } from '@aztec/stdlib/testing';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { CallContext, HashedValues, PrivateExecutionResult, Tx, TxConstantData, TxContext, TxEffect, TxHash, collectNested } from '@aztec/stdlib/tx';
 import { ForkCheckpoint } from '@aztec/world-state';
+import { DEFAULT_ADDRESS } from '../constants.js';
 import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js';
-import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlockHeader } from '../utils/block_creation.js';
+import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlock } from '../utils/block_creation.js';
 export class TXEOracleTopLevelContext {
     stateMachine;
-    contractDataProvider;
+    contractStore;
+    noteStore;
     keyStore;
-    addressDataProvider;
-    accountDataProvider;
-    pxeOracleInterface;
+    addressStore;
+    accountStore;
+    senderTaggingStore;
+    recipientTaggingStore;
+    senderAddressBookStore;
+    capsuleStore;
+    privateEventStore;
     nextBlockTimestamp;
     version;
     chainId;
@@ -36,13 +43,18 @@ export class TXEOracleTopLevelContext {
     isMisc;
     isTxe;
     logger;
-    constructor(stateMachine, contractDataProvider, keyStore, addressDataProvider, accountDataProvider, pxeOracleInterface, nextBlockTimestamp, version, chainId, authwits){
+    constructor(stateMachine, contractStore, noteStore, keyStore, addressStore, accountStore, senderTaggingStore, recipientTaggingStore, senderAddressBookStore, capsuleStore, privateEventStore, nextBlockTimestamp, version, chainId, authwits){
         this.stateMachine = stateMachine;
-        this.contractDataProvider = contractDataProvider;
+        this.contractStore = contractStore;
+        this.noteStore = noteStore;
         this.keyStore = keyStore;
-        this.addressDataProvider = addressDataProvider;
-        this.accountDataProvider = accountDataProvider;
-        this.pxeOracleInterface = pxeOracleInterface;
+        this.addressStore = addressStore;
+        this.accountStore = accountStore;
+        this.senderTaggingStore = senderTaggingStore;
+        this.recipientTaggingStore = recipientTaggingStore;
+        this.senderAddressBookStore = senderAddressBookStore;
+        this.capsuleStore = capsuleStore;
+        this.privateEventStore = privateEventStore;
         this.nextBlockTimestamp = nextBlockTimestamp;
         this.version = version;
         this.chainId = chainId;
@@ -63,17 +75,21 @@ export class TXEOracleTopLevelContext {
         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
-    utilityDebugLog(level, message, fields) {
+    utilityLog(level, message, fields) {
         if (!LogLevels[level]) {
-            throw new Error(`Invalid debug log level: ${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();
+    }
+    txeGetDefaultAddress() {
+        return DEFAULT_ADDRESS;
     }
     async txeGetNextBlockNumber() {
-        return await this.getLastBlockNumber() + 1;
+        return BlockNumber(await this.getLastBlockNumber() + 1);
     }
     txeGetNextBlockTimestamp() {
         return Promise.resolve(this.nextBlockTimestamp);
@@ -82,7 +98,8 @@ export class TXEOracleTopLevelContext {
         return (await this.stateMachine.node.getBlockHeader('latest')).globalVariables.timestamp;
     }
     async txeGetLastTxEffects() {
-        const block = await this.stateMachine.archiver.getBlock('latest');
+        const latestBlockNumber = await this.stateMachine.archiver.getBlockNumber();
+        const block = await this.stateMachine.archiver.getBlock(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}`);
@@ -94,6 +111,28 @@ export class TXEOracleTopLevelContext {
             nullifiers: txEffects.nullifiers
         };
     }
+    async syncContractNonOracleMethod(contractAddress, scope, jobId) {
+        if (contractAddress.equals(DEFAULT_ADDRESS)) {
+            this.logger.debug(`Skipping sync in txeGetPrivateEvents 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 txeGetPrivateEvents(selector, contractAddress, scope) {
+        return (await this.privateEventStore.getPrivateEvents(selector, {
+            contractAddress,
+            scopes: [
+                scope
+            ],
+            fromBlock: 0,
+            toBlock: await this.getLastBlockNumber() + 1
+        })).map((e)=>e.packedEvent);
+    }
     async txeAdvanceBlocksBy(blocks) {
         this.logger.debug(`time traveling ${blocks} blocks`);
         for(let i = 0; i < blocks; i++){
@@ -114,32 +153,32 @@ export class TXEOracleTopLevelContext {
         if (!secret.equals(Fr.ZERO)) {
             await this.txeAddAccount(artifact, instance, secret);
         } else {
-            await this.contractDataProvider.addContractInstance(instance);
-            await this.contractDataProvider.addContractArtifact(instance.currentContractClassId, artifact);
+            await this.contractStore.addContractInstance(instance);
+            await this.contractStore.addContractArtifact(artifact);
             this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
         }
     }
     async txeAddAccount(artifact, instance, secret) {
         const partialAddress = await computePartialAddress(instance);
         this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
-        await this.contractDataProvider.addContractInstance(instance);
-        await this.contractDataProvider.addContractArtifact(instance.currentContractClassId, artifact);
+        await this.contractStore.addContractInstance(instance);
+        await this.contractStore.addContractArtifact(artifact);
         const completeAddress = await this.keyStore.addAccount(secret, partialAddress);
-        await this.accountDataProvider.setAccount(completeAddress.address, completeAddress);
-        await this.addressDataProvider.addCompleteAddress(completeAddress);
+        await this.accountStore.setAccount(completeAddress.address, completeAddress);
+        await this.addressStore.addCompleteAddress(completeAddress);
         this.logger.debug(`Created account ${completeAddress.address}`);
         return completeAddress;
     }
     async txeCreateAccount(secret) {
-        // This is a footgun !
+        // This is a foot gun !
         const completeAddress = await this.keyStore.addAccount(secret, secret);
-        await this.accountDataProvider.setAccount(completeAddress.address, completeAddress);
-        await this.addressDataProvider.addCompleteAddress(completeAddress);
+        await this.accountStore.setAccount(completeAddress.address, completeAddress);
+        await this.addressStore.addCompleteAddress(completeAddress);
         this.logger.debug(`Created account ${completeAddress.address}`);
         return completeAddress;
     }
     async txeAddAuthWitness(address, messageHash) {
-        const account = await this.accountDataProvider.getAccount(address);
+        const account = await this.accountStore.getAccount(address);
         const privateKey = await this.keyStore.getMasterSecretKey(account.publicKeys.masterIncomingViewingPublicKey);
         const schnorr = new Schnorr();
         const signature = await schnorr.constructSignature(messageHash.toBuffer(), privateKey);
@@ -158,42 +197,85 @@ export class TXEOracleTopLevelContext {
         txEffect.txHash = new TxHash(new Fr(blockNumber));
         const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
         await insertTxEffectIntoWorldTrees(txEffect, forkedWorldTrees);
-        const block = new L2Block(makeAppendOnlyTreeSnapshot(), await makeTXEBlockHeader(forkedWorldTrees, makeGlobalVariables(undefined, {
+        const globals = makeGlobalVariables(undefined, {
             blockNumber,
             timestamp: this.nextBlockTimestamp,
             version: this.version,
             chainId: this.chainId
-        })), new Body([
+        });
+        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 txePrivateCallNewFlow(from, targetContractAddress = AztecAddress.zero(), functionSelector = FunctionSelector.empty(), args, argsHash = Fr.zero(), isStaticCall = false) {
-        this.logger.verbose(`Executing external function ${await this.contractDataProvider.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`);
-        const artifact = await this.contractDataProvider.getFunctionArtifact(targetContractAddress, functionSelector);
+    async txePrivateCallNewFlow(from, targetContractAddress = AztecAddress.zero(), functionSelector = FunctionSelector.empty(), args, argsHash = Fr.zero(), isStaticCall = false, jobId) {
+        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);
         }
+        // When `from` is the zero address (e.g. when deploying a new account contract), we return an
+        // empty scope list which acts as deny-all: no notes are visible and no keys are accessible.
+        const effectiveScopes = from.isZero() ? [] : [
+            from
+        ];
+        // Sync notes before executing private function to discover notes from previous transactions
+        const utilityExecutor = async (call, execScopes)=>{
+            await this.executeUtilityCall(call, execScopes, jobId);
+        };
+        const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+        await this.stateMachine.contractSyncService.ensureContractSynced(targetContractAddress, functionSelector, utilityExecutor, blockHeader, jobId, effectiveScopes);
         const blockNumber = await this.txeGetNextBlockNumber();
         const callContext = new CallContext(from, targetContractAddress, functionSelector, isStaticCall);
         const gasLimits = new Gas(DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT);
         const teardownGasLimits = new Gas(DEFAULT_TEARDOWN_DA_GAS_LIMIT, DEFAULT_TEARDOWN_L2_GAS_LIMIT);
         const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
         const txContext = new TxContext(this.chainId, this.version, gasSettings);
-        const blockHeader = await this.pxeOracleInterface.getAnchorBlockHeader();
-        const txRequestHash = getSingleTxBlockRequestHash(blockNumber);
-        const noteCache = new ExecutionNoteCache(txRequestHash);
+        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, /** Header of a block whose state is used during private execution (not the block the transaction is included in). */ blockHeader, /** List of transient auth witnesses to be used during this simulation */ Array.from(this.authwits.values()), /** List of transient auth witnesses to be used during this simulation */ [], HashedValuesCache.create([
-            new HashedValues(args, argsHash)
-        ]), noteCache, taggingIndexCache, this.pxeOracleInterface, 0, 1, undefined, undefined, /**
-       * In TXE, the typical transaction entrypoint is skipped, so we need to simulate the actions that such a
-       * contract would perform, including setting senderForTags.
-       */ from, simulator);
+        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,
+            capsuleStore: this.capsuleStore,
+            privateEventStore: this.privateEventStore,
+            contractSyncService: this.stateMachine.contractSyncService,
+            jobId,
+            totalPublicCalldataCount: 0,
+            sideEffectCounter: minRevertibleSideEffectCounter,
+            scopes: effectiveScopes,
+            // 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
+        });
         // 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;
         let executionResult;
@@ -208,18 +290,16 @@ export class TXEOracleTopLevelContext {
                 const calldata = await privateExecutionOracle.privateLoadFromExecutionCache(r.calldataHash);
                 return new HashedValues(calldata, r.calldataHash);
             }));
-            // TXE's top level context does not track side effect counters, and as such, minRevertibleSideEffectCounter is always 0.
-            // This has the unfortunate consequence of always producing revertible nullifiers, which means we
-            // must set the firstNullifierHint to Fr.ZERO so the txRequestHash is always used as nonce generator
-            result = new PrivateExecutionResult(executionResult, Fr.ZERO, publicFunctionsCalldata);
+            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, the nonce generator for the note hashes
-        // can either be the first nullifier in the tx or the hash of the initial tx request
-        // if there are none.
-        const nonceGenerator = result.firstNullifier.equals(Fr.ZERO) ? txRequestHash : result.firstNullifier;
-        const { publicInputs } = await generateSimulatedProvingResult(result, nonceGenerator, this.contractDataProvider);
+        // 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;
@@ -227,12 +307,17 @@ export class TXEOracleTopLevelContext {
         globals.version = this.version;
         globals.gasFees = GasFees.empty();
         const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
-        const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractDataProvider));
+        const bindings = this.logger.getBindings();
+        const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractStore), bindings);
         const guardedMerkleTrees = new GuardedMerkleTreeOperations(forkedWorldTrees);
-        const processor = new PublicProcessor(globals, guardedMerkleTrees, contractsDB, new PublicTxSimulator(guardedMerkleTrees, contractsDB, globals, {
-            doMerkleOperations: true,
-            skipFeeEnforcement: true
-        }), new TestDateProvider());
+        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(),
@@ -253,7 +338,7 @@ export class TXEOracleTopLevelContext {
         } else if (!processedTx.revertCode.isOK()) {
             if (processedTx.revertReason) {
                 try {
-                    await enrichPublicSimulationError(processedTx.revertReason, this.contractDataProvider, this.logger);
+                    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()}`);
@@ -275,22 +360,21 @@ export class TXEOracleTopLevelContext {
         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 body = new Body([
+        const l2Block = await makeTXEBlock(forkedWorldTrees, globals, [
             txEffect
         ]);
-        const l2Block = new L2Block(makeAppendOnlyTreeSnapshot(), await makeTXEBlockHeader(forkedWorldTrees, globals), body);
         await this.stateMachine.handleL2Block(l2Block);
         await forkedWorldTrees.close();
         return executionResult.returnValues ?? [];
     }
     async txePublicCallNewFlow(from, targetContractAddress, calldata, isStaticCall) {
-        this.logger.verbose(`Executing public function ${await this.contractDataProvider.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`);
+        this.logger.verbose(`Executing public function ${await this.contractStore.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`);
         const blockNumber = await this.txeGetNextBlockNumber();
         const gasLimits = new Gas(DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT);
         const teardownGasLimits = new Gas(DEFAULT_TEARDOWN_DA_GAS_LIMIT, DEFAULT_TEARDOWN_L2_GAS_LIMIT);
         const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
         const txContext = new TxContext(this.chainId, this.version, gasSettings);
-        const anchorBlockHeader = await this.pxeOracleInterface.getAnchorBlockHeader();
+        const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
         const calldataHash = await computeCalldataHash(calldata);
         const calldataHashedValues = new HashedValues(calldata, calldataHash);
         const globals = makeGlobalVariables();
@@ -300,28 +384,31 @@ export class TXEOracleTopLevelContext {
         globals.version = this.version;
         globals.gasFees = GasFees.empty();
         const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
-        const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractDataProvider));
+        const bindings2 = this.logger.getBindings();
+        const contractsDB = new PublicContractsDB(new TXEPublicContractDataSource(blockNumber, this.contractStore), bindings2);
         const guardedMerkleTrees = new GuardedMerkleTreeOperations(forkedWorldTrees);
-        const simulator = new PublicTxSimulator(guardedMerkleTrees, contractsDB, globals, {
-            doMerkleOperations: true,
-            skipFeeEnforcement: true
+        const config = PublicSimulatorConfig.from({
+            skipFeeEnforcement: true,
+            collectDebugLogs: true,
+            collectHints: false,
+            collectStatistics: false,
+            collectCallMetadata: true
         });
-        const processor = new PublicProcessor(globals, guardedMerkleTrees, contractsDB, simulator, new TestDateProvider());
+        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();
-        if (!isStaticCall) {
-            nonRevertibleAccumulatedData.nullifiers[0] = getSingleTxBlockRequestHash(blockNumber);
-        }
+        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, 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(), /*includeByTimestamp=*/ 0n, inputsForPublic, undefined);
+        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(),
@@ -344,7 +431,7 @@ export class TXEOracleTopLevelContext {
         } else if (!processedTx.revertCode.isOK()) {
             if (processedTx.revertReason) {
                 try {
-                    await enrichPublicSimulationError(processedTx.revertReason, this.contractDataProvider, this.logger);
+                    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()}`);
@@ -367,25 +454,37 @@ export class TXEOracleTopLevelContext {
         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 body = new Body([
+        const l2Block = await makeTXEBlock(forkedWorldTrees, globals, [
             txEffect
         ]);
-        const l2Block = new L2Block(makeAppendOnlyTreeSnapshot(), await makeTXEBlockHeader(forkedWorldTrees, globals), body);
         await this.stateMachine.handleL2Block(l2Block);
         await forkedWorldTrees.close();
         return returnValues ?? [];
     }
-    async txeSimulateUtilityFunction(targetContractAddress, functionSelector, args) {
-        const artifact = await this.contractDataProvider.getFunctionArtifact(targetContractAddress, functionSelector);
+    async txeExecuteUtilityFunction(targetContractAddress, functionSelector, args, jobId) {
+        const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
         if (!artifact) {
             throw new Error(`Cannot call ${functionSelector} as there is no artifact found at ${targetContractAddress}.`);
         }
-        const call = {
+        // 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, 'ALL_SCOPES');
+        const call = FunctionCall.from({
             name: artifact.name,
+            to: targetContractAddress,
             selector: functionSelector,
-            to: targetContractAddress
-        };
-        const entryPointArtifact = await this.pxeOracleInterface.getFunctionArtifact(call.to, call.selector);
+            type: FunctionType.UTILITY,
+            hideMsgSender: false,
+            isStatic: false,
+            args,
+            returnTypes: []
+        });
+        return this.executeUtilityCall(call, 'ALL_SCOPES', jobId);
+    }
+    async executeUtilityCall(call, scopes, jobId) {
+        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`);
         }
@@ -394,8 +493,25 @@ export class TXEOracleTopLevelContext {
             selector: call.selector
         });
         try {
-            const oracle = new UtilityExecutionOracle(call.to, [], [], this.pxeOracleInterface);
-            const acirExecutionResult = await new WASMSimulator().executeUserCircuit(toACVMWitness(0, args), entryPointArtifact, new Oracle(oracle).toACIRCallback()).catch((err)=>{
+            const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+            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,
+                capsuleStore: this.capsuleStore,
+                privateEventStore: this.privateEventStore,
+                jobId,
+                scopes
+            });
+            const acirExecutionResult = await new WASMSimulator().executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback()).catch((err)=>{
                 err.message = resolveAssertionMessageFromError(err, entryPointArtifact);
                 throw new ExecutionError(err.message, {
                     contractAddress: call.to,
@@ -404,10 +520,10 @@ export class TXEOracleTopLevelContext {
                     cause: err
                 });
             });
-            this.logger.verbose(`Utility simulation for ${call.to}.${call.selector} completed`);
+            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 simulation'));
+            throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during utility execution'));
         }
     }
     close() {
@@ -418,6 +534,7 @@ export class TXEOracleTopLevelContext {
         ];
     }
     async getLastBlockNumber() {
-        return (await this.stateMachine.node.getBlockHeader('latest'))?.globalVariables.blockNumber ?? 0;
+        const header = await this.stateMachine.node.getBlockHeader('latest');
+        return header ? header.globalVariables.blockNumber : BlockNumber.ZERO;
     }
 }