@aztec/pxe 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5a9928

package/dest/node/caching_aztec_node.js

@@ -0,0 +1,268 @@
+import { allToCompletion } from '@aztec/foundation/promise';
+import { BlockHash } from '@aztec/stdlib/block';
+import { withRecording } from './benchmarked_node.js';
+/**
+ * Wraps `node`, serving repeated reads from a cache the wrapper owns. Consumers share cached reads by sharing the
+ * wrapper.
+ *
+ * Only hash-pinned reads are cached. A block hash names immutable content, so the same call can never correctly answer
+ * differently, and even an `undefined` witness or leaf index is kept as a non-membership fact. That makes the wrapper
+ * safe for any consumer, whatever its anchor block. Uncached methods, and reads that name a block any other way (see
+ * {@link hashReferenceOf}), pass straight through. A few entries below opt out even when hash-pinned, where the answer
+ * can still change, and the tag queries opt in only once the request also stops short of blocks yet to be produced
+ * (see {@link hasImmutableAnswer}).
+ *
+ * Wiping (see {@link CachingAztecNode.wipeCache}) bounds memory. Correctness does not depend on it.
+ */ export function withCache(node) {
+    const cache = new AztecNodeCache();
+    // The recording wrapper sits below the cache, so a recording sees only the reads the node answered: a read served
+    // from the cache appears nowhere in it. Every read below goes to `source` rather than to `node`, and
+    // `startRecording` passes through this wrapper untouched.
+    const source = withRecording(node);
+    /** Runs `read` through `cache` when `block` pins a chain position by hash. Everything else goes to the node. */ const readCachedIfBlockIsHashPinned = (block, key, read, options)=>{
+        const blockHash = hashReferenceOf(block);
+        return blockHash === undefined ? read() : cache.fetch(key(blockHash.toString()), read, options);
+    };
+    const cachedReads = {
+        getBlock: (block, options)=>{
+            if (options?.includeL1PublishInfo || options?.includeAttestations) {
+                // These payloads keep changing after a block is fixed (its L1 publication status, its incoming committee
+                // attestations), so a repeat can correctly differ; read straight from the node.
+                return source.getBlock(block, options);
+            }
+            return readCachedIfBlockIsHashPinned(block, (blockHash)=>`block:${blockHash}:${keyPart(options)}`, ()=>source.getBlock(block, options), {
+                // PXE only asks for pinned blocks it has already observed, so an undefined answer means the node has not
+                // served the block yet, not that it never will.
+                shouldCache: (response)=>response !== undefined
+            });
+        },
+        getContract: (address, referenceBlock)=>readCachedIfBlockIsHashPinned(referenceBlock, (blockHash)=>`contract:${blockHash}:${address.toString()}`, ()=>source.getContract(address, referenceBlock)),
+        getBlockHashMembershipWitness: (referenceBlock, blockHash)=>readCachedIfBlockIsHashPinned(referenceBlock, (referenceHash)=>`block-hash-membership-witness:${referenceHash}:${blockHash.toString()}`, ()=>source.getBlockHashMembershipWitness(referenceBlock, blockHash)),
+        getPublicDataWitness: (referenceBlock, leafSlot)=>readCachedIfBlockIsHashPinned(referenceBlock, (blockHash)=>`public-data-witness:${blockHash}:${leafSlot.toString()}`, ()=>source.getPublicDataWitness(referenceBlock, leafSlot)),
+        getNoteHashMembershipWitness: (referenceBlock, noteHash)=>readCachedIfBlockIsHashPinned(referenceBlock, (blockHash)=>`note-hash-membership-witness:${blockHash}:${noteHash.toString()}`, ()=>source.getNoteHashMembershipWitness(referenceBlock, noteHash)),
+        getNullifierMembershipWitness: (referenceBlock, nullifier)=>readCachedIfBlockIsHashPinned(referenceBlock, (blockHash)=>`nullifier-membership-witness:${blockHash}:${nullifier.toString()}`, ()=>source.getNullifierMembershipWitness(referenceBlock, nullifier)),
+        getLowNullifierMembershipWitness: (referenceBlock, nullifier)=>readCachedIfBlockIsHashPinned(referenceBlock, (blockHash)=>`low-nullifier-membership-witness:${blockHash}:${nullifier.toString()}`, ()=>source.getLowNullifierMembershipWitness(referenceBlock, nullifier)),
+        getL1ToL2MessageMembershipWitness: (referenceBlock, l1ToL2Message)=>readCachedIfBlockIsHashPinned(referenceBlock, (blockHash)=>`l1-to-l2-message-membership-witness:${blockHash}:${l1ToL2Message.toString()}`, ()=>source.getL1ToL2MessageMembershipWitness(referenceBlock, l1ToL2Message)),
+        getPublicStorageAt: (referenceBlock, contractAddress, storageSlot)=>readCachedIfBlockIsHashPinned(referenceBlock, (blockHash)=>`public-storage:${blockHash}:${contractAddress.toString()}:${storageSlot.toString()}`, ()=>source.getPublicStorageAt(referenceBlock, contractAddress, storageSlot)),
+        findLeavesIndexes: (referenceBlock, treeId, leafValues)=>{
+            // Cached per leaf: only leaves without a cached result are fetched, in a single batched node call. The per-leaf
+            // keys don't fit single-key readCachedIfBlockIsHashPinned, so the hash gate is inline.
+            const referenceHash = hashReferenceOf(referenceBlock);
+            if (referenceHash === undefined) {
+                return source.findLeavesIndexes(referenceBlock, treeId, leafValues);
+            }
+            return readBatchedPerKey(cache, leafValues.map((leaf)=>`leaf-index:${referenceHash.toString()}:${treeId}:${leaf.toString()}`), (missing)=>source.findLeavesIndexes(referenceBlock, treeId, missing.map((i)=>leafValues[i])), {
+                method: 'findLeavesIndexes',
+                requested: 'leaves'
+            });
+        },
+        getPrivateLogsByTags: (query)=>{
+            if (!hasImmutableAnswer(query)) {
+                return source.getPrivateLogsByTags(query);
+            }
+            const keyPrefix = `private-logs:${privateLogsQueryKey(query)}`;
+            return readBatchedPerKey(cache, query.tags.map((tag)=>`${keyPrefix}:${tagQueryKey(tag)}`), (missing)=>source.getPrivateLogsByTags({
+                    ...query,
+                    tags: missing.map((i)=>query.tags[i])
+                }), {
+                method: 'getPrivateLogsByTags',
+                requested: 'tags'
+            });
+        },
+        getPublicLogsByTags: (query)=>{
+            if (!hasImmutableAnswer(query)) {
+                return source.getPublicLogsByTags(query);
+            }
+            const keyPrefix = `public-logs:${publicLogsQueryKey(query)}`;
+            return readBatchedPerKey(cache, query.tags.map((tag)=>`${keyPrefix}:${tagQueryKey(tag)}`), (missing)=>source.getPublicLogsByTags({
+                    ...query,
+                    tags: missing.map((i)=>query.tags[i])
+                }), {
+                method: 'getPublicLogsByTags',
+                requested: 'tags'
+            });
+        }
+    };
+    return new Proxy(source, {
+        get (target, prop) {
+            if (prop === 'wipeCache') {
+                return ()=>cache.wipe();
+            }
+            if (Object.hasOwn(cachedReads, prop)) {
+                return cachedReads[prop];
+            }
+            const value = Reflect.get(target, prop);
+            return typeof value === 'function' ? value.bind(target) : value;
+        }
+    });
+}
+/**
+ * Store of node read promises keyed by method and arguments.
+ *
+ * Holds no node reference of its own: it only memoizes promises handed to it by the {@link withCache} wrapper that
+ * owns it. Rejected promises are evicted so callers can retry. A settled value is kept unless the caller's
+ * `shouldCache` turns it away.
+ */ class AztecNodeCache {
+    cache = new Map();
+    /**
+   * Returns the cached promise for `key`, or runs `read` and caches the in-flight promise.
+   *
+   * `shouldCache` runs once the promise settles and answers whether its value is kept. Every settled value is kept by
+   * default. Callers waiting on a value that is then turned away still share the one in-flight read, so declining to
+   * keep a value costs nothing on concurrent reads.
+   */ fetch(key, read, { shouldCache } = {}) {
+        return this.#get(key) ?? this.#set(key, read(), shouldCache);
+    }
+    /**
+   * The cached promise for each of `keys`, `undefined` where there is none. For callers that batch their own misses
+   * rather than reading one key.
+   */ peekAll(keys) {
+        return keys.map((key)=>this.#get(key));
+    }
+    /**
+   * Clears the store.
+   */ wipe() {
+        this.cache.clear();
+    }
+    #get(key) {
+        return this.cache.get(key);
+    }
+    #set(key, promise, shouldCache) {
+        const evict = ()=>{
+            if (this.cache.get(key) === promise) {
+                this.cache.delete(key);
+            }
+        };
+        // A rejected read is evicted so callers can retry; a `shouldCache` that throws is treated the same way. The
+        // trailing catch keeps a throwing predicate from surfacing as an unhandled rejection on this detached promise.
+        promise.then((value)=>{
+            if (shouldCache && !shouldCache(value)) {
+                evict();
+            }
+        }, evict).catch(evict);
+        this.cache.set(key, promise);
+        return promise;
+    }
+}
+/**
+ * The block hash `block` pins to (a `BlockHash` or `{ hash }` reference), or `undefined` for every other way of naming
+ * a block.
+ *
+ * A number or a tag names a moving chain position, as does naming no block at all: a reorg can put a different block
+ * at the same number, and tags follow the growing chain. An `{ archive }` root is different, since it commits to every
+ * block hash up to its own block and so pins content as tightly as a hash. It stays uncached because no PXE read uses
+ * one: keeping an `undefined` answer as a non-membership fact is only sound because PXE pins blocks it has already
+ * seen, and that holds for the references PXE actually builds.
+ */ function hashReferenceOf(block) {
+    if (block instanceof BlockHash) {
+        return block;
+    }
+    if (typeof block === 'object' && block !== null && 'hash' in block) {
+        return block.hash;
+    }
+    return undefined;
+}
+/**
+ * Answers one result per entry of `keys`, taking whatever the cache already holds and fetching the rest in a single
+ * batched call. Each fetched result is cached under its own key, so a later call that overlaps this one fetches only
+ * the entries it has not seen, and a key repeated within `keys` is asked of the node once.
+ *
+ * `fetchMissing` receives the indexes still missing, in order, and must answer one result per requested index.
+ * `shortResponse` names the method and what it requests, for the error raised when it does not.
+ */ function readBatchedPerKey(cache, keys, fetchMissing, shortResponse) {
+    const cached = cache.peekAll(keys);
+    // One request per missing key rather than per missing position, so a key repeated in `keys` seeds a single entry
+    // that every position carrying it then reads.
+    const requestIndexByKey = new Map();
+    cached.forEach((result, index)=>{
+        if (result === undefined && !requestIndexByKey.has(keys[index])) {
+            requestIndexByKey.set(keys[index], index);
+        }
+    });
+    const fetchedByKey = new Map();
+    if (requestIndexByKey.size > 0) {
+        const requestedIndexes = [
+            ...requestIndexByKey.values()
+        ];
+        const batch = fetchMissing(requestedIndexes).then((fetched)=>{
+            if (fetched.length !== requestedIndexes.length) {
+                // Each entry is filled from the batch response by position. If the node returned fewer results than we asked
+                // for, the positions past the end would read undefined, which the cache keeps as a genuine answer, so a
+                // truncated response would be cached as fact. Rejecting the whole batch evicts those entries instead, so a
+                // retry re-fetches every one of them.
+                throw new Error(`${shortResponse.method} returned ${fetched.length} results for ${requestedIndexes.length} requested ` + `${shortResponse.requested}`);
+            }
+            return fetched;
+        });
+        [
+            ...requestIndexByKey.keys()
+        ].forEach((key, batchIndex)=>{
+            fetchedByKey.set(key, cache.fetch(key, ()=>batch.then((fetched)=>fetched[batchIndex])));
+        });
+    }
+    // Every position is answered: a cache hit, or the entry its key's request seeded just above.
+    return allToCompletion(keys.map((key, index)=>cached[index] ?? fetchedByKey.get(key)));
+}
+/**
+ * Whether a tag query's answer can no longer change, and so can be cached.
+ *
+ * Two things would let it change, and the query has to rule out both. `referenceBlock` names the chain the answer
+ * belongs to, so the call fails once that block is gone rather than answering from a chain that reorged. `toBlock`
+ * stops the query below the tip, so blocks yet to be produced cannot add logs to the answer. Where the query starts
+ * does not matter: an open lower end reaches only blocks that are already behind it, which no longer move. PXE's tag
+ * queries get both from the `getAll*LogsByTags` helpers, which take them from the anchor block the query is pinned to.
+ */ function hasImmutableAnswer(query) {
+    return query.referenceBlock !== undefined && query.toBlock !== undefined;
+}
+/** Cache-key segment for the parts of a private tag query that every tag in it shares. */ function privateLogsQueryKey(query) {
+    const parts = {
+        ...sharedQueryKeyParts(query)
+    };
+    return Object.values(parts).map(keyPart).join(':');
+}
+/** Cache-key segment for the parts of a public tag query that every tag in it shares. */ function publicLogsQueryKey(query) {
+    const parts = {
+        ...sharedQueryKeyParts(query),
+        contractAddress: query.contractAddress
+    };
+    return Object.values(parts).map(keyPart).join(':');
+}
+/** The key parts {@link PrivateLogsQuery} and {@link PublicLogsQuery} have in common. */ function sharedQueryKeyParts(query) {
+    return {
+        referenceBlock: query.referenceBlock,
+        fromBlock: query.fromBlock,
+        toBlock: query.toBlock,
+        txHash: query.txHash,
+        includeEffects: query.includeEffects,
+        limitPerTag: query.limitPerTag
+    };
+}
+/**
+ * Cache-key segment for one tag entry, covering the pagination cursor as well as the tag: each page of a tag's stream
+ * is a read of its own, and a repeated query asks for the same pages in the same order.
+ */ function tagQueryKey(entry) {
+    return 'tag' in entry ? `${keyPart(entry.tag)}@${keyPart(entry.afterLog)}` : keyPart(entry);
+}
+/**
+ * Renders a call argument as a stable cache-key segment, via its own `toString` when it has one, else as JSON.
+ *
+ * Example: the options object `{ includeTransactions: true }` renders as `'{"includeTransactions":true}'`, and an
+ * absent optional argument as `'undefined'`.
+ */ function keyPart(value) {
+    if ([
+        'string',
+        'number',
+        'bigint',
+        'boolean'
+    ].includes(typeof value)) {
+        return String(value);
+    }
+    if (value && typeof value === 'object') {
+        const toString = value.toString;
+        if (toString && toString !== Object.prototype.toString) {
+            return toString.call(value);
+        }
+        return JSON.stringify(value, (_key, nested)=>typeof nested === 'bigint' ? nested.toString() : nested);
+    }
+    return String(value);
+}

package/dest/notes/note_service.d.ts

@@ -1,10 +1,13 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { type InBlock } from '@aztec/stdlib/block';
 import { type AztecNode } from '@aztec/stdlib/interfaces/client';
 import { Note, NoteStatus } from '@aztec/stdlib/note';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader } from '@aztec/stdlib/tx';
+import type { NoteValidationRequest } from '../contract_function_simulator/noir-structs/note_validation_request.js';
 import type { NoteStore } from '../storage/note_store/note_store.js';
 export declare class NoteService {
+    #private;
     private readonly noteStore;
     private readonly aztecNode;
     private readonly anchorBlockHeader;
@@ -17,9 +20,9 @@ export declare class NoteService {
      *
      * @param owner - The owner of the notes. If undefined, returns notes for all known owners.
      * @param status - The status of notes to fetch.
-     * @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
+     * @param scopes - The accounts whose notes we can access in this call. An empty list matches no notes.
      */
-    getNotes(contractAddress: AztecAddress, owner: AztecAddress | undefined, storageSlot: Fr, status: NoteStatus, scopes?: AztecAddress[]): Promise<{
+    getNotes(contractAddress: AztecAddress, owner: AztecAddress | undefined, storageSlot: Fr, status: NoteStatus, scopes: AztecAddress[]): Promise<{
         contractAddress: AztecAddress;
         owner: AztecAddress;
         storageSlot: Fr;
@@ -42,7 +45,32 @@ export declare class NoteService {
      *
      * @param contractAddress - The contract whose notes should be checked and nullified.
      */
-    syncNoteNullifiers(contractAddress: AztecAddress): Promise<void>;
-    validateAndStoreNote(contractAddress: AztecAddress, owner: AztecAddress, storageSlot: Fr, randomness: Fr, noteNonce: Fr, content: Fr[], noteHash: Fr, nullifier: Fr, txHash: TxHash, recipient: AztecAddress): Promise<void>;
+    syncNoteNullifiers(contractAddress: AztecAddress, scopes: AztecAddress[]): Promise<void>;
+    /**
+     * Validates and stores a batch of notes against the pre-fetched onchain context of their txs.
+     *
+     * For each request we must verify that:
+     *  - the note actually exists in the corresponding tx effect (and thus in the note hash tree), and
+     *  - the note has not already been nullified.
+     *
+     * Failing to do either would result in circuits getting either non-existent notes and failing to produce inclusion
+     * proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which are catastrophic
+     * failure modes.
+     *
+     * Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
+     * emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
+     * so we must store both the note hash and nullifier block information.
+     *
+     * @param requests - The notes to validate and store.
+     * @param scope - The scope under which the notes are being stored.
+     * @param validationTxData - The onchain context of each request's tx, keyed by `TxHash.toString()`. Must contain
+     * entries for every request's txHash; missing entries are treated as a node bug and cause an error.
+     */
+    validateAndStoreNotes(requests: NoteValidationRequest[], scope: AztecAddress, validationTxData: ReadonlyMap<string, NoteValidationTxData>): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZXMvbm90ZV9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUdoRSxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RSxPQUFPLEVBQUUsSUFBSSxFQUFXLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUVyRSxxQkFBYSxXQUFXO0lBRXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUI7SUFDbEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBSnhCLFlBQ21CLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDNUI7SUFFSjs7Ozs7Ozs7T0FRRztJQUNVLFFBQVEsQ0FDbkIsZUFBZSxFQUFFLFlBQVksRUFDN0IsS0FBSyxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQy9CLFdBQVcsRUFBRSxFQUFFLEVBQ2YsTUFBTSxFQUFFLFVBQVUsRUFDbEIsTUFBTSxDQUFDLEVBQUUsWUFBWSxFQUFFOzs7Ozs7Ozs7O1NBeUJ4QjtJQUVEOzs7Ozs7Ozs7OztPQVdHO0lBQ1Usa0JBQWtCLENBQUMsZUFBZSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBc0M1RTtJQUVZLG9CQUFvQixDQUMvQixlQUFlLEVBQUUsWUFBWSxFQUM3QixLQUFLLEVBQUUsWUFBWSxFQUNuQixXQUFXLEVBQUUsRUFBRSxFQUNmLFVBQVUsRUFBRSxFQUFFLEVBQ2QsU0FBUyxFQUFFLEVBQUUsRUFDYixPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQ2IsUUFBUSxFQUFFLEVBQUUsRUFDWixTQUFTLEVBQUUsRUFBRSxFQUNiLE1BQU0sRUFBRSxNQUFNLEVBQ2QsU0FBUyxFQUFFLFlBQVksR0FDdEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXNFZjtDQUNGIn0=
+/** The onchain context of the tx a note validation request points at: where it was mined and its note hashes. */
+export type NoteValidationTxData = InBlock & {
+    noteHashes: Fr[];
+    txIndexInBlock: number;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZXMvbm90ZV9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQStCLEtBQUssT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFaEYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFlLE1BQU0saUNBQWlDLENBQUM7QUFDOUUsT0FBTyxFQUFFLElBQUksRUFBVyxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUvRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHdFQUF3RSxDQUFDO0FBQ3BILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXJFLHFCQUFhLFdBQVc7O0lBRXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUI7SUFDbEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBSnhCLFlBQ21CLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDNUI7SUFFSjs7Ozs7Ozs7T0FRRztJQUNVLFFBQVEsQ0FDbkIsZUFBZSxFQUFFLFlBQVksRUFDN0IsS0FBSyxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQy9CLFdBQVcsRUFBRSxFQUFFLEVBQ2YsTUFBTSxFQUFFLFVBQVUsRUFDbEIsTUFBTSxFQUFFLFlBQVksRUFBRTs7Ozs7Ozs7OztTQXlCdkI7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNVLGtCQUFrQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FxQnBHO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FtQkc7SUFDVSxxQkFBcUIsQ0FDaEMsUUFBUSxFQUFFLHFCQUFxQixFQUFFLEVBQ2pDLEtBQUssRUFBRSxZQUFZLEVBQ25CLGdCQUFnQixFQUFFLFdBQVcsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLENBQUMsR0FDMUQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWtHZjtDQVVGO0FBRUQsaUhBQWlIO0FBQ2pILE1BQU0sTUFBTSxvQkFBb0IsR0FBRyxPQUFPLEdBQUc7SUFDM0MsVUFBVSxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQ2pCLGNBQWMsRUFBRSxNQUFNLENBQUM7Q0FDeEIsQ0FBQyJ9

package/dest/notes/note_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_service.d.ts","sourceRoot":"","sources":["../../src/notes/note_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJxB,YACmB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EAC5B;IAEJ;;;;;;;;OAQG;IACU,QAAQ,CACnB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,UAAU,EAClB,MAAM,CAAC,EAAE,YAAY,EAAE;;;;;;;;;;SAyBxB;IAED;;;;;;;;;;;OAWG;IACU,kBAAkB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC5E;IAEY,oBAAoB,CAC/B,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,EAAE,EACd,SAAS,EAAE,EAAE,EACb,OAAO,EAAE,EAAE,EAAE,EACb,QAAQ,EAAE,EAAE,EACZ,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,IAAI,CAAC,CAsEf;CACF"}
+{"version":3,"file":"note_service.d.ts","sourceRoot":"","sources":["../../src/notes/note_service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAA+B,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEhF,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wEAAwE,CAAC;AACpH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE,qBAAa,WAAW;;IAEpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJxB,YACmB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EAC5B;IAEJ;;;;;;;;OAQG;IACU,QAAQ,CACnB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,YAAY,EAAE;;;;;;;;;;SAyBvB;IAED;;;;;;;;;;;OAWG;IACU,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBpG;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACU,qBAAqB,CAChC,QAAQ,EAAE,qBAAqB,EAAE,EACjC,KAAK,EAAE,YAAY,EACnB,gBAAgB,EAAE,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAC1D,OAAO,CAAC,IAAI,CAAC,CAkGf;CAUF;AAED,iHAAiH;AACjH,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG;IAC3C,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC"}

package/dest/notes/note_service.js

@@ -1,3 +1,5 @@
+import { chunk } from '@aztec/foundation/collection';
+import { allToCompletion } from '@aztec/foundation/promise';
 import { computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
 import { MAX_RPC_LEN } from '@aztec/stdlib/interfaces/client';
 import { Note, NoteDao } from '@aztec/stdlib/note';
@@ -20,7 +22,7 @@ export class NoteService {
    *
    * @param owner - The owner of the notes. If undefined, returns notes for all known owners.
    * @param status - The status of notes to fetch.
-   * @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
+   * @param scopes - The accounts whose notes we can access in this call. An empty list matches no notes.
    */ async getNotes(contractAddress, owner, storageSlot, status, scopes) {
         const noteDaos = await this.noteStore.getNotes({
             contractAddress,
@@ -52,28 +54,17 @@ export class NoteService {
    * This allows recent nullifications to be processed even if the node is not an archive node.
    *
    * @param contractAddress - The contract whose notes should be checked and nullified.
-   */ async syncNoteNullifiers(contractAddress) {
+   */ async syncNoteNullifiers(contractAddress, scopes) {
         const anchorBlockHash = await this.anchorBlockHeader.hash();
         const contractNotes = await this.noteStore.getNotes({
-            contractAddress
+            contractAddress,
+            scopes
         }, this.jobId);
         if (contractNotes.length === 0) {
             return;
         }
         const nullifiersToCheck = contractNotes.map((note)=>note.siloedNullifier);
-        const nullifierBatches = nullifiersToCheck.reduce((acc, nullifier)=>{
-            if (acc[acc.length - 1].length < MAX_RPC_LEN) {
-                acc[acc.length - 1].push(nullifier);
-            } else {
-                acc.push([
-                    nullifier
-                ]);
-            }
-            return acc;
-        }, [
-            []
-        ]);
-        const nullifierIndexes = (await Promise.all(nullifierBatches.map((batch)=>this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, batch)))).flat();
+        const nullifierIndexes = await this.#findNullifierIndexes(anchorBlockHash, nullifiersToCheck);
         const foundNullifiers = nullifiersToCheck.map((nullifier, i)=>{
             if (nullifierIndexes[i] !== undefined) {
                 return {
@@ -86,19 +77,29 @@ export class NoteService {
         }).filter((nullifier)=>nullifier !== undefined);
         await this.noteStore.applyNullifiers(foundNullifiers, this.jobId);
     }
-    async validateAndStoreNote(contractAddress, owner, storageSlot, randomness, noteNonce, content, noteHash, nullifier, txHash, recipient) {
-        // We are going to store the new note in the NoteStore, which will let us later return it via `getNotes`.
-        // There's two things we need to check before we do this however:
-        //  - we must make sure the note does actually exist in the note hash tree
-        //  - we need to check if the note has already been nullified
-        //
-        // Failing to do either of the above would result in circuits getting either non-existent notes and failing to
-        // produce inclusion proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which
-        // are catastrophic failure modes.
-        //
-        // Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
-        // emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
-        // so we must store both the note hash and nullifier block information.
+    /**
+   * Validates and stores a batch of notes against the pre-fetched onchain context of their txs.
+   *
+   * For each request we must verify that:
+   *  - the note actually exists in the corresponding tx effect (and thus in the note hash tree), and
+   *  - the note has not already been nullified.
+   *
+   * Failing to do either would result in circuits getting either non-existent notes and failing to produce inclusion
+   * proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which are catastrophic
+   * failure modes.
+   *
+   * Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
+   * emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
+   * so we must store both the note hash and nullifier block information.
+   *
+   * @param requests - The notes to validate and store.
+   * @param scope - The scope under which the notes are being stored.
+   * @param validationTxData - The onchain context of each request's tx, keyed by `TxHash.toString()`. Must contain
+   * entries for every request's txHash; missing entries are treated as a node bug and cause an error.
+   */ async validateAndStoreNotes(requests, scope, validationTxData) {
+        if (requests.length === 0) {
+            return;
+        }
         // We avoid making node queries at 'latest' since we don't want to process notes or nullifiers that only exist ahead
         // in time of the locally synced state.
         // Note that while this technically results in historical queries, we perform it at the latest locally synced block
@@ -109,39 +110,64 @@ export class NoteService {
         const anchorBlockHash = await this.anchorBlockHeader.hash();
         // By computing siloed and unique note hashes ourselves we prevent contracts from interfering with the note storage
         // of other contracts, which would constitute a security breach.
-        const uniqueNoteHash = await computeUniqueNoteHash(noteNonce, await siloNoteHash(contractAddress, noteHash));
-        const siloedNullifier = await siloNullifier(contractAddress, nullifier);
-        const [txEffect, [nullifierIndex]] = await Promise.all([
-            this.aztecNode.getTxEffect(txHash),
-            this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [
+        const computed = await allToCompletion(requests.map(async ({ contractAddress, noteHash, nullifier, noteNonce })=>{
+            const [siloedNoteHash, siloedNullifier] = await allToCompletion([
+                siloNoteHash(contractAddress, noteHash),
+                siloNullifier(contractAddress, nullifier)
+            ]);
+            const uniqueNoteHash = await computeUniqueNoteHash(noteNonce, siloedNoteHash);
+            return {
+                uniqueNoteHash,
                 siloedNullifier
-            ])
-        ]);
-        if (!txEffect) {
-            throw new Error(`Could not find tx effect for tx hash ${txHash}`);
-        }
-        if (txEffect.l2BlockNumber > anchorBlockNumber) {
-            throw new Error(`Could not find tx effect for tx hash ${txHash} as of block number ${anchorBlockNumber}`);
-        }
-        // Find the index of the note hash in the noteHashes array to determine note ordering within the tx
-        const noteIndexInTx = txEffect.data.noteHashes.findIndex((nh)=>nh.equals(uniqueNoteHash));
-        if (noteIndexInTx === -1) {
-            throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present in tx ${txHash}`);
-        }
-        const noteDao = new NoteDao(new Note(content), contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, txEffect.l2BlockNumber, txEffect.l2BlockHash.toString(), txEffect.txIndexInBlock, noteIndexInTx);
-        // The note was found by `recipient`, so we use that as the scope when storing the note.
-        await this.noteStore.addNotes([
-            noteDao
-        ], recipient, this.jobId);
-        if (nullifierIndex !== undefined) {
-            // We found nullifier index which implies that the note has already been nullified.
-            const { data: _, ...blockHashAndNum } = nullifierIndex;
-            await this.noteStore.applyNullifiers([
-                {
+            };
+        }));
+        const nullifierIndexes = await this.#findNullifierIndexes(anchorBlockHash, computed.map((c)=>c.siloedNullifier));
+        const noteDaos = [];
+        const foundNullifiers = [];
+        for(let i = 0; i < requests.length; i++){
+            const { contractAddress, owner, storageSlot, randomness, noteNonce, content, noteHash, txHash } = requests[i];
+            const { uniqueNoteHash, siloedNullifier } = computed[i];
+            const nullifierIndex = nullifierIndexes[i];
+            const txData = validationTxData.get(txHash.toString());
+            if (!txData) {
+                // We error out instead of just logging a warning and skipping the note because this would indicate a bug. This
+                // is because the node has already served info about this tx either when obtaining the log (LogResult carries
+                // the tx info) or when getting metadata for the offchain message (before the message got passed to
+                // `process_log`).
+                throw new Error(`Could not find tx effect for tx hash ${txHash} when processing a note.`);
+            }
+            if (txData.l2BlockNumber > anchorBlockNumber) {
+                // If the message was delivered onchain, this would indicate a bug: log sync should never load logs from blocks
+                // newer than the anchor block. If the note came via an offchain message, it would likely also be a bug, since
+                // we sync a new anchor block before calling `process_message`. For this not to be a bug, the message would
+                // need to come from a newer block than the anchor served by the node, implying the node isn't properly synced.
+                //     We therefore error out here rather than assuming the offchain message was constructed by a malicious
+                // sender with the intention of bricking recipient's PXE (if we assumed that we would just ignore the message).
+                throw new Error(`Obtained a newer tx effect for ${txHash} for a note validation request than the anchor block ${anchorBlockNumber}. This is a bug as we should not ever be processing a note from a newer block than the anchor block.`);
+            }
+            // Find the index of the note hash in the noteHashes array to determine note ordering within the tx
+            const noteIndexInTx = txData.noteHashes.findIndex((nh)=>nh.equals(uniqueNoteHash));
+            if (noteIndexInTx === -1) {
+                // Similar to the comment above - we error out as this would indicate a bug in nonce discovery.
+                throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present in tx ${txHash}`);
+            }
+            noteDaos.push(new NoteDao(new Note(content), contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, txData.l2BlockNumber, txData.l2BlockHash.toString(), txData.txIndexInBlock, noteIndexInTx));
+            if (nullifierIndex !== undefined) {
+                // We found a nullifier index which implies that the note has already been nullified.
+                const { data: _, ...blockHashAndNum } = nullifierIndex;
+                foundNullifiers.push({
                     data: siloedNullifier,
                     ...blockHashAndNum
-                }
-            ], this.jobId);
+                });
+            }
         }
+        await this.noteStore.addNotes(noteDaos, scope, this.jobId);
+        if (foundNullifiers.length > 0) {
+            await this.noteStore.applyNullifiers(foundNullifiers, this.jobId);
+        }
+    }
+    async #findNullifierIndexes(anchorBlockHash, siloedNullifiers) {
+        const batches = chunk(siloedNullifiers, MAX_RPC_LEN);
+        return (await allToCompletion(batches.map((batch)=>this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, batch)))).flat();
     }
 }

package/dest/notes_filter.d.ts

@@ -0,0 +1,24 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { NoteStatus } from '@aztec/stdlib/note';
+/**
+ * A filter used to fetch notes.
+ * @remarks This filter is applied as an intersection of all its params.
+ */
+export type NotesFilter = {
+    /**
+     * The contract address the note belongs to.
+     * @remarks Providing a contract address is required as we need that information to trigger private state sync.
+     */
+    contractAddress: AztecAddress;
+    /** The owner of the note. */
+    owner?: AztecAddress;
+    /** The specific storage location of the note on the contract. */
+    storageSlot?: Fr;
+    /** The status of the note. Defaults to 'ACTIVE'. */
+    status?: NoteStatus;
+    /** The siloed nullifier for the note. */
+    siloedNullifier?: Fr;
+    scopes: AztecAddress[];
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZXNfZmlsdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbm90ZXNfZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXJEOzs7R0FHRztBQUNILE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEI7OztPQUdHO0lBQ0gsZUFBZSxFQUFFLFlBQVksQ0FBQztJQUM5Qiw2QkFBNkI7SUFDN0IsS0FBSyxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQ3JCLGlFQUFpRTtJQUNqRSxXQUFXLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDakIsb0RBQW9EO0lBQ3BELE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUNwQix5Q0FBeUM7SUFDekMsZUFBZSxDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxZQUFZLEVBQUUsQ0FBQztDQUN4QixDQUFDIn0=

package/dest/notes_filter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../src/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B,6BAA6B;IAC7B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB,CAAC"}

package/dest/notes_filter.js

@@ -0,0 +1,4 @@
+/**
+ * A filter used to fetch notes.
+ * @remarks This filter is applied as an intersection of all its params.
+ */ export { };

package/dest/oracle_version.d.ts

@@ -1,3 +1,4 @@
-export declare const ORACLE_VERSION = 11;
-export declare const ORACLE_INTERFACE_HASH = "20c4d02d8cd5e448c11001a5f72ea2e0927630aeda75e537550872a9627bf40b";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9vcmFjbGVfdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFNQSxlQUFPLE1BQU0sY0FBYyxLQUFLLENBQUM7QUFLakMsZUFBTyxNQUFNLHFCQUFxQixxRUFBcUUsQ0FBQyJ9
+export declare const ORACLE_VERSION_MAJOR = 30;
+export declare const ORACLE_VERSION_MINOR = 8;
+export declare const ORACLE_INTERFACE_HASH = "fec4d3a95fc57a62a20bfeb659bb3bfd91b31cd93e07f8cf97b368f9f55cc67b";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9vcmFjbGVfdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFZQSxlQUFPLE1BQU0sb0JBQW9CLEtBQUssQ0FBQztBQUN2QyxlQUFPLE1BQU0sb0JBQW9CLElBQUksQ0FBQztBQVF0QyxlQUFPLE1BQU0scUJBQXFCLHFFQUFxRSxDQUFDIn0=

package/dest/oracle_version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracle_version.d.ts","sourceRoot":"","sources":["../src/oracle_version.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc,KAAK,CAAC;AAKjC,eAAO,MAAM,qBAAqB,qEAAqE,CAAC"}
+{"version":3,"file":"oracle_version.d.ts","sourceRoot":"","sources":["../src/oracle_version.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,oBAAoB,KAAK,CAAC;AACvC,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAQtC,eAAO,MAAM,qBAAqB,qEAAqE,CAAC"}

package/dest/oracle_version.js

@@ -1,11 +1,21 @@
-/// The ORACLE_VERSION constant is used to check that the oracle interface is in sync between PXE and Aztec.nr. We need
-/// to version the oracle interface to ensure that developers get a reasonable error message if they use incompatible
-/// versions of Aztec.nr and PXE. The Noir counterpart is in `noir-projects/aztec-nr/aztec/src/oracle/version.nr`.
+/// The oracle version constants are used to check that the oracle interface is in sync between PXE and Aztec.nr.
+/// We version the oracle interface as `major.minor` where:
+///   - `major` = backward-breaking changes (must match exactly between PXE and Aztec.nr)
+///   - `minor` = oracle additions (non-breaking; PXE minor >= contract minor)
 ///
-/// @dev Whenever a contract function or Noir test is run, the `utilityAssertCompatibleOracleVersion` oracle is called
-/// and if the oracle version is incompatible an error is thrown.
-export const ORACLE_VERSION = 11;
-/// This hash is computed as by hashing the Oracle interface and it is used to detect when the Oracle interface changes,
-/// which in turn implies that you need to update the ORACLE_VERSION constant in this file and in
-/// `noir-projects/aztec-nr/aztec/src/oracle/version.nr`.
-export const ORACLE_INTERFACE_HASH = '20c4d02d8cd5e448c11001a5f72ea2e0927630aeda75e537550872a9627bf40b';
+/// The Noir counterparts are in `noir-projects/aztec-nr/aztec/src/oracle/version.nr`.
+///
+/// @dev Whenever a contract function or Noir test is run, the `aztec_misc_assertCompatibleOracleVersion` oracle is called.
+/// If the major version is incompatible, an error is thrown immediately. The minor version is recorded by the PXE and
+/// used to provide helpful error messages if a contract calls an oracle that doesn't exist. We don't throw immediately
+/// if AZTEC_NR_MINOR > PXE_MINOR because if a contract is updated to use a newer Aztec.nr dependency without actually
+/// using any of the new oracles then there is no reason to throw.
+export const ORACLE_VERSION_MAJOR = 30;
+export const ORACLE_VERSION_MINOR = 8;
+/// This hash is computed from `ORACLE_REGISTRY` (each oracle's name, ordered parameter names and
+/// types, and return type) and is used to detect when the oracle interface changes. When it does, you need to either:
+/// - increment `ORACLE_VERSION_MAJOR` and reset `ORACLE_VERSION_MINOR` to zero if the change is breaking, or
+/// - increment only `ORACLE_VERSION_MINOR` if the change is additive (a new oracle was added).
+///
+/// These constants must be kept in sync between this file and `noir-projects/aztec-nr/aztec/src/oracle/version.nr`.
+export const ORACLE_INTERFACE_HASH = 'fec4d3a95fc57a62a20bfeb659bb3bfd91b31cd93e07f8cf97b368f9f55cc67b';