@aztec/pxe 0.0.1-commit.2448fdb → 0.0.1-commit.2606882

package/dest/contract_function_simulator/oracle/utility_execution_oracle.js

@@ -1,25 +1,29 @@
+import { ARCHIVE_HEIGHT } from '@aztec/constants';
+import { uniqueBy } from '@aztec/foundation/collection';
 import { Aes128 } from '@aztec/foundation/crypto/aes128';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { LogLevels, createLogger } from '@aztec/foundation/log';
-import { isProtocolContract } from '@aztec/protocol-contracts';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import { ExecutionError, extractCallStack, resolveAssertionMessageFromError, toACVMWitness, witnessMapToFields } from '@aztec/simulator/client';
 import { siloNullifier } from '@aztec/stdlib/hash';
-import { computeAddressSecret } from '@aztec/stdlib/keys';
-import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
+import { PublicKeys, computeAddressSecret, hashPublicKey } from '@aztec/stdlib/keys';
+import { AppTaggingSecret, MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
 import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { TxEffect } from '@aztec/stdlib/tx';
 import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
 import { EventService } from '../../events/event_service.js';
 import { LogService } from '../../logs/log_service.js';
 import { NoteService } from '../../notes/note_service.js';
 import { ORACLE_VERSION_MAJOR } from '../../oracle_version.js';
 import { EphemeralArrayService } from '../ephemeral_array_service.js';
-import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
-import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
-import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
-import { NoteValidationRequest } from '../noir-structs/note_validation_request.js';
+import { BoundedVec } from '../noir-structs/bounded_vec.js';
+import { EphemeralArray } from '../noir-structs/ephemeral_array.js';
+import { Option } from '../noir-structs/option.js';
 import { UtilityContext } from '../noir-structs/utility_context.js';
 import { pickNotes } from '../pick_notes.js';
 import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
+import { Oracle } from './oracle.js';
 /**
  * The oracle for an execution of utility contract functions.
  */ export class UtilityExecutionOracle {
@@ -50,6 +54,9 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
     jobId;
     logger;
     scopes;
+    simulator;
+    hooks;
+    utilityExecutor;
     constructor(args){
         this.contractAddress = args.contractAddress;
         this.authWitnesses = args.authWitnesses;
@@ -70,30 +77,15 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         this.jobId = args.jobId;
         this.logger = args.log ?? createLogger('simulator:client_view_context');
         this.scopes = args.scopes;
+        this.simulator = args.simulator;
+        this.hooks = args.hooks;
+        this.utilityExecutor = args.utilityExecutor;
     }
     assertCompatibleOracleVersion(major, minor) {
-        // TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
-        // Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
-        // the expected pinned version or the current one. We want to allow for both the pinned and the current versions
-        // because we want this code to work with both the pinned and unpinned version since some branches do not have the
-        // pinned contracts (like e.g. next)
-        const LEGACY_ORACLE_VERSION = 12;
-        if (isProtocolContract(this.contractAddress)) {
-            if (major !== LEGACY_ORACLE_VERSION && major !== ORACLE_VERSION_MAJOR) {
-                const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
-                throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${LEGACY_ORACLE_VERSION} or ${ORACLE_VERSION_MAJOR}, got ${major})`);
-            }
-            this.contractOracleVersion = {
-                major,
-                minor
-            };
-            return;
-        }
         if (major !== ORACLE_VERSION_MAJOR) {
             const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
             throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`);
         }
-        // Major matches - store both major and minor for later diagnostics (e.g. when an oracle is not found)
         this.contractOracleVersion = {
             major,
             minor
@@ -133,8 +125,12 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * membership witness.
    * @param noteHash - The note hash to find in the note hash tree.
    * @returns The membership witness containing the leaf index and sibling path
-   */ getNoteHashMembershipWitness(blockHash, noteHash) {
-        return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
+   */ async getNoteHashMembershipWitness(blockHash, noteHash) {
+        const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
+        if (!witness) {
+            throw new Error(`Note hash ${noteHash} not found in the note hash tree at block ${blockHash.toString()}.`);
+        }
+        return witness;
     }
     /**
    * Fetches the index and sibling path of a block hash in the archive tree.
@@ -146,19 +142,24 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * witness.
    * @param blockHash - The block hash to find in the archive tree.
    * @returns The membership witness containing the leaf index and sibling path
-   */ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
+   */ async getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
         // Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
         // hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
         // membership witness as there is none.
-        return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
+        const witness = await this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
+        return witness ? Option.some(witness) : Option.none(MembershipWitness.empty(ARCHIVE_HEIGHT));
     }
     /**
    * Returns a nullifier membership witness for a given nullifier at a given block.
    * @param blockHash - The block hash at which to get the index.
    * @param nullifier - Nullifier we try to find witness for.
    * @returns The nullifier membership witness (if found).
-   */ getNullifierMembershipWitness(blockHash, nullifier) {
-        return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
+   */ async getNullifierMembershipWitness(blockHash, nullifier) {
+        const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
+        if (!witness) {
+            throw new Error(`Nullifier membership witness not found at block ${blockHash.toString()}.`);
+        }
+        return witness;
     }
     /**
    * Returns a low nullifier membership witness for a given nullifier at a given block.
@@ -168,16 +169,24 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
    * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
    * we are trying to prove non-inclusion for.
-   */ getLowNullifierMembershipWitness(blockHash, nullifier) {
-        return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
+   */ async getLowNullifierMembershipWitness(blockHash, nullifier) {
+        const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
+        if (!witness) {
+            throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block hash ${blockHash.toString()}.`);
+        }
+        return witness;
     }
     /**
    * Returns a public data tree witness for a given leaf slot at a given block.
    * @param blockHash - The block hash at which to get the index.
    * @param leafSlot - The slot of the public data tree to get the witness for.
    * @returns - The witness
-   */ getPublicDataWitness(blockHash, leafSlot) {
-        return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
+   */ async getPublicDataWitness(blockHash, leafSlot) {
+        const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
+        if (!witness) {
+            throw new Error(`Public data witness not found for slot ${leafSlot} at block hash ${blockHash.toString()}.`);
+        }
+        return witness;
     }
     /**
    * Fetches a block header of a given block.
@@ -188,8 +197,15 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         if (blockNumber > anchorBlockNumber) {
             throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
         }
+        // Most contracts query state at the "current" block, which is the anchor. Skip the RPC when we can.
+        if (blockNumber === anchorBlockNumber) {
+            return this.anchorBlockHeader;
+        }
         const block = await this.aztecNode.getBlock(blockNumber);
-        return block?.header;
+        if (!block?.header) {
+            throw new Error(`Block header not found for block ${blockNumber}.`);
+        }
+        return block.header;
     }
     /**
    * Retrieve the public keys and partial address associated to a given address.
@@ -198,12 +214,15 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    */ async getPublicKeysAndPartialAddress(account) {
         const completeAddress = await this.addressStore.getCompleteAddress(account);
         if (!completeAddress) {
-            return undefined;
+            return Option.none({
+                publicKeys: PublicKeys.default(),
+                partialAddress: Fr.ZERO
+            });
         }
-        return {
+        return Option.some({
             publicKeys: completeAddress.publicKeys,
             partialAddress: completeAddress.partialAddress
-        };
+        });
     }
     async getCompleteAddressOrFail(account) {
         const completeAddress = await this.addressStore.getCompleteAddress(account);
@@ -229,7 +248,11 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * @param messageHash - Hash of the message to authenticate.
    * @returns Authentication witness for the requested message hash, or undefined if not found.
    */ getAuthWitness(messageHash) {
-        return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
+        const witness = this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness;
+        if (!witness) {
+            throw new Error(`Unknown auth witness for message hash ${messageHash}`);
+        }
+        return Promise.resolve(witness);
     }
     /**
    * Gets some notes for a contract address and storage slot.
@@ -252,10 +275,10 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * @param offset - The starting index for pagination.
    * @param status - The status of notes to fetch.
    * @returns Array of note data.
-   */ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
+   */ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status, maxNotes, packedHintedNoteLength) {
         const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
-        const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
-        return pickNotes(dbNotes, {
+        const dbNotes = await noteService.getNotes(this.contractAddress, owner.value, storageSlot, status, this.scopes);
+        const picked = pickNotes(dbNotes, {
             selects: selectByIndexes.slice(0, numSelects).map((index, i)=>({
                     selector: {
                         index,
@@ -276,6 +299,11 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
             limit,
             offset
         });
+        return BoundedVec.from({
+            data: picked,
+            maxLength: maxNotes,
+            elementSize: packedHintedNoteLength
+        });
     }
     /**
    * Check if a nullifier exists in the nullifier tree.
@@ -340,7 +368,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         }
         return this.aztecnrLogger;
     }
-    async log(level, message, fields) {
+    async log(level, message, _fieldsSize, fields) {
         if (!LogLevels[level]) {
             throw new Error(`Invalid log level: ${level}`);
         }
@@ -348,110 +376,58 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
         logContractMessage(logger, LogLevels[level], strippedMessage, fields);
     }
-    // Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
-    async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot, scope) {
-        const logService = this.#createLogService();
-        const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
-        await this.capsuleService.appendToCapsuleArray(this.contractAddress, pendingTaggedLogArrayBaseSlot, logs.map((log)=>log.toFields()), this.jobId, scope);
-    }
-    /** Fetches pending tagged logs into a freshly allocated ephemeral array and returns its base slot. */ async getPendingTaggedLogsV2(scope) {
+    /** Fetches pending tagged logs into a freshly allocated ephemeral array and returns it. */ async getPendingTaggedLogs(scope, providedSecrets) {
+        const secrets = providedSecrets.readAll(this.ephemeralArrayService).map((ps)=>new AppTaggingSecret(ps.secret, this.contractAddress, ps.mode));
         const logService = this.#createLogService();
-        const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
-        return this.ephemeralArrayService.newArray(logs.map((log)=>log.toFields()));
+        const logs = await logService.fetchTaggedLogs(this.contractAddress, scope, secrets);
+        return EphemeralArray.fromValues(this.ephemeralArrayService, logs);
     }
     #createLogService() {
         return new LogService(this.aztecNode, this.anchorBlockHeader, this.l2TipsStore, this.keyStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
     }
-    /**
-   * Legacy: validates note/event requests stored in capsule arrays.
-   *
-   * Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
-   */ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
-        // TODO(#10727): allow other contracts to store notes
-        if (!this.contractAddress.equals(contractAddress)) {
-            throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
-        }
-        const noteValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
-        const eventValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
-        await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
-        await this.capsuleService.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId, scope);
-        await this.capsuleService.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId, scope);
-    }
-    async validateAndStoreEnqueuedNotesAndEventsV2(noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
-        const noteValidationRequests = this.ephemeralArrayService.readArrayAt(noteValidationRequestsArrayBaseSlot).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
-        const eventValidationRequests = this.ephemeralArrayService.readArrayAt(eventValidationRequestsArrayBaseSlot).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
-        await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
+    async validateAndStoreEnqueuedNotesAndEvents(noteValidationRequests, eventValidationRequests, scope) {
+        await this.#processValidationRequests(noteValidationRequests.readAll(this.ephemeralArrayService), eventValidationRequests.readAll(this.ephemeralArrayService), scope);
     }
-    /**
-   * Dispatches note and event validation requests to the service layer.
-   *
-   * This function is an auxiliary to support legacy (capsule backed) and new (ephemeral array backed) versions of the
-   * `validateAndStoreEnqueuedNotesAndEvents` oracle.
-   */ async #processValidationRequests(noteValidationRequests, eventValidationRequests, scope) {
+    async #processValidationRequests(noteValidationRequests, eventValidationRequests, scope) {
+        const txEffects = await this.#fetchTxEffects([
+            ...noteValidationRequests.map((r)=>r.txHash),
+            ...eventValidationRequests.map((r)=>r.txHash)
+        ]);
         const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
-        const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash, scope));
         const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
-        const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, scope));
         await Promise.all([
-            ...noteStorePromises,
-            ...eventStorePromises
+            noteService.validateAndStoreNotes(noteValidationRequests, scope, txEffects),
+            eventService.validateAndStoreEvents(eventValidationRequests, scope, txEffects)
         ]);
     }
-    async getLogsByTag(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot, scope) {
-        // TODO(#10727): allow other contracts to process partial notes
-        if (!this.contractAddress.equals(contractAddress)) {
-            throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
-        }
-        // We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
-        // don't need to wait for the network round-trip.
-        const logRetrievalRequests = (await this.capsuleService.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)).map(LogRetrievalRequest.fromFields);
-        const logService = this.#createLogService();
-        const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
-        // Requests are cleared once we're done.
-        await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
-        // The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
-        await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId, scope);
-    }
-    async getLogsByTagV2(requestArrayBaseSlot) {
-        const logRetrievalRequests = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot).map(LogRetrievalRequest.fromFields);
+    async getLogsByTag(requests) {
+        const logRetrievalRequests = requests.readAll(this.ephemeralArrayService);
         const logService = this.#createLogService();
-        const maybeLogRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
-        return this.ephemeralArrayService.newArray(maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption));
+        const logRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
+        // Create an inner ephemeral array for each request's matching logs, then wrap all slots in an outer array.
+        const innerArrays = logRetrievalResponses.map((responses)=>EphemeralArray.fromValues(this.ephemeralArrayService, responses));
+        return EphemeralArray.fromValues(this.ephemeralArrayService, innerArrays);
     }
-    // Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
-    async getMessageContextsByTxHash(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot, scope) {
-        try {
-            if (!this.contractAddress.equals(contractAddress)) {
-                throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
-            }
-            // TODO(@mverzilli): this is a prime example of where using an ephemeral array would make much more sense, we don't
-            // need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
-            // At the same time, we don't want to allow any global scope access other than where backwards compatibility
-            // forces us to. Hence we need the scope here to be artificial.
-            const requestCapsules = await this.capsuleService.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId, scope);
-            const txHashes = requestCapsules.map((fields, i)=>{
-                if (fields.length !== 1) {
-                    throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
-                }
-                return fields[0];
-            });
-            const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
-            // Leave response in response capsule array.
-            await this.capsuleService.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
-        } finally{
-            await this.capsuleService.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
-        }
+    /** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response array. */ async getMessageContextsByTxHash(requests) {
+        const txHashes = requests.readAll(this.ephemeralArrayService);
+        const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
+        const options = maybeMessageContexts.map((mc)=>mc ? Option.some(mc) : Option.none(MessageContext.empty()));
+        return EphemeralArray.fromValues(this.ephemeralArrayService, options);
     }
-    /** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response slot. */ async getMessageContextsByTxHashV2(requestArrayBaseSlot) {
-        const requestFields = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot);
-        const txHashes = requestFields.map((fields, i)=>{
-            if (fields.length !== 1) {
-                throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
-            }
-            return fields[0];
+    /**
+   * Fetches the effects of a transaction by its hash. Returns null if the tx is not found or is beyond the anchor
+   * block.
+   */ async getTxEffect(txHash) {
+        if (txHash.hash.isZero()) {
+            throw new Error('Invalid tx hash passed into aztec_utl_getTxEffect oracle handler');
+        }
+        const receipt = await this.aztecNode.getTxReceipt(txHash, {
+            includeTxEffect: true
         });
-        const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
-        return this.ephemeralArrayService.newArray(maybeMessageContexts.map(MessageContext.toSerializedOption));
+        if (!receipt.isMined() || !receipt.txEffect || receipt.blockNumber > this.anchorBlockHeader.getBlockNumber()) {
+            return Option.none(TxEffect.empty());
+        }
+        return Option.some(receipt.txEffect);
     }
     setCapsule(contractAddress, slot, capsule, scope) {
         if (!contractAddress.equals(this.contractAddress)) {
@@ -460,12 +436,13 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         }
         this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
     }
-    getCapsule(contractAddress, slot, scope) {
+    async getCapsule(contractAddress, slot, tSize, scope) {
         if (!contractAddress.equals(this.contractAddress)) {
             // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
             throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
         }
-        return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
+        const values = await this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
+        return values ? Option.some(values) : Option.none(new Array(tSize).fill(Fr.ZERO));
     }
     deleteCapsule(contractAddress, slot, scope) {
         if (!contractAddress.equals(this.contractAddress)) {
@@ -488,27 +465,43 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         if (!contractAddress.equals(this.contractAddress)) {
             throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
         }
-        this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
+        this.contractSyncService.invalidateContractForScopes(contractAddress, scopes.data);
     }
     // TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
-    decryptAes128(ciphertext, iv, symKey) {
-        const aes128 = new Aes128();
-        return aes128.decryptBufferCBC(ciphertext, iv, symKey);
+    async decryptAes128(ciphertext, iv, symKey) {
+        const capacity = ciphertext.maxLength;
+        try {
+            const aes128 = new Aes128();
+            const plaintext = await aes128.decryptBufferCBC(Buffer.from(ciphertext.data), iv, symKey);
+            return Option.some(BoundedVec.from({
+                data: [
+                    ...plaintext
+                ],
+                maxLength: capacity
+            }));
+        } catch  {
+            return Option.none(BoundedVec.empty({
+                maxLength: capacity
+            }));
+        }
     }
     /**
-   * Retrieves the app-siloed shared secret for a given address and ephemeral public key.
-   * @param address - The address to get the secret for.
-   * @param ephPk - The ephemeral public key to get the secret for.
+   * Retrieves app-siloed shared secrets for multiple ephemeral public keys stored in an ephemeral array.
+   * @param address - The recipient address.
+   * @param ephPks - Ephemeral array containing the serialized Points.
    * @param contractAddress - The contract address for app-siloing (validated against execution context).
-   * @returns The app-siloed shared secret as a Field.
-   */ async getSharedSecret(address, ephPk, contractAddress) {
+   * @returns A new ephemeral array containing the computed shared secrets.
+   */ async getSharedSecrets(address, ephPks, contractAddress) {
         if (!contractAddress.equals(this.contractAddress)) {
-            throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
+            throw new Error(`getSharedSecrets called with contract address ${contractAddress}, expected ${this.contractAddress}`);
         }
         const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
-        const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
+        const ivpkMHash = await hashPublicKey(recipientCompleteAddress.publicKeys.ivpkM);
+        const ivskM = await this.keyStore.getMasterSecretKey(ivpkMHash);
         const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
-        return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
+        const ephPkPoints = ephPks.readAll(this.ephemeralArrayService);
+        const secrets = await Promise.all(ephPkPoints.map((ephPk)=>deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress)));
+        return EphemeralArray.fromValues(this.ephemeralArrayService, secrets);
     }
     pushEphemeral(slot, elements) {
         return this.ephemeralArrayService.push(slot, elements);
@@ -538,22 +531,124 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         });
         return Promise.resolve();
     }
+    /** Executes another utility function from within this one and returns its serialized return values. */ async callUtilityFunction(targetContractAddress, functionSelector, args) {
+        const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(targetContractAddress, functionSelector);
+        if (!targetContractAddress.equals(this.contractAddress)) {
+            const [callerInstance, targetInstance] = await Promise.all([
+                this.getContractInstance(this.contractAddress),
+                this.getContractInstance(targetContractAddress)
+            ]);
+            const request = {
+                caller: this.contractAddress,
+                callerClassId: callerInstance.currentContractClassId,
+                target: targetContractAddress,
+                targetClassId: targetInstance.currentContractClassId,
+                functionSelector,
+                functionName: targetArtifact.name,
+                args,
+                callerContext: this.callerContext
+            };
+            const response = this.hooks ? await this.hooks.authorizeUtilityCall(request) : {
+                authorized: false,
+                reason: 'No execution hooks configured'
+            };
+            if (!response.authorized) {
+                const reason = response.reason ? `: ${response.reason}` : '';
+                throw new Error(`Cross-contract utility call denied${reason}. ${this.contractAddress} attempted to call ` + `${targetContractAddress}:${functionSelector} (${targetArtifact.name}). ` + `See https://docs.aztec.network/errors/11`);
+            }
+            await this.contractSyncService.ensureContractSynced(targetContractAddress, functionSelector, this.utilityExecutor, this.anchorBlockHeader, this.jobId, this.scopes);
+        }
+        this.logger.debug(`Calling nested utility function ${targetContractAddress}:${functionSelector} from ${this.contractAddress}`);
+        const nestedOracle = new UtilityExecutionOracle({
+            contractAddress: targetContractAddress,
+            authWitnesses: this.authWitnesses,
+            capsules: this.capsules,
+            anchorBlockHeader: this.anchorBlockHeader,
+            contractStore: this.contractStore,
+            noteStore: this.noteStore,
+            keyStore: this.keyStore,
+            addressStore: this.addressStore,
+            aztecNode: this.aztecNode,
+            recipientTaggingStore: this.recipientTaggingStore,
+            senderAddressBookStore: this.senderAddressBookStore,
+            capsuleService: this.capsuleService,
+            privateEventStore: this.privateEventStore,
+            messageContextService: this.messageContextService,
+            contractSyncService: this.contractSyncService,
+            l2TipsStore: this.l2TipsStore,
+            jobId: this.jobId,
+            scopes: this.scopes,
+            simulator: this.simulator,
+            hooks: this.hooks,
+            utilityExecutor: this.utilityExecutor,
+            log: this.logger
+        });
+        const initialWitness = toACVMWitness(0, args);
+        const acvmCallback = new Oracle(nestedOracle);
+        const acirExecutionResult = await this.simulator.executeUserCircuit(initialWitness, targetArtifact, acvmCallback.toACIRCallback()).catch((err)=>{
+            err.message = resolveAssertionMessageFromError(err, targetArtifact);
+            throw new ExecutionError(err.message, {
+                contractAddress: targetContractAddress,
+                functionSelector
+            }, extractCallStack(err, targetArtifact.debug), {
+                cause: err
+            });
+        });
+        return witnessMapToFields(acirExecutionResult.returnWitness);
+    }
     /** Returns offchain effects collected during execution. */ getOffchainEffects() {
         return this.offchainEffects;
     }
+    /**
+   * Fetches tx effects for the given hashes in parallel, deduplicating repeated hashes so each tx is only requested
+   * once. Returns a map keyed by `TxHash.toString()`; hashes for which the node has no tx effect are omitted.
+   */ async #fetchTxEffects(txHashes) {
+        const uniqueTxHashes = uniqueBy(txHashes, (h)=>h.toString());
+        const fetched = await Promise.all(uniqueTxHashes.map((h)=>this.aztecNode.getTxReceipt(h, {
+                includeTxEffect: true
+            })));
+        return new Map(uniqueTxHashes.map((h, i)=>{
+            const receipt = fetched[i];
+            if (!receipt.isMined() || !receipt.txEffect) {
+                return [
+                    h.toString(),
+                    undefined
+                ];
+            }
+            return [
+                h.toString(),
+                {
+                    data: receipt.txEffect,
+                    l2BlockNumber: receipt.blockNumber,
+                    l2BlockHash: receipt.blockHash,
+                    txIndexInBlock: receipt.txIndexInBlock,
+                    slotNumber: receipt.slotNumber
+                }
+            ];
+        }).filter((entry)=>entry[1] !== undefined));
+    }
     /** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
+        // Most contracts query state at the "current" block, which is the anchor. Skip the validation when we can.
+        const anchorHash = await this.anchorBlockHeader.hash();
+        if (blockHash.equals(anchorHash)) {
+            return query();
+        }
         const [response] = await Promise.all([
             query(),
             (async ()=>{
-                const header = await this.aztecNode.getBlockHeader(blockHash);
+                const block = await this.aztecNode.getBlock(blockHash);
+                const header = block?.header;
                 if (!header) {
                     throw new Error(`Could not find block header for block hash ${blockHash}`);
                 }
                 if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
-                    throw new Error(`Made a node query with a reference block hash ${blockHash} with block number ${header.getBlockNumber()}, which is ahead of the anchor block number ${this.anchorBlockHeader.getBlockNumber()} (from anchor block hash ${await this.anchorBlockHeader.hash()}).`);
+                    throw new Error(`Made a node query with a reference block hash ${blockHash} with block number ${header.getBlockNumber()}, which is ahead of the anchor block number ${this.anchorBlockHeader.getBlockNumber()} (from anchor block hash ${anchorHash}).`);
                 }
             })()
         ]);
         return response;
     }
+    /** The execution context of the current call. */ get callerContext() {
+        return 'utility';
+    }
 }

package/dest/contract_function_simulator/proxied_contract_data_source.d.ts

@@ -3,4 +3,4 @@ import type { ContractStore } from '../storage/contract_store/contract_store.js'
 export declare class ProxiedContractStoreFactory {
     static create(contractStore: ContractStore, overrides?: ContractOverrides): ContractStore;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJveGllZF9jb250cmFjdF9kYXRhX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9wcm94aWVkX2NvbnRyYWN0X2RhdGFfc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFPakYscUJBQWEsMkJBQTJCO0lBQ3RDLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLGFBQWEsRUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsaUJBNEV4RTtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJveGllZF9jb250cmFjdF9kYXRhX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9wcm94aWVkX2NvbnRyYWN0X2RhdGFfc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFjakYscUJBQWEsMkJBQTJCO0lBQ3RDLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLGFBQWEsRUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsaUJBdUN4RTtDQUNGIn0=

package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxied_contract_data_source.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/proxied_contract_data_source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAOjF,qBAAa,2BAA2B;IACtC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,iBAAiB,iBA4ExE;CACF"}
+{"version":3,"file":"proxied_contract_data_source.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/proxied_contract_data_source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAcjF,qBAAa,2BAA2B;IACtC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,iBAAiB,iBAuCxE;CACF"}