@aztec/pxe 0.0.1-commit.5de5ca79e → 0.0.1-commit.6201a7b05

package/dest/contract_function_simulator/oracle/utility_execution_oracle.js

@@ -4,18 +4,18 @@ import { LogLevels, createLogger } from '@aztec/foundation/log';
 import { isProtocolContract } from '@aztec/protocol-contracts';
 import { siloNullifier } from '@aztec/stdlib/hash';
 import { computeAddressSecret } from '@aztec/stdlib/keys';
-import { deriveEcdhSharedSecret } from '@aztec/stdlib/logs';
+import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
 import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { createContractLogger, logContractMessage } from '../../contract_logging.js';
+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 } from '../../oracle_version.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 { MessageTxContext } from '../noir-structs/message_tx_context.js';
 import { NoteValidationRequest } from '../noir-structs/note_validation_request.js';
 import { UtilityContext } from '../noir-structs/utility_context.js';
 import { pickNotes } from '../pick_notes.js';
@@ -26,7 +26,11 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
     isMisc = true;
     isUtility = true;
     contractLogger;
+    aztecnrLogger;
     offchainEffects = [];
+    ephemeralArrayService = new EphemeralArrayService();
+    // We store oracle version to be able to show a nice error message when an oracle handler is missing.
+    contractOracleVersion;
     contractAddress;
     authWitnesses;
     capsules;
@@ -38,10 +42,11 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
     aztecNode;
     recipientTaggingStore;
     senderAddressBookStore;
-    capsuleStore;
+    capsuleService;
     privateEventStore;
     messageContextService;
     contractSyncService;
+    l2TipsStore;
     jobId;
     logger;
     scopes;
@@ -57,15 +62,16 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         this.aztecNode = args.aztecNode;
         this.recipientTaggingStore = args.recipientTaggingStore;
         this.senderAddressBookStore = args.senderAddressBookStore;
-        this.capsuleStore = args.capsuleStore;
+        this.capsuleService = args.capsuleService;
         this.privateEventStore = args.privateEventStore;
         this.messageContextService = args.messageContextService;
         this.contractSyncService = args.contractSyncService;
+        this.l2TipsStore = args.l2TipsStore;
         this.jobId = args.jobId;
         this.logger = args.log ?? createLogger('simulator:client_view_context');
         this.scopes = args.scopes;
     }
-    assertCompatibleOracleVersion(version) {
+    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
@@ -73,14 +79,29 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         // pinned contracts (like e.g. next)
         const LEGACY_ORACLE_VERSION = 12;
         if (isProtocolContract(this.contractAddress)) {
-            if (version !== LEGACY_ORACLE_VERSION && version !== ORACLE_VERSION) {
-                throw new Error(`Expected legacy oracle version ${LEGACY_ORACLE_VERSION} or current oracle version ${ORACLE_VERSION} for alpha payload contract at ${this.contractAddress}, got ${version}.`);
+            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 (version !== ORACLE_VERSION) {
-            throw new Error(`Incompatible oracle version. Expected version ${ORACLE_VERSION}, got ${version}.`);
+        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
+        };
+    }
+    // Prefixed with "nonOracleFunction" as it is not used as an oracle handler.
+    nonOracleFunctionGetContractOracleVersion() {
+        return this.contractOracleVersion;
     }
     getRandomField() {
         return Fr.random();
@@ -95,28 +116,25 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * @throws If the keys are not registered in the key store.
    * @throws If scopes are defined and the account is not in the scopes.
    */ async getKeyValidationRequest(pkMHash) {
-        // If scopes are defined, check that the key belongs to an account in the scopes.
-        if (this.scopes !== 'ALL_SCOPES' && this.scopes.length > 0) {
-            let hasAccess = false;
-            for(let i = 0; i < this.scopes.length && !hasAccess; i++){
-                if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
-                    hasAccess = true;
-                }
-            }
-            if (!hasAccess) {
-                throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
+        let hasAccess = false;
+        for(let i = 0; i < this.scopes.length && !hasAccess; i++){
+            if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
+                hasAccess = true;
             }
         }
+        if (!hasAccess) {
+            throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
+        }
         return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
     }
     /**
    * Fetches the index and sibling path of a leaf at a given block from the note hash tree.
-   * @param anchorBlockHash - The hash of a block that contains the note hash tree root in which to find the membership
-   * witness.
+   * @param blockHash - The hash of a block that contains the note hash tree root in which to find the
+   * 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(anchorBlockHash, noteHash) {
-        return this.aztecNode.getNoteHashMembershipWitness(anchorBlockHash, noteHash);
+   */ getNoteHashMembershipWitness(blockHash, noteHash) {
+        return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
     }
     /**
    * Fetches the index and sibling path of a block hash in the archive tree.
@@ -124,12 +142,15 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
    * its block hash is appended as a new leaf to the archive tree.
    *
-   * @param anchorBlockHash - The hash of a block that contains the archive tree root in which to find the membership
+   * @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
    * witness.
    * @param blockHash - The block hash to find in the archive tree.
    * @returns The membership witness containing the leaf index and sibling path
-   */ getBlockHashMembershipWitness(anchorBlockHash, blockHash) {
-        return this.aztecNode.getBlockHashMembershipWitness(anchorBlockHash, blockHash);
+   */ 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));
     }
     /**
    * Returns a nullifier membership witness for a given nullifier at a given block.
@@ -137,7 +158,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * @param nullifier - Nullifier we try to find witness for.
    * @returns The nullifier membership witness (if found).
    */ getNullifierMembershipWitness(blockHash, nullifier) {
-        return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
+        return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
     }
     /**
    * Returns a low nullifier membership witness for a given nullifier at a given block.
@@ -148,7 +169,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * 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.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
+        return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
     }
     /**
    * Returns a public data tree witness for a given leaf slot at a given block.
@@ -156,7 +177,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * @param leafSlot - The slot of the public data tree to get the witness for.
    * @returns - The witness
    */ getPublicDataWitness(blockHash, leafSlot) {
-        return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
+        return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
     }
     /**
    * Fetches a block header of a given block.
@@ -174,7 +195,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * Retrieve the public keys and partial address associated to a given address.
    * @param account - The account address.
    * @returns The public keys and partial address, or `undefined` if the account is not registered.
-   */ async tryGetPublicKeysAndPartialAddress(account) {
+   */ async getPublicKeysAndPartialAddress(account) {
         const completeAddress = await this.addressStore.getCompleteAddress(account);
         if (!completeAddress) {
             return undefined;
@@ -204,10 +225,9 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         return instance;
     }
     /**
-   * Returns an auth witness for the given message hash. Checks on the list of transient witnesses
-   * for this transaction first, and falls back to the local database if not found.
+   * Returns an auth witness for the given message hash from the list of transient witnesses for this transaction.
    * @param messageHash - Hash of the message to authenticate.
-   * @returns Authentication witness for the requested message hash.
+   * @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);
     }
@@ -261,7 +281,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * Check if a nullifier exists in the nullifier tree.
    * @param innerNullifier - The inner nullifier.
    * @returns A boolean indicating whether the nullifier exists in the tree or not.
-   */ async checkNullifierExists(innerNullifier) {
+   */ async doesNullifierExist(innerNullifier) {
         const [nullifier, anchorBlockHash] = await Promise.all([
             siloNullifier(this.contractAddress, innerNullifier),
             this.anchorBlockHeader.hash()
@@ -272,14 +292,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
         return leafIndex?.data !== undefined;
     }
     /**
-   * Fetches a message from the executionStore, given its key.
+   * Returns the membership witness of an un-nullified L1 to L2 message.
    * @param contractAddress - Address of a contract by which the message was emitted.
    * @param messageHash - Hash of the message.
    * @param secret - Secret used to compute a nullifier.
    * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
    * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
    */ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
-        const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
+        const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
         return new MessageLoadOracleInputs(messageIndex, siblingPath);
     }
     /**
@@ -288,155 +308,228 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
    * @param contractAddress - The address to read storage from.
    * @param startStorageSlot - The starting storage slot.
    * @param numberOfElements - Number of elements to read from the starting storage slot.
-   */ async storageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
-        const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
-        const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
-        this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
-        return values;
+   */ getFromPublicStorage(blockHash, contractAddress, startStorageSlot, numberOfElements) {
+        return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
+            const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
+            const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
+            this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
+            return values;
+        });
     }
     /**
-   * Returns a per-contract logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
+   * Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
    */ async #getContractLogger() {
         if (!this.contractLogger) {
             // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
             // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
-            this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
+            this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'user', {
                 instanceId: this.jobId
             });
         }
         return this.contractLogger;
     }
+    /**
+   * Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
+   */ async #getAztecnrLogger() {
+        if (!this.aztecnrLogger) {
+            // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
+            // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
+            this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'aztecnr', {
+                instanceId: this.jobId
+            });
+        }
+        return this.aztecnrLogger;
+    }
     async log(level, message, fields) {
         if (!LogLevels[level]) {
             throw new Error(`Invalid log level: ${level}`);
         }
-        const logger = await this.#getContractLogger();
-        logContractMessage(logger, LogLevels[level], message, fields);
+        const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
+        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);
     }
-    async fetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
-        const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
-        await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
+    /** Fetches pending tagged logs into a freshly allocated ephemeral array and returns its base slot. */ async getPendingTaggedLogsV2(scope) {
+        const logService = this.#createLogService();
+        const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
+        return this.ephemeralArrayService.newArray(logs.map((log)=>log.toFields()));
+    }
+    #createLogService() {
+        return new LogService(this.aztecNode, this.anchorBlockHeader, this.l2TipsStore, this.keyStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
     }
     /**
-   * Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
-   * `enqueue_event_for_validation`, inserting them into the note database and event store respectively, making them
-   * queryable via `get_notes` and `getPrivateEvents`.
+   * Legacy: validates note/event requests stored in capsule arrays.
    *
-   * This automatically clears both validation request queues, so no further work needs to be done by the caller.
-   * @param contractAddress - The address of the contract that the logs are tagged for.
-   * @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
-   * @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
-   */ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen) {
+   * 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}`);
         }
-        // We read all note and event validation 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 noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
-        const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
+        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);
+    }
+    /**
+   * 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) {
         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, request.recipient));
+        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, request.recipient));
+        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
         ]);
-        // Requests are cleared once we're done.
-        await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
-        await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
     }
-    async bulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
+    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.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
-        const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
-        const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
+        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.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
+        await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
         // The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
-        await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
+        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);
+        const logService = this.#createLogService();
+        const maybeLogRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
+        return this.ephemeralArrayService.newArray(maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption));
     }
-    async utilityResolveMessageContexts(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot) {
+    // 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}`);
             }
-            const requestCapsules = await this.capsuleStore.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId);
+            // 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.resolveMessageContexts(txHashes, this.anchorBlockHeader.getBlockNumber());
+            const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
             // Leave response in response capsule array.
-            await this.capsuleStore.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageTxContext.toSerializedOption), this.jobId);
+            await this.capsuleService.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
         } finally{
-            await this.capsuleStore.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId);
+            await this.capsuleService.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
         }
     }
-    storeCapsule(contractAddress, slot, capsule) {
+    /** 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];
+        });
+        const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
+        return this.ephemeralArrayService.newArray(maybeMessageContexts.map(MessageContext.toSerializedOption));
+    }
+    setCapsule(contractAddress, slot, capsule, 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`);
         }
-        this.capsuleStore.storeCapsule(this.contractAddress, slot, capsule, this.jobId);
-        return Promise.resolve();
+        this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
     }
-    async loadCapsule(contractAddress, slot) {
+    getCapsule(contractAddress, slot, 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(// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
-        this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
+        return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
     }
-    deleteCapsule(contractAddress, slot) {
+    deleteCapsule(contractAddress, slot, 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`);
         }
-        this.capsuleStore.deleteCapsule(this.contractAddress, slot, this.jobId);
-        return Promise.resolve();
+        this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
     }
-    copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
+    copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, 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.capsuleStore.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries, this.jobId);
+        return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
     }
     /**
    * Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
    * stored notes or events are discovered.
-   */ invalidateContractSyncCache(contractAddress, scopes) {
+   */ setContractSyncCacheInvalid(contractAddress, scopes) {
         if (!contractAddress.equals(this.contractAddress)) {
             throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
         }
         this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
     }
     // TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
-    aes128Decrypt(ciphertext, iv, symKey) {
+    decryptAes128(ciphertext, iv, symKey) {
         const aes128 = new Aes128();
         return aes128.decryptBufferCBC(ciphertext, iv, symKey);
     }
     /**
-   * Retrieves the shared secret for a given address and ephemeral public key.
+   * 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.
-   * @returns The secret for the given address.
-   */ async getSharedSecret(address, ephPk) {
-        // TODO(#12656): return an app-siloed secret
+   * @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) {
+        if (!contractAddress.equals(this.contractAddress)) {
+            throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
+        }
         const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
         const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
         const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
-        return deriveEcdhSharedSecret(addressSecret, ephPk);
+        return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
+    }
+    pushEphemeral(slot, elements) {
+        return this.ephemeralArrayService.push(slot, elements);
+    }
+    popEphemeral(slot) {
+        return this.ephemeralArrayService.pop(slot);
+    }
+    getEphemeral(slot, index) {
+        return this.ephemeralArrayService.get(slot, index);
+    }
+    setEphemeral(slot, index, elements) {
+        this.ephemeralArrayService.set(slot, index, elements);
+    }
+    getEphemeralLen(slot) {
+        return this.ephemeralArrayService.len(slot);
+    }
+    removeEphemeral(slot, index) {
+        this.ephemeralArrayService.remove(slot, index);
+    }
+    clearEphemeral(slot) {
+        this.ephemeralArrayService.clear(slot);
     }
     emitOffchainEffect(data) {
         this.offchainEffects.push({
@@ -448,4 +541,20 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
     /** Returns offchain effects collected during execution. */ getOffchainEffects() {
         return this.offchainEffects;
     }
+    /** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
+        const [response] = await Promise.all([
+            query(),
+            (async ()=>{
+                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()}).`);
+                }
+            })()
+        ]);
+        return response;
+    }
 }

package/dest/contract_function_simulator/pick_notes.d.ts

@@ -82,4 +82,4 @@ interface ContainsNote {
  */
 export declare function pickNotes<T extends ContainsNote>(noteDatas: T[], { selects, sorts, limit, offset }: GetOptions): T[];
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGlja19ub3Rlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9waWNrX25vdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssSUFBSSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFM0QsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRSxNQUFNLENBQUM7Q0FDaEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxNQUFNO0lBQ3JCOztPQUVHO0lBQ0gsUUFBUSxFQUFFLGdCQUFnQixDQUFDO0lBQzNCOztPQUVHO0lBQ0gsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUNWOztPQUVHO0lBQ0gsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QjtBQUVEOztHQUVHO0FBQ0gsb0JBQVksU0FBUztJQUNuQixJQUFJLElBQUk7SUFDUixJQUFJLElBQUk7SUFDUixHQUFHLElBQUk7Q0FDUjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLElBQUk7SUFDbkI7O09BRUc7SUFDSCxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0I7O09BRUc7SUFDSCxLQUFLLEVBQUUsU0FBUyxDQUFDO0NBQ2xCO0FBRUQ7O0dBRUc7QUFDSCxVQUFVLFVBQVU7SUFDbEI7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbkI7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFDZjs7O09BR0c7SUFDSCxLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZjs7O09BR0c7SUFDSCxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakI7QUFFRDs7R0FFRztBQUNILFVBQVUsWUFBWTtJQUNwQjs7T0FFRztJQUNILElBQUksRUFBRSxJQUFJLENBQUM7Q0FDWjtBQThDRDs7R0FFRztBQUNILHdCQUFnQixTQUFTLENBQUMsQ0FBQyxTQUFTLFlBQVksRUFDOUMsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUNkLEVBQUUsT0FBWSxFQUFFLEtBQVUsRUFBRSxLQUFTLEVBQUUsTUFBVSxFQUFFLEVBQUUsVUFBVSxHQUM5RCxDQUFDLEVBQUUsQ0FJTCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGlja19ub3Rlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9waWNrX25vdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssSUFBSSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFM0QsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRSxNQUFNLENBQUM7Q0FDaEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxNQUFNO0lBQ3JCOztPQUVHO0lBQ0gsUUFBUSxFQUFFLGdCQUFnQixDQUFDO0lBQzNCOztPQUVHO0lBQ0gsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUNWOztPQUVHO0lBQ0gsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QjtBQUVEOztHQUVHO0FBQ0gsb0JBQVksU0FBUztJQUNuQixJQUFJLElBQUk7SUFDUixJQUFJLElBQUk7SUFDUixHQUFHLElBQUk7Q0FDUjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLElBQUk7SUFDbkI7O09BRUc7SUFDSCxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0I7O09BRUc7SUFDSCxLQUFLLEVBQUUsU0FBUyxDQUFDO0NBQ2xCO0FBRUQ7O0dBRUc7QUFDSCxVQUFVLFVBQVU7SUFDbEI7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbkI7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFDZjs7O09BR0c7SUFDSCxLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZjs7O09BR0c7SUFDSCxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakI7QUFFRDs7R0FFRztBQUNILFVBQVUsWUFBWTtJQUNwQjs7T0FFRztJQUNILElBQUksRUFBRSxJQUFJLENBQUM7Q0FDWjtBQWlFRDs7R0FFRztBQUNILHdCQUFnQixTQUFTLENBQUMsQ0FBQyxTQUFTLFlBQVksRUFDOUMsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUNkLEVBQUUsT0FBWSxFQUFFLEtBQVUsRUFBRSxLQUFTLEVBQUUsTUFBVSxFQUFFLEVBQUUsVUFBVSxHQUM5RCxDQUFDLEVBQUUsQ0FJTCJ9

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

@@ -1 +1 @@
-{"version":3,"file":"pick_notes.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/pick_notes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,EAAE,CAAC;IACV;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,GAAG,IAAI;CACR;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,UAAU;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,YAAY;IACpB;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;CACZ;AA8CD;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,YAAY,EAC9C,SAAS,EAAE,CAAC,EAAE,EACd,EAAE,OAAY,EAAE,KAAU,EAAE,KAAS,EAAE,MAAU,EAAE,EAAE,UAAU,GAC9D,CAAC,EAAE,CAIL"}
+{"version":3,"file":"pick_notes.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/pick_notes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,EAAE,CAAC;IACV;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,GAAG,IAAI;CACR;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,UAAU;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,YAAY;IACpB;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;CACZ;AAiED;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,YAAY,EAC9C,SAAS,EAAE,CAAC,EAAE,EACd,EAAE,OAAY,EAAE,KAAU,EAAE,KAAS,EAAE,MAAU,EAAE,EAAE,UAAU,GAC9D,CAAC,EAAE,CAIL"}

package/dest/contract_function_simulator/pick_notes.js

@@ -9,9 +9,22 @@ import { Comparator } from '@aztec/stdlib/note';
     return SortOrder;
 }({});
 const selectPropertyFromPackedNoteContent = (noteData, selector)=>{
+    if (selector.index >= noteData.length) {
+        throw new Error(`Property selector index ${selector.index} out of bounds for note with ${noteData.length} fields`);
+    }
+    if (selector.offset + selector.length > Fr.SIZE_IN_BYTES) {
+        throw new Error(`Property selector range (offset=${selector.offset}, length=${selector.length}) exceeds Fr buffer size of ${Fr.SIZE_IN_BYTES} bytes`);
+    }
     const noteValueBuffer = noteData[selector.index].toBuffer();
-    const noteValue = noteValueBuffer.subarray(selector.offset, selector.offset + selector.length);
-    return Fr.fromBuffer(noteValue);
+    // Noir's PropertySelector counts offset from the LSB (last byte of the big-endian buffer),
+    // so offset=0,length=Fr.SIZE_IN_BYTES reads the entire field, and offset=0,length=1 reads the last byte.
+    const start = Fr.SIZE_IN_BYTES - selector.offset - selector.length;
+    const end = Fr.SIZE_IN_BYTES - selector.offset;
+    const noteValue = noteValueBuffer.subarray(start, end);
+    // Left-pad to Fr.SIZE_IN_BYTES so Fr.fromBuffer interprets the value correctly.
+    const padded = Buffer.alloc(Fr.SIZE_IN_BYTES);
+    noteValue.copy(padded, Fr.SIZE_IN_BYTES - noteValue.length);
+    return Fr.fromBuffer(padded);
 };
 const selectNotes = (noteDatas, selects)=>noteDatas.filter((noteData)=>selects.every(({ selector, value, comparator })=>{
             const noteValueFr = selectPropertyFromPackedNoteContent(noteData.note.items, selector);
@@ -23,7 +36,11 @@ const selectNotes = (noteDatas, selects)=>noteDatas.filter((noteData)=>selects.e
                 [Comparator.GT]: ()=>!noteValueFr.lt(value) && !noteValueFr.equals(value),
                 [Comparator.GTE]: ()=>!noteValueFr.lt(value)
             };
-            return comparatorSelector[comparator]();
+            const fn = comparatorSelector[comparator];
+            if (!fn) {
+                throw new Error(`Invalid comparator value: ${comparator}`);
+            }
+            return fn();
         }));
 const sortNotes = (a, b, sorts, level = 0)=>{
     if (sorts[level] === undefined) {

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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJveGllZF9jb250cmFjdF9kYXRhX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9wcm94aWVkX2NvbnRyYWN0X2RhdGFfc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFPakYscUJBQWEsMkJBQTJCO0lBQ3RDLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLGFBQWEsRUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsaUJBcUV4RTtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJveGllZF9jb250cmFjdF9kYXRhX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9wcm94aWVkX2NvbnRyYWN0X2RhdGFfc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFPakYscUJBQWEsMkJBQTJCO0lBQ3RDLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLGFBQWEsRUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsaUJBNEV4RTtDQUNGIn0=

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,iBAqExE;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;AAOjF,qBAAa,2BAA2B;IACtC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,iBAAiB,iBA4ExE;CACF"}