@aztec/pxe 0.0.1-commit.8afd444 → 0.0.1-commit.934299a21

package/dest/storage/contract_store/contract_store.js

@@ -1,8 +1,53 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { toArray } from '@aztec/foundation/iterable';
-import { FunctionSelector, FunctionType, contractArtifactFromBuffer, contractArtifactToBuffer, encodeArguments, getFunctionDebugMetadata } from '@aztec/stdlib/abi';
+import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
+import { FunctionCall, FunctionSelector, FunctionType, contractArtifactFromBuffer, contractArtifactToBuffer, encodeArguments, getFunctionDebugMetadata } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { SerializableContractInstance, getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { PrivateFunctionsTree } from './private_functions_tree.js';
+const VERSION = 1;
+/**
+ * All contract class data except the large packedBytecode.
+ * The expensive data from the ContractClass is precomputed and stored in this format to avoid redundant hashing.
+ * Since we have to store the artifacts anyway, the final ContractClass is reconstructed by combining this data
+ * with the packedBytecode obtained from the former. That way we can have quick class lookups without wasted storage.
+ */ export class SerializableContractClassData {
+    version = VERSION;
+    id;
+    artifactHash;
+    privateFunctionsRoot;
+    publicBytecodeCommitment;
+    privateFunctions;
+    constructor(data){
+        this.id = data.id;
+        this.artifactHash = data.artifactHash;
+        this.privateFunctionsRoot = data.privateFunctionsRoot;
+        this.publicBytecodeCommitment = data.publicBytecodeCommitment;
+        this.privateFunctions = data.privateFunctions;
+    }
+    toBuffer() {
+        return serializeToBuffer(numToUInt8(this.version), this.id, this.artifactHash, this.privateFunctionsRoot, this.publicBytecodeCommitment, this.privateFunctions.length, ...this.privateFunctions.map((fn)=>serializeToBuffer(fn.selector, fn.vkHash)));
+    }
+    static fromBuffer(bufferOrReader) {
+        const reader = BufferReader.asReader(bufferOrReader);
+        const version = reader.readUInt8();
+        if (version !== VERSION) {
+            throw new Error(`Unexpected contract class data version ${version}`);
+        }
+        return new SerializableContractClassData({
+            id: reader.readObject(Fr),
+            artifactHash: reader.readObject(Fr),
+            privateFunctionsRoot: reader.readObject(Fr),
+            publicBytecodeCommitment: reader.readObject(Fr),
+            privateFunctions: reader.readVector({
+                fromBuffer: (r)=>({
+                        selector: r.readObject(FunctionSelector),
+                        vkHash: r.readObject(Fr)
+                    })
+            })
+        });
+    }
+}
 /**
  * ContractStore serves as a data manager and retriever for Aztec.nr contracts.
  * It provides methods to obtain contract addresses, function ABI, bytecode, and membership witnesses
@@ -12,24 +57,46 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
  */ export class ContractStore {
     /** Map from contract class id to private function tree. */ // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
     #privateFunctionTrees = new Map();
-    /** Map from contract address to contract class id */ #contractClassIdMap = new Map();
+    /**
+   * In-memory cache of deserialized ContractArtifact objects, keyed by class id string.
+   * Avoids repeated LMDB reads + JSON.parse + Zod validation on every oracle call.
+   * Artifacts are large but immutable after registration — safe to cache for the lifetime of the store.
+   */ // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
+    #contractArtifactCache = new Map();
+    /** Map from contract address to contract class id (avoids KV round-trip on hot path). */ #contractClassIdMap = new Map();
     #store;
     #contractArtifacts;
+    #contractClassData;
     #contractInstances;
     constructor(store){
         this.#store = store;
         this.#contractArtifacts = store.openMap('contract_artifacts');
+        this.#contractClassData = store.openMap('contract_classes');
         this.#contractInstances = store.openMap('contracts_instances');
     }
     // Setters
-    async addContractArtifact(id, contract) {
-        // Validation outside transactionAsync - these are not DB operations
+    /**
+   * Registers a new contract artifact and its corresponding class data.
+   * IMPORTANT: This method does not verify that the provided artifact matches the class data or that the class id matches the artifact.
+   * It is the caller's responsibility to ensure the consistency and correctness of the provided data.
+   * This is done to avoid redundant, expensive contract class computations
+   */ async addContractArtifact(contract, contractClassWithIdAndPreimage) {
+        const contractClass = contractClassWithIdAndPreimage ?? await getContractClassFromArtifact(contract);
+        const key = contractClass.id.toString();
+        if (this.#contractArtifactCache.has(key)) {
+            return contractClass.id;
+        }
         const privateFunctions = contract.functions.filter((functionArtifact)=>functionArtifact.functionType === FunctionType.PRIVATE);
-        const privateSelectors = await Promise.all(privateFunctions.map(async (privateFunctionArtifact)=>(await FunctionSelector.fromNameAndParameters(privateFunctionArtifact.name, privateFunctionArtifact.parameters)).toString()));
+        const privateSelectors = await Promise.all(privateFunctions.map(async (fn)=>(await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)).toString()));
         if (privateSelectors.length !== new Set(privateSelectors).size) {
             throw new Error('Repeated function selectors of private functions');
         }
-        await this.#store.transactionAsync(()=>this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract)));
+        this.#contractArtifactCache.set(key, contract);
+        await this.#store.transactionAsync(async ()=>{
+            await this.#contractArtifacts.set(key, contractArtifactToBuffer(contract));
+            await this.#contractClassData.set(key, new SerializableContractClassData(contractClass).toBuffer());
+        });
+        return contractClass.id;
     }
     async addContractInstance(contract) {
         this.#contractClassIdMap.set(contract.address.toString(), contract.currentContractClassId);
@@ -37,25 +104,17 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
     }
     // Private getters
     async #getContractClassId(contractAddress) {
-        if (!this.#contractClassIdMap.has(contractAddress.toString())) {
+        const key = contractAddress.toString();
+        if (!this.#contractClassIdMap.has(key)) {
             const instance = await this.getContractInstance(contractAddress);
             if (!instance) {
                 return;
             }
-            this.#contractClassIdMap.set(contractAddress.toString(), instance.currentContractClassId);
+            this.#contractClassIdMap.set(key, instance.currentContractClassId);
         }
-        return this.#contractClassIdMap.get(contractAddress.toString());
+        return this.#contractClassIdMap.get(key);
     }
-    /**
-   * Retrieve or create a ContractTree instance based on the provided class id.
-   * If an existing tree with the same class id is found in the cache, it will be returned.
-   * Otherwise, a new ContractTree instance will be created using the contract data from the database
-   * and added to the cache before returning.
-   *
-   * @param classId - The class id of the contract for which the ContractTree is required.
-   * @returns A ContractTree instance associated with the specified contract address.
-   * @throws An Error if the contract is not found in the ContractDatabase.
-   */ async #getPrivateFunctionTreeForClassId(classId) {
+    async #getPrivateFunctionTreeForClassId(classId) {
         if (!this.#privateFunctionTrees.has(classId.toString())) {
             const artifact = await this.getContractArtifact(classId);
             if (!artifact) {
@@ -66,9 +125,9 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         }
         return this.#privateFunctionTrees.get(classId.toString());
     }
-    async #getContractArtifactByAddress(contractAddress) {
-        const contractClassId = await this.#getContractClassId(contractAddress);
-        return contractClassId && this.getContractArtifact(contractClassId);
+    async #getArtifactByAddress(contractAddress) {
+        const classId = await this.#getContractClassId(contractAddress);
+        return classId && this.getContractArtifact(classId);
     }
     // Public getters
     getContractsAddresses() {
@@ -77,22 +136,43 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
             return keys.map(AztecAddress.fromString);
         });
     }
-    /** Returns a contract instance for a given address. Throws if not found. */ getContractInstance(contractAddress) {
+    /** Returns a contract instance for a given address. */ getContractInstance(contractAddress) {
         return this.#store.transactionAsync(async ()=>{
             const contract = await this.#contractInstances.getAsync(contractAddress.toString());
             return contract && SerializableContractInstance.fromBuffer(contract).withAddress(contractAddress);
         });
     }
-    getContractArtifact(contractClassId) {
-        return this.#store.transactionAsync(async ()=>{
-            const contract = await this.#contractArtifacts.getAsync(contractClassId.toString());
-            // TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
-            return contract && contractArtifactFromBuffer(Buffer.from(contract));
+    /** Returns the raw contract artifact for a given class id. */ async getContractArtifact(contractClassId) {
+        const key = contractClassId.toString();
+        const cached = this.#contractArtifactCache.get(key);
+        if (cached) {
+            return cached;
+        }
+        const artifact = await this.#store.transactionAsync(async ()=>{
+            const buf = await this.#contractArtifacts.getAsync(key);
+            return buf && contractArtifactFromBuffer(buf);
         });
+        if (artifact) {
+            this.#contractArtifactCache.set(key, artifact);
+        }
+        return artifact;
     }
-    /** Returns a contract class for a given class id. Throws if not found. */ async getContractClass(contractClassId) {
+    /** Returns a contract class for a given class id. */ async getContractClassWithPreimage(contractClassId) {
+        const key = contractClassId.toString();
+        const buf = await this.#contractClassData.getAsync(key);
+        if (!buf) {
+            return undefined;
+        }
+        const classData = SerializableContractClassData.fromBuffer(buf);
         const artifact = await this.getContractArtifact(contractClassId);
-        return artifact && getContractClassFromArtifact(artifact);
+        if (!artifact) {
+            return undefined;
+        }
+        const packedBytecode = artifact.functions.find((f)=>f.name === 'public_dispatch')?.bytecode ?? Buffer.alloc(0);
+        return {
+            ...classData,
+            packedBytecode
+        };
     }
     async getContract(address) {
         const instance = await this.getContractInstance(address);
@@ -110,17 +190,18 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
     }
     /**
    * Retrieves the artifact of a specified function within a given contract.
-   * The function is identified by its selector, which is a unique code generated from the function's signature.
-   * Throws an error if the contract address or function selector are invalid or not found.
    *
    * @param contractAddress - The AztecAddress representing the contract containing the function.
    * @param selector - The function selector.
    * @returns The corresponding function's artifact as an object.
    */ async getFunctionArtifact(contractAddress, selector) {
-        const artifact = await this.#getContractArtifactByAddress(contractAddress);
-        const fnArtifact = artifact && await this.#findFunctionArtifactBySelector(artifact, selector);
-        return fnArtifact && {
-            ...fnArtifact,
+        const artifact = await this.#getArtifactByAddress(contractAddress);
+        if (!artifact) {
+            return undefined;
+        }
+        const fn = await this.#findFunctionArtifactBySelector(artifact, selector);
+        return fn && {
+            ...fn,
             contractName: artifact.name
         };
     }
@@ -136,40 +217,38 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         };
     }
     async getPublicFunctionArtifact(contractAddress) {
-        const artifact = await this.#getContractArtifactByAddress(contractAddress);
-        const fnArtifact = artifact && artifact.functions.find((fn)=>fn.functionType === FunctionType.PUBLIC);
-        return fnArtifact && {
-            ...fnArtifact,
+        const artifact = await this.#getArtifactByAddress(contractAddress);
+        const fn = artifact && artifact.functions.find((f)=>f.functionType === FunctionType.PUBLIC);
+        return fn && {
+            ...fn,
             contractName: artifact.name
         };
     }
     async getFunctionAbi(contractAddress, selector) {
-        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const artifact = await this.#getArtifactByAddress(contractAddress);
         return artifact && await this.#findFunctionAbiBySelector(artifact, selector);
     }
     /**
    * Retrieves the debug metadata of a specified function within a given contract.
-   * The function is identified by its selector, which is a unique code generated from the function's signature.
-   * Returns undefined if the debug metadata for the given function is not found.
-   * Throws if the contract has not been added to the database.
    *
    * @param contractAddress - The AztecAddress representing the contract containing the function.
    * @param selector - The function selector.
-   * @returns The corresponding function's artifact as an object.
+   * @returns The corresponding function's debug metadata, or undefined.
    */ async getFunctionDebugMetadata(contractAddress, selector) {
-        const artifact = await this.#getContractArtifactByAddress(contractAddress);
-        const fnArtifact = artifact && await this.#findFunctionArtifactBySelector(artifact, selector);
-        return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
+        const artifact = await this.#getArtifactByAddress(contractAddress);
+        if (!artifact) {
+            return undefined;
+        }
+        const fn = await this.#findFunctionArtifactBySelector(artifact, selector);
+        return fn && getFunctionDebugMetadata(artifact, fn);
     }
     async getPublicFunctionDebugMetadata(contractAddress) {
-        const artifact = await this.#getContractArtifactByAddress(contractAddress);
-        const fnArtifact = artifact && artifact.functions.find((fn)=>fn.functionType === FunctionType.PUBLIC);
-        return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
+        const artifact = await this.#getArtifactByAddress(contractAddress);
+        const fn = artifact && artifact.functions.find((f)=>f.functionType === FunctionType.PUBLIC);
+        return fn && getFunctionDebugMetadata(artifact, fn);
     }
     /**
    * Retrieve the function membership witness for the given contract class and function selector.
-   * The function membership witness represents a proof that the function belongs to the specified contract.
-   * Throws an error if the contract address or function selector is unknown.
    *
    * @param contractClassId - The id of the class.
    * @param selector - The function selector.
@@ -179,18 +258,16 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         return tree?.getFunctionMembershipWitness(selector);
     }
     async getDebugContractName(contractAddress) {
-        const artifact = await this.#getContractArtifactByAddress(contractAddress);
+        const artifact = await this.#getArtifactByAddress(contractAddress);
         return artifact?.name;
     }
     async getDebugFunctionName(contractAddress, selector) {
-        const artifact = await this.#getContractArtifactByAddress(contractAddress);
-        const fnArtifact = artifact && await this.#findFunctionAbiBySelector(artifact, selector);
-        return `${artifact?.name ?? contractAddress}:${fnArtifact?.name ?? selector}`;
+        const artifact = await this.#getArtifactByAddress(contractAddress);
+        const fn = artifact && await this.#findFunctionAbiBySelector(artifact, selector);
+        return `${artifact?.name ?? contractAddress}:${fn?.name ?? selector}`;
     }
     async #findFunctionArtifactBySelector(artifact, selector) {
-        const functions = artifact.functions;
-        for(let i = 0; i < functions.length; i++){
-            const fn = functions[i];
+        for (const fn of artifact.functions){
             const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
             if (fnSelector.equals(selector)) {
                 return fn;
@@ -198,12 +275,10 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         }
     }
     async #findFunctionAbiBySelector(artifact, selector) {
-        const functions = [
+        for (const fn of [
             ...artifact.functions,
             ...artifact.nonDispatchPublicFunctions ?? []
-        ];
-        for(let i = 0; i < functions.length; i++){
-            const fn = functions[i];
+        ]){
             const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
             if (fnSelector.equals(selector)) {
                 return fn;
@@ -219,15 +294,16 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         if (!functionDao) {
             throw new Error(`Unknown function ${functionName} in contract ${contract.name}.`);
         }
-        return {
+        const selector = await FunctionSelector.fromNameAndParameters(functionDao.name, functionDao.parameters);
+        return FunctionCall.from({
             name: functionDao.name,
-            args: encodeArguments(functionDao, args),
-            selector: await FunctionSelector.fromNameAndParameters(functionDao.name, functionDao.parameters),
-            type: functionDao.functionType,
             to,
+            selector,
+            type: functionDao.functionType,
             hideMsgSender: false,
             isStatic: functionDao.isStatic,
+            args: encodeArguments(functionDao, args),
             returnTypes: functionDao.returnTypes
-        };
+        });
     }
 }

package/dest/storage/note_store/note_store.d.ts

@@ -2,8 +2,9 @@ import type { Fr } from '@aztec/foundation/schemas';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { DataInBlock } from '@aztec/stdlib/block';
-import { NoteDao, type NotesFilter } from '@aztec/stdlib/note';
+import { NoteDao } from '@aztec/stdlib/note';
 import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
+import type { NotesFilter } from '../../notes_filter.js';
 /**
  * NoteStore manages the storage and retrieval of notes.
  *
@@ -35,7 +36,6 @@ export declare class NoteStore implements StagedStore {
      * @params jobId - the job context to read from.
      * @returns Filtered and deduplicated notes (a note might be present in multiple scopes - we ensure it is only
      * returned once if this is the case)
-     * @throws If filtering by an empty scopes array. Scopes have to be set to undefined or to a non-empty array.
      */
     getNotes(filter: NotesFilter, jobId: string): Promise<NoteDao[]>;
     /**
@@ -80,4 +80,4 @@ export declare class NoteStore implements StagedStore {
     commit(jobId: string): Promise<void>;
     discardStaged(jobId: string): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2Uvbm90ZV9zdG9yZS9ub3RlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxPQUFPLEVBQWMsS0FBSyxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUzRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUc1RTs7Ozs7SUFLSTtBQUNKLHFCQUFhLFNBQVUsWUFBVyxXQUFXOztJQUMzQyxRQUFRLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBVTtJQStCcEMsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBUW5DO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0ksUUFBUSxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRSxLQUFLLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBYXJGO0lBY0Q7Ozs7Ozs7Ozs7O09BV0c7SUFDSCxRQUFRLENBQUMsTUFBTSxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQTZGL0Q7SUFFRDs7Ozs7Ozs7Ozs7Ozs7T0FjRztJQUNILGVBQWUsQ0FBQyxVQUFVLEVBQUUsV0FBVyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FxQ2hGO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDVSxRQUFRLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1wRjtJQTZFRDs7Ozs7Ozs7O09BU0c7SUFDRyxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBVXpDO0lBRUQsYUFBYSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUcxQztDQWtDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2Uvbm90ZV9zdG9yZS9ub3RlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxPQUFPLEVBQWMsTUFBTSxvQkFBb0IsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUd6RDs7Ozs7SUFLSTtBQUNKLHFCQUFhLFNBQVUsWUFBVyxXQUFXOztJQUMzQyxRQUFRLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBVTtJQStCcEMsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBUW5DO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0ksUUFBUSxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRSxLQUFLLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBYXJGO0lBY0Q7Ozs7Ozs7Ozs7T0FVRztJQUNILFFBQVEsQ0FBQyxNQUFNLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBZ0cvRDtJQUVEOzs7Ozs7Ozs7Ozs7OztPQWNHO0lBQ0gsZUFBZSxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQXlDaEY7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNVLFFBQVEsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLGtCQUFrQixFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTXBGO0lBNkVEOzs7Ozs7Ozs7T0FTRztJQUNHLE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FVekM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzFDO0NBa0NGIn0=

package/dest/storage/note_store/note_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_store.d.ts","sourceRoot":"","sources":["../../../src/storage/note_store/note_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAG5E;;;;;IAKI;AACJ,qBAAa,SAAU,YAAW,WAAW;;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAU;IA+BpC,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IAED;;;;;;;;;OASG;IACI,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAarF;IAcD;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CA6F/D;IAED;;;;;;;;;;;;;;OAcG;IACH,eAAe,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAqChF;IAED;;;;;;;;;;;OAWG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMpF;IA6ED;;;;;;;;;OASG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1C;CAkCF"}
+{"version":3,"file":"note_store.d.ts","sourceRoot":"","sources":["../../../src/storage/note_store/note_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAc,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD;;;;;IAKI;AACJ,qBAAa,SAAU,YAAW,WAAW;;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAU;IA+BpC,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IAED;;;;;;;;;OASG;IACI,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAarF;IAcD;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAgG/D;IAED;;;;;;;;;;;;;;OAcG;IACH,eAAe,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAyChF;IAED;;;;;;;;;;;OAWG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMpF;IA6ED;;;;;;;;;OASG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1C;CAkCF"}

package/dest/storage/note_store/note_store.js

@@ -74,10 +74,9 @@ import { StoredNote } from './stored_note.js';
    * @params jobId - the job context to read from.
    * @returns Filtered and deduplicated notes (a note might be present in multiple scopes - we ensure it is only
    * returned once if this is the case)
-   * @throws If filtering by an empty scopes array. Scopes have to be set to undefined or to a non-empty array.
    */ getNotes(filter, jobId) {
-        if (filter.scopes !== undefined && filter.scopes.length === 0) {
-            return Promise.reject(new Error('Trying to get notes with an empty scopes array'));
+        if (filter.scopes !== 'ALL_SCOPES' && filter.scopes.length === 0) {
+            return Promise.resolve([]);
         }
         return this.#store.transactionAsync(async ()=>{
             const targetStatus = filter.status ?? NoteStatus.ACTIVE;
@@ -136,7 +135,7 @@ import { StoredNote } from './stored_note.js';
                 if (filter.siloedNullifier && !note.noteDao.siloedNullifier.equals(filter.siloedNullifier)) {
                     continue;
                 }
-                if (filter.scopes && note.scopes.intersection(new Set(filter.scopes.map((s)=>s.toString()))).size === 0) {
+                if (filter.scopes !== 'ALL_SCOPES' && note.scopes.intersection(new Set(filter.scopes.map((s)=>s.toString()))).size === 0) {
                     continue;
                 }
                 foundNotes.set(note.noteDao.siloedNullifier.toString(), note.noteDao);
@@ -173,6 +172,9 @@ import { StoredNote } from './stored_note.js';
         if (nullifiers.length === 0) {
             return Promise.resolve([]);
         }
+        if (nullifiers.some((n)=>n.l2BlockNumber === 0)) {
+            return Promise.reject(new Error('applyNullifiers: nullifiers cannot have been emitted at block 0'));
+        }
         return this.#withJobLock(jobId, ()=>this.#store.transactionAsync(async ()=>{
                 const notesToNullify = await Promise.all(nullifiers.map(async (nullifierInBlock)=>{
                     const nullifier = nullifierInBlock.data.toString();

package/dest/tagging/get_all_logs_by_tags.d.ts

@@ -21,4 +21,4 @@ export declare function getAllPrivateLogsByTags(aztecNode: AztecNode, tags: Silo
  * @returns An array of log arrays, one per tag, containing all logs across all pages.
  */
 export declare function getAllPublicLogsByTagsFromContract(aztecNode: AztecNode, contractAddress: AztecAddress, tags: Tag[], anchorBlockHash: BlockHash): Promise<TxScopedL2Log[][]>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2FsbF9sb2dzX2J5X3RhZ3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2dldF9hbGxfbG9nc19ieV90YWdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUE2QnhFOzs7Ozs7O0dBT0c7QUFDSCx3QkFBZ0IsdUJBQXVCLENBQ3JDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLElBQUksRUFBRSxTQUFTLEVBQUUsRUFDakIsZUFBZSxFQUFFLFNBQVMsR0FDekIsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FFNUI7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFnQixrQ0FBa0MsQ0FDaEQsU0FBUyxFQUFFLFNBQVMsRUFDcEIsZUFBZSxFQUFFLFlBQVksRUFDN0IsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLGVBQWUsRUFBRSxTQUFTLEdBQ3pCLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBSTVCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2FsbF9sb2dzX2J5X3RhZ3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2dldF9hbGxfbG9nc19ieV90YWdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFpRHhFOzs7Ozs7O0dBT0c7QUFDSCx3QkFBZ0IsdUJBQXVCLENBQ3JDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLElBQUksRUFBRSxTQUFTLEVBQUUsRUFDakIsZUFBZSxFQUFFLFNBQVMsR0FDekIsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FJNUI7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFnQixrQ0FBa0MsQ0FDaEQsU0FBUyxFQUFFLFNBQVMsRUFDcEIsZUFBZSxFQUFFLFlBQVksRUFDN0IsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLGVBQWUsRUFBRSxTQUFTLEdBQ3pCLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBTTVCIn0=

package/dest/tagging/get_all_logs_by_tags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get_all_logs_by_tags.d.ts","sourceRoot":"","sources":["../../src/tagging/get_all_logs_by_tags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA6BxE;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EAAE,EACjB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAE5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAI5B"}
+{"version":3,"file":"get_all_logs_by_tags.d.ts","sourceRoot":"","sources":["../../src/tagging/get_all_logs_by_tags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAiDxE;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EAAE,EACjB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAI5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAM5B"}

package/dest/tagging/get_all_logs_by_tags.js

@@ -1,4 +1,4 @@
-import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
+import { MAX_LOGS_PER_TAG, MAX_RPC_LEN } from '@aztec/stdlib/interfaces/api-limit';
 /**
  * Generic pagination helper that fetches all pages of results.
  * @param numTags - The number of tags being queried (determines result array size).
@@ -23,6 +23,20 @@ import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
     }
     return allResultsPerTag;
 }
+/**
+ * Splits tags into chunks of MAX_RPC_LEN, fetches logs for each chunk using getAllPages, then stitches the results
+ * back into a single array preserving the original tag order.
+ */ async function getAllPagesInBatches(tags, fetchAllPagesForBatch) {
+    if (tags.length <= MAX_RPC_LEN) {
+        return fetchAllPagesForBatch(tags);
+    }
+    const batches = [];
+    for(let i = 0; i < tags.length; i += MAX_RPC_LEN){
+        batches.push(tags.slice(i, i + MAX_RPC_LEN));
+    }
+    const batchResults = await Promise.all(batches.map(fetchAllPagesForBatch));
+    return batchResults.flat();
+}
 /**
  * Fetches all private logs for the given tags, automatically paginating through all pages.
  * @param aztecNode - The Aztec node to query.
@@ -31,7 +45,7 @@ import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
  * because of reorgs).
  * @returns An array of log arrays, one per tag, containing all logs across all pages.
  */ export function getAllPrivateLogsByTags(aztecNode, tags, anchorBlockHash) {
-    return getAllPages(tags.length, (page)=>aztecNode.getPrivateLogsByTags(tags, page, anchorBlockHash));
+    return getAllPagesInBatches(tags, (batch)=>getAllPages(batch.length, (page)=>aztecNode.getPrivateLogsByTags(batch, page, anchorBlockHash)));
 }
 /**
  * Fetches all public logs for the given tags from a contract, automatically paginating through all pages.
@@ -42,5 +56,5 @@ import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
  * because of reorgs).
  * @returns An array of log arrays, one per tag, containing all logs across all pages.
  */ export function getAllPublicLogsByTagsFromContract(aztecNode, contractAddress, tags, anchorBlockHash) {
-    return getAllPages(tags.length, (page)=>aztecNode.getPublicLogsByTagsFromContract(contractAddress, tags, page, anchorBlockHash));
+    return getAllPagesInBatches(tags, (batch)=>getAllPages(batch.length, (page)=>aztecNode.getPublicLogsByTagsFromContract(contractAddress, batch, page, anchorBlockHash)));
 }

package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js

@@ -13,7 +13,7 @@ import { loadLogsForRange } from './utils/load_logs_for_range.js';
     // (highestAgedIndex, highestFinalizedIndex + WINDOW_LEN]
     //
     // highestAgedIndex is the highest index that was used in a tx that is included in a block at least
-    //                  `MAX_INCLUDE_BY_TIMESTAMP_DURATION` seconds ago.
+    //                  `MAX_TX_LIFETIME` seconds ago.
     // highestFinalizedIndex is the highest index that was used in a tx that is included in a finalized block.
     //
     // "(" denotes an open end of the range - the index is not included in the range.
@@ -25,19 +25,19 @@ import { loadLogsForRange } from './utils/load_logs_for_range.js';
     // ever appear.
     //
     // This relies on the "maximum inclusion timestamp" rule enforced by the kernel and rollup circuits:
-    // - a transaction's maximum inclusion timestamp is at most `MAX_INCLUDE_BY_TIMESTAMP_DURATION` seconds after
+    // - a transaction's maximum inclusion timestamp is at most `MAX_TX_LIFETIME` seconds after
     //   the timestamp of its anchor block; and
     // - a rollup only includes transactions whose inclusion timestamp is >= the L2 block's timestamp.
     //
     // Suppose some device used index `I` in a transaction anchored to block `B_N` at time `N`, and that block is now at
-    // least `MAX_INCLUDE_BY_TIMESTAMP_DURATION` seconds in the past. Then there is no possibility of any *other* device
+    // least `MAX_TX_LIFETIME` seconds in the past. Then there is no possibility of any *other* device
     // trying to use an index <= `I` while anchoring to a *newer* block than `B_N` because if we were anchoring to
     // a newer block than `B_N` then we would already have seen the log with index `I` and hence the device would have
     // chosen a larger index.
     //    If that *other* device would anchor to a block older than `B_N` then that tx could never be included in a block
     // because it would already have been expired.
     //
-    // Therefore, once we see that index `I` has been used in a block that is at least `MAX_INCLUDE_BY_TIMESTAMP_DURATION`
+    // Therefore, once we see that index `I` has been used in a block that is at least `MAX_TX_LIFETIME`
     // seconds old, we can safely stop syncing logs for all indexes <= `I` and set highestAgedIndex = `I`.
     //
     // ## Explanation of the upper bound `highestFinalizedIndex + WINDOW_LEN`

package/dest/tagging/recipient_sync/utils/find_highest_indexes.js

@@ -1,4 +1,4 @@
-import { MAX_INCLUDE_BY_TIMESTAMP_DURATION } from '@aztec/constants';
+import { MAX_TX_LIFETIME } from '@aztec/constants';
 /**
  * Finds the highest aged and the highest finalized tagging indexes.
  */ export function findHighestIndexes(privateLogsWithIndexes, currentTimestamp, finalizedBlockNumber) {
@@ -6,7 +6,7 @@ import { MAX_INCLUDE_BY_TIMESTAMP_DURATION } from '@aztec/constants';
     let highestFinalizedIndex = undefined;
     for (const { log, taggingIndex } of privateLogsWithIndexes){
         const ageInSeconds = currentTimestamp - log.blockTimestamp;
-        if (ageInSeconds >= BigInt(MAX_INCLUDE_BY_TIMESTAMP_DURATION) && (highestAgedIndex === undefined || taggingIndex > highestAgedIndex)) {
+        if (ageInSeconds >= BigInt(MAX_TX_LIFETIME) && (highestAgedIndex === undefined || taggingIndex > highestAgedIndex)) {
             highestAgedIndex = taggingIndex;
         }
         if (log.blockNumber <= finalizedBlockNumber && (highestFinalizedIndex === undefined || taggingIndex > highestFinalizedIndex)) {

package/package.json

@@ -1,7 +1,16 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.0.1-commit.8afd444",
+  "version": "0.0.1-commit.934299a21",
   "type": "module",
+  "typedocOptions": {
+    "entryPoints": [
+      "./src/entrypoints/server/index.ts",
+      "./src/entrypoints/client/lazy/index.ts",
+      "./src/config/index.ts"
+    ],
+    "name": "PXE",
+    "tsconfig": "./tsconfig.json"
+  },
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
     "./client/lazy": "./dest/entrypoints/client/lazy/index.js",
@@ -61,19 +70,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.0.1-commit.8afd444",
-    "@aztec/bb.js": "0.0.1-commit.8afd444",
-    "@aztec/builder": "0.0.1-commit.8afd444",
-    "@aztec/constants": "0.0.1-commit.8afd444",
-    "@aztec/ethereum": "0.0.1-commit.8afd444",
-    "@aztec/foundation": "0.0.1-commit.8afd444",
-    "@aztec/key-store": "0.0.1-commit.8afd444",
-    "@aztec/kv-store": "0.0.1-commit.8afd444",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.8afd444",
-    "@aztec/noir-types": "0.0.1-commit.8afd444",
-    "@aztec/protocol-contracts": "0.0.1-commit.8afd444",
-    "@aztec/simulator": "0.0.1-commit.8afd444",
-    "@aztec/stdlib": "0.0.1-commit.8afd444",
+    "@aztec/bb-prover": "0.0.1-commit.934299a21",
+    "@aztec/bb.js": "0.0.1-commit.934299a21",
+    "@aztec/builder": "0.0.1-commit.934299a21",
+    "@aztec/constants": "0.0.1-commit.934299a21",
+    "@aztec/ethereum": "0.0.1-commit.934299a21",
+    "@aztec/foundation": "0.0.1-commit.934299a21",
+    "@aztec/key-store": "0.0.1-commit.934299a21",
+    "@aztec/kv-store": "0.0.1-commit.934299a21",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.934299a21",
+    "@aztec/noir-types": "0.0.1-commit.934299a21",
+    "@aztec/protocol-contracts": "0.0.1-commit.934299a21",
+    "@aztec/simulator": "0.0.1-commit.934299a21",
+    "@aztec/stdlib": "0.0.1-commit.934299a21",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "lodash.omit": "^4.5.0",
@@ -82,8 +91,8 @@
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/merkle-tree": "0.0.1-commit.8afd444",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.8afd444",
+    "@aztec/merkle-tree": "0.0.1-commit.934299a21",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.934299a21",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.omit": "^4.5.7",

package/src/access_scopes.ts

@@ -0,0 +1,9 @@
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+/**
+ * Controls which accounts' private state and keys are accessible during execution.
+ * - `'ALL_SCOPES'`: All registered accounts' private state and keys are accessible.
+ * - `AztecAddress[]` with entries: Only the specified accounts' private state and keys are accessible.
+ * - `[]` (empty array): Deny-all. No private state is visible and no keys are accessible.
+ */
+export type AccessScopes = 'ALL_SCOPES' | AztecAddress[];

package/src/block_synchronizer/block_synchronizer.ts

@@ -7,6 +7,7 @@ import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { BlockHeader } from '@aztec/stdlib/tx';
 
 import type { BlockSynchronizerConfig } from '../config/index.js';
+import type { ContractSyncService } from '../contract_sync/contract_sync_service.js';
 import type { AnchorBlockStore } from '../storage/anchor_block_store/anchor_block_store.js';
 import type { NoteStore } from '../storage/note_store/note_store.js';
 import type { PrivateEventStore } from '../storage/private_event_store/private_event_store.js';
@@ -28,6 +29,7 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
     private noteStore: NoteStore,
     private privateEventStore: PrivateEventStore,
     private l2TipsStore: L2TipsKVStore,
+    private contractSyncService: ContractSyncService,
     private config: Partial<BlockSynchronizerConfig> = {},
     bindings?: LoggerBindings,
   ) {
@@ -125,6 +127,10 @@ export class BlockSynchronizer implements L2BlockStreamEventHandler {
 
   /** Updates the anchor block header to the target block */
   private async updateAnchorBlockHeader(blockHeader: BlockHeader) {
+    // Whenever the anchor block header is updated, we need to synchronize the private state of contracts again.
+    // Therefore, we clear the contract synchronization cache here such that the sync is re-triggered upon new
+    // execution.
+    this.contractSyncService.wipe();
     this.log.verbose(`Updated pxe last block to ${blockHeader.getBlockNumber()}`, blockHeader.toInspect());
     await this.anchorBlockStore.setHeader(blockHeader);
   }

package/src/config/package_info.ts

@@ -1,3 +1,3 @@
 export function getPackageInfo() {
-  return { version: '4.0.0', name: '@aztec/pxe' };
+  return { version: '5.0.0', name: '@aztec/pxe' };
 }