@aztec/txe 3.0.0-nightly.20250925 → 3.0.0-nightly.20250927

package/dest/rpc_translator.js

@@ -5,6 +5,11 @@ import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { addressFromSingle, arrayOfArraysToBoundedVecOfArrays, arrayToBoundedVec, bufferToU8Array, fromArray, fromSingle, fromUintArray, fromUintBoundedVec, toArray, toForeignCallResult, toSingle } from './util/encoding.js';
+export class UnavailableOracleError extends Error {
+    constructor(oracleName){
+        super(`${oracleName} oracles not available with the current handler`);
+    }
+}
 export class RPCTranslator {
     stateHandler;
     oracleHandler;
@@ -20,54 +25,84 @@ export class RPCTranslator {
         this.stateHandler = stateHandler;
         this.oracleHandler = oracleHandler;
     }
+    handlerAsMisc() {
+        if (!('isMisc' in this.oracleHandler)) {
+            throw new UnavailableOracleError('Misc');
+        }
+        return this.oracleHandler;
+    }
+    handlerAsUtility() {
+        if (!('isUtility' in this.oracleHandler)) {
+            throw new UnavailableOracleError('Utility');
+        }
+        return this.oracleHandler;
+    }
+    handlerAsPrivate() {
+        if (!('isPrivate' in this.oracleHandler)) {
+            throw new UnavailableOracleError('Private');
+        }
+        return this.oracleHandler;
+    }
+    handlerAsAvm() {
+        if (!('isAvm' in this.oracleHandler)) {
+            throw new UnavailableOracleError('Avm');
+        }
+        return this.oracleHandler;
+    }
+    handlerAsTxe() {
+        if (!('isTxe' in this.oracleHandler)) {
+            throw new UnavailableOracleError('Txe');
+        }
+        return this.oracleHandler;
+    }
     // TXE session state transition functions - these get handled by the state handler
     async txeSetTopLevelTXEContext() {
-        await this.stateHandler.setTopLevelContext();
+        await this.stateHandler.enterTopLevelState();
         return toForeignCallResult([]);
     }
     async txeSetPrivateTXEContext(foreignContractAddressIsSome, foreignContractAddressValue, foreignAnchorBlockNumberIsSome, foreignAnchorBlockNumberValue) {
         const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
         const anchorBlockNumber = fromSingle(foreignAnchorBlockNumberIsSome).toBool() ? fromSingle(foreignAnchorBlockNumberValue).toNumber() : undefined;
-        const privateContextInputs = await this.stateHandler.setPrivateContext(contractAddress, anchorBlockNumber);
+        const privateContextInputs = await this.stateHandler.enterPrivateState(contractAddress, anchorBlockNumber);
         return toForeignCallResult(privateContextInputs.toFields().map(toSingle));
     }
     async txeSetPublicTXEContext(foreignContractAddressIsSome, foreignContractAddressValue) {
         const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
-        await this.stateHandler.setPublicContext(contractAddress);
+        await this.stateHandler.enterPublicState(contractAddress);
         return toForeignCallResult([]);
     }
     async txeSetUtilityTXEContext(foreignContractAddressIsSome, foreignContractAddressValue) {
         const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
-        await this.stateHandler.setUtilityContext(contractAddress);
+        await this.stateHandler.enterUtilityState(contractAddress);
         return toForeignCallResult([]);
     }
     // Other oracles - these get handled by the oracle handler
     // TXE-specific oracles
     async txeGetNextBlockNumber() {
-        const nextBlockNumber = await this.oracleHandler.txeGetNextBlockNumber();
+        const nextBlockNumber = await this.handlerAsTxe().txeGetNextBlockNumber();
         return toForeignCallResult([
             toSingle(nextBlockNumber)
         ]);
     }
     async txeGetNextBlockTimestamp() {
-        const nextBlockTimestamp = await this.oracleHandler.txeGetNextBlockTimestamp();
+        const nextBlockTimestamp = await this.handlerAsTxe().txeGetNextBlockTimestamp();
         return toForeignCallResult([
             toSingle(nextBlockTimestamp)
         ]);
     }
     async txeAdvanceBlocksBy(foreignBlocks) {
         const blocks = fromSingle(foreignBlocks).toNumber();
-        await this.oracleHandler.txeAdvanceBlocksBy(blocks);
+        await this.handlerAsTxe().txeAdvanceBlocksBy(blocks);
         return toForeignCallResult([]);
     }
     txeAdvanceTimestampBy(foreignDuration) {
         const duration = fromSingle(foreignDuration).toBigInt();
-        this.oracleHandler.txeAdvanceTimestampBy(duration);
+        this.handlerAsTxe().txeAdvanceTimestampBy(duration);
         return toForeignCallResult([]);
     }
     async txeDeploy(artifact, instance, foreignSecret) {
         const secret = fromSingle(foreignSecret);
-        await this.oracleHandler.txeDeploy(artifact, instance, secret);
+        await this.handlerAsTxe().txeDeploy(artifact, instance, secret);
         return toForeignCallResult([
             toArray([
                 instance.salt,
@@ -80,7 +115,7 @@ export class RPCTranslator {
     }
     async txeCreateAccount(foreignSecret) {
         const secret = fromSingle(foreignSecret);
-        const completeAddress = await this.oracleHandler.txeCreateAccount(secret);
+        const completeAddress = await this.handlerAsTxe().txeCreateAccount(secret);
         return toForeignCallResult([
             toSingle(completeAddress.address),
             ...completeAddress.publicKeys.toFields().map(toSingle)
@@ -88,7 +123,7 @@ export class RPCTranslator {
     }
     async txeAddAccount(artifact, instance, foreignSecret) {
         const secret = fromSingle(foreignSecret);
-        const completeAddress = await this.oracleHandler.txeAddAccount(artifact, instance, secret);
+        const completeAddress = await this.handlerAsTxe().txeAddAccount(artifact, instance, secret);
         return toForeignCallResult([
             toSingle(completeAddress.address),
             ...completeAddress.publicKeys.toFields().map(toSingle)
@@ -97,29 +132,29 @@ export class RPCTranslator {
     async txeAddAuthWitness(foreignAddress, foreignMessageHash) {
         const address = addressFromSingle(foreignAddress);
         const messageHash = fromSingle(foreignMessageHash);
-        await this.oracleHandler.txeAddAuthWitness(address, messageHash);
+        await this.handlerAsTxe().txeAddAuthWitness(address, messageHash);
         return toForeignCallResult([]);
     }
     // PXE oracles
     utilityAssertCompatibleOracleVersion(foreignVersion) {
         const version = fromSingle(foreignVersion).toNumber();
-        this.oracleHandler.utilityAssertCompatibleOracleVersion(version);
+        this.handlerAsMisc().utilityAssertCompatibleOracleVersion(version);
         return toForeignCallResult([]);
     }
     utilityGetRandomField() {
-        const randomField = this.oracleHandler.utilityGetRandomField();
+        const randomField = this.handlerAsMisc().utilityGetRandomField();
         return toForeignCallResult([
             toSingle(randomField)
         ]);
     }
     async txeGetLastBlockTimestamp() {
-        const timestamp = await this.oracleHandler.txeGetLastBlockTimestamp();
+        const timestamp = await this.handlerAsTxe().txeGetLastBlockTimestamp();
         return toForeignCallResult([
             toSingle(new Fr(timestamp))
         ]);
     }
     async txeGetLastTxEffects() {
-        const { txHash, noteHashes, nullifiers } = await this.oracleHandler.txeGetLastTxEffects();
+        const { txHash, noteHashes, nullifiers } = await this.handlerAsTxe().txeGetLastTxEffects();
         return toForeignCallResult([
             toSingle(txHash.hash),
             ...arrayToBoundedVec(toArray(noteHashes), MAX_NOTE_HASHES_PER_TX),
@@ -130,12 +165,12 @@ export class RPCTranslator {
     privateStoreInExecutionCache(_foreignLength, foreignValues, foreignHash) {
         const values = fromArray(foreignValues);
         const hash = fromSingle(foreignHash);
-        this.oracleHandler.privateStoreInExecutionCache(values, hash);
+        this.handlerAsPrivate().privateStoreInExecutionCache(values, hash);
         return toForeignCallResult([]);
     }
     async privateLoadFromExecutionCache(foreignHash) {
         const hash = fromSingle(foreignHash);
-        const returns = await this.oracleHandler.privateLoadFromExecutionCache(hash);
+        const returns = await this.handlerAsPrivate().privateLoadFromExecutionCache(hash);
         return toForeignCallResult([
             toArray(returns)
         ]);
@@ -144,7 +179,7 @@ export class RPCTranslator {
     utilityDebugLog(foreignMessage, _foreignLength, foreignFields) {
         const message = fromArray(foreignMessage).map((field)=>String.fromCharCode(field.toNumber())).join('');
         const fields = fromArray(foreignFields);
-        this.oracleHandler.utilityDebugLog(message, fields);
+        this.handlerAsMisc().utilityDebugLog(message, fields);
         return toForeignCallResult([]);
     }
     async utilityStorageRead(foreignContractAddress, foreignStartStorageSlot, foreignBlockNumber, foreignNumberOfElements) {
@@ -152,7 +187,7 @@ export class RPCTranslator {
         const startStorageSlot = fromSingle(foreignStartStorageSlot);
         const blockNumber = fromSingle(foreignBlockNumber).toNumber();
         const numberOfElements = fromSingle(foreignNumberOfElements).toNumber();
-        const values = await this.oracleHandler.utilityStorageRead(contractAddress, startStorageSlot, blockNumber, numberOfElements);
+        const values = await this.handlerAsUtility().utilityStorageRead(contractAddress, startStorageSlot, blockNumber, numberOfElements);
         return toForeignCallResult([
             toArray(values)
         ]);
@@ -160,7 +195,7 @@ export class RPCTranslator {
     async utilityGetPublicDataWitness(foreignBlockNumber, foreignLeafSlot) {
         const blockNumber = fromSingle(foreignBlockNumber).toNumber();
         const leafSlot = fromSingle(foreignLeafSlot);
-        const witness = await this.oracleHandler.utilityGetPublicDataWitness(blockNumber, leafSlot);
+        const witness = await this.handlerAsUtility().utilityGetPublicDataWitness(blockNumber, leafSlot);
         if (!witness) {
             throw new Error(`Public data witness not found for slot ${leafSlot} at block ${blockNumber}.`);
         }
@@ -183,7 +218,7 @@ export class RPCTranslator {
         const status = fromSingle(foreignStatus).toNumber();
         const maxNotes = fromSingle(foreignMaxNotes).toNumber();
         const packedRetrievedNoteLength = fromSingle(foreignPackedRetrievedNoteLength).toNumber();
-        const noteDatas = await this.oracleHandler.utilityGetNotes(storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status);
+        const noteDatas = await this.handlerAsUtility().utilityGetNotes(storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status);
         const returnDataAsArrayOfArrays = noteDatas.map(packAsRetrievedNote);
         // Now we convert each sub-array to an array of ForeignCallSingles
         const returnDataAsArrayOfForeignCallSingleArrays = returnDataAsArrayOfArrays.map((subArray)=>subArray.map(toSingle));
@@ -196,31 +231,31 @@ export class RPCTranslator {
         const note = fromArray(foreignNote);
         const noteHash = fromSingle(foreignNoteHash);
         const counter = fromSingle(foreignCounter).toNumber();
-        this.oracleHandler.privateNotifyCreatedNote(storageSlot, noteTypeId, note, noteHash, counter);
+        this.handlerAsPrivate().privateNotifyCreatedNote(storageSlot, noteTypeId, note, noteHash, counter);
         return toForeignCallResult([]);
     }
     async privateNotifyNullifiedNote(foreignInnerNullifier, foreignNoteHash, foreignCounter) {
         const innerNullifier = fromSingle(foreignInnerNullifier);
         const noteHash = fromSingle(foreignNoteHash);
         const counter = fromSingle(foreignCounter).toNumber();
-        await this.oracleHandler.privateNotifyNullifiedNote(innerNullifier, noteHash, counter);
+        await this.handlerAsPrivate().privateNotifyNullifiedNote(innerNullifier, noteHash, counter);
         return toForeignCallResult([]);
     }
     async privateNotifyCreatedNullifier(foreignInnerNullifier) {
         const innerNullifier = fromSingle(foreignInnerNullifier);
-        await this.oracleHandler.privateNotifyCreatedNullifier(innerNullifier);
+        await this.handlerAsPrivate().privateNotifyCreatedNullifier(innerNullifier);
         return toForeignCallResult([]);
     }
     async utilityCheckNullifierExists(foreignInnerNullifier) {
         const innerNullifier = fromSingle(foreignInnerNullifier);
-        const exists = await this.oracleHandler.utilityCheckNullifierExists(innerNullifier);
+        const exists = await this.handlerAsUtility().utilityCheckNullifierExists(innerNullifier);
         return toForeignCallResult([
             toSingle(new Fr(exists))
         ]);
     }
     async utilityGetContractInstance(foreignAddress) {
         const address = addressFromSingle(foreignAddress);
-        const instance = await this.oracleHandler.utilityGetContractInstance(address);
+        const instance = await this.handlerAsUtility().utilityGetContractInstance(address);
         return toForeignCallResult([
             instance.salt,
             instance.deployer.toField(),
@@ -231,7 +266,7 @@ export class RPCTranslator {
     }
     async utilityGetPublicKeysAndPartialAddress(foreignAddress) {
         const address = addressFromSingle(foreignAddress);
-        const { publicKeys, partialAddress } = await this.oracleHandler.utilityGetPublicKeysAndPartialAddress(address);
+        const { publicKeys, partialAddress } = await this.handlerAsUtility().utilityGetPublicKeysAndPartialAddress(address);
         return toForeignCallResult([
             toArray([
                 ...publicKeys.toFields(),
@@ -241,7 +276,7 @@ export class RPCTranslator {
     }
     async utilityGetKeyValidationRequest(foreignPkMHash) {
         const pkMHash = fromSingle(foreignPkMHash);
-        const keyValidationRequest = await this.oracleHandler.utilityGetKeyValidationRequest(pkMHash);
+        const keyValidationRequest = await this.handlerAsUtility().utilityGetKeyValidationRequest(pkMHash);
         return toForeignCallResult(keyValidationRequest.toFields().map(toSingle));
     }
     privateCallPrivateFunction(_foreignTargetContractAddress, _foreignFunctionSelector, _foreignArgsHash, _foreignSideEffectCounter, _foreignIsStaticCall) {
@@ -250,7 +285,7 @@ export class RPCTranslator {
     async utilityGetNullifierMembershipWitness(foreignBlockNumber, foreignNullifier) {
         const blockNumber = fromSingle(foreignBlockNumber).toNumber();
         const nullifier = fromSingle(foreignNullifier);
-        const witness = await this.oracleHandler.utilityGetNullifierMembershipWitness(blockNumber, nullifier);
+        const witness = await this.handlerAsUtility().utilityGetNullifierMembershipWitness(blockNumber, nullifier);
         if (!witness) {
             throw new Error(`Nullifier membership witness not found at block ${blockNumber}.`);
         }
@@ -258,7 +293,7 @@ export class RPCTranslator {
     }
     async utilityGetAuthWitness(foreignMessageHash) {
         const messageHash = fromSingle(foreignMessageHash);
-        const authWitness = await this.oracleHandler.utilityGetAuthWitness(messageHash);
+        const authWitness = await this.handlerAsUtility().utilityGetAuthWitness(messageHash);
         if (!authWitness) {
             throw new Error(`Auth witness not found for message hash ${messageHash}.`);
         }
@@ -276,12 +311,12 @@ export class RPCTranslator {
         throw new Error('Enqueueing public calls is not supported in TestEnvironment::private_context');
     }
     async utilityGetUtilityContext() {
-        const context = await this.oracleHandler.utilityGetUtilityContext();
+        const context = await this.handlerAsUtility().utilityGetUtilityContext();
         return toForeignCallResult(context.toNoirRepresentation());
     }
     async utilityGetBlockHeader(foreignBlockNumber) {
         const blockNumber = fromSingle(foreignBlockNumber).toNumber();
-        const header = await this.oracleHandler.utilityGetBlockHeader(blockNumber);
+        const header = await this.handlerAsUtility().utilityGetBlockHeader(blockNumber);
         if (!header) {
             throw new Error(`Block header not found for block ${blockNumber}.`);
         }
@@ -291,7 +326,7 @@ export class RPCTranslator {
         const blockNumber = fromSingle(foreignBlockNumber).toNumber();
         const treeId = fromSingle(foreignTreeId).toNumber();
         const leafValue = fromSingle(foreignLeafValue);
-        const witness = await this.oracleHandler.utilityGetMembershipWitness(blockNumber, treeId, leafValue);
+        const witness = await this.handlerAsUtility().utilityGetMembershipWitness(blockNumber, treeId, leafValue);
         if (!witness) {
             throw new Error(`Membership witness in tree ${MerkleTreeId[treeId]} not found for value ${leafValue} at block ${blockNumber}.`);
         }
@@ -303,7 +338,7 @@ export class RPCTranslator {
     async utilityGetLowNullifierMembershipWitness(foreignBlockNumber, foreignNullifier) {
         const blockNumber = fromSingle(foreignBlockNumber).toNumber();
         const nullifier = fromSingle(foreignNullifier);
-        const witness = await this.oracleHandler.utilityGetLowNullifierMembershipWitness(blockNumber, nullifier);
+        const witness = await this.handlerAsUtility().utilityGetLowNullifierMembershipWitness(blockNumber, nullifier);
         if (!witness) {
             throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block ${blockNumber}.`);
         }
@@ -312,40 +347,40 @@ export class RPCTranslator {
     async utilityGetIndexedTaggingSecretAsSender(foreignSender, foreignRecipient) {
         const sender = AztecAddress.fromField(fromSingle(foreignSender));
         const recipient = AztecAddress.fromField(fromSingle(foreignRecipient));
-        const secret = await this.oracleHandler.utilityGetIndexedTaggingSecretAsSender(sender, recipient);
+        const secret = await this.handlerAsUtility().utilityGetIndexedTaggingSecretAsSender(sender, recipient);
         return toForeignCallResult(secret.toFields().map(toSingle));
     }
     async utilityFetchTaggedLogs(foreignPendingTaggedLogArrayBaseSlot) {
         const pendingTaggedLogArrayBaseSlot = fromSingle(foreignPendingTaggedLogArrayBaseSlot);
-        await this.oracleHandler.utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot);
+        await this.handlerAsUtility().utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot);
         return toForeignCallResult([]);
     }
     async utilityValidateEnqueuedNotesAndEvents(foreignContractAddress, foreignNoteValidationRequestsArrayBaseSlot, foreignEventValidationRequestsArrayBaseSlot) {
         const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
         const noteValidationRequestsArrayBaseSlot = fromSingle(foreignNoteValidationRequestsArrayBaseSlot);
         const eventValidationRequestsArrayBaseSlot = fromSingle(foreignEventValidationRequestsArrayBaseSlot);
-        await this.oracleHandler.utilityValidateEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot);
+        await this.handlerAsUtility().utilityValidateEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot);
         return toForeignCallResult([]);
     }
     async utilityBulkRetrieveLogs(foreignContractAddress, foreignLogRetrievalRequestsArrayBaseSlot, foreignLogRetrievalResponsesArrayBaseSlot) {
         const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
         const logRetrievalRequestsArrayBaseSlot = fromSingle(foreignLogRetrievalRequestsArrayBaseSlot);
         const logRetrievalResponsesArrayBaseSlot = fromSingle(foreignLogRetrievalResponsesArrayBaseSlot);
-        await this.oracleHandler.utilityBulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot);
+        await this.handlerAsUtility().utilityBulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot);
         return toForeignCallResult([]);
     }
     async utilityStoreCapsule(foreignContractAddress, foreignSlot, foreignCapsule) {
         const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
         const slot = fromSingle(foreignSlot);
         const capsule = fromArray(foreignCapsule);
-        await this.oracleHandler.utilityStoreCapsule(contractAddress, slot, capsule);
+        await this.handlerAsUtility().utilityStoreCapsule(contractAddress, slot, capsule);
         return toForeignCallResult([]);
     }
     async utilityLoadCapsule(foreignContractAddress, foreignSlot, foreignTSize) {
         const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
         const slot = fromSingle(foreignSlot);
         const tSize = fromSingle(foreignTSize).toNumber();
-        const values = await this.oracleHandler.utilityLoadCapsule(contractAddress, slot);
+        const values = await this.handlerAsUtility().utilityLoadCapsule(contractAddress, slot);
         // We are going to return a Noir Option struct to represent the possibility of null values. Options are a struct
         // with two fields: `some` (a boolean) and `value` (a field array in this case).
         if (values === null) {
@@ -365,7 +400,7 @@ export class RPCTranslator {
     async utilityDeleteCapsule(foreignContractAddress, foreignSlot) {
         const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
         const slot = fromSingle(foreignSlot);
-        await this.oracleHandler.utilityDeleteCapsule(contractAddress, slot);
+        await this.handlerAsUtility().utilityDeleteCapsule(contractAddress, slot);
         return toForeignCallResult([]);
     }
     async utilityCopyCapsule(foreignContractAddress, foreignSrcSlot, foreignDstSlot, foreignNumEntries) {
@@ -373,7 +408,7 @@ export class RPCTranslator {
         const srcSlot = fromSingle(foreignSrcSlot);
         const dstSlot = fromSingle(foreignDstSlot);
         const numEntries = fromSingle(foreignNumEntries).toNumber();
-        await this.oracleHandler.utilityCopyCapsule(contractAddress, srcSlot, dstSlot, numEntries);
+        await this.handlerAsUtility().utilityCopyCapsule(contractAddress, srcSlot, dstSlot, numEntries);
         return toForeignCallResult([]);
     }
     // TODO: I forgot to add a corresponding function here, when I introduced an oracle method to txe_oracle.ts.
@@ -384,7 +419,7 @@ export class RPCTranslator {
         const ciphertext = fromUintBoundedVec(foreignCiphertextBVecStorage, foreignCiphertextLength, 8);
         const iv = fromUintArray(foreignIv, 8);
         const symKey = fromUintArray(foreignSymKey, 8);
-        const plaintextBuffer = await this.oracleHandler.utilityAes128Decrypt(ciphertext, iv, symKey);
+        const plaintextBuffer = await this.handlerAsUtility().utilityAes128Decrypt(ciphertext, iv, symKey);
         return toForeignCallResult(arrayToBoundedVec(bufferToU8Array(plaintextBuffer), foreignCiphertextBVecStorage.length));
     }
     async utilityGetSharedSecret(foreignAddress, foreignEphPKField0, foreignEphPKField1, foreignEphPKField2) {
@@ -394,7 +429,7 @@ export class RPCTranslator {
             fromSingle(foreignEphPKField1),
             fromSingle(foreignEphPKField2)
         ]);
-        const secret = await this.oracleHandler.utilityGetSharedSecret(address, ephPK);
+        const secret = await this.handlerAsUtility().utilityGetSharedSecret(address, ephPK);
         return toForeignCallResult(secret.toFields().map(toSingle));
     }
     emitOffchainEffect(_foreignData) {
@@ -407,7 +442,7 @@ export class RPCTranslator {
     }
     async avmOpcodeStorageRead(foreignSlot) {
         const slot = fromSingle(foreignSlot);
-        const value = (await this.oracleHandler.avmOpcodeStorageRead(slot)).value;
+        const value = (await this.handlerAsAvm().avmOpcodeStorageRead(slot)).value;
         return toForeignCallResult([
             toSingle(new Fr(value))
         ]);
@@ -415,12 +450,12 @@ export class RPCTranslator {
     async avmOpcodeStorageWrite(foreignSlot, foreignValue) {
         const slot = fromSingle(foreignSlot);
         const value = fromSingle(foreignValue);
-        await this.oracleHandler.avmOpcodeStorageWrite(slot, value);
+        await this.handlerAsAvm().avmOpcodeStorageWrite(slot, value);
         return toForeignCallResult([]);
     }
     async avmOpcodeGetContractInstanceDeployer(foreignAddress) {
         const address = addressFromSingle(foreignAddress);
-        const instance = await this.oracleHandler.utilityGetContractInstance(address);
+        const instance = await this.handlerAsUtility().utilityGetContractInstance(address);
         return toForeignCallResult([
             toSingle(instance.deployer),
             // AVM requires an extra boolean indicating the instance was found
@@ -429,7 +464,7 @@ export class RPCTranslator {
     }
     async avmOpcodeGetContractInstanceClassId(foreignAddress) {
         const address = addressFromSingle(foreignAddress);
-        const instance = await this.oracleHandler.utilityGetContractInstance(address);
+        const instance = await this.handlerAsUtility().utilityGetContractInstance(address);
         return toForeignCallResult([
             toSingle(instance.currentContractClassId),
             // AVM requires an extra boolean indicating the instance was found
@@ -438,69 +473,69 @@ export class RPCTranslator {
     }
     async avmOpcodeGetContractInstanceInitializationHash(foreignAddress) {
         const address = addressFromSingle(foreignAddress);
-        const instance = await this.oracleHandler.utilityGetContractInstance(address);
+        const instance = await this.handlerAsUtility().utilityGetContractInstance(address);
         return toForeignCallResult([
             toSingle(instance.initializationHash),
             // AVM requires an extra boolean indicating the instance was found
             toSingle(new Fr(1))
         ]);
     }
-    avmOpcodeSender() {
-        const sender = this.oracleHandler.getMsgSender();
+    async avmOpcodeSender() {
+        const sender = await this.handlerAsAvm().avmOpcodeSender();
         return toForeignCallResult([
             toSingle(sender)
         ]);
     }
     async avmOpcodeEmitNullifier(foreignNullifier) {
         const nullifier = fromSingle(foreignNullifier);
-        await this.oracleHandler.avmOpcodeEmitNullifier(nullifier);
+        await this.handlerAsAvm().avmOpcodeEmitNullifier(nullifier);
         return toForeignCallResult([]);
     }
     async avmOpcodeEmitNoteHash(foreignNoteHash) {
         const noteHash = fromSingle(foreignNoteHash);
-        await this.oracleHandler.avmOpcodeEmitNoteHash(noteHash);
+        await this.handlerAsAvm().avmOpcodeEmitNoteHash(noteHash);
         return toForeignCallResult([]);
     }
     async avmOpcodeNullifierExists(foreignInnerNullifier, foreignTargetAddress) {
         const innerNullifier = fromSingle(foreignInnerNullifier);
         const targetAddress = AztecAddress.fromField(fromSingle(foreignTargetAddress));
-        const exists = await this.oracleHandler.avmOpcodeNullifierExists(innerNullifier, targetAddress);
+        const exists = await this.handlerAsAvm().avmOpcodeNullifierExists(innerNullifier, targetAddress);
         return toForeignCallResult([
             toSingle(new Fr(exists))
         ]);
     }
     async avmOpcodeAddress() {
-        const contractAddress = await this.oracleHandler.avmOpcodeAddress();
+        const contractAddress = await this.handlerAsAvm().avmOpcodeAddress();
         return toForeignCallResult([
             toSingle(contractAddress.toField())
         ]);
     }
     async avmOpcodeBlockNumber() {
-        const blockNumber = await this.oracleHandler.avmOpcodeBlockNumber();
+        const blockNumber = await this.handlerAsAvm().avmOpcodeBlockNumber();
         return toForeignCallResult([
             toSingle(new Fr(blockNumber))
         ]);
     }
     async avmOpcodeTimestamp() {
-        const timestamp = await this.oracleHandler.avmOpcodeTimestamp();
+        const timestamp = await this.handlerAsAvm().avmOpcodeTimestamp();
         return toForeignCallResult([
             toSingle(new Fr(timestamp))
         ]);
     }
     async avmOpcodeIsStaticCall() {
-        const isStaticCall = await this.oracleHandler.avmOpcodeIsStaticCall();
+        const isStaticCall = await this.handlerAsAvm().avmOpcodeIsStaticCall();
         return toForeignCallResult([
             toSingle(new Fr(isStaticCall ? 1 : 0))
         ]);
     }
     async avmOpcodeChainId() {
-        const chainId = await this.oracleHandler.avmOpcodeChainId();
+        const chainId = await this.handlerAsAvm().avmOpcodeChainId();
         return toForeignCallResult([
             toSingle(chainId)
         ]);
     }
     async avmOpcodeVersion() {
-        const version = await this.oracleHandler.avmOpcodeVersion();
+        const version = await this.handlerAsAvm().avmOpcodeVersion();
         return toForeignCallResult([
             toSingle(version)
         ]);
@@ -527,7 +562,7 @@ export class RPCTranslator {
         const args = fromArray(foreignArgs);
         const argsHash = fromSingle(foreignArgsHash);
         const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
-        const returnValues = await this.oracleHandler.txePrivateCallNewFlow(from, targetContractAddress, functionSelector, args, argsHash, isStaticCall);
+        const returnValues = await this.handlerAsTxe().txePrivateCallNewFlow(from, targetContractAddress, functionSelector, args, argsHash, isStaticCall);
         return toForeignCallResult([
             toArray(returnValues)
         ]);
@@ -536,7 +571,7 @@ export class RPCTranslator {
         const targetContractAddress = addressFromSingle(foreignTargetContractAddress);
         const functionSelector = FunctionSelector.fromField(fromSingle(foreignFunctionSelector));
         const args = fromArray(foreignArgs);
-        const returnValues = await this.oracleHandler.txeSimulateUtilityFunction(targetContractAddress, functionSelector, args);
+        const returnValues = await this.handlerAsTxe().txeSimulateUtilityFunction(targetContractAddress, functionSelector, args);
         return toForeignCallResult([
             toArray(returnValues)
         ]);
@@ -546,13 +581,13 @@ export class RPCTranslator {
         const address = addressFromSingle(foreignAddress);
         const calldata = fromArray(foreignCalldata);
         const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
-        const returnValues = await this.oracleHandler.txePublicCallNewFlow(from, address, calldata, isStaticCall);
+        const returnValues = await this.handlerAsTxe().txePublicCallNewFlow(from, address, calldata, isStaticCall);
         return toForeignCallResult([
             toArray(returnValues)
         ]);
     }
     async privateGetSenderForTags() {
-        const sender = await this.oracleHandler.privateGetSenderForTags();
+        const sender = await this.handlerAsPrivate().privateGetSenderForTags();
         // Return a Noir Option struct with `some` and `value` fields
         if (sender === undefined) {
             // No sender found, return Option with some=0 and value=0
@@ -570,7 +605,7 @@ export class RPCTranslator {
     }
     async privateSetSenderForTags(foreignSenderForTags) {
         const senderForTags = AztecAddress.fromField(fromSingle(foreignSenderForTags));
-        await this.oracleHandler.privateSetSenderForTags(senderForTags);
+        await this.handlerAsPrivate().privateSetSenderForTags(senderForTags);
         return toForeignCallResult([]);
     }
 }

package/dest/txe_session.d.ts

@@ -3,10 +3,11 @@ import { type Logger } from '@aztec/foundation/log';
 import { KeyStore } from '@aztec/key-store';
 import type { ProtocolContract } from '@aztec/protocol-contracts';
 import { AddressDataProvider, PXEOracleInterface } from '@aztec/pxe/server';
+import { type IPrivateExecutionOracle, type IUtilityExecutionOracle } from '@aztec/pxe/simulator';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PrivateContextInputs } from '@aztec/stdlib/kernel';
 import type { UInt32 } from '@aztec/stdlib/types';
-import type { TXETypedOracle } from './oracle/txe_typed_oracle.js';
+import type { IAvmExecutionOracle, ITxeExecutionOracle } from './oracle/interfaces.js';
 import { RPCTranslator } from './rpc_translator.js';
 import { TXEStateMachine } from './state_machine/index.js';
 import type { ForeignCallArgs, ForeignCallResult } from './util/encoding.js';
@@ -21,10 +22,10 @@ type MethodNames<T> = {
  */
 export type TXEOracleFunctionName = MethodNames<RPCTranslator>;
 export interface TXESessionStateHandler {
-    setTopLevelContext(): Promise<void>;
-    setPublicContext(contractAddress?: AztecAddress): Promise<void>;
-    setPrivateContext(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
-    setUtilityContext(contractAddress?: AztecAddress): Promise<void>;
+    enterTopLevelState(): Promise<void>;
+    enterPublicState(contractAddress?: AztecAddress): Promise<void>;
+    enterPrivateState(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
+    enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
 }
 /**
  * A `TXESession` corresponds to a Noir `#[test]` function, and handles all of its oracle calls, stores test-specific
@@ -43,7 +44,8 @@ export declare class TXESession implements TXESessionStateHandler {
     private nextBlockTimestamp;
     private pxeOracleInterface;
     private state;
-    constructor(logger: Logger, stateMachine: TXEStateMachine, oracleHandler: TXETypedOracle, contractDataProvider: TXEContractDataProvider, keyStore: KeyStore, addressDataProvider: AddressDataProvider, accountDataProvider: TXEAccountDataProvider, chainId: Fr, version: Fr, nextBlockTimestamp: bigint, pxeOracleInterface: PXEOracleInterface);
+    private authwits;
+    constructor(logger: Logger, stateMachine: TXEStateMachine, oracleHandler: IUtilityExecutionOracle | IPrivateExecutionOracle | IAvmExecutionOracle | ITxeExecutionOracle, contractDataProvider: TXEContractDataProvider, keyStore: KeyStore, addressDataProvider: AddressDataProvider, accountDataProvider: TXEAccountDataProvider, chainId: Fr, version: Fr, nextBlockTimestamp: bigint, pxeOracleInterface: PXEOracleInterface);
     static init(protocolContracts: ProtocolContract[]): Promise<TXESession>;
     /**
      * Processes an oracle function invoked by the Noir test associated to this session.
@@ -52,16 +54,14 @@ export declare class TXESession implements TXESessionStateHandler {
      * @returns The oracle return values.
      */
     processFunction(functionName: TXEOracleFunctionName, inputs: ForeignCallArgs): Promise<ForeignCallResult>;
-    setTopLevelContext(): Promise<void>;
-    setPublicContext(contractAddress?: AztecAddress): Promise<void>;
-    setPrivateContext(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
-    setUtilityContext(contractAddress?: AztecAddress): Promise<void>;
-    private exitTopLevelContext;
-    private exitPublicContext;
-    private exitPrivateContext;
+    enterTopLevelState(): Promise<void>;
+    enterPrivateState(contractAddress?: AztecAddress, anchorBlockNumber?: UInt32): Promise<PrivateContextInputs>;
+    enterPublicState(contractAddress?: AztecAddress): Promise<void>;
+    enterUtilityState(contractAddress?: AztecAddress): Promise<void>;
+    private exitTopLevelState;
+    private exitPrivateState;
+    private exitPublicState;
     private exitUtilityContext;
-    private assertState;
-    private getPrivateContextInputs;
 }
 export {};
 //# sourceMappingURL=txe_session.d.ts.map

package/dest/txe_session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txe_session.d.ts","sourceRoot":"","sources":["../src/txe_session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"txe_session.d.ts","sourceRoot":"","sources":["../src/txe_session.ts"],"names":[],"mappings":"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"}