@aztec/pxe 0.79.0 → 0.81.0

package/dest/pxe_service/pxe_service.js

@@ -1,5 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
+import { SerialQueue } from '@aztec/foundation/queue';
 import { Timer } from '@aztec/foundation/timer';
 import { KeyStore } from '@aztec/key-store';
 import { L2TipsStore } from '@aztec/kv-store/stores';
@@ -48,7 +49,8 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
     proofCreator;
     protocolContractsProvider;
     log;
-    constructor(node, synchronizer, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, authWitnessDataProvider, simulator, packageVersion, proverEnabled, proofCreator, protocolContractsProvider, log){
+    jobQueue;
+    constructor(node, synchronizer, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, authWitnessDataProvider, simulator, packageVersion, proverEnabled, proofCreator, protocolContractsProvider, log, jobQueue){
         this.node = node;
         this.synchronizer = synchronizer;
         this.keyStore = keyStore;
@@ -65,6 +67,7 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         this.proofCreator = proofCreator;
         this.protocolContractsProvider = protocolContractsProvider;
         this.log = log;
+        this.jobQueue = jobQueue;
     }
     /**
    * Creates an instance of a PXE Service by instantiating all the necessary data providers and services.
@@ -88,12 +91,26 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         const synchronizer = new Synchronizer(node, syncDataProvider, noteDataProvider, taggingDataProvider, tipsStore, config, loggerOrSuffix);
         const pxeOracleInterface = new PXEOracleInterface(node, keyStore, simulationProvider, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, authWitnessDataProvider, log);
         const simulator = new AcirSimulator(pxeOracleInterface, simulationProvider);
-        const pxeService = new PXEService(node, synchronizer, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, authWitnessDataProvider, simulator, packageVersion, proverEnabled, proofCreator, protocolContractsProvider, log);
+        const jobQueue = new SerialQueue();
+        const pxeService = new PXEService(node, synchronizer, keyStore, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, authWitnessDataProvider, simulator, packageVersion, proverEnabled, proofCreator, protocolContractsProvider, log, jobQueue);
+        pxeService.jobQueue.start();
         await pxeService.#registerProtocolContracts();
         const info = await pxeService.getNodeInfo();
         log.info(`Started PXE connected to chain ${info.l1ChainId} version ${info.protocolVersion}`);
         return pxeService;
     }
+    /**
+   * Enqueues a job for execution once no other jobs are running. Returns a promise that will resolve once the job is
+   * complete.
+   *
+   * Useful for tasks that cannot run concurrently, such as contract function simulation.
+   */ #putInJobQueue(fn) {
+        // TODO(#12636): relax the conditions under which we forbid concurrency.
+        if (this.jobQueue.length() != 0) {
+            this.log.warn(`PXE is already processing ${this.jobQueue.length()} jobs, concurrent execution is not supported. Will run once those are complete.`);
+        }
+        return this.jobQueue.put(fn);
+    }
     isL1ToL2MessageSynced(l1ToL2Message) {
         return this.node.isL1ToL2MessageSynced(l1ToL2Message);
     }
@@ -234,27 +251,31 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         await this.contractDataProvider.addContractInstance(instance);
         this.log.info(`Added contract ${artifact.name} at ${instance.address.toString()} with class ${instance.currentContractClassId}`);
     }
-    async updateContract(contractAddress, artifact) {
-        const currentInstance = await this.contractDataProvider.getContractInstance(contractAddress);
-        const contractClass = await getContractClassFromArtifact(artifact);
-        await this.synchronizer.sync();
-        const header = await this.syncDataProvider.getBlockHeader();
-        const currentClassId = await readCurrentClassId(contractAddress, currentInstance, this.node, header.globalVariables.blockNumber.toNumber());
-        if (!contractClass.id.equals(currentClassId)) {
-            throw new Error('Could not update contract to a class different from the current one.');
-        }
-        await this.contractDataProvider.addContractArtifact(contractClass.id, artifact);
-        const publicFunctionSignatures = artifact.functions.filter((fn)=>fn.functionType === FunctionType.PUBLIC).map((fn)=>decodeFunctionSignature(fn.name, fn.parameters));
-        await this.node.registerContractFunctionSignatures(contractAddress, publicFunctionSignatures);
-        // TODO(#10007): Node should get public contract class from the registration event, not from PXE registration
-        await this.node.addContractClass({
-            ...contractClass,
-            privateFunctions: [],
-            unconstrainedFunctions: []
+    updateContract(contractAddress, artifact) {
+        // We disable concurrently updating contracts to avoid concurrently syncing with the node, or changing a contract's
+        // class while we're simulating it.
+        return this.#putInJobQueue(async ()=>{
+            const currentInstance = await this.contractDataProvider.getContractInstance(contractAddress);
+            const contractClass = await getContractClassFromArtifact(artifact);
+            await this.synchronizer.sync();
+            const header = await this.syncDataProvider.getBlockHeader();
+            const currentClassId = await readCurrentClassId(contractAddress, currentInstance, this.node, header.globalVariables.blockNumber.toNumber());
+            if (!contractClass.id.equals(currentClassId)) {
+                throw new Error('Could not update contract to a class different from the current one.');
+            }
+            await this.contractDataProvider.addContractArtifact(contractClass.id, artifact);
+            const publicFunctionSignatures = artifact.functions.filter((fn)=>fn.functionType === FunctionType.PUBLIC).map((fn)=>decodeFunctionSignature(fn.name, fn.parameters));
+            await this.node.registerContractFunctionSignatures(contractAddress, publicFunctionSignatures);
+            // TODO(#10007): Node should get public contract class from the registration event, not from PXE registration
+            await this.node.addContractClass({
+                ...contractClass,
+                privateFunctions: [],
+                unconstrainedFunctions: []
+            });
+            currentInstance.currentContractClassId = contractClass.id;
+            await this.contractDataProvider.addContractInstance(currentInstance);
+            this.log.info(`Updated contract ${artifact.name} at ${contractAddress.toString()} to class ${contractClass.id}`);
         });
-        currentInstance.currentContractClassId = contractClass.id;
-        await this.contractDataProvider.addContractInstance(currentInstance);
-        this.log.info(`Updated contract ${artifact.name} at ${contractAddress.toString()} to class ${contractClass.id}`);
     }
     getContracts() {
         return this.contractDataProvider.getContractsAddresses();
@@ -265,17 +286,17 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
     async getNotes(filter) {
         const noteDaos = await this.noteDataProvider.getNotes(filter);
         const extendedNotes = noteDaos.map(async (dao)=>{
-            let owner = filter.owner;
-            if (owner === undefined) {
+            let recipient = filter.recipient;
+            if (recipient === undefined) {
                 const completeAddresses = await this.addressDataProvider.getCompleteAddresses();
-                const completeAddressIndex = (await Promise.all(completeAddresses.map((completeAddresses)=>completeAddresses.address.toAddressPoint()))).findIndex((addressPoint)=>addressPoint.equals(dao.addressPoint));
+                const completeAddressIndex = completeAddresses.findIndex((completeAddress)=>completeAddress.address.equals(dao.recipient));
                 const completeAddress = completeAddresses[completeAddressIndex];
                 if (completeAddress === undefined) {
-                    throw new Error(`Cannot find complete address for addressPoint ${dao.addressPoint.toString()}`);
+                    throw new Error(`Cannot find complete address for recipient ${dao.recipient.toString()}`);
                 }
-                owner = completeAddress.address;
+                recipient = completeAddress.address;
             }
-            return new UniqueNote(dao.note, owner, dao.contractAddress, dao.storageSlot, dao.noteTypeId, dao.txHash, dao.nonce);
+            return new UniqueNote(dao.note, recipient, dao.contractAddress, dao.storageSlot, dao.txHash, dao.nonce);
         });
         return Promise.all(extendedNotes);
     }
@@ -295,71 +316,80 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
     async getCurrentBaseFees() {
         return await this.node.getCurrentBaseFees();
     }
-    async proveTx(txRequest, privateExecutionResult) {
-        try {
-            const { publicInputs, clientIvcProof } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
-                simulate: false,
-                skipFeeEnforcement: false,
-                profile: false
-            });
-            return new TxProvingResult(privateExecutionResult, publicInputs, clientIvcProof);
-        } catch (err) {
-            throw this.contextualizeError(err, inspect(txRequest), inspect(privateExecutionResult));
-        }
+    proveTx(txRequest, privateExecutionResult) {
+        // We disable proving concurrently mostly out of caution, since it accesses some of our stores. Proving is so
+        // computationally demanding that it'd be rare for someone to try to do it concurrently regardless.
+        return this.#putInJobQueue(async ()=>{
+            try {
+                const { publicInputs, clientIvcProof } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
+                    simulate: false,
+                    skipFeeEnforcement: false,
+                    profile: false
+                });
+                return new TxProvingResult(privateExecutionResult, publicInputs, clientIvcProof);
+            } catch (err) {
+                throw this.contextualizeError(err, inspect(txRequest), inspect(privateExecutionResult));
+            }
+        });
     }
     // TODO(#7456) Prevent msgSender being defined here for the first call
-    async simulateTx(txRequest, simulatePublic, msgSender = undefined, skipTxValidation = false, skipFeeEnforcement = false, profile = false, scopes) {
-        try {
-            const txInfo = {
-                origin: txRequest.origin,
-                functionSelector: txRequest.functionSelector,
-                simulatePublic,
-                msgSender,
-                chainId: txRequest.txContext.chainId,
-                version: txRequest.txContext.version,
-                authWitnesses: txRequest.authWitnesses.map((w)=>w.requestHash)
-            };
-            this.log.info(`Simulating transaction execution request to ${txRequest.functionSelector} at ${txRequest.origin}`, txInfo);
-            const timer = new Timer();
-            await this.synchronizer.sync();
-            const privateExecutionResult = await this.#executePrivate(txRequest, msgSender, scopes);
-            const { publicInputs, profileResult } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
-                simulate: !profile,
-                skipFeeEnforcement,
-                profile
-            });
-            const privateSimulationResult = new PrivateSimulationResult(privateExecutionResult, publicInputs);
-            const simulatedTx = privateSimulationResult.toSimulatedTx();
-            let publicOutput;
-            if (simulatePublic && publicInputs.forPublic) {
-                publicOutput = await this.#simulatePublicCalls(simulatedTx, skipFeeEnforcement);
-            }
-            if (!skipTxValidation) {
-                const validationResult = await this.node.isValidTx(simulatedTx, {
-                    isSimulation: true,
-                    skipFeeEnforcement
+    simulateTx(txRequest, simulatePublic, msgSender = undefined, skipTxValidation = false, skipFeeEnforcement = false, profile = false, scopes) {
+        // We disable concurrent simulations since those might execute oracles which read and write to the PXE stores (e.g.
+        // to the capsules), and we need to prevent concurrent runs from interfering with one another (e.g. attempting to
+        // delete the same read value, or reading values that another simulation is currently modifying).
+        return this.#putInJobQueue(async ()=>{
+            try {
+                const txInfo = {
+                    origin: txRequest.origin,
+                    functionSelector: txRequest.functionSelector,
+                    simulatePublic,
+                    msgSender,
+                    chainId: txRequest.txContext.chainId,
+                    version: txRequest.txContext.version,
+                    authWitnesses: txRequest.authWitnesses.map((w)=>w.requestHash)
+                };
+                this.log.info(`Simulating transaction execution request to ${txRequest.functionSelector} at ${txRequest.origin}`, txInfo);
+                const timer = new Timer();
+                await this.synchronizer.sync();
+                const privateExecutionResult = await this.#executePrivate(txRequest, msgSender, scopes);
+                const { publicInputs, profileResult } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
+                    simulate: !profile,
+                    skipFeeEnforcement,
+                    profile
                 });
-                if (validationResult.result === 'invalid') {
-                    throw new Error('The simulated transaction is unable to be added to state and is invalid.');
+                const privateSimulationResult = new PrivateSimulationResult(privateExecutionResult, publicInputs);
+                const simulatedTx = privateSimulationResult.toSimulatedTx();
+                let publicOutput;
+                if (simulatePublic && publicInputs.forPublic) {
+                    publicOutput = await this.#simulatePublicCalls(simulatedTx, skipFeeEnforcement);
+                }
+                if (!skipTxValidation) {
+                    const validationResult = await this.node.isValidTx(simulatedTx, {
+                        isSimulation: true,
+                        skipFeeEnforcement
+                    });
+                    if (validationResult.result === 'invalid') {
+                        throw new Error('The simulated transaction is unable to be added to state and is invalid.');
+                    }
                 }
+                const txHash = await simulatedTx.getTxHash();
+                this.log.info(`Simulation completed for ${txHash.toString()} in ${timer.ms()}ms`, {
+                    txHash,
+                    ...txInfo,
+                    ...profileResult ? {
+                        gateCounts: profileResult.gateCounts
+                    } : {},
+                    ...publicOutput ? {
+                        gasUsed: publicOutput.gasUsed,
+                        revertCode: publicOutput.txEffect.revertCode.getCode(),
+                        revertReason: publicOutput.revertReason
+                    } : {}
+                });
+                return TxSimulationResult.fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, profileResult);
+            } catch (err) {
+                throw this.contextualizeError(err, inspect(txRequest), `simulatePublic=${simulatePublic}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`, `skipTxValidation=${skipTxValidation}`, `profile=${profile}`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
             }
-            const txHash = await simulatedTx.getTxHash();
-            this.log.info(`Simulation completed for ${txHash.toString()} in ${timer.ms()}ms`, {
-                txHash,
-                ...txInfo,
-                ...profileResult ? {
-                    gateCounts: profileResult.gateCounts
-                } : {},
-                ...publicOutput ? {
-                    gasUsed: publicOutput.gasUsed,
-                    revertCode: publicOutput.txEffect.revertCode.getCode(),
-                    revertReason: publicOutput.revertReason
-                } : {}
-            });
-            return TxSimulationResult.fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, profileResult);
-        } catch (err) {
-            throw this.contextualizeError(err, inspect(txRequest), `simulatePublic=${simulatePublic}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`, `skipTxValidation=${skipTxValidation}`, `profile=${profile}`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
-        }
+        });
     }
     async sendTx(tx) {
         const txHash = await tx.getTxHash();
@@ -373,18 +403,23 @@ import { enrichPublicSimulationError, enrichSimulationError } from './error_enri
         this.log.info(`Sent transaction ${txHash}`);
         return txHash;
     }
-    async simulateUnconstrained(functionName, args, to, _from, scopes) {
-        try {
-            await this.synchronizer.sync();
-            // TODO - Should check if `from` has the permission to call the view function.
-            const functionCall = await this.#getFunctionCall(functionName, args, to);
-            const executionResult = await this.#simulateUnconstrained(functionCall, scopes);
-            // TODO - Return typed result based on the function artifact.
-            return executionResult;
-        } catch (err) {
-            const stringifiedArgs = args.map((arg)=>arg.toString()).join(', ');
-            throw this.contextualizeError(err, `simulateUnconstrained ${to}:${functionName}(${stringifiedArgs})`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
-        }
+    simulateUnconstrained(functionName, args, to, _from, scopes) {
+        // We disable concurrent simulations since those might execute oracles which read and write to the PXE stores (e.g.
+        // to the capsules), and we need to prevent concurrent runs from interfering with one another (e.g. attempting to
+        // delete the same read value, or reading values that another simulation is currently modifying).
+        return this.#putInJobQueue(async ()=>{
+            try {
+                await this.synchronizer.sync();
+                // TODO - Should check if `from` has the permission to call the view function.
+                const functionCall = await this.#getFunctionCall(functionName, args, to);
+                const executionResult = await this.#simulateUnconstrained(functionCall, scopes);
+                // TODO - Return typed result based on the function artifact.
+                return executionResult;
+            } catch (err) {
+                const stringifiedArgs = args.map((arg)=>arg.toString()).join(', ');
+                throw this.contextualizeError(err, `simulateUnconstrained ${to}:${functionName}(${stringifiedArgs})`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
+            }
+        });
     }
     getTxReceipt(txHash) {
         return this.node.getTxReceipt(txHash);

package/dest/storage/note_data_provider/note_dao.d.ts

@@ -3,9 +3,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { NoteData } from '@aztec/simulator/client';
-import { NoteSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PublicKey } from '@aztec/stdlib/keys';
 import { Note } from '@aztec/stdlib/note';
 import { TxHash } from '@aztec/stdlib/tx';
 /**
@@ -46,12 +44,11 @@ export declare class NoteDao implements NoteData {
     l2BlockHash: string;
     /** The index of the leaf in the global note hash tree the note is stored at */
     index: bigint;
-    /** The public key with which the note log was encrypted during delivery. */
-    addressPoint: PublicKey;
-    /** The note type identifier for the contract.
-     * TODO(#12013): remove
+    /**
+     * The address whose public key was used to encrypt the note log during delivery.
+     * (This is the x-coordinate of the public key.)
      */
-    noteTypeId: NoteSelector;
+    recipient: AztecAddress;
     constructor(
     /** The packed content of the note, as will be returned in the getNotes oracle. */
     note: Note, 
@@ -86,12 +83,11 @@ export declare class NoteDao implements NoteData {
     l2BlockHash: string, 
     /** The index of the leaf in the global note hash tree the note is stored at */
     index: bigint, 
-    /** The public key with which the note log was encrypted during delivery. */
-    addressPoint: PublicKey, 
-    /** The note type identifier for the contract.
-     * TODO(#12013): remove
+    /**
+     * The address whose public key was used to encrypt the note log during delivery.
+     * (This is the x-coordinate of the public key.)
      */
-    noteTypeId: NoteSelector);
+    recipient: AztecAddress);
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer | BufferReader): NoteDao;
     toString(): string;
@@ -101,6 +97,6 @@ export declare class NoteDao implements NoteData {
      * @returns - Its size in bytes.
      */
     getSize(): number;
-    static random({ note, contractAddress, storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, addressPoint, noteTypeId, }?: Partial<NoteDao>): Promise<NoteDao>;
+    static random({ note, contractAddress, storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, recipient, }?: Partial<NoteDao>): Promise<NoteDao>;
 }
 //# sourceMappingURL=note_dao.d.ts.map

package/dest/storage/note_data_provider/note_dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_dao.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IAIpC,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB,4EAA4E;IACrE,YAAY,EAAE,SAAS;IAE9B;;OAEG;IACI,UAAU,EAAE,YAAY;;IA3C/B,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB,4EAA4E;IACrE,YAAY,EAAE,SAAS;IAE9B;;OAEG;IACI,UAAU,EAAE,YAAY;IAGjC,QAAQ,IAAI,MAAM;IAiBlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAgC/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;WAMD,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,KAAmB,EACnB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC9B,YAAwB,EACxB,UAAkC,GACnC,GAAE,OAAO,CAAC,OAAO,CAAM;CAgBzB"}
+{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_dao.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IAIpC,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;;IAzC9B,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB;;;OAGG;IACI,SAAS,EAAE,YAAY;IAGhC,QAAQ,IAAI,MAAM;IAgBlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA8B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;WAMD,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,KAAmB,EACnB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC9B,SAAqB,GACtB,GAAE,OAAO,CAAC,OAAO,CAAM;CAezB"}

package/dest/storage/note_data_provider/note_dao.js

@@ -1,7 +1,6 @@
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { NoteSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Note } from '@aztec/stdlib/note';
 import { TxHash } from '@aztec/stdlib/tx';
@@ -19,8 +18,7 @@ import { TxHash } from '@aztec/stdlib/tx';
     l2BlockNumber;
     l2BlockHash;
     index;
-    addressPoint;
-    noteTypeId;
+    recipient;
     constructor(// Note information
     /** The packed content of the note, as will be returned in the getNotes oracle. */ note, /** The address of the contract that created the note (i.e. the address used by the kernel during siloing). */ contractAddress, /**
      * The storage location of the note. This value is not used for anything in PXE, but we do index by storage slot
@@ -37,9 +35,10 @@ import { TxHash } from '@aztec/stdlib/tx';
      *  when searching for txEffects.
      */ txHash, /** The L2 block number in which the tx with this note was included. Used for note management while processing
      * reorgs.*/ l2BlockNumber, /** The L2 block hash in which the tx with this note was included. Used for note management while processing
-     * reorgs.*/ l2BlockHash, /** The index of the leaf in the global note hash tree the note is stored at */ index, /** The public key with which the note log was encrypted during delivery. */ addressPoint, /** The note type identifier for the contract.
-     * TODO(#12013): remove
-     */ noteTypeId){
+     * reorgs.*/ l2BlockHash, /** The index of the leaf in the global note hash tree the note is stored at */ index, /**
+     * The address whose public key was used to encrypt the note log during delivery.
+     * (This is the x-coordinate of the public key.)
+     */ recipient){
         this.note = note;
         this.contractAddress = contractAddress;
         this.storageSlot = storageSlot;
@@ -50,8 +49,7 @@ import { TxHash } from '@aztec/stdlib/tx';
         this.l2BlockNumber = l2BlockNumber;
         this.l2BlockHash = l2BlockHash;
         this.index = index;
-        this.addressPoint = addressPoint;
-        this.noteTypeId = noteTypeId;
+        this.recipient = recipient;
     }
     toBuffer() {
         return serializeToBuffer([
@@ -65,8 +63,7 @@ import { TxHash } from '@aztec/stdlib/tx';
             this.l2BlockNumber,
             Fr.fromHexString(this.l2BlockHash),
             this.index,
-            this.addressPoint,
-            this.noteTypeId
+            this.recipient
         ]);
     }
     static fromBuffer(buffer) {
@@ -81,9 +78,8 @@ import { TxHash } from '@aztec/stdlib/tx';
         const l2BlockNumber = reader.readNumber();
         const l2BlockHash = Fr.fromBuffer(reader).toString();
         const index = toBigIntBE(reader.readBytes(32));
-        const publicKey = Point.fromBuffer(reader);
-        const noteTypeId = reader.readObject(NoteSelector);
-        return new NoteDao(note, contractAddress, storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, publicKey, noteTypeId);
+        const recipient = AztecAddress.fromBuffer(reader);
+        return new NoteDao(note, contractAddress, storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, recipient);
     }
     toString() {
         return '0x' + this.toBuffer().toString('hex');
@@ -100,7 +96,7 @@ import { TxHash } from '@aztec/stdlib/tx';
         const noteSize = 4 + this.note.items.length * Fr.SIZE_IN_BYTES;
         return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
     }
-    static async random({ note = Note.random(), contractAddress = undefined, storageSlot = Fr.random(), nonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = TxHash.random(), l2BlockNumber = Math.floor(Math.random() * 1000), l2BlockHash = Fr.random().toString(), index = Fr.random().toBigInt(), addressPoint = undefined, noteTypeId = NoteSelector.random() } = {}) {
-        return new NoteDao(note, contractAddress ?? await AztecAddress.random(), storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, addressPoint ?? await Point.random(), noteTypeId);
+    static async random({ note = Note.random(), contractAddress = undefined, storageSlot = Fr.random(), nonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = TxHash.random(), l2BlockNumber = Math.floor(Math.random() * 1000), l2BlockHash = Fr.random().toString(), index = Fr.random().toBigInt(), recipient = undefined } = {}) {
+        return new NoteDao(note, contractAddress ?? await AztecAddress.random(), storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, recipient ?? await AztecAddress.random());
     }
 }

package/dest/storage/note_data_provider/note_data_provider.d.ts

@@ -1,4 +1,4 @@
-import type { Fr, Point } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/fields';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { InBlock } from '@aztec/stdlib/block';
@@ -14,7 +14,7 @@ export declare class NoteDataProvider implements DataProvider {
     removeNotesAfter(blockNumber: number): Promise<void>;
     unnullifyNotesAfter(blockNumber: number, synchedBlockNumber?: number): Promise<void>;
     getNotes(filter: NotesFilter): Promise<NoteDao[]>;
-    removeNullifiedNotes(nullifiers: InBlock<Fr>[], accountAddressPoint: Point): Promise<NoteDao[]>;
+    removeNullifiedNotes(nullifiers: InBlock<Fr>[], recipient: AztecAddress): Promise<NoteDao[]>;
     getSize(): Promise<number>;
 }
 //# sourceMappingURL=note_data_provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"note_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_data_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,qBAAa,gBAAiB,YAAW,YAAY;;IAsBnD,OAAO;WAsBa,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWlE,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBtD,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,GAAE,YAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBjF,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB9C,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD3F,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAkGvD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,mBAAmB,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA6DzF,OAAO;CAGd"}
+{"version":3,"file":"note_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/note_data_provider/note_data_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,qBAAa,gBAAiB,YAAW,YAAY;;IAsBnD,OAAO;WAsBa,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWlE,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBtD,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,GAAE,YAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBjF,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB9C,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD3F,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAgGvD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA6DtF,OAAO;CAGd"}