@aztec/txe 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

package/dest/{txe_service/txe_service.js → rpc_translator.js}

@@ -1,14 +1,23 @@
-import { Fr, Point } from '@aztec/aztec.js';
-import { packAsRetrievedNote } from '@aztec/pxe/simulator';
-import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
+import { Fr, Point } from '@aztec/aztec.js/fields';
+import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX } from '@aztec/constants';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { packAsHintedNote } from '@aztec/pxe/simulator';
+import { EventSelector, 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 TXEService {
+import { BlockHash } from '@aztec/stdlib/block';
+import { addressFromSingle, arrayOfArraysToBoundedVecOfArrays, arrayToBoundedVec, bufferToU8Array, fromArray, fromSingle, fromUintArray, fromUintBoundedVec, toArray, toForeignCallResult, toSingle } from './util/encoding.js';
+const MAX_EVENT_LEN = 12; // This is MAX_MESSAGE_CONTENT_LEN - PRIVATE_EVENT_RESERVED_FIELDS
+const MAX_PRIVATE_EVENTS_PER_TXE_QUERY = 5;
+export class UnavailableOracleError extends Error {
+    constructor(oracleName){
+        super(`${oracleName} oracles not available with the current handler`);
+    }
+}
+export class RPCTranslator {
     stateHandler;
     oracleHandler;
     /**
-   * Create a new instance of `TXEService` that will translate all TXE RPC calls to and from the foreign
+   * Create a new instance of `RPCTranslator` that will translate all TXE RPC calls to and from the foreign
    * (`ForeignCallSingle`, `ForeignCallResult`, etc.) and native TS types, delegating actual execution of the oracles
    * to the different handlers.
    * @param stateHandler The handler that will process TXE session state transitions, such as entering a private or
@@ -19,42 +28,92 @@ export class TXEService {
         this.stateHandler = stateHandler;
         this.oracleHandler = oracleHandler;
     }
+    // Note: If you rename the following functions to not start with "handlerAs", you must also update the validation
+    // check in `TXESession.processFunction`.
+    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, foreignHistoricalBlockNumberIsSome, foreignHistoricalBlockNumberValue) {
+    async txeSetPrivateTXEContext(foreignContractAddressIsSome, foreignContractAddressValue, foreignAnchorBlockNumberIsSome, foreignAnchorBlockNumberValue) {
         const contractAddress = fromSingle(foreignContractAddressIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignContractAddressValue)) : undefined;
-        const historicalBlockNumber = fromSingle(foreignHistoricalBlockNumberIsSome).toBool() ? fromSingle(foreignHistoricalBlockNumberValue).toNumber() : undefined;
-        const privateContextInputs = await this.stateHandler.setPrivateContext(contractAddress, historicalBlockNumber);
+        const anchorBlockNumber = fromSingle(foreignAnchorBlockNumberIsSome).toBool() ? BlockNumber(fromSingle(foreignAnchorBlockNumberValue).toNumber()) : undefined;
+        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
+    txeGetDefaultAddress() {
+        const defaultAddress = this.handlerAsTxe().txeGetDefaultAddress();
+        return toForeignCallResult([
+            toSingle(defaultAddress)
+        ]);
+    }
+    async txeGetNextBlockNumber() {
+        const nextBlockNumber = await this.handlerAsTxe().txeGetNextBlockNumber();
+        return toForeignCallResult([
+            toSingle(nextBlockNumber)
+        ]);
+    }
+    async 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,
@@ -67,7 +126,7 @@ export class TXEService {
     }
     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)
@@ -75,7 +134,7 @@ export class TXEService {
     }
     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)
@@ -84,87 +143,101 @@ export class TXEService {
     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 utilityGetContractAddress() {
-        const contractAddress = await this.oracleHandler.utilityGetContractAddress();
-        return toForeignCallResult([
-            toSingle(contractAddress.toField())
-        ]);
-    }
-    async utilityGetBlockNumber() {
-        const blockNumber = await this.oracleHandler.utilityGetBlockNumber();
+    async txeGetLastBlockTimestamp() {
+        const timestamp = await this.handlerAsTxe().txeGetLastBlockTimestamp();
         return toForeignCallResult([
-            toSingle(new Fr(blockNumber))
+            toSingle(new Fr(timestamp))
         ]);
     }
-    // seems to be used to mean the timestamp of the last mined block in txe (but that's not what is done here)
-    async utilityGetTimestamp() {
-        const timestamp = await this.oracleHandler.utilityGetTimestamp();
+    async txeGetLastTxEffects() {
+        const { txHash, noteHashes, nullifiers } = await this.handlerAsTxe().txeGetLastTxEffects();
         return toForeignCallResult([
-            toSingle(new Fr(timestamp))
+            toSingle(txHash.hash),
+            ...arrayToBoundedVec(toArray(noteHashes), MAX_NOTE_HASHES_PER_TX),
+            ...arrayToBoundedVec(toArray(nullifiers), MAX_NULLIFIERS_PER_TX)
         ]);
     }
-    async txeGetLastBlockTimestamp() {
-        const timestamp = await this.oracleHandler.txeGetLastBlockTimestamp();
+    async txeGetPrivateEvents(foreignSelector, foreignContractAddress, foreignScope) {
+        const selector = EventSelector.fromField(fromSingle(foreignSelector));
+        const contractAddress = addressFromSingle(foreignContractAddress);
+        const scope = addressFromSingle(foreignScope);
+        const events = await this.handlerAsTxe().txeGetPrivateEvents(selector, contractAddress, scope);
+        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_EVENT_LEN)) {
+            throw new Error(`Some private event has length larger than maxLen ${MAX_EVENT_LEN}`);
+        }
+        // This is a workaround as Noir does not currently let us return nested structs with arrays. We instead return a raw
+        // multidimensional array in get_private_events_oracle and create the BoundedVecs here.
+        const rawArrayStorage = events.map((e)=>e.concat(Array(MAX_EVENT_LEN - e.length).fill(new Fr(0)))).concat(Array(MAX_PRIVATE_EVENTS_PER_TXE_QUERY - events.length).fill(Array(MAX_EVENT_LEN).fill(new Fr(0)))).flat();
+        const eventLengths = events.map((e)=>new Fr(e.length)).concat(Array(MAX_PRIVATE_EVENTS_PER_TXE_QUERY - events.length).fill(new Fr(0)));
+        const queryLength = new Fr(events.length);
         return toForeignCallResult([
-            toSingle(new Fr(timestamp))
+            toArray(rawArrayStorage),
+            toArray(eventLengths),
+            toSingle(queryLength)
         ]);
     }
-    // Since the argument is a slice, noir automatically adds a length field to oracle call.
-    privateStoreInExecutionCache(_foreignLength, foreignValues, foreignHash) {
+    privateStoreInExecutionCache(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)
         ]);
     }
-    // Since the argument is a slice, noir automatically adds a length field to oracle call.
-    utilityDebugLog(foreignMessage, _foreignLength, foreignFields) {
+    // When the argument is a slice, noir automatically adds a length field to oracle call.
+    // When the argument is an array, we add the field length manually to the signature.
+    async utilityLog(foreignLevel, foreignMessage, _foreignLength, foreignFields) {
+        const level = fromSingle(foreignLevel).toNumber();
         const message = fromArray(foreignMessage).map((field)=>String.fromCharCode(field.toNumber())).join('');
         const fields = fromArray(foreignFields);
-        this.oracleHandler.utilityDebugLog(message, fields);
+        await this.handlerAsMisc().utilityLog(level, message, fields);
         return toForeignCallResult([]);
     }
-    async utilityStorageRead(foreignContractAddress, foreignStartStorageSlot, foreignBlockNumber, foreignNumberOfElements) {
+    async utilityStorageRead(foreignBlockHash, foreignContractAddress, foreignStartStorageSlot, foreignNumberOfElements) {
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
         const contractAddress = addressFromSingle(foreignContractAddress);
         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(blockHash, contractAddress, startStorageSlot, numberOfElements);
         return toForeignCallResult([
             toArray(values)
         ]);
     }
-    async utilityGetPublicDataWitness(foreignBlockNumber, foreignLeafSlot) {
-        const blockNumber = fromSingle(foreignBlockNumber).toNumber();
+    async utilityGetPublicDataWitness(foreignBlockHash, foreignLeafSlot) {
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
         const leafSlot = fromSingle(foreignLeafSlot);
-        const witness = await this.oracleHandler.utilityGetPublicDataWitness(blockNumber, leafSlot);
+        const witness = await this.handlerAsUtility().utilityGetPublicDataWitness(blockHash, leafSlot);
         if (!witness) {
-            throw new Error(`Public data witness not found for slot ${leafSlot} at block ${blockNumber}.`);
+            throw new Error(`Public data witness not found for slot ${leafSlot} at block ${blockHash.toString()}.`);
         }
         return toForeignCallResult(witness.toNoirRepresentation());
     }
-    async utilityGetNotes(foreignStorageSlot, foreignNumSelects, foreignSelectByIndexes, foreignSelectByOffsets, foreignSelectByLengths, foreignSelectValues, foreignSelectComparators, foreignSortByIndexes, foreignSortByOffsets, foreignSortByLengths, foreignSortOrder, foreignLimit, foreignOffset, foreignStatus, foreignMaxNotes, foreignPackedRetrievedNoteLength) {
+    async utilityGetNotes(foreignOwnerIsSome, foreignOwnerValue, foreignStorageSlot, foreignNumSelects, foreignSelectByIndexes, foreignSelectByOffsets, foreignSelectByLengths, foreignSelectValues, foreignSelectComparators, foreignSortByIndexes, foreignSortByOffsets, foreignSortByLengths, foreignSortOrder, foreignLimit, foreignOffset, foreignStatus, foreignMaxNotes, foreignPackedHintedNoteLength) {
+        // Parse Option<AztecAddress>: ownerIsSome is 0 for None, 1 for Some
+        const owner = fromSingle(foreignOwnerIsSome).toBool() ? AztecAddress.fromField(fromSingle(foreignOwnerValue)) : undefined;
         const storageSlot = fromSingle(foreignStorageSlot);
         const numSelects = fromSingle(foreignNumSelects).toNumber();
         const selectByIndexes = fromArray(foreignSelectByIndexes).map((fr)=>fr.toNumber());
@@ -180,45 +253,63 @@ export class TXEService {
         const offset = fromSingle(foreignOffset).toNumber();
         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 returnDataAsArrayOfArrays = noteDatas.map(packAsRetrievedNote);
+        const packedHintedNoteLength = fromSingle(foreignPackedHintedNoteLength).toNumber();
+        const noteDatas = await this.handlerAsUtility().utilityGetNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status);
+        const returnDataAsArrayOfArrays = noteDatas.map((noteData)=>packAsHintedNote({
+                contractAddress: noteData.contractAddress,
+                owner: noteData.owner,
+                randomness: noteData.randomness,
+                storageSlot: noteData.storageSlot,
+                noteNonce: noteData.noteNonce,
+                isPending: noteData.isPending,
+                note: noteData.note
+            }));
         // Now we convert each sub-array to an array of ForeignCallSingles
         const returnDataAsArrayOfForeignCallSingleArrays = returnDataAsArrayOfArrays.map((subArray)=>subArray.map(toSingle));
         // At last we convert the array of arrays to a bounded vec of arrays
-        return toForeignCallResult(arrayOfArraysToBoundedVecOfArrays(returnDataAsArrayOfForeignCallSingleArrays, maxNotes, packedRetrievedNoteLength));
+        return toForeignCallResult(arrayOfArraysToBoundedVecOfArrays(returnDataAsArrayOfForeignCallSingleArrays, maxNotes, packedHintedNoteLength));
     }
-    privateNotifyCreatedNote(foreignStorageSlot, foreignNoteTypeId, foreignNote, foreignNoteHash, foreignCounter) {
+    privateNotifyCreatedNote(foreignOwner, foreignStorageSlot, foreignRandomness, foreignNoteTypeId, foreignNote, foreignNoteHash, foreignCounter) {
+        const owner = addressFromSingle(foreignOwner);
         const storageSlot = fromSingle(foreignStorageSlot);
+        const randomness = fromSingle(foreignRandomness);
         const noteTypeId = NoteSelector.fromField(fromSingle(foreignNoteTypeId));
         const note = fromArray(foreignNote);
         const noteHash = fromSingle(foreignNoteHash);
         const counter = fromSingle(foreignCounter).toNumber();
-        this.oracleHandler.privateNotifyCreatedNote(storageSlot, noteTypeId, note, noteHash, counter);
+        this.handlerAsPrivate().privateNotifyCreatedNote(owner, storageSlot, randomness, 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 privateIsNullifierPending(foreignInnerNullifier, foreignContractAddress) {
+        const innerNullifier = fromSingle(foreignInnerNullifier);
+        const contractAddress = addressFromSingle(foreignContractAddress);
+        const isPending = await this.handlerAsPrivate().privateIsNullifierPending(innerNullifier, contractAddress);
+        return toForeignCallResult([
+            toSingle(new Fr(isPending))
+        ]);
+    }
     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(),
@@ -227,36 +318,48 @@ export class TXEService {
             ...instance.publicKeys.toFields()
         ].map(toSingle));
     }
-    async utilityGetPublicKeysAndPartialAddress(foreignAddress) {
+    async utilityTryGetPublicKeysAndPartialAddress(foreignAddress) {
         const address = addressFromSingle(foreignAddress);
-        const { publicKeys, partialAddress } = await this.oracleHandler.utilityGetCompleteAddress(address);
-        return toForeignCallResult([
-            toArray([
-                ...publicKeys.toFields(),
-                partialAddress
-            ])
-        ]);
+        const result = await this.handlerAsUtility().utilityTryGetPublicKeysAndPartialAddress(address);
+        // 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 (result === undefined) {
+            // No data was found so we set `some` to 0 and pad `value` with zeros get the correct return size.
+            return toForeignCallResult([
+                toSingle(new Fr(0)),
+                toArray(Array(13).fill(new Fr(0)))
+            ]);
+        } else {
+            // Data was found so we set `some` to 1 and return it along with `value`.
+            return toForeignCallResult([
+                toSingle(new Fr(1)),
+                toArray([
+                    ...result.publicKeys.toFields(),
+                    result.partialAddress
+                ])
+            ]);
+        }
     }
     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) {
         throw new Error('Contract calls are forbidden inside a `TestEnvironment::private_context`, use `private_call` instead');
     }
-    async utilityGetNullifierMembershipWitness(foreignBlockNumber, foreignNullifier) {
-        const blockNumber = fromSingle(foreignBlockNumber).toNumber();
+    async utilityGetNullifierMembershipWitness(foreignBlockHash, foreignNullifier) {
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
         const nullifier = fromSingle(foreignNullifier);
-        const witness = await this.oracleHandler.utilityGetNullifierMembershipWitness(blockNumber, nullifier);
+        const witness = await this.handlerAsUtility().utilityGetNullifierMembershipWitness(blockHash, nullifier);
         if (!witness) {
-            throw new Error(`Nullifier membership witness not found at block ${blockNumber}.`);
+            throw new Error(`Nullifier membership witness not found at block ${blockHash}.`);
         }
         return toForeignCallResult(witness.toNoirRepresentation());
     }
     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}.`);
         }
@@ -273,85 +376,83 @@ export class TXEService {
     privateNotifySetMinRevertibleSideEffectCounter(_foreignMinRevertibleSideEffectCounter) {
         throw new Error('Enqueueing public calls is not supported in TestEnvironment::private_context');
     }
-    async utilityGetChainId() {
-        const chainId = await this.oracleHandler.utilityGetChainId();
+    async privateIsSideEffectCounterRevertible(foreignSideEffectCounter) {
+        const sideEffectCounter = fromSingle(foreignSideEffectCounter).toNumber();
+        const isRevertible = await this.handlerAsPrivate().privateIsSideEffectCounterRevertible(sideEffectCounter);
         return toForeignCallResult([
-            toSingle(chainId)
+            toSingle(new Fr(isRevertible))
         ]);
     }
-    async utilityGetVersion() {
-        const version = await this.oracleHandler.utilityGetVersion();
-        return toForeignCallResult([
-            toSingle(version)
-        ]);
+    utilityGetUtilityContext() {
+        const context = this.handlerAsUtility().utilityGetUtilityContext();
+        return toForeignCallResult(context.toNoirRepresentation());
     }
     async utilityGetBlockHeader(foreignBlockNumber) {
-        const blockNumber = fromSingle(foreignBlockNumber).toNumber();
-        const header = await this.oracleHandler.utilityGetBlockHeader(blockNumber);
+        const blockNumber = BlockNumber(fromSingle(foreignBlockNumber).toNumber());
+        const header = await this.handlerAsUtility().utilityGetBlockHeader(blockNumber);
         if (!header) {
             throw new Error(`Block header not found for block ${blockNumber}.`);
         }
         return toForeignCallResult(header.toFields().map(toSingle));
     }
-    async utilityGetMembershipWitness(foreignBlockNumber, foreignTreeId, foreignLeafValue) {
-        const blockNumber = fromSingle(foreignBlockNumber).toNumber();
-        const treeId = fromSingle(foreignTreeId).toNumber();
-        const leafValue = fromSingle(foreignLeafValue);
-        const witness = await this.oracleHandler.utilityGetMembershipWitness(blockNumber, treeId, leafValue);
+    async utilityGetNoteHashMembershipWitness(foreignAnchorBlockHash, foreignNoteHash) {
+        const blockHash = new BlockHash(fromSingle(foreignAnchorBlockHash));
+        const noteHash = fromSingle(foreignNoteHash);
+        const witness = await this.handlerAsUtility().utilityGetNoteHashMembershipWitness(blockHash, noteHash);
         if (!witness) {
-            throw new Error(`Membership witness in tree ${MerkleTreeId[treeId]} not found for value ${leafValue} at block ${blockNumber}.`);
+            throw new Error(`Note hash ${noteHash} not found in the note hash tree at block ${blockHash.toString()}.`);
         }
-        return toForeignCallResult([
-            toSingle(witness[0]),
-            toArray(witness.slice(1))
-        ]);
+        return toForeignCallResult(witness.toNoirRepresentation());
     }
-    async utilityGetLowNullifierMembershipWitness(foreignBlockNumber, foreignNullifier) {
-        const blockNumber = fromSingle(foreignBlockNumber).toNumber();
-        const nullifier = fromSingle(foreignNullifier);
-        const witness = await this.oracleHandler.utilityGetLowNullifierMembershipWitness(blockNumber, nullifier);
+    async utilityGetBlockHashMembershipWitness(foreignAnchorBlockHash, foreignBlockHash) {
+        const anchorBlockHash = new BlockHash(fromSingle(foreignAnchorBlockHash));
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
+        const witness = await this.handlerAsUtility().utilityGetBlockHashMembershipWitness(anchorBlockHash, blockHash);
         if (!witness) {
-            throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block ${blockNumber}.`);
+            throw new Error(`Block hash ${blockHash.toString()} not found in the archive tree at anchor block ${anchorBlockHash.toString()}.`);
         }
         return toForeignCallResult(witness.toNoirRepresentation());
     }
-    async utilityGetIndexedTaggingSecretAsSender(foreignSender, foreignRecipient) {
-        const sender = AztecAddress.fromField(fromSingle(foreignSender));
-        const recipient = AztecAddress.fromField(fromSingle(foreignRecipient));
-        const secret = await this.oracleHandler.utilityGetIndexedTaggingSecretAsSender(sender, recipient);
-        return toForeignCallResult(secret.toFields().map(toSingle));
+    async utilityGetLowNullifierMembershipWitness(foreignBlockHash, foreignNullifier) {
+        const blockHash = new BlockHash(fromSingle(foreignBlockHash));
+        const nullifier = fromSingle(foreignNullifier);
+        const witness = await this.handlerAsUtility().utilityGetLowNullifierMembershipWitness(blockHash, nullifier);
+        if (!witness) {
+            throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block ${blockHash}.`);
+        }
+        return toForeignCallResult(witness.toNoirRepresentation());
     }
     async utilityFetchTaggedLogs(foreignPendingTaggedLogArrayBaseSlot) {
         const pendingTaggedLogArrayBaseSlot = fromSingle(foreignPendingTaggedLogArrayBaseSlot);
-        await this.oracleHandler.utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot);
+        await this.handlerAsUtility().utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot);
         return toForeignCallResult([]);
     }
-    async utilityValidateEnqueuedNotesAndEvents(foreignContractAddress, foreignNoteValidationRequestsArrayBaseSlot, foreignEventValidationRequestsArrayBaseSlot) {
+    async utilityValidateAndStoreEnqueuedNotesAndEvents(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().utilityValidateAndStoreEnqueuedNotesAndEvents(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) {
@@ -371,7 +472,7 @@ export class TXEService {
     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) {
@@ -379,7 +480,7 @@ export class TXEService {
         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.
@@ -390,7 +491,7 @@ export class TXEService {
         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) {
@@ -400,20 +501,21 @@ export class TXEService {
             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) {
         throw new Error('Offchain effects are not yet supported in the TestEnvironment');
     }
     // AVM opcodes
-    avmOpcodeEmitUnencryptedLog(_foreignMessage) {
+    avmOpcodeEmitPublicLog(_foreignMessage) {
         // TODO(#8811): Implement
         return toForeignCallResult([]);
     }
-    async avmOpcodeStorageRead(foreignSlot) {
+    async avmOpcodeStorageRead(foreignSlot, foreignContractAddress) {
         const slot = fromSingle(foreignSlot);
-        const value = (await this.oracleHandler.avmOpcodeStorageRead(slot)).value;
+        const contractAddress = AztecAddress.fromField(fromSingle(foreignContractAddress));
+        const value = (await this.handlerAsAvm().avmOpcodeStorageRead(slot, contractAddress)).value;
         return toForeignCallResult([
             toSingle(new Fr(value))
         ]);
@@ -421,12 +523,12 @@ export class TXEService {
     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
@@ -435,7 +537,7 @@ export class TXEService {
     }
     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
@@ -444,69 +546,68 @@ export class TXEService {
     }
     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);
+    async avmOpcodeNullifierExists(foreignSiloedNullifier) {
+        const siloedNullifier = fromSingle(foreignSiloedNullifier);
+        const exists = await this.handlerAsAvm().avmOpcodeNullifierExists(siloedNullifier);
         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)
         ]);
@@ -526,46 +627,39 @@ export class TXEService {
     avmOpcodeSuccessCopy() {
         throw new Error('Contract calls are forbidden inside a `TestEnvironment::public_context`, use `public_call` instead');
     }
-    async txePrivateCallNewFlow(foreignFrom, foreignTargetContractAddress, foreignFunctionSelector, _foreignArgsLength, foreignArgs, foreignArgsHash, foreignIsStaticCall) {
+    async txePrivateCallNewFlow(foreignFrom, foreignTargetContractAddress, foreignFunctionSelector, foreignArgs, foreignArgsHash, foreignIsStaticCall) {
         const from = addressFromSingle(foreignFrom);
         const targetContractAddress = addressFromSingle(foreignTargetContractAddress);
         const functionSelector = FunctionSelector.fromField(fromSingle(foreignFunctionSelector));
         const args = fromArray(foreignArgs);
         const argsHash = fromSingle(foreignArgsHash);
         const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
-        const result = 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([
-                result.endSideEffectCounter,
-                result.returnsHash,
-                result.txHash.hash
-            ])
+            toArray(returnValues)
         ]);
     }
-    async simulateUtilityFunction(foreignTargetContractAddress, foreignFunctionSelector, foreignArgsHash) {
+    async txeExecuteUtilityFunction(foreignTargetContractAddress, foreignFunctionSelector, foreignArgs) {
         const targetContractAddress = addressFromSingle(foreignTargetContractAddress);
         const functionSelector = FunctionSelector.fromField(fromSingle(foreignFunctionSelector));
-        const argsHash = fromSingle(foreignArgsHash);
-        const result = await this.oracleHandler.simulateUtilityFunction(targetContractAddress, functionSelector, argsHash);
+        const args = fromArray(foreignArgs);
+        const returnValues = await this.handlerAsTxe().txeExecuteUtilityFunction(targetContractAddress, functionSelector, args);
         return toForeignCallResult([
-            toSingle(result)
+            toArray(returnValues)
         ]);
     }
-    async txePublicCallNewFlow(foreignFrom, foreignAddress, _foreignLength, foreignCalldata, foreignIsStaticCall) {
+    async txePublicCallNewFlow(foreignFrom, foreignAddress, foreignCalldata, foreignIsStaticCall) {
         const from = addressFromSingle(foreignFrom);
         const address = addressFromSingle(foreignAddress);
         const calldata = fromArray(foreignCalldata);
         const isStaticCall = fromSingle(foreignIsStaticCall).toBool();
-        const result = await this.oracleHandler.txePublicCallNewFlow(from, address, calldata, isStaticCall);
+        const returnValues = await this.handlerAsTxe().txePublicCallNewFlow(from, address, calldata, isStaticCall);
         return toForeignCallResult([
-            toArray([
-                result.returnsHash,
-                result.txHash.hash
-            ])
+            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
@@ -583,7 +677,15 @@ export class TXEService {
     }
     async privateSetSenderForTags(foreignSenderForTags) {
         const senderForTags = AztecAddress.fromField(fromSingle(foreignSenderForTags));
-        await this.oracleHandler.privateSetSenderForTags(senderForTags);
+        await this.handlerAsPrivate().privateSetSenderForTags(senderForTags);
         return toForeignCallResult([]);
     }
+    async privateGetNextAppTagAsSender(foreignSender, foreignRecipient) {
+        const sender = AztecAddress.fromField(fromSingle(foreignSender));
+        const recipient = AztecAddress.fromField(fromSingle(foreignRecipient));
+        const nextAppTag = await this.handlerAsPrivate().privateGetNextAppTagAsSender(sender, recipient);
+        return toForeignCallResult([
+            toSingle(nextAppTag.value)
+        ]);
+    }
 }