@aztec/pxe 0.0.1-commit.b9865e97 → 0.0.1-commit.be03c316

package/dest/contract_function_simulator/oracle/utility_execution_oracle.js

@@ -1,29 +1,32 @@
-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 { Point } from '@aztec/foundation/curves/grumpkin';
 import { LogLevels, createLogger } from '@aztec/foundation/log';
-import { MembershipWitness } from '@aztec/foundation/trees';
 import { ExecutionError, extractCallStack, resolveAssertionMessageFromError, toACVMWitness, witnessMapToFields } from '@aztec/simulator/client';
+import { STANDARD_HANDSHAKE_REGISTRY_ADDRESS } from '@aztec/standard-contracts/handshake-registry/constants';
+import { FunctionSelector } from '@aztec/stdlib/abi';
 import { siloNullifier } from '@aztec/stdlib/hash';
-import { PublicKeys, computeAddressSecret, hashPublicKey } from '@aztec/stdlib/keys';
-import { AppTaggingSecret, MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
-import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
+import { computeAddressSecret, hashPublicKey } from '@aztec/stdlib/keys';
+import { AppTaggingSecret, FlatPublicLogs, appSiloEcdhSharedSecret } from '@aztec/stdlib/logs';
+import { getL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { TxEffect } from '@aztec/stdlib/tx';
+import { CallContext } 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 { assertAllowedScope } from '../../storage/allowed_scopes.js';
+import { FactCollectionKey, FactCollectionTypeKey, anchoredTipBlockNumbers } from '../../storage/fact_store/index.js';
+import { AztecNodeReadCache } from '../aztec_node_read_cache.js';
 import { EphemeralArrayService } from '../ephemeral_array_service.js';
 import { BoundedVec } from '../noir-structs/bounded_vec.js';
 import { EphemeralArray } from '../noir-structs/ephemeral_array.js';
+import { emptyFactCollection, toNoirFactCollection } from '../noir-structs/fact_collection.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';
+import { buildACIRCallback } from './acir_callback.js';
 /**
  * The oracle for an execution of utility contract functions.
  */ export class UtilityExecutionOracle {
@@ -33,22 +36,25 @@ import { Oracle } from './oracle.js';
     aztecnrLogger;
     offchainEffects = [];
     ephemeralArrayService = new EphemeralArrayService();
+    transientArrayService;
+    aztecNodeReadCache;
     // We store oracle version to be able to show a nice error message when an oracle handler is missing.
     contractOracleVersion;
-    contractAddress;
+    callContext;
     authWitnesses;
     capsules;
     anchorBlockHeader;
-    contractStore;
+    anchoredContractData;
     noteStore;
     keyStore;
     addressStore;
     aztecNode;
     recipientTaggingStore;
-    senderAddressBookStore;
+    taggingSecretSourcesStore;
     capsuleService;
+    factService;
     privateEventStore;
-    messageContextService;
+    txResolver;
     contractSyncService;
     l2TipsStore;
     jobId;
@@ -58,20 +64,21 @@ import { Oracle } from './oracle.js';
     hooks;
     utilityExecutor;
     constructor(args){
-        this.contractAddress = args.contractAddress;
+        this.callContext = args.callContext;
         this.authWitnesses = args.authWitnesses;
         this.capsules = args.capsules;
         this.anchorBlockHeader = args.anchorBlockHeader;
-        this.contractStore = args.contractStore;
+        this.anchoredContractData = args.anchoredContractData;
         this.noteStore = args.noteStore;
         this.keyStore = args.keyStore;
         this.addressStore = args.addressStore;
         this.aztecNode = args.aztecNode;
         this.recipientTaggingStore = args.recipientTaggingStore;
-        this.senderAddressBookStore = args.senderAddressBookStore;
+        this.taggingSecretSourcesStore = args.taggingSecretSourcesStore;
         this.capsuleService = args.capsuleService;
+        this.factService = args.factService;
         this.privateEventStore = args.privateEventStore;
-        this.messageContextService = args.messageContextService;
+        this.txResolver = args.txResolver;
         this.contractSyncService = args.contractSyncService;
         this.l2TipsStore = args.l2TipsStore;
         this.jobId = args.jobId;
@@ -80,6 +87,8 @@ import { Oracle } from './oracle.js';
         this.simulator = args.simulator;
         this.hooks = args.hooks;
         this.utilityExecutor = args.utilityExecutor;
+        this.transientArrayService = args.transientArrayService;
+        this.aztecNodeReadCache = new AztecNodeReadCache(args.aztecNode);
     }
     assertCompatibleOracleVersion(major, minor) {
         if (major !== ORACLE_VERSION_MAJOR) {
@@ -99,15 +108,20 @@ import { Oracle } from './oracle.js';
         return Fr.random();
     }
     getUtilityContext() {
-        return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
+        return {
+            blockHeader: this.anchorBlockHeader,
+            contractAddress: this.callContext.contractAddress,
+            msgSender: this.callContext.msgSender
+        };
     }
     /**
    * Retrieve keys associated with a specific master public key and app address.
    * @param pkMHash - The master public key hash.
+   * @param _keyIndex - Sent by the Noir oracle caller but unused here; kept to match the oracle signature.
    * @returns A Promise that resolves to nullifier keys.
    * @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) {
+   */ async getKeyValidationRequest(pkMHash, _keyIndex) {
         let hasAccess = false;
         for(let i = 0; i < this.scopes.length && !hasAccess; i++){
             if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
@@ -146,8 +160,13 @@ import { Oracle } from './oracle.js';
         // 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.
-        const witness = await this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
-        return witness ? Option.some(witness) : Option.none(MembershipWitness.empty(ARCHIVE_HEIGHT));
+        const witness = await this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNodeReadCache.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
+        return witness ? Option.some(witness) : Option.none();
+    }
+    /** Returns whether each block hash is present in the archive tree at the referenced block. */ async areBlockHashesInArchive(referenceBlockHash, blockHashes) {
+        const hashes = blockHashes.readAll(this.ephemeralArrayService);
+        const memberships = await this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>Promise.all(hashes.map((blockHash)=>this.aztecNodeReadCache.getBlockHashMembershipWitness(referenceBlockHash, blockHash).then(Boolean))));
+        return EphemeralArray.fromValues(this.ephemeralArrayService, memberships);
     }
     /**
    * Returns a nullifier membership witness for a given nullifier at a given block.
@@ -182,7 +201,7 @@ import { Oracle } from './oracle.js';
    * @param leafSlot - The slot of the public data tree to get the witness for.
    * @returns - The witness
    */ async getPublicDataWitness(blockHash, leafSlot) {
-        const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
+        const witness = await this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNodeReadCache.getPublicDataWitness(blockHash, leafSlot));
         if (!witness) {
             throw new Error(`Public data witness not found for slot ${leafSlot} at block hash ${blockHash.toString()}.`);
         }
@@ -214,10 +233,7 @@ import { Oracle } from './oracle.js';
    */ async getPublicKeysAndPartialAddress(account) {
         const completeAddress = await this.addressStore.getCompleteAddress(account);
         if (!completeAddress) {
-            return Option.none({
-                publicKeys: PublicKeys.default(),
-                partialAddress: Fr.ZERO
-            });
+            return Option.none();
         }
         return Option.some({
             publicKeys: completeAddress.publicKeys,
@@ -228,7 +244,7 @@ import { Oracle } from './oracle.js';
         const completeAddress = await this.addressStore.getCompleteAddress(account);
         if (!completeAddress) {
             throw new Error(`No public key registered for address ${account}.
-        Register it by calling pxe.addAccount(...).\nSee docs for context: https://docs.aztec.network/developers/resources/debugging/aztecnr-errors#simulation-error-no-public-key-registered-for-address-0x0-register-it-by-calling-pxeregisterrecipient-or-pxeregisteraccount`);
+        Register it by calling wallet.registerSender(...).\nSee docs for context: https://docs.aztec.network/errors/14`);
         }
         return completeAddress;
     }
@@ -237,7 +253,7 @@ import { Oracle } from './oracle.js';
    * @param address - Address.
    * @returns A contract instance.
    */ async getContractInstance(address) {
-        const instance = await this.contractStore.getContractInstance(address);
+        const instance = await this.anchoredContractData.getContractInstance(address);
         if (!instance) {
             throw new Error(`No contract instance found for address ${address.toString()}`);
         }
@@ -320,15 +336,17 @@ import { Oracle } from './oracle.js';
         return leafIndex?.data !== undefined;
     }
     /**
-   * Returns the membership witness of an un-nullified L1 to L2 message.
-   * @param contractAddress - Address of a contract by which the message was emitted.
+   * Returns the membership witness of an L1 to L2 message.
    * @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
+   * @param nullifier - When present, the unsiloed nullifier of the message and the address to silo it with. The witness
+   * is only returned if the siloed nullifier is absent from the nullifier tree, i.e. the message has not been consumed.
    * @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, await this.anchorBlockHeader.hash());
-        return new MessageLoadOracleInputs(messageIndex, siblingPath);
+   */ async getL1ToL2MembershipWitnessV2(messageHash, nullifier) {
+        const [messageIndex, siblingPath] = await getL1ToL2MessageWitness(this.aztecNode, messageHash, nullifier.value, await this.anchorBlockHeader.hash());
+        return {
+            index: messageIndex,
+            siblingPath
+        };
     }
     /**
    * Read the public storage data.
@@ -338,9 +356,8 @@ import { Oracle } from './oracle.js';
    * @param numberOfElements - Number of elements to read from the starting storage slot.
    */ 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(', ')}]`);
+            const values = await this.aztecNodeReadCache.getPublicStorageRange(blockHash, contractAddress, startStorageSlot, numberOfElements);
+            this.logger.debug(`Oracle storage read: start=${startStorageSlot.toString()} count=${numberOfElements} ` + `address=${contractAddress.toString()} values=[${values.join(', ')}]`);
             return values;
         });
     }
@@ -350,7 +367,7 @@ import { Oracle } from './oracle.js';
         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), 'user', {
+            this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.anchoredContractData.getDebugContractName(addr), 'user', {
                 instanceId: this.jobId
             });
         }
@@ -362,7 +379,7 @@ import { Oracle } from './oracle.js';
         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', {
+            this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.anchoredContractData.getDebugContractName(addr), 'aztecnr', {
                 instanceId: this.jobId
             });
         }
@@ -376,14 +393,14 @@ import { Oracle } from './oracle.js';
         const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
         logContractMessage(logger, LogLevels[level], strippedMessage, fields);
     }
-    /** Fetches pending tagged logs into a freshly allocated ephemeral array and returns it. */ async getPendingTaggedLogs(scope, providedSecrets) {
+    /** Fetches pending tagged logs into a freshly allocated ephemeral array and returns it. */ async getPendingTaggedLogsV2(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, 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());
+        return new LogService(this.aztecNode, this.anchorBlockHeader, this.l2TipsStore, this.keyStore, this.recipientTaggingStore, this.taggingSecretSourcesStore, this.addressStore, this.scopes, this.jobId, this.logger.getBindings());
     }
     async validateAndStoreEnqueuedNotesAndEvents(noteValidationRequests, eventValidationRequests, scope) {
         await this.#processValidationRequests(noteValidationRequests.readAll(this.ephemeralArrayService), eventValidationRequests.readAll(this.ephemeralArrayService), scope);
@@ -400,7 +417,7 @@ import { Oracle } from './oracle.js';
             eventService.validateAndStoreEvents(eventValidationRequests, scope, txEffects)
         ]);
     }
-    async getLogsByTag(requests) {
+    async getLogsByTagV2(requests) {
         const logRetrievalRequests = requests.readAll(this.ephemeralArrayService);
         const logService = this.#createLogService();
         const logRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
@@ -408,10 +425,10 @@ import { Oracle } from './oracle.js';
         const innerArrays = logRetrievalResponses.map((responses)=>EphemeralArray.fromValues(this.ephemeralArrayService, responses));
         return EphemeralArray.fromValues(this.ephemeralArrayService, innerArrays);
     }
-    /** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response array. */ async getMessageContextsByTxHash(requests) {
+    /** Given an array of tx hashes, returns an aligned array of tx info if the tx is available. */ async getResolvedTxs(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()));
+        const resolved = await this.txResolver.resolveTxs(txHashes, this.anchorBlockHeader.getBlockNumber());
+        const options = resolved.map((r)=>r ? Option.some(r) : Option.none());
         return EphemeralArray.fromValues(this.ephemeralArrayService, options);
     }
     /**
@@ -421,42 +438,74 @@ import { Oracle } from './oracle.js';
         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
-        });
-        if (!receipt.isMined() || !receipt.txEffect || receipt.blockNumber > this.anchorBlockHeader.getBlockNumber()) {
-            return Option.none(TxEffect.empty());
+        return await this.#getTxEffectOption(txHash);
+    }
+    /** Fetches transaction effects for all hashes, preserving request order. */ async getTxEffects(txHashes) {
+        const hashes = txHashes.readAll(this.ephemeralArrayService);
+        const invalidHash = hashes.find((txHash)=>txHash.hash.isZero());
+        if (invalidHash) {
+            throw new Error('Invalid tx hash passed into aztec_utl_getTxEffects oracle handler');
         }
-        return Option.some(receipt.txEffect);
+        const uniqueTxHashes = uniqueBy(hashes, (h)=>h.toString());
+        const options = await Promise.all(uniqueTxHashes.map((txHash)=>this.#getTxEffectOption(txHash)));
+        const optionsByHash = new Map(uniqueTxHashes.map((txHash, i)=>[
+                txHash.toString(),
+                options[i]
+            ]));
+        return EphemeralArray.fromValues(this.ephemeralArrayService, hashes.map((txHash)=>optionsByHash.get(txHash.toString())));
     }
     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.#assertOwnContract(contractAddress);
         this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, 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`);
-        }
+        this.#assertOwnContract(contractAddress);
         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));
+        return values ? Option.some(values) : Option.none({
+            length: tSize
+        });
     }
     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.#assertOwnContract(contractAddress);
         this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
     }
     copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, scope) {
+        this.#assertOwnContract(contractAddress);
+        return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
+    }
+    /**
+   * Asserts the executing contract may only access its own slice of PXE DB.
+   */ #assertOwnContract(contractAddress) {
         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.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
+    }
+    /**
+   * Records a fact into a collection. A `Some` origin block makes the fact retractable (pruned on reorg of that
+   * block), a `None` origin block makes it non-retractable, surviving reorgs.
+   */ recordFact(contractAddress, scope, factCollectionTypeId, factCollectionId, factTypeId, payload, originBlock) {
+        this.#assertOwnContract(contractAddress);
+        return this.factService.recordFact(new FactCollectionKey(contractAddress, scope, factCollectionTypeId, factCollectionId), factTypeId, payload.readAll(this.ephemeralArrayService), originBlock.isSome() ? originBlock.value : undefined, this.jobId);
+    }
+    /**
+   * Deletes a fact collection, removing all its facts. A no-op if no such collection exists.
+   */ deleteFactCollection(contractAddress, scope, factCollectionTypeId, factCollectionId) {
+        this.#assertOwnContract(contractAddress);
+        return this.factService.deleteFactCollection(new FactCollectionKey(contractAddress, scope, factCollectionTypeId, factCollectionId), this.jobId);
+    }
+    /**
+   * Returns a fact collection.
+   */ async getFactCollection(contractAddress, scope, factCollectionTypeId, factCollectionId) {
+        this.#assertOwnContract(contractAddress);
+        const tips = anchoredTipBlockNumbers(await this.l2TipsStore.getL2Tips(), this.anchorBlockHeader.getBlockNumber());
+        const collection = await this.factService.getFactCollection(new FactCollectionKey(contractAddress, scope, factCollectionTypeId, factCollectionId), tips, this.jobId);
+        return collection ? Option.some(toNoirFactCollection(this.ephemeralArrayService, contractAddress, scope, factCollectionTypeId, factCollectionId, collection.facts)) : Option.none(emptyFactCollection(this.ephemeralArrayService));
+    }
+    /** Returns every fact collection of `factCollectionTypeId`. */ async getFactCollectionsByType(contractAddress, scope, factCollectionTypeId) {
+        this.#assertOwnContract(contractAddress);
+        const tips = anchoredTipBlockNumbers(await this.l2TipsStore.getL2Tips(), this.anchorBlockHeader.getBlockNumber());
+        const collections = await this.factService.getFactCollectionsByType(new FactCollectionTypeKey(contractAddress, scope, factCollectionTypeId), tips, this.jobId);
+        return EphemeralArray.fromValues(this.ephemeralArrayService, collections.map((collection)=>toNoirFactCollection(this.ephemeralArrayService, collection.key.contractAddress, collection.key.scope, collection.key.factCollectionTypeId, collection.key.factCollectionId, collection.facts)));
     }
     /**
    * Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
@@ -472,7 +521,7 @@ import { Oracle } from './oracle.js';
         const capacity = ciphertext.maxLength;
         try {
             const aes128 = new Aes128();
-            const plaintext = await aes128.decryptBufferCBC(Buffer.from(ciphertext.data), iv, symKey);
+            const plaintext = await aes128.decryptBufferCBC(Buffer.from(ciphertext.data), Buffer.from(iv), Buffer.from(symKey));
             return Option.some(BoundedVec.from({
                 data: [
                     ...plaintext
@@ -480,9 +529,9 @@ import { Oracle } from './oracle.js';
                 maxLength: capacity
             }));
         } catch  {
-            return Option.none(BoundedVec.empty({
+            return Option.none({
                 maxLength: capacity
-            }));
+            });
         }
     }
     /**
@@ -490,17 +539,29 @@ import { Oracle } from './oracle.js';
    * @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 A new ephemeral array containing the computed shared secrets.
+   * @returns A new ephemeral array containing the computed shared secrets, or an empty array when the PXE does not
+   * hold the keys for `address`.
+   * @throws If `address` is not in the execution's allowed scopes.
    */ async getSharedSecrets(address, ephPks, contractAddress) {
         if (!contractAddress.equals(this.contractAddress)) {
             throw new Error(`getSharedSecrets called with contract address ${contractAddress}, expected ${this.contractAddress}`);
         }
-        const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
+        assertAllowedScope(address, this.scopes);
+        // An address can be in scope without the PXE holding its keys (e.g. syncing a registered but non-owned account),
+        // in which case no secrets can be derived and we return an empty array rather than failing.
+        const recipientCompleteAddress = await this.addressStore.getCompleteAddress(address);
+        if (!recipientCompleteAddress) {
+            this.logger.warn(`Computing shared secrets for address ${address} whose keys are not held - returning no secrets`, {
+                address,
+                contractAddress: this.contractAddress
+            });
+            return EphemeralArray.fromValues(this.ephemeralArrayService, []);
+        }
         const ivpkMHash = await hashPublicKey(recipientCompleteAddress.publicKeys.ivpkM);
         const ivskM = await this.keyStore.getMasterSecretKey(ivpkMHash);
         const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
         const ephPkPoints = ephPks.readAll(this.ephemeralArrayService);
-        const secrets = await Promise.all(ephPkPoints.map((ephPk)=>deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress)));
+        const secrets = await Promise.all(ephPkPoints.map(({ x, y })=>appSiloEcdhSharedSecret(addressSecret, new Point(x, y), this.contractAddress)));
         return EphemeralArray.fromValues(this.ephemeralArrayService, secrets);
     }
     pushEphemeral(slot, elements) {
@@ -524,6 +585,27 @@ import { Oracle } from './oracle.js';
     clearEphemeral(slot) {
         this.ephemeralArrayService.clear(slot);
     }
+    pushTransient(slot, elements) {
+        return this.transientArrayService.push(this.contractAddress, slot, elements);
+    }
+    popTransient(slot) {
+        return this.transientArrayService.pop(this.contractAddress, slot);
+    }
+    getTransient(slot, index) {
+        return this.transientArrayService.get(this.contractAddress, slot, index);
+    }
+    setTransient(slot, index, elements) {
+        this.transientArrayService.set(this.contractAddress, slot, index, elements);
+    }
+    getTransientLen(slot) {
+        return this.transientArrayService.len(this.contractAddress, slot);
+    }
+    removeTransient(slot, index) {
+        this.transientArrayService.remove(this.contractAddress, slot, index);
+    }
+    clearTransient(slot) {
+        this.transientArrayService.clear(this.contractAddress, slot);
+    }
     emitOffchainEffect(data) {
         this.offchainEffects.push({
             data,
@@ -532,48 +614,63 @@ import { Oracle } from './oracle.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);
+        const targetArtifact = await this.anchoredContractData.getFunctionArtifactWithDebugMetadata(targetContractAddress, functionSelector);
+        if (!targetArtifact) {
+            throw new Error(`Cannot call ${targetContractAddress}:${functionSelector}: the contract is not registered. ` + `Register it via wallet.registerContract(...).`);
+        }
         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`);
+            // Standard handshake registry reads are authorized by default; every other cross-contract call needs the hook.
+            if (!await isStandardHandshakeRegistryUtilityRead(targetContractAddress, functionSelector)) {
+                const [callerClassId, targetClassId] = await Promise.all([
+                    this.anchoredContractData.getCurrentClassId(this.contractAddress),
+                    this.anchoredContractData.getCurrentClassId(targetContractAddress)
+                ]);
+                if (!callerClassId || !targetClassId) {
+                    throw new Error(`Cannot authorize utility call from ${this.contractAddress} to ${targetContractAddress}: ` + `${!callerClassId ? this.contractAddress : targetContractAddress} is not registered.`);
+                }
+                const request = {
+                    caller: this.contractAddress,
+                    callerClassId,
+                    target: targetContractAddress,
+                    targetClassId,
+                    functionSelector,
+                    functionName: targetArtifact.name,
+                    args,
+                    callerContext: this.callerContext
+                };
+                const response = this.hooks?.authorizeUtilityCall ? await this.hooks.authorizeUtilityCall(request) : {
+                    authorized: false,
+                    reason: 'No authorizeUtilityCall hook 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,
+            callContext: CallContext.from({
+                msgSender: this.contractAddress,
+                contractAddress: targetContractAddress,
+                functionSelector,
+                isStaticCall: true
+            }),
             authWitnesses: this.authWitnesses,
             capsules: this.capsules,
             anchorBlockHeader: this.anchorBlockHeader,
-            contractStore: this.contractStore,
+            anchoredContractData: this.anchoredContractData,
             noteStore: this.noteStore,
             keyStore: this.keyStore,
             addressStore: this.addressStore,
             aztecNode: this.aztecNode,
             recipientTaggingStore: this.recipientTaggingStore,
-            senderAddressBookStore: this.senderAddressBookStore,
+            taggingSecretSourcesStore: this.taggingSecretSourcesStore,
             capsuleService: this.capsuleService,
+            factService: this.factService,
             privateEventStore: this.privateEventStore,
-            messageContextService: this.messageContextService,
+            txResolver: this.txResolver,
             contractSyncService: this.contractSyncService,
             l2TipsStore: this.l2TipsStore,
             jobId: this.jobId,
@@ -581,11 +678,12 @@ import { Oracle } from './oracle.js';
             simulator: this.simulator,
             hooks: this.hooks,
             utilityExecutor: this.utilityExecutor,
-            log: this.logger
+            log: this.logger,
+            // Shared across the whole execution tree: nested utility frames inherit the caller's transient-array store.
+            transientArrayService: this.transientArrayService
         });
         const initialWitness = toACVMWitness(0, args);
-        const acvmCallback = new Oracle(nestedOracle);
-        const acirExecutionResult = await this.simulator.executeUserCircuit(initialWitness, targetArtifact, acvmCallback.toACIRCallback()).catch((err)=>{
+        const acirExecutionResult = await this.simulator.executeUserCircuit(initialWitness, targetArtifact, buildACIRCallback(nestedOracle)).catch((err)=>{
             err.message = resolveAssertionMessageFromError(err, targetArtifact);
             throw new ExecutionError(err.message, {
                 contractAddress: targetContractAddress,
@@ -604,9 +702,7 @@ import { Oracle } from './oracle.js';
    * 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
-            })));
+        const fetched = await Promise.all(uniqueTxHashes.map((h)=>this.aztecNodeReadCache.getTxReceiptWithEffect(h)));
         return new Map(uniqueTxHashes.map((h, i)=>{
             const receipt = fetched[i];
             if (!receipt.isMined() || !receipt.txEffect) {
@@ -627,6 +723,25 @@ import { Oracle } from './oracle.js';
             ];
         }).filter((entry)=>entry[1] !== undefined));
     }
+    async #getTxEffectOption(txHash) {
+        const receipt = await this.aztecNodeReadCache.getTxReceiptWithEffect(txHash);
+        if (!receipt.isMined() || !receipt.txEffect || receipt.blockNumber > this.anchorBlockHeader.getBlockNumber()) {
+            return Option.none();
+        }
+        return Option.some(this.#toTxEffectData(receipt.txEffect));
+    }
+    #toTxEffectData(txEffect) {
+        return {
+            ...txEffect,
+            revertCode: txEffect.revertCode.getCode(),
+            publicLogs: FlatPublicLogs.fromLogs(txEffect.publicLogs),
+            contractClassLogs: txEffect.contractClassLogs.map((log)=>({
+                    contractAddress: log.contractAddress,
+                    fields: log.fields.toFields(),
+                    emittedLength: log.emittedLength
+                }))
+        };
+    }
     /** 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();
@@ -636,7 +751,7 @@ import { Oracle } from './oracle.js';
         const [response] = await Promise.all([
             query(),
             (async ()=>{
-                const block = await this.aztecNode.getBlock(blockHash);
+                const block = await this.aztecNodeReadCache.getBlock(blockHash);
                 const header = block?.header;
                 if (!header) {
                     throw new Error(`Could not find block header for block hash ${blockHash}`);
@@ -651,4 +766,30 @@ import { Oracle } from './oracle.js';
     /** The execution context of the current call. */ get callerContext() {
         return 'utility';
     }
+    /** The address of the contract whose function is being executed, from the call context. */ get contractAddress() {
+        return this.callContext.contractAddress;
+    }
+}
+// Registry reads that any contract may issue without an `authorizeUtilityCall` hook. The constrained-delivery
+// library calls these implicitly for the app, and they are safe to default-authorize: `get_app_siloed_secrets`
+// siloes every returned secret to `msg_sender`, and `get_non_interactive_handshakes` only exposes ephemeral public
+// keys, from which the shared secret cannot be derived without the recipient's secret keys.
+const STANDARD_HANDSHAKE_REGISTRY_DEFAULT_AUTHORIZED_READ_SIGNATURES = [
+    'get_non_interactive_handshakes((Field),u32)',
+    'get_app_siloed_secrets((Field),(Field))'
+];
+async function doesSelectorHaveSignature(functionSelector, signature) {
+    return functionSelector.equals(await FunctionSelector.fromSignature(signature));
+}
+/**
+ * Whether a cross-contract utility call targets one of the standard handshake registry's read functions.
+ *
+ * These reads are authorized by PXE for every wallet, without consulting the `authorizeUtilityCall` hook, so that
+ * wallets don't need to know the handshake registry exists in order to deliver and discover messages through it.
+ */ async function isStandardHandshakeRegistryUtilityRead(targetContractAddress, functionSelector) {
+    if (!targetContractAddress.equals(STANDARD_HANDSHAKE_REGISTRY_ADDRESS)) {
+        return false;
+    }
+    const matches = await Promise.all(STANDARD_HANDSHAKE_REGISTRY_DEFAULT_AUTHORIZED_READ_SIGNATURES.map((signature)=>doesSelectorHaveSignature(functionSelector, signature)));
+    return matches.some(Boolean);
 }