@aztec/txe 0.0.1-commit.2ed92850 → 0.0.1-commit.3100065

package/dest/oracle/txe_oracle_top_level_context.js

@@ -1,11 +1,11 @@
-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 { 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, applyStringFormatting, createLogger } from '@aztec/foundation/log';
 import { TestDateProvider } from '@aztec/foundation/timer';
-import { ORACLE_VERSION, enrichPublicSimulationError, syncState } from '@aztec/pxe/server';
-import { ExecutionNoteCache, ExecutionTaggingIndexCache, HashedValuesCache, Oracle, PrivateExecutionOracle, UtilityExecutionOracle, executePrivateFunction, generateSimulatedProvingResult } from '@aztec/pxe/simulator';
+import { AnchoredContractData, CapsuleService, FactService, ORACLE_VERSION_MAJOR, composeHooks, enrichPublicSimulationError } from '@aztec/pxe/server';
+import { CONTRACT_INSTANCE, ExecutionNoteCache, ExecutionTaggingIndexCache, HashedValuesCache, PrivateExecutionOracle, TransientArrayService, UtilityExecutionOracle, buildACIRCallback, 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 { FunctionCall, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
@@ -13,17 +13,21 @@ import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { computePartialAddress } from '@aztec/stdlib/contract';
-import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
+import { Gas, GasFees } from '@aztec/stdlib/gas';
 import { computeCalldataHash, computeProtocolNullifier, siloNullifier } from '@aztec/stdlib/hash';
 import { PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, PrivateToPublicAccumulatedData, PublicCallRequest } from '@aztec/stdlib/kernel';
+import { deriveKeys, hashPublicKey } from '@aztec/stdlib/keys';
+import { AppTaggingSecretKind } from '@aztec/stdlib/logs';
+import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/stdlib/messaging';
 import { ChonkProof } from '@aztec/stdlib/proofs';
 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 { ForkCheckpoint } from '@aztec/world-state/native';
+import { DEFAULT_ADDRESS, MAX_PRIVATE_EVENTS_PER_TXE_QUERY, MAX_PRIVATE_EVENT_LEN } from '../constants.js';
 import { getSingleTxBlockRequestHash, insertTxEffectIntoWorldTrees, makeTXEBlock } from '../utils/block_creation.js';
+import { TXEPublicContractDataSource } from '../utils/txe_public_contract_data_source.js';
+import { makeResolveTaggingSecretStrategyHook } from './tagging_secret_strategy.js';
 export class TXEOracleTopLevelContext {
     stateMachine;
     contractStore;
@@ -33,18 +37,22 @@ export class TXEOracleTopLevelContext {
     accountStore;
     senderTaggingStore;
     recipientTaggingStore;
-    senderAddressBookStore;
+    taggingSecretSourcesStore;
     capsuleStore;
+    factStore;
     privateEventStore;
-    jobId;
     nextBlockTimestamp;
     version;
     chainId;
     authwits;
+    taggingSecretStrategies;
+    artifactResolver;
+    rootPath;
+    packageName;
     isMisc;
     isTxe;
     logger;
-    constructor(stateMachine, contractStore, noteStore, keyStore, addressStore, accountStore, senderTaggingStore, recipientTaggingStore, senderAddressBookStore, capsuleStore, privateEventStore, jobId, nextBlockTimestamp, version, chainId, authwits){
+    constructor(stateMachine, contractStore, noteStore, keyStore, addressStore, accountStore, senderTaggingStore, recipientTaggingStore, taggingSecretSourcesStore, capsuleStore, factStore, privateEventStore, nextBlockTimestamp, version, chainId, authwits, taggingSecretStrategies, artifactResolver, rootPath, packageName){
         this.stateMachine = stateMachine;
         this.contractStore = contractStore;
         this.noteStore = noteStore;
@@ -53,67 +61,104 @@ export class TXEOracleTopLevelContext {
         this.accountStore = accountStore;
         this.senderTaggingStore = senderTaggingStore;
         this.recipientTaggingStore = recipientTaggingStore;
-        this.senderAddressBookStore = senderAddressBookStore;
+        this.taggingSecretSourcesStore = taggingSecretSourcesStore;
         this.capsuleStore = capsuleStore;
+        this.factStore = factStore;
         this.privateEventStore = privateEventStore;
-        this.jobId = jobId;
         this.nextBlockTimestamp = nextBlockTimestamp;
         this.version = version;
         this.chainId = chainId;
         this.authwits = authwits;
+        this.taggingSecretStrategies = taggingSecretStrategies;
+        this.artifactResolver = artifactResolver;
+        this.rootPath = rootPath;
+        this.packageName = packageName;
         this.isMisc = true;
         this.isTxe = true;
         this.logger = createLogger('txe:top_level_context');
         this.logger.debug('Entering Top Level Context');
     }
-    utilityAssertCompatibleOracleVersion(version) {
-        if (version !== ORACLE_VERSION) {
-            throw new Error(`Incompatible oracle version. TXE is using version '${ORACLE_VERSION}', but got a request for '${version}'.`);
+    contractOracleVersion;
+    assertCompatibleOracleVersion(major, minor) {
+        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() {
+        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.
-    utilityGetRandomField() {
+    getRandomField() {
         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) {
+    log(level, message, _fieldsSize, 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() {
+    getDefaultAddress() {
         return DEFAULT_ADDRESS;
     }
-    async txeGetNextBlockNumber() {
+    async getNextBlockNumber() {
         return BlockNumber(await this.getLastBlockNumber() + 1);
     }
-    txeGetNextBlockTimestamp() {
+    getNextBlockTimestamp() {
         return Promise.resolve(this.nextBlockTimestamp);
     }
-    async txeGetLastBlockTimestamp() {
-        return (await this.stateMachine.node.getBlockHeader('latest')).globalVariables.timestamp;
+    async getLastBlockTimestamp() {
+        return (await this.stateMachine.node.getBlockData('latest')).header.globalVariables.timestamp;
     }
-    async txeGetLastTxEffects() {
+    async getLastTxEffects() {
         const latestBlockNumber = await this.stateMachine.archiver.getBlockNumber();
-        const block = await this.stateMachine.archiver.getBlock(latestBlockNumber);
+        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
+            nullifiers: txEffects.nullifiers,
+            privateLogs
         };
     }
-    async txeGetPrivateEvents(selector, contractAddress, scope) {
-        return (await this.privateEventStore.getPrivateEvents(selector, {
+    async syncContractNonOracleMethod(contractAddress, scope, jobId) {
+        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, {
+                scopes: execScopes,
+                jobId
+            });
+        }, blockHeader, jobId, [
+            scope
+        ]);
+    }
+    async getPrivateEvents(selector, contractAddress, scope) {
+        const events = (await this.privateEventStore.getPrivateEvents(selector, {
             contractAddress,
             scopes: [
                 scope
@@ -121,63 +166,117 @@ export class TXEOracleTopLevelContext {
             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 txeAdvanceBlocksBy(blocks) {
+    async advanceBlocksBy(blocks) {
         this.logger.debug(`time traveling ${blocks} blocks`);
         for(let i = 0; i < blocks; i++){
             await this.mineBlock();
         }
     }
-    txeAdvanceTimestampBy(duration) {
+    advanceTimestampBy(duration) {
         this.logger.debug(`time traveling ${duration} seconds`);
         this.nextBlockTimestamp += duration;
     }
-    async txeDeploy(artifact, instance, secret) {
+    deploymentNullifier(address) {
+        return siloNullifier(AztecAddress.fromNumberUnsafe(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS), address.toField());
+    }
+    async deploy(contractPath, initializer, args, secret, salt, deployer) {
+        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 siloNullifier(AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS), instance.address.toField())
+                await this.deploymentNullifier(instance.address)
             ]
         });
         if (!secret.equals(Fr.ZERO)) {
-            await this.txeAddAccount(artifact, instance, secret);
+            await this.registerContractAndAddAccount(artifact, instance, secret);
         } else {
             await this.contractStore.addContractInstance(instance);
-            await this.contractStore.addContractArtifact(instance.currentContractClassId, artifact);
+            await this.contractStore.addContractArtifact(artifact);
             this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
         }
+        return CONTRACT_INSTANCE.serialization.fn(instance).flat();
+    }
+    /**
+   * Mines a single block containing only the deployment nullifiers for the contracts at the given addresses.
+   */ async mineDeploymentNullifiers(addresses) {
+        await this.mineBlock({
+            nullifiers: await Promise.all(addresses.map((address)=>this.deploymentNullifier(address)))
+        });
+    }
+    async addAccount(secret) {
+        const { artifact, instance } = await this.artifactResolver.resolveAccountArtifact(secret);
+        return this.registerContractAndAddAccount(artifact, instance, secret);
     }
-    async txeAddAccount(artifact, instance, secret) {
+    async registerContractAndAddAccount(artifact, instance, secret) {
         const partialAddress = await computePartialAddress(instance);
         this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
         await this.contractStore.addContractInstance(instance);
-        await this.contractStore.addContractArtifact(instance.currentContractClassId, artifact);
-        const completeAddress = await this.keyStore.addAccount(secret, partialAddress);
+        await this.contractStore.addContractArtifact(artifact);
+        const completeAddress = await this.keyStore.addAccount(await deriveKeys(secret), partialAddress);
         await this.accountStore.setAccount(completeAddress.address, completeAddress);
         await this.addressStore.addCompleteAddress(completeAddress);
         this.logger.debug(`Created account ${completeAddress.address}`);
         return completeAddress;
     }
-    async txeCreateAccount(secret) {
+    async createAccount(secret) {
         // This is a foot gun !
-        const completeAddress = await this.keyStore.addAccount(secret, secret);
+        const completeAddress = await this.keyStore.addAccount(await deriveKeys(secret), secret);
         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) {
+    async addAuthWitness(address, messageHash) {
         const account = await this.accountStore.getAccount(address);
-        const privateKey = await this.keyStore.getMasterSecretKey(account.publicKeys.masterIncomingViewingPublicKey);
+        const ivpkMHash = await hashPublicKey(account.publicKeys.ivpkM);
+        const privateKey = await this.keyStore.getMasterSecretKey(ivpkMHash);
         const schnorr = new Schnorr();
-        const signature = await schnorr.constructSignature(messageHash.toBuffer(), privateKey);
-        const authWitness = new AuthWitness(messageHash, [
-            ...signature.toBuffer()
-        ]);
+        const signature = await schnorr.constructSignature(messageHash, privateKey);
+        const authWitness = new AuthWitness(messageHash, signature.toLimbFields());
         this.authwits.set(authWitness.requestHash.toString(), authWitness);
     }
+    setTaggingSecretStrategies(unconstrainedStrategy, constrainedStrategy) {
+        const apply = (mode, strategy)=>{
+            if (strategy.isSome()) {
+                this.taggingSecretStrategies.set(mode, strategy.value);
+            } else {
+                this.taggingSecretStrategies.delete(mode);
+            }
+        };
+        apply(AppTaggingSecretKind.UNCONSTRAINED, unconstrainedStrategy);
+        apply(AppTaggingSecretKind.CONSTRAINED, constrainedStrategy);
+    }
+    async sendL1ToL2Message(content, secretHash, sender, recipient) {
+        // Messages are appended to the tree, so the next free slot is simply the current tree size.
+        const { size } = await this.stateMachine.synchronizer.getCommitted().getTreeInfo(MerkleTreeId.L1_TO_L2_MESSAGE_TREE);
+        const leafIndex = new Fr(size);
+        const message = new L1ToL2Message(new L1Actor(sender, this.chainId.toNumber()), new L2Actor(recipient, this.version.toNumber()), content, secretHash, leafIndex);
+        await this.mineBlock({
+            l1ToL2Messages: [
+                message.hash()
+            ]
+        });
+        return leafIndex;
+    }
     async mineBlock(options = {}) {
-        const blockNumber = await this.txeGetNextBlockNumber();
+        const blockNumber = await this.getNextBlockNumber();
         const txEffect = TxEffect.empty();
         txEffect.nullifiers = [
             getSingleTxBlockRequestHash(blockNumber),
@@ -185,7 +284,7 @@ export class TXEOracleTopLevelContext {
         ];
         txEffect.txHash = new TxHash(new Fr(blockNumber));
         const forkedWorldTrees = await this.stateMachine.synchronizer.nativeWorldStateService.fork();
-        await insertTxEffectIntoWorldTrees(txEffect, forkedWorldTrees);
+        await insertTxEffectIntoWorldTrees(txEffect, forkedWorldTrees, options.l1ToL2Messages ?? []);
         const globals = makeGlobalVariables(undefined, {
             blockNumber,
             timestamp: this.nextBlockTimestamp,
@@ -197,27 +296,33 @@ export class TXEOracleTopLevelContext {
         ]);
         await forkedWorldTrees.close();
         this.logger.info(`Created block ${blockNumber} with timestamp ${block.header.globalVariables.timestamp}`);
-        await this.stateMachine.handleL2Block(block);
+        await this.stateMachine.handleL2Block(block, options.l1ToL2Messages ?? []);
     }
-    async txePrivateCallNewFlow(from, targetContractAddress = AztecAddress.zero(), functionSelector = FunctionSelector.empty(), args, argsHash = Fr.zero(), isStaticCall = false) {
-        this.logger.verbose(`Executing external function ${await this.contractStore.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`);
-        const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
+    async privateCallNewFlow(from, targetContractAddress = AztecAddress.zero(), functionSelector = FunctionSelector.empty(), args, argsHash = Fr.zero(), isStaticCall = false, additionalScopes = [], jobId, authorizedUtilityCallTargets, gasSettings) {
+        const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+        const anchoredContractData = new AnchoredContractData(this.contractStore, this.stateMachine.contractClassService, blockHeader);
+        this.logger.verbose(`Executing external function ${await anchoredContractData.getDebugFunctionName(targetContractAddress, functionSelector)}@${targetContractAddress} isStaticCall=${isStaticCall}`);
+        const artifact = await anchoredContractData.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)=>{
-            await this.executeUtilityCall(call);
+        const utilityExecutor = async (call, execScopes)=>{
+            await this.executeUtilityCall(call, {
+                scopes: execScopes,
+                jobId
+            });
         };
-        await syncState(targetContractAddress, this.contractStore, functionSelector, utilityExecutor);
-        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());
+        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 blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
         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.
@@ -227,12 +332,50 @@ export class TXEOracleTopLevelContext {
         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, utilityExecutor, /** 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.contractStore, this.noteStore, this.keyStore, this.addressStore, this.stateMachine.node, this.stateMachine.anchorBlockStore, this.senderTaggingStore, this.recipientTaggingStore, this.senderAddressBookStore, this.capsuleStore, this.privateEventStore, this.jobId, 0, minRevertibleSideEffectCounter, 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 transientArrayService = new TransientArrayService();
+        const privateExecutionOracle = new PrivateExecutionOracle({
+            argsHash,
+            txContext,
+            // The TXE does not run the init kernel's salt binding, so no tx-request salt is in scope.
+            txRequestSalt: Fr.ZERO,
+            callContext,
+            anchorBlockHeader: blockHeader,
+            utilityExecutor,
+            authWitnesses: Array.from(this.authwits.values()),
+            capsules: [],
+            executionCache: HashedValuesCache.create([
+                new HashedValues(args, argsHash)
+            ]),
+            noteCache,
+            taggingIndexCache,
+            anchoredContractData,
+            noteStore: this.noteStore,
+            keyStore: this.keyStore,
+            addressStore: this.addressStore,
+            aztecNode: this.stateMachine.node,
+            senderTaggingStore: this.senderTaggingStore,
+            recipientTaggingStore: this.recipientTaggingStore,
+            taggingSecretSourcesStore: this.taggingSecretSourcesStore,
+            capsuleService: new CapsuleService(this.capsuleStore, scopes),
+            factService: new FactService(this.factStore, 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,
+            txResolver: this.stateMachine.txResolver,
+            l2TipsStore: this.stateMachine.l2TipsProvider,
+            hooks: composeHooks({
+                authorizeUtilityCall: this.buildAuthorizeUtilityCallHook(isStaticCall ? 'private view' : 'private', authorizedUtilityCallTargets),
+                resolveTaggingSecretStrategy: makeResolveTaggingSecretStrategyHook(this.taggingSecretStrategies)
+            }),
+            transientArrayService
+        });
         // 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;
@@ -244,10 +387,9 @@ export class TXEOracleTopLevelContext {
                     r.publicInputs.publicTeardownCallRequest
                 ]));
             const publicFunctionsCalldata = await Promise.all(publicCallRequests.map(async (r)=>{
-                const calldata = await privateExecutionOracle.privateLoadFromExecutionCache(r.calldataHash);
+                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) {
@@ -256,7 +398,7 @@ export class TXEOracleTopLevelContext {
         // 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, this.contractStore, minRevertibleSideEffectCounter);
+        const { publicInputs } = await generateSimulatedProvingResult(result, (addr, sel)=>anchoredContractData.getDebugFunctionName(addr, sel), this.stateMachine.node, minRevertibleSideEffectCounter);
         const globals = makeGlobalVariables();
         globals.blockNumber = blockNumber;
         globals.timestamp = this.nextBlockTimestamp;
@@ -264,7 +406,8 @@ 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.contractStore));
+        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,
@@ -273,7 +416,7 @@ export class TXEOracleTopLevelContext {
             collectStatistics: false,
             collectCallMetadata: true
         });
-        const processor = new PublicProcessor(globals, guardedMerkleTrees, contractsDB, new CppPublicTxSimulator(guardedMerkleTrees, contractsDB, globals, config), new TestDateProvider());
+        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(),
@@ -294,7 +437,7 @@ export class TXEOracleTopLevelContext {
         } else if (!processedTx.revertCode.isOK()) {
             if (processedTx.revertReason) {
                 try {
-                    await enrichPublicSimulationError(processedTx.revertReason, this.contractStore, this.logger);
+                    await enrichPublicSimulationError(processedTx.revertReason, this.contractStore, this.stateMachine.contractClassService, await this.stateMachine.anchorBlockStore.getBlockHeader(), this.logger);
                 // eslint-disable-next-line no-empty
                 } catch  {}
                 throw new Error(`Contract execution has reverted: ${processedTx.revertReason.getMessage()}`);
@@ -302,10 +445,20 @@ export class TXEOracleTopLevelContext {
                 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 executionResult.returnValues ?? [];
+            return {
+                returnValues: executionResult.returnValues ?? [],
+                offchainEffects
+            };
         }
         const txEffect = TxEffect.empty();
         txEffect.noteHashes = processedTx.txEffect.noteHashes;
@@ -321,16 +474,17 @@ export class TXEOracleTopLevelContext {
         ]);
         await this.stateMachine.handleL2Block(l2Block);
         await forkedWorldTrees.close();
-        return executionResult.returnValues ?? [];
+        return {
+            returnValues: executionResult.returnValues ?? [],
+            offchainEffects
+        };
     }
-    async txePublicCallNewFlow(from, targetContractAddress, calldata, 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);
+    async publicCallNewFlow(from, targetContractAddress, calldata, isStaticCall, gasSettings) {
         const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+        const anchoredContractData = new AnchoredContractData(this.contractStore, this.stateMachine.contractClassService, anchorBlockHeader);
+        this.logger.verbose(`Executing public function ${await anchoredContractData.getDebugFunctionName(targetContractAddress, FunctionSelector.fromField(calldata[0]))}@${targetContractAddress} isStaticCall=${isStaticCall}`);
+        const blockNumber = await this.getNextBlockNumber();
+        const txContext = new TxContext(this.chainId, this.version, gasSettings);
         const calldataHash = await computeCalldataHash(calldata);
         const calldataHashedValues = new HashedValues(calldata, calldataHash);
         const globals = makeGlobalVariables();
@@ -340,7 +494,8 @@ 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.contractStore));
+        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,
@@ -349,8 +504,8 @@ export class TXEOracleTopLevelContext {
             collectStatistics: false,
             collectCallMetadata: true
         });
-        const simulator = new CppPublicTxSimulator(guardedMerkleTrees, contractsDB, globals, config);
-        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
@@ -360,10 +515,10 @@ export class TXEOracleTopLevelContext {
         // 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);
+        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(), /*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(),
@@ -386,7 +541,7 @@ export class TXEOracleTopLevelContext {
         } else if (!processedTx.revertCode.isOK()) {
             if (processedTx.revertReason) {
                 try {
-                    await enrichPublicSimulationError(processedTx.revertReason, this.contractStore, this.logger);
+                    await enrichPublicSimulationError(processedTx.revertReason, this.contractStore, this.stateMachine.contractClassService, anchorBlockHeader, this.logger);
                 // eslint-disable-next-line no-empty
                 } catch  {}
                 throw new Error(`Contract execution has reverted: ${processedTx.revertReason.getMessage()}`);
@@ -416,20 +571,44 @@ export class TXEOracleTopLevelContext {
         await forkedWorldTrees.close();
         return returnValues ?? [];
     }
-    async txeSimulateUtilityFunction(targetContractAddress, functionSelector, args) {
-        const artifact = await this.contractStore.getFunctionArtifact(targetContractAddress, functionSelector);
+    async executeUtilityFunction(from, targetContractAddress, functionSelector, args, jobId, authorizedUtilityCallTargets) {
+        const blockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+        const anchoredContractData = new AnchoredContractData(this.contractStore, this.stateMachine.contractClassService, blockHeader);
+        const artifact = await anchoredContractData.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
-        await syncState(targetContractAddress, this.contractStore, functionSelector, async (call)=>{
-            await this.executeUtilityCall(call);
+        await this.stateMachine.contractSyncService.ensureContractSynced(targetContractAddress, functionSelector, async (call, execScopes)=>{
+            await this.executeUtilityCall(call, {
+                scopes: 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, {
+            from,
+            scopes: await this.keyStore.getAccounts(),
+            jobId,
+            authorizedUtilityCallTargets
         });
-        const call = new FunctionCall(artifact.name, targetContractAddress, functionSelector, FunctionType.UTILITY, false, false, args, []);
-        return this.executeUtilityCall(call);
     }
-    async executeUtilityCall(call) {
-        const entryPointArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(call.to, call.selector);
+    async executeUtilityCall(call, { from = AztecAddress.NULL_MSG_SENDER, scopes, jobId, authorizedUtilityCallTargets = [] }) {
+        const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
+        const anchoredContractData = new AnchoredContractData(this.contractStore, this.stateMachine.contractClassService, anchorBlockHeader);
+        const entryPointArtifact = await anchoredContractData.getFunctionArtifactWithDebugMetadata(call.to, call.selector);
+        if (!entryPointArtifact) {
+            throw new Error(`Cannot run function ${call.selector} on ${call.to}: the contract is not registered.`);
+        }
         if (entryPointArtifact.functionType !== FunctionType.UTILITY) {
             throw new Error(`Cannot run ${entryPointArtifact.functionType} function as utility`);
         }
@@ -438,9 +617,48 @@ export class TXEOracleTopLevelContext {
             selector: call.selector
         });
         try {
-            const anchorBlockHeader = await this.stateMachine.anchorBlockStore.getBlockHeader();
-            const oracle = new UtilityExecutionOracle(call.to, [], [], anchorBlockHeader, this.contractStore, this.noteStore, this.keyStore, this.addressStore, this.stateMachine.node, this.stateMachine.anchorBlockStore, this.recipientTaggingStore, this.senderAddressBookStore, this.capsuleStore, this.privateEventStore, this.jobId);
-            const acirExecutionResult = await new WASMSimulator().executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, new Oracle(oracle).toACIRCallback()).catch((err)=>{
+            const simulator = new WASMSimulator();
+            const utilityExecutor = async (syncCall, execScopes)=>{
+                await this.executeUtilityCall(syncCall, {
+                    scopes: execScopes,
+                    jobId,
+                    authorizedUtilityCallTargets
+                });
+            };
+            const oracle = new UtilityExecutionOracle({
+                callContext: CallContext.from({
+                    msgSender: from,
+                    contractAddress: call.to,
+                    functionSelector: call.selector,
+                    isStaticCall: true
+                }),
+                authWitnesses: [],
+                capsules: [],
+                anchorBlockHeader,
+                anchoredContractData,
+                noteStore: this.noteStore,
+                keyStore: this.keyStore,
+                addressStore: this.addressStore,
+                aztecNode: this.stateMachine.node,
+                recipientTaggingStore: this.recipientTaggingStore,
+                taggingSecretSourcesStore: this.taggingSecretSourcesStore,
+                capsuleService: new CapsuleService(this.capsuleStore, scopes),
+                factService: new FactService(this.factStore, scopes),
+                privateEventStore: this.privateEventStore,
+                txResolver: this.stateMachine.txResolver,
+                contractSyncService: this.stateMachine.contractSyncService,
+                l2TipsStore: this.stateMachine.l2TipsProvider,
+                jobId,
+                scopes,
+                simulator,
+                utilityExecutor,
+                hooks: composeHooks({
+                    authorizeUtilityCall: this.buildAuthorizeUtilityCallHook('utility', authorizedUtilityCallTargets)
+                }),
+                // Execution-tree root (top-level utility run or contract sync): own store; nested frames inherit it.
+                transientArrayService: new TransientArrayService()
+            });
+            const acirExecutionResult = await simulator.executeUserCircuit(toACVMWitness(0, call.args), entryPointArtifact, buildACIRCallback(oracle)).catch((err)=>{
                 err.message = resolveAssertionMessageFromError(err, entryPointArtifact);
                 throw new ExecutionError(err.message, {
                     contractAddress: call.to,
@@ -449,21 +667,30 @@ 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() {
         this.logger.debug('Exiting Top Level Context');
         return [
             this.nextBlockTimestamp,
-            this.authwits
+            this.authwits,
+            this.taggingSecretStrategies
         ];
     }
     async getLastBlockNumber() {
-        const header = await this.stateMachine.node.getBlockHeader('latest');
-        return header ? header.globalVariables.blockNumber : BlockNumber.ZERO;
+        const block = await this.stateMachine.node.getBlock('latest');
+        return block ? block.header.globalVariables.blockNumber : BlockNumber.ZERO;
+    }
+    buildAuthorizeUtilityCallHook(callerContext, authorizedTargets) {
+        if (authorizedTargets.length === 0) {
+            return undefined;
+        }
+        return (req)=>Promise.resolve({
+                authorized: req.callerContext === callerContext && authorizedTargets.some((t)=>t.equals(req.target))
+            });
     }
 }