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

package/dest/contract_function_simulator/oracle/oracle.js

@@ -1,22 +1,50 @@
-import { Fr, Point } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
 import { arrayOfArraysToBoundedVecOfArrays, bufferToBoundedVec, fromUintArray, fromUintBoundedVec, toACVMField } from '@aztec/simulator/client';
 import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { BlockHash } from '@aztec/stdlib/block';
 import { ContractClassLog, ContractClassLogFields } from '@aztec/stdlib/logs';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { packAsRetrievedNote } from './note_packing_utils.js';
+import { packAsHintedNote } from './note_packing_utils.js';
+export class UnavailableOracleError extends Error {
+    constructor(oracleName){
+        super(`${oracleName} oracles not available with the current handler`);
+    }
+}
 /**
  * A data source that has all the apis required by Aztec.nr.
  */ export class Oracle {
-    typedOracle;
-    constructor(typedOracle){
-        this.typedOracle = typedOracle;
+    handler;
+    constructor(handler){
+        this.handler = handler;
+    }
+    handlerAsMisc() {
+        if (!('isMisc' in this.handler)) {
+            throw new UnavailableOracleError('Misc');
+        }
+        return this.handler;
+    }
+    handlerAsUtility() {
+        if (!('isUtility' in this.handler)) {
+            throw new UnavailableOracleError('Utility');
+        }
+        return this.handler;
+    }
+    handlerAsPrivate() {
+        if (!('isPrivate' in this.handler)) {
+            throw new UnavailableOracleError('Private');
+        }
+        return this.handler;
     }
     toACIRCallback() {
         const excludedProps = [
-            'typedOracle',
+            'handler',
             'constructor',
-            'toACIRCallback'
+            'toACIRCallback',
+            'handlerAsMisc',
+            'handlerAsUtility',
+            'handlerAsPrivate'
         ];
         // Get all the oracle function names
         const oracleNames = Object.getOwnPropertyNames(Oracle.prototype).filter((name)=>!excludedProps.includes(name));
@@ -39,57 +67,35 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
         }, {});
     }
     utilityAssertCompatibleOracleVersion([version]) {
-        this.typedOracle.utilityAssertCompatibleOracleVersion(Fr.fromString(version).toNumber());
+        this.handlerAsMisc().utilityAssertCompatibleOracleVersion(Fr.fromString(version).toNumber());
         return Promise.resolve([]);
     }
     utilityGetRandomField() {
-        const val = this.typedOracle.utilityGetRandomField();
+        const val = this.handlerAsMisc().utilityGetRandomField();
         return Promise.resolve([
             toACVMField(val)
         ]);
     }
-    // Since the argument is a slice, noir automatically adds a length field to oracle call.
-    privateStoreInExecutionCache(_length, values, [hash]) {
-        this.typedOracle.privateStoreInExecutionCache(values.map(Fr.fromString), Fr.fromString(hash));
+    privateStoreInExecutionCache(values, [hash]) {
+        this.handlerAsPrivate().privateStoreInExecutionCache(values.map(Fr.fromString), Fr.fromString(hash));
         return Promise.resolve([]);
     }
     async privateLoadFromExecutionCache([returnsHash]) {
-        const values = await this.typedOracle.privateLoadFromExecutionCache(Fr.fromString(returnsHash));
+        const values = await this.handlerAsPrivate().privateLoadFromExecutionCache(Fr.fromString(returnsHash));
         return [
             values.map(toACVMField)
         ];
     }
-    async utilityGetBlockNumber() {
-        return [
-            toACVMField(await this.typedOracle.utilityGetBlockNumber())
-        ];
-    }
-    async utilityGetTimestamp() {
-        return [
-            toACVMField(await this.typedOracle.utilityGetTimestamp())
-        ];
-    }
-    async utilityGetContractAddress() {
-        return [
-            toACVMField(await this.typedOracle.utilityGetContractAddress())
-        ];
-    }
-    async utilityGetVersion() {
-        return [
-            toACVMField(await this.typedOracle.utilityGetVersion())
-        ];
-    }
-    async utilityGetChainId() {
-        return [
-            toACVMField(await this.typedOracle.utilityGetChainId())
-        ];
+    utilityGetUtilityContext() {
+        const context = this.handlerAsUtility().utilityGetUtilityContext();
+        return Promise.resolve(context.toNoirRepresentation());
     }
     async utilityGetKeyValidationRequest([pkMHash]) {
-        const keyValidationRequest = await this.typedOracle.utilityGetKeyValidationRequest(Fr.fromString(pkMHash));
+        const keyValidationRequest = await this.handlerAsUtility().utilityGetKeyValidationRequest(Fr.fromString(pkMHash));
         return keyValidationRequest.toFields().map(toACVMField);
     }
     async utilityGetContractInstance([address]) {
-        const instance = await this.typedOracle.utilityGetContractInstance(AztecAddress.fromField(Fr.fromString(address)));
+        const instance = await this.handlerAsUtility().utilityGetContractInstance(AztecAddress.fromField(Fr.fromString(address)));
         return [
             instance.salt,
             instance.deployer,
@@ -98,49 +104,54 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
             ...instance.publicKeys.toFields()
         ].map(toACVMField);
     }
-    async utilityGetMembershipWitness([blockNumber], [treeId], [leafValue]) {
-        const parsedBlockNumber = Fr.fromString(blockNumber).toNumber();
-        const parsedTreeId = Fr.fromString(treeId).toNumber();
-        const parsedLeafValue = Fr.fromString(leafValue);
-        const witness = await this.typedOracle.utilityGetMembershipWitness(parsedBlockNumber, parsedTreeId, parsedLeafValue);
+    async utilityGetNoteHashMembershipWitness([anchorBlockHash], [noteHash]) {
+        const parsedAnchorBlockHash = BlockHash.fromString(anchorBlockHash);
+        const parsedNoteHash = Fr.fromString(noteHash);
+        const witness = await this.handlerAsUtility().utilityGetNoteHashMembershipWitness(parsedAnchorBlockHash, parsedNoteHash);
         if (!witness) {
-            throw new Error(`Leaf ${leafValue} not found in the tree ${MerkleTreeId[parsedTreeId]} at block ${parsedBlockNumber}.`);
+            throw new Error(`Note hash ${noteHash} not found in the note hash tree at anchor block hash ${parsedAnchorBlockHash.toString()}.`);
         }
-        return [
-            toACVMField(witness[0]),
-            witness.slice(1).map(toACVMField)
-        ];
+        return witness.toNoirRepresentation();
     }
-    async utilityGetNullifierMembershipWitness([blockNumber], [nullifier]) {
-        const parsedBlockNumber = Fr.fromString(blockNumber).toNumber();
+    async utilityGetBlockHashMembershipWitness([anchorBlockHash], [blockHash]) {
+        const parsedAnchorBlockHash = BlockHash.fromString(anchorBlockHash);
+        const parsedBlockHash = BlockHash.fromString(blockHash);
+        const witness = await this.handlerAsUtility().utilityGetBlockHashMembershipWitness(parsedAnchorBlockHash, parsedBlockHash);
+        if (!witness) {
+            throw new Error(`Block hash ${parsedBlockHash.toString()} not found in the archive tree at anchor block ${parsedAnchorBlockHash.toString()}.`);
+        }
+        return witness.toNoirRepresentation();
+    }
+    async utilityGetNullifierMembershipWitness([blockHash], [nullifier]) {
+        const parsedBlockHash = BlockHash.fromString(blockHash);
         const parsedNullifier = Fr.fromString(nullifier);
-        const witness = await this.typedOracle.utilityGetNullifierMembershipWitness(parsedBlockNumber, parsedNullifier);
+        const witness = await this.handlerAsUtility().utilityGetNullifierMembershipWitness(parsedBlockHash, parsedNullifier);
         if (!witness) {
-            throw new Error(`Nullifier witness not found for nullifier ${parsedNullifier} at block ${parsedBlockNumber}.`);
+            throw new Error(`Nullifier witness not found for nullifier ${parsedNullifier} at block hash ${parsedBlockHash.toString()}.`);
         }
         return witness.toNoirRepresentation();
     }
-    async utilityGetLowNullifierMembershipWitness([blockNumber], [nullifier]) {
-        const parsedBlockNumber = Fr.fromString(blockNumber).toNumber();
+    async utilityGetLowNullifierMembershipWitness([blockHash], [nullifier]) {
+        const parsedBlockHash = BlockHash.fromString(blockHash);
         const parsedNullifier = Fr.fromString(nullifier);
-        const witness = await this.typedOracle.utilityGetLowNullifierMembershipWitness(parsedBlockNumber, parsedNullifier);
+        const witness = await this.handlerAsUtility().utilityGetLowNullifierMembershipWitness(parsedBlockHash, parsedNullifier);
         if (!witness) {
-            throw new Error(`Low nullifier witness not found for nullifier ${parsedNullifier} at block ${parsedBlockNumber}.`);
+            throw new Error(`Low nullifier witness not found for nullifier ${parsedNullifier} at block hash ${parsedBlockHash.toString()}.`);
         }
         return witness.toNoirRepresentation();
     }
-    async utilityGetPublicDataWitness([blockNumber], [leafSlot]) {
-        const parsedBlockNumber = Fr.fromString(blockNumber).toNumber();
+    async utilityGetPublicDataWitness([blockHash], [leafSlot]) {
+        const parsedBlockHash = BlockHash.fromString(blockHash);
         const parsedLeafSlot = Fr.fromString(leafSlot);
-        const witness = await this.typedOracle.utilityGetPublicDataWitness(parsedBlockNumber, parsedLeafSlot);
+        const witness = await this.handlerAsUtility().utilityGetPublicDataWitness(parsedBlockHash, parsedLeafSlot);
         if (!witness) {
-            throw new Error(`Public data witness not found for slot ${parsedLeafSlot} at block ${parsedBlockNumber}.`);
+            throw new Error(`Public data witness not found for slot ${parsedLeafSlot} at block hash ${parsedBlockHash.toString()}.`);
         }
         return witness.toNoirRepresentation();
     }
     async utilityGetBlockHeader([blockNumber]) {
         const parsedBlockNumber = Fr.fromString(blockNumber).toNumber();
-        const header = await this.typedOracle.utilityGetBlockHeader(parsedBlockNumber);
+        const header = await this.handlerAsUtility().utilityGetBlockHeader(BlockNumber(parsedBlockNumber));
         if (!header) {
             throw new Error(`Block header not found for block ${parsedBlockNumber}.`);
         }
@@ -148,7 +159,7 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
     }
     async utilityGetAuthWitness([messageHash]) {
         const messageHashField = Fr.fromString(messageHash);
-        const witness = await this.typedOracle.utilityGetAuthWitness(messageHashField);
+        const witness = await this.handlerAsUtility().utilityGetAuthWitness(messageHashField);
         if (!witness) {
             throw new Error(`Unknown auth witness for message hash ${messageHashField}`);
         }
@@ -156,49 +167,76 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
             witness.map(toACVMField)
         ];
     }
-    // TODO(benesjan): This doesn't map to the underlying oracle name which is just ugly.
-    async utilityGetPublicKeysAndPartialAddress([address]) {
+    async utilityTryGetPublicKeysAndPartialAddress([address]) {
         const parsedAddress = AztecAddress.fromField(Fr.fromString(address));
-        const { publicKeys, partialAddress } = await this.typedOracle.utilityGetCompleteAddress(parsedAddress);
-        return [
-            [
-                ...publicKeys.toFields(),
-                partialAddress
-            ].map(toACVMField)
-        ];
+        const result = await this.handlerAsUtility().utilityTryGetPublicKeysAndPartialAddress(parsedAddress);
+        // 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 [
+                toACVMField(0),
+                Array(13).fill(toACVMField(0))
+            ];
+        } else {
+            // Data was found so we set `some` to 1 and return it along with `value`.
+            return [
+                toACVMField(1),
+                [
+                    ...result.publicKeys.toFields(),
+                    result.partialAddress
+                ].map(toACVMField)
+            ];
+        }
     }
-    async utilityGetNotes([storageSlot], [numSelects], selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, [limit], [offset], [status], [maxNotes], [packedRetrievedNoteLength]) {
-        const noteDatas = await this.typedOracle.utilityGetNotes(Fr.fromString(storageSlot), +numSelects, selectByIndexes.map((s)=>+s), selectByOffsets.map((s)=>+s), selectByLengths.map((s)=>+s), selectValues.map(Fr.fromString), selectComparators.map((s)=>+s), sortByIndexes.map((s)=>+s), sortByOffsets.map((s)=>+s), sortByLengths.map((s)=>+s), sortOrder.map((s)=>+s), +limit, +offset, +status);
-        const returnDataAsArrayOfPackedRetrievedNotes = noteDatas.map(packAsRetrievedNote);
+    async utilityGetNotes([ownerSome], [ownerValue], [storageSlot], [numSelects], selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, [limit], [offset], [status], [maxNotes], [packedHintedNoteLength]) {
+        // Parse Option<AztecAddress>: ownerSome is 0 for None, 1 for Some
+        const owner = Fr.fromString(ownerSome).toNumber() === 1 ? AztecAddress.fromString(ownerValue) : undefined;
+        const noteDatas = await this.handlerAsUtility().utilityGetNotes(owner, Fr.fromString(storageSlot), +numSelects, selectByIndexes.map((s)=>+s), selectByOffsets.map((s)=>+s), selectByLengths.map((s)=>+s), selectValues.map(Fr.fromString), selectComparators.map((s)=>+s), sortByIndexes.map((s)=>+s), sortByOffsets.map((s)=>+s), sortByLengths.map((s)=>+s), sortOrder.map((s)=>+s), +limit, +offset, +status);
+        const returnDataAsArrayOfPackedHintedNotes = 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 ACVMField
-        const returnDataAsArrayOfACVMFieldArrays = returnDataAsArrayOfPackedRetrievedNotes.map((subArray)=>subArray.map(toACVMField));
+        const returnDataAsArrayOfACVMFieldArrays = returnDataAsArrayOfPackedHintedNotes.map((subArray)=>subArray.map(toACVMField));
         // At last we convert the array of arrays to a bounded vec of arrays
-        return arrayOfArraysToBoundedVecOfArrays(returnDataAsArrayOfACVMFieldArrays, +maxNotes, +packedRetrievedNoteLength);
+        return arrayOfArraysToBoundedVecOfArrays(returnDataAsArrayOfACVMFieldArrays, +maxNotes, +packedHintedNoteLength);
     }
-    privateNotifyCreatedNote([storageSlot], [noteTypeId], note, [noteHash], [counter]) {
-        this.typedOracle.privateNotifyCreatedNote(Fr.fromString(storageSlot), NoteSelector.fromField(Fr.fromString(noteTypeId)), note.map(Fr.fromString), Fr.fromString(noteHash), +counter);
+    privateNotifyCreatedNote([owner], [storageSlot], [randomness], [noteTypeId], note, [noteHash], [counter]) {
+        this.handlerAsPrivate().privateNotifyCreatedNote(AztecAddress.fromString(owner), Fr.fromString(storageSlot), Fr.fromString(randomness), NoteSelector.fromField(Fr.fromString(noteTypeId)), note.map(Fr.fromString), Fr.fromString(noteHash), +counter);
         return Promise.resolve([]);
     }
     async privateNotifyNullifiedNote([innerNullifier], [noteHash], [counter]) {
-        await this.typedOracle.privateNotifyNullifiedNote(Fr.fromString(innerNullifier), Fr.fromString(noteHash), +counter);
+        await this.handlerAsPrivate().privateNotifyNullifiedNote(Fr.fromString(innerNullifier), Fr.fromString(noteHash), +counter);
         return [];
     }
     async privateNotifyCreatedNullifier([innerNullifier]) {
-        await this.typedOracle.privateNotifyCreatedNullifier(Fr.fromString(innerNullifier));
+        await this.handlerAsPrivate().privateNotifyCreatedNullifier(Fr.fromString(innerNullifier));
         return [];
     }
+    async privateIsNullifierPending([innerNullifier], [contractAddress]) {
+        const isPending = await this.handlerAsPrivate().privateIsNullifierPending(Fr.fromString(innerNullifier), AztecAddress.fromString(contractAddress));
+        return [
+            toACVMField(isPending)
+        ];
+    }
     async utilityCheckNullifierExists([innerNullifier]) {
-        const exists = await this.typedOracle.utilityCheckNullifierExists(Fr.fromString(innerNullifier));
+        const exists = await this.handlerAsUtility().utilityCheckNullifierExists(Fr.fromString(innerNullifier));
         return [
             toACVMField(exists)
         ];
     }
     async utilityGetL1ToL2MembershipWitness([contractAddress], [messageHash], [secret]) {
-        const message = await this.typedOracle.utilityGetL1ToL2MembershipWitness(AztecAddress.fromString(contractAddress), Fr.fromString(messageHash), Fr.fromString(secret));
+        const message = await this.handlerAsUtility().utilityGetL1ToL2MembershipWitness(AztecAddress.fromString(contractAddress), Fr.fromString(messageHash), Fr.fromString(secret));
         return message.toNoirRepresentation();
     }
-    async utilityStorageRead([contractAddress], [startStorageSlot], [blockNumber], [numberOfElements]) {
-        const values = await this.typedOracle.utilityStorageRead(new AztecAddress(Fr.fromString(contractAddress)), Fr.fromString(startStorageSlot), +blockNumber, +numberOfElements);
+    async utilityStorageRead([blockHash], [contractAddress], [startStorageSlot], [numberOfElements]) {
+        const values = await this.handlerAsUtility().utilityStorageRead(BlockHash.fromString(blockHash), new AztecAddress(Fr.fromString(contractAddress)), Fr.fromString(startStorageSlot), +numberOfElements);
         return [
             values.map(toACVMField)
         ];
@@ -206,19 +244,20 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
     privateNotifyCreatedContractClassLog([contractAddress], message, [length], [counter]) {
         const logFields = new ContractClassLogFields(message.map(Fr.fromString));
         const log = new ContractClassLog(new AztecAddress(Fr.fromString(contractAddress)), logFields, +length);
-        this.typedOracle.privateNotifyCreatedContractClassLog(log, +counter);
+        this.handlerAsPrivate().privateNotifyCreatedContractClassLog(log, +counter);
         return Promise.resolve([]);
     }
-    utilityDebugLog(message, _ignoredFieldsSize, fields) {
+    async utilityLog(level, message, _ignoredFieldsSize, fields) {
+        const levelFr = Fr.fromString(level[0]);
         const messageStr = message.map((acvmField)=>String.fromCharCode(Fr.fromString(acvmField).toNumber())).join('');
         const fieldsFr = fields.map(Fr.fromString);
-        this.typedOracle.utilityDebugLog(messageStr, fieldsFr);
-        return Promise.resolve([]);
+        await this.handlerAsMisc().utilityLog(levelFr.toNumber(), messageStr, fieldsFr);
+        return [];
     }
     // This function's name is directly hardcoded in `circuit_recorder.ts`. Don't forget to update it there if you
     // change the name here.
     async privateCallPrivateFunction([contractAddress], [functionSelector], [argsHash], [sideEffectCounter], [isStaticCall]) {
-        const { endSideEffectCounter, returnsHash } = await this.typedOracle.privateCallPrivateFunction(AztecAddress.fromField(Fr.fromString(contractAddress)), FunctionSelector.fromField(Fr.fromString(functionSelector)), Fr.fromString(argsHash), Fr.fromString(sideEffectCounter).toNumber(), Fr.fromString(isStaticCall).toBool());
+        const { endSideEffectCounter, returnsHash } = await this.handlerAsPrivate().privateCallPrivateFunction(AztecAddress.fromField(Fr.fromString(contractAddress)), FunctionSelector.fromField(Fr.fromString(functionSelector)), Fr.fromString(argsHash), Fr.fromString(sideEffectCounter).toNumber(), Fr.fromString(isStaticCall).toBool());
         return [
             [
                 endSideEffectCounter,
@@ -227,43 +266,47 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
         ];
     }
     async privateNotifyEnqueuedPublicFunctionCall([contractAddress], [calldataHash], [sideEffectCounter], [isStaticCall]) {
-        await this.typedOracle.privateNotifyEnqueuedPublicFunctionCall(AztecAddress.fromString(contractAddress), Fr.fromString(calldataHash), Fr.fromString(sideEffectCounter).toNumber(), Fr.fromString(isStaticCall).toBool());
+        await this.handlerAsPrivate().privateNotifyEnqueuedPublicFunctionCall(AztecAddress.fromString(contractAddress), Fr.fromString(calldataHash), Fr.fromString(sideEffectCounter).toNumber(), Fr.fromString(isStaticCall).toBool());
         return [];
     }
     async privateNotifySetPublicTeardownFunctionCall([contractAddress], [calldataHash], [sideEffectCounter], [isStaticCall]) {
-        await this.typedOracle.privateNotifySetPublicTeardownFunctionCall(AztecAddress.fromString(contractAddress), Fr.fromString(calldataHash), Fr.fromString(sideEffectCounter).toNumber(), Fr.fromString(isStaticCall).toBool());
+        await this.handlerAsPrivate().privateNotifySetPublicTeardownFunctionCall(AztecAddress.fromString(contractAddress), Fr.fromString(calldataHash), Fr.fromString(sideEffectCounter).toNumber(), Fr.fromString(isStaticCall).toBool());
         return [];
     }
     async privateNotifySetMinRevertibleSideEffectCounter([minRevertibleSideEffectCounter]) {
-        await this.typedOracle.privateNotifySetMinRevertibleSideEffectCounter(Fr.fromString(minRevertibleSideEffectCounter).toNumber());
+        await this.handlerAsPrivate().privateNotifySetMinRevertibleSideEffectCounter(Fr.fromString(minRevertibleSideEffectCounter).toNumber());
         return Promise.resolve([]);
     }
-    async utilityGetIndexedTaggingSecretAsSender([sender], [recipient]) {
-        const taggingSecret = await this.typedOracle.utilityGetIndexedTaggingSecretAsSender(AztecAddress.fromString(sender), AztecAddress.fromString(recipient));
-        return taggingSecret.toFields().map(toACVMField);
+    async privateIsSideEffectCounterRevertible([sideEffectCounter]) {
+        const isRevertible = await this.handlerAsPrivate().privateIsSideEffectCounterRevertible(Fr.fromString(sideEffectCounter).toNumber());
+        return Promise.resolve([
+            toACVMField(isRevertible)
+        ]);
     }
-    async privateIncrementAppTaggingSecretIndexAsSender([sender], [recipient]) {
-        await this.typedOracle.privateIncrementAppTaggingSecretIndexAsSender(AztecAddress.fromString(sender), AztecAddress.fromString(recipient));
-        return [];
+    async privateGetNextAppTagAsSender([sender], [recipient]) {
+        const tag = await this.handlerAsPrivate().privateGetNextAppTagAsSender(AztecAddress.fromString(sender), AztecAddress.fromString(recipient));
+        return [
+            toACVMField(tag.value)
+        ];
     }
     async utilityFetchTaggedLogs([pendingTaggedLogArrayBaseSlot]) {
-        await this.typedOracle.utilityFetchTaggedLogs(Fr.fromString(pendingTaggedLogArrayBaseSlot));
+        await this.handlerAsUtility().utilityFetchTaggedLogs(Fr.fromString(pendingTaggedLogArrayBaseSlot));
         return [];
     }
-    async utilityValidateEnqueuedNotesAndEvents([contractAddress], [noteValidationRequestsArrayBaseSlot], [eventValidationRequestsArrayBaseSlot]) {
-        await this.typedOracle.utilityValidateEnqueuedNotesAndEvents(AztecAddress.fromString(contractAddress), Fr.fromString(noteValidationRequestsArrayBaseSlot), Fr.fromString(eventValidationRequestsArrayBaseSlot));
+    async utilityValidateAndStoreEnqueuedNotesAndEvents([contractAddress], [noteValidationRequestsArrayBaseSlot], [eventValidationRequestsArrayBaseSlot]) {
+        await this.handlerAsUtility().utilityValidateAndStoreEnqueuedNotesAndEvents(AztecAddress.fromString(contractAddress), Fr.fromString(noteValidationRequestsArrayBaseSlot), Fr.fromString(eventValidationRequestsArrayBaseSlot));
         return [];
     }
     async utilityBulkRetrieveLogs([contractAddress], [logRetrievalRequestsArrayBaseSlot], [logRetrievalResponsesArrayBaseSlot]) {
-        await this.typedOracle.utilityBulkRetrieveLogs(AztecAddress.fromString(contractAddress), Fr.fromString(logRetrievalRequestsArrayBaseSlot), Fr.fromString(logRetrievalResponsesArrayBaseSlot));
+        await this.handlerAsUtility().utilityBulkRetrieveLogs(AztecAddress.fromString(contractAddress), Fr.fromString(logRetrievalRequestsArrayBaseSlot), Fr.fromString(logRetrievalResponsesArrayBaseSlot));
         return [];
     }
     async utilityStoreCapsule([contractAddress], [slot], capsule) {
-        await this.typedOracle.utilityStoreCapsule(AztecAddress.fromField(Fr.fromString(contractAddress)), Fr.fromString(slot), capsule.map(Fr.fromString));
+        await this.handlerAsUtility().utilityStoreCapsule(AztecAddress.fromField(Fr.fromString(contractAddress)), Fr.fromString(slot), capsule.map(Fr.fromString));
         return [];
     }
     async utilityLoadCapsule([contractAddress], [slot], [tSize]) {
-        const values = await this.typedOracle.utilityLoadCapsule(AztecAddress.fromField(Fr.fromString(contractAddress)), Fr.fromString(slot));
+        const values = await this.handlerAsUtility().utilityLoadCapsule(AztecAddress.fromField(Fr.fromString(contractAddress)), Fr.fromString(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) {
@@ -281,22 +324,22 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
         }
     }
     async utilityDeleteCapsule([contractAddress], [slot]) {
-        await this.typedOracle.utilityDeleteCapsule(AztecAddress.fromField(Fr.fromString(contractAddress)), Fr.fromString(slot));
+        await this.handlerAsUtility().utilityDeleteCapsule(AztecAddress.fromField(Fr.fromString(contractAddress)), Fr.fromString(slot));
         return [];
     }
     async utilityCopyCapsule([contractAddress], [srcSlot], [dstSlot], [numEntries]) {
-        await this.typedOracle.utilityCopyCapsule(AztecAddress.fromField(Fr.fromString(contractAddress)), Fr.fromString(srcSlot), Fr.fromString(dstSlot), Fr.fromString(numEntries).toNumber());
+        await this.handlerAsUtility().utilityCopyCapsule(AztecAddress.fromField(Fr.fromString(contractAddress)), Fr.fromString(srcSlot), Fr.fromString(dstSlot), Fr.fromString(numEntries).toNumber());
         return [];
     }
     async utilityAes128Decrypt(ciphertextBVecStorage, [ciphertextLength], iv, symKey) {
         const ciphertext = fromUintBoundedVec(ciphertextBVecStorage, ciphertextLength, 8);
         const ivBuffer = fromUintArray(iv, 8);
         const symKeyBuffer = fromUintArray(symKey, 8);
-        const plaintext = await this.typedOracle.utilityAes128Decrypt(ciphertext, ivBuffer, symKeyBuffer);
+        const plaintext = await this.handlerAsUtility().utilityAes128Decrypt(ciphertext, ivBuffer, symKeyBuffer);
         return bufferToBoundedVec(plaintext, ciphertextBVecStorage.length);
     }
     async utilityGetSharedSecret([address], [ephPKField0], [ephPKField1], [ephPKField2]) {
-        const secret = await this.typedOracle.utilityGetSharedSecret(AztecAddress.fromField(Fr.fromString(address)), Point.fromFields([
+        const secret = await this.handlerAsUtility().utilityGetSharedSecret(AztecAddress.fromField(Fr.fromString(address)), Point.fromFields([
             ephPKField0,
             ephPKField1,
             ephPKField2
@@ -304,11 +347,11 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
         return secret.toFields().map(toACVMField);
     }
     async utilityEmitOffchainEffect(data) {
-        await this.typedOracle.utilityEmitOffchainEffect(data.map(Fr.fromString));
+        await this.handlerAsPrivate().utilityEmitOffchainEffect(data.map(Fr.fromString));
         return [];
     }
     async privateGetSenderForTags() {
-        const sender = await this.typedOracle.privateGetSenderForTags();
+        const sender = await this.handlerAsPrivate().privateGetSenderForTags();
         // Return [1, address] for Some(address), [0, 0] for None
         return sender ? [
             toACVMField(1n),
@@ -319,7 +362,7 @@ import { packAsRetrievedNote } from './note_packing_utils.js';
         ];
     }
     async privateSetSenderForTags([senderForTags]) {
-        await this.typedOracle.privateSetSenderForTags(AztecAddress.fromField(Fr.fromString(senderForTags)));
+        await this.handlerAsPrivate().privateSetSenderForTags(AztecAddress.fromField(Fr.fromString(senderForTags)));
         return [];
     }
 }

package/dest/contract_function_simulator/oracle/private_execution.d.ts

@@ -1,13 +1,8 @@
-import { Fr } from '@aztec/foundation/fields';
 import { type ACVMWitness, type CircuitSimulator } from '@aztec/simulator/client';
 import { type FunctionArtifact, type FunctionArtifactWithContractName, type FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ContractInstance } from '@aztec/stdlib/contract';
-import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import { PrivateCircuitPublicInputs } from '@aztec/stdlib/kernel';
-import { BlockHeader, PrivateCallExecutionResult } from '@aztec/stdlib/tx';
-import type { UInt64 } from '@aztec/stdlib/types';
-import type { ExecutionDataProvider } from '../execution_data_provider.js';
+import { PrivateCallExecutionResult } from '@aztec/stdlib/tx';
 import type { PrivateExecutionOracle } from './private_execution_oracle.js';
 /**
  * Execute a private function and return the execution result.
@@ -25,24 +20,4 @@ export declare function executePrivateFunction(simulator: CircuitSimulator, priv
  * @returns - The public inputs.
  */
 export declare function extractPrivateCircuitPublicInputs(artifact: FunctionArtifact, partialWitness: ACVMWitness): PrivateCircuitPublicInputs;
-/**
- * Read the current class id of a contract from the execution data provider or AztecNode. If not found, class id
- * from the instance is used.
- * @param contractAddress - The address of the contract to read the class id for.
- * @param instance - The instance of the contract.
- * @param executionDataProvider - The execution data provider.
- * @param blockNumber - The block number at which to load the DelayedPublicMutable storing the class id.
- * @param timestamp - The timestamp at which to obtain the class id from the DelayedPublicMutable.
- * @returns The current class id.
- */
-export declare function readCurrentClassId(contractAddress: AztecAddress, instance: ContractInstance, executionDataProvider: ExecutionDataProvider | AztecNode, blockNumber: number, timestamp: UInt64): Promise<Fr>;
-/**
- * Verify that the current class id of a contract obtained from AztecNode is the same as the one in the execution data
- * provider (i.e. PXE).
- * @param contractAddress - The address of the contract to verify class id for.
- * @param executionDataProvider - The execution data provider.
- * @param header - The header of the block at which to verify the current class id. If not provided, the current block
- * number and timestamp from the execution data provider will be used.
- */
-export declare function verifyCurrentClassId(contractAddress: AztecAddress, executionDataProvider: ExecutionDataProvider, header?: BlockHeader): Promise<void>;
-//# sourceMappingURL=private_execution.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9leGVjdXRpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdF9mdW5jdGlvbl9zaW11bGF0b3Ivb3JhY2xlL3ByaXZhdGVfZXhlY3V0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFDaEIsS0FBSyxnQkFBZ0IsRUFLdEIsTUFBTSx5QkFBeUIsQ0FBQztBQUNqQyxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxnQ0FBZ0MsRUFDckMsS0FBSyxnQkFBZ0IsRUFFdEIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUc5RCxPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTVFOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0Isc0JBQXNCLENBQzFDLFNBQVMsRUFBRSxnQkFBZ0IsRUFDM0Isc0JBQXNCLEVBQUUsc0JBQXNCLEVBQzlDLFFBQVEsRUFBRSxnQ0FBZ0MsRUFDMUMsZUFBZSxFQUFFLFlBQVksRUFDN0IsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEdBQUcseUNBQThDLEdBQ2hELE9BQU8sQ0FBQywwQkFBMEIsQ0FBQyxDQTJFckM7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFnQixpQ0FBaUMsQ0FDL0MsUUFBUSxFQUFFLGdCQUFnQixFQUMxQixjQUFjLEVBQUUsV0FBVyxHQUMxQiwwQkFBMEIsQ0FhNUIifQ==

package/dest/contract_function_simulator/oracle/private_execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_execution.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/private_execution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gCAAgC,EACrC,KAAK,gBAAgB,EAEtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAE5E;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,gBAAgB,EAC3B,sBAAsB,EAAE,sBAAsB,EAC9C,QAAQ,EAAE,gCAAgC,EAC1C,eAAe,EAAE,YAAY,EAC7B,gBAAgB,EAAE,gBAAgB,EAClC,GAAG,yCAA8C,GAChD,OAAO,CAAC,0BAA0B,CAAC,CA2ErC;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,WAAW,GAC1B,0BAA0B,CAa5B;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,EAC1B,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,EACxD,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,eAWlB;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,qBAAqB,EAAE,qBAAqB,EAC5C,MAAM,CAAC,EAAE,WAAW,iBA2BrB"}
+{"version":3,"file":"private_execution.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/private_execution.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gCAAgC,EACrC,KAAK,gBAAgB,EAEtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAG9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAE5E;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,gBAAgB,EAC3B,sBAAsB,EAAE,sBAAsB,EAC9C,QAAQ,EAAE,gCAAgC,EAC1C,eAAe,EAAE,YAAY,EAC7B,gBAAgB,EAAE,gBAAgB,EAClC,GAAG,yCAA8C,GAChD,OAAO,CAAC,0BAA0B,CAAC,CA2ErC;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,WAAW,GAC1B,0BAA0B,CAa5B"}

package/dest/contract_function_simulator/oracle/private_execution.js

@@ -1,11 +1,9 @@
 import { PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH, PRIVATE_CONTEXT_INPUTS_LENGTH } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { ExecutionError, extractCallStack, resolveAssertionMessageFromError, witnessMapToFields } from '@aztec/simulator/client';
 import { countArgumentsSize } from '@aztec/stdlib/abi';
-import { DelayedPublicMutableValues, DelayedPublicMutableValuesWithHash } from '@aztec/stdlib/delayed-public-mutable';
 import { PrivateCircuitPublicInputs } from '@aztec/stdlib/kernel';
 import { PrivateCallExecutionResult } from '@aztec/stdlib/tx';
 import { Oracle } from './oracle.js';
@@ -48,10 +46,10 @@ import { Oracle } from './oracle.js';
     });
     const contractClassLogs = privateExecutionOracle.getContractClassLogs();
     const rawReturnValues = await privateExecutionOracle.privateLoadFromExecutionCache(publicInputs.returnsHash);
-    const noteHashLeafIndexMap = privateExecutionOracle.getNoteHashLeafIndexMap();
     const newNotes = privateExecutionOracle.getNewNotes();
     const noteHashNullifierCounterMap = privateExecutionOracle.getNoteHashNullifierCounterMap();
     const offchainEffects = privateExecutionOracle.getOffchainEffects();
+    const preTags = privateExecutionOracle.getUsedPreTags();
     const nestedExecutionResults = privateExecutionOracle.getNestedExecutionResults();
     let timerSubtractionList = nestedExecutionResults;
     let witgenTime = duration;
@@ -61,7 +59,7 @@ import { Oracle } from './oracle.js';
         timerSubtractionList = timerSubtractionList.flatMap((nested)=>nested.nestedExecutionResults ?? []);
     }
     log.debug(`Returning from call to ${contractAddress.toString()}:${functionSelector}`);
-    return new PrivateCallExecutionResult(artifact.bytecode, Buffer.from(artifact.verificationKey, 'base64'), partialWitness, publicInputs, noteHashLeafIndexMap, newNotes, noteHashNullifierCounterMap, rawReturnValues, offchainEffects, nestedExecutionResults, contractClassLogs, {
+    return new PrivateCallExecutionResult(artifact.bytecode, Buffer.from(artifact.verificationKey, 'base64'), partialWitness, publicInputs, newNotes, noteHashNullifierCounterMap, rawReturnValues, offchainEffects, preTags, nestedExecutionResults, contractClassLogs, {
         timings: {
             witgen: witgenTime,
             oracles: acirExecutionResult.oracles
@@ -87,46 +85,3 @@ import { Oracle } from './oracle.js';
     }
     return PrivateCircuitPublicInputs.fromFields(returnData);
 }
-/**
- * Read the current class id of a contract from the execution data provider or AztecNode. If not found, class id
- * from the instance is used.
- * @param contractAddress - The address of the contract to read the class id for.
- * @param instance - The instance of the contract.
- * @param executionDataProvider - The execution data provider.
- * @param blockNumber - The block number at which to load the DelayedPublicMutable storing the class id.
- * @param timestamp - The timestamp at which to obtain the class id from the DelayedPublicMutable.
- * @returns The current class id.
- */ export async function readCurrentClassId(contractAddress, instance, executionDataProvider, blockNumber, timestamp) {
-    const { delayedPublicMutableSlot } = await DelayedPublicMutableValuesWithHash.getContractUpdateSlots(contractAddress);
-    const delayedPublicMutableValues = await DelayedPublicMutableValues.readFromTree(delayedPublicMutableSlot, (slot)=>executionDataProvider.getPublicStorageAt(blockNumber, ProtocolContractAddress.ContractInstanceRegistry, slot));
-    let currentClassId = delayedPublicMutableValues.svc.getCurrentAt(timestamp)[0];
-    if (currentClassId.isZero()) {
-        currentClassId = instance.originalContractClassId;
-    }
-    return currentClassId;
-}
-/**
- * Verify that the current class id of a contract obtained from AztecNode is the same as the one in the execution data
- * provider (i.e. PXE).
- * @param contractAddress - The address of the contract to verify class id for.
- * @param executionDataProvider - The execution data provider.
- * @param header - The header of the block at which to verify the current class id. If not provided, the current block
- * number and timestamp from the execution data provider will be used.
- */ export async function verifyCurrentClassId(contractAddress, executionDataProvider, header) {
-    let blockNumber;
-    let timestamp;
-    if (header) {
-        blockNumber = header.globalVariables.blockNumber;
-        timestamp = header.globalVariables.timestamp;
-    } else {
-        [blockNumber, timestamp] = await Promise.all([
-            executionDataProvider.getBlockNumber(),
-            executionDataProvider.getTimestamp()
-        ]);
-    }
-    const instance = await executionDataProvider.getContractInstance(contractAddress);
-    const currentClassId = await readCurrentClassId(contractAddress, instance, executionDataProvider, blockNumber, timestamp);
-    if (!instance.currentContractClassId.equals(currentClassId)) {
-        throw new Error(`Contract ${contractAddress} is outdated, current class id is ${currentClassId}, local class id is ${instance.currentContractClassId}`);
-    }
-}