@aztec/pxe 0.24.0 → 0.26.1

package/dest/kernel_prover/kernel_prover.js

@@ -1,8 +1,10 @@
-import { CallRequest, Fr, GrumpkinScalar, MAX_NEW_NULLIFIERS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_READ_REQUESTS_PER_CALL, MAX_READ_REQUESTS_PER_TX, PrivateCallData, PrivateKernelInitCircuitPrivateInputs, PrivateKernelInnerCircuitPrivateInputs, PrivateKernelInnerCircuitPublicInputs, PrivateKernelInnerData, PrivateKernelTailCircuitPrivateInputs, ReadRequestMembershipWitness, VK_TREE_HEIGHT, VerificationKey, makeEmptyProof, } from '@aztec/circuits.js';
+import { CallRequest, Fr, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, NoteHashReadRequestMembershipWitness, PrivateCallData, PrivateKernelInitCircuitPrivateInputs, PrivateKernelInnerCircuitPrivateInputs, PrivateKernelInnerCircuitPublicInputs, PrivateKernelInnerData, PrivateKernelTailCircuitPrivateInputs, VK_TREE_HEIGHT, VerificationKey, makeEmptyProof, } from '@aztec/circuits.js';
 import { makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
+import { createDebugLogger } from '@aztec/foundation/log';
 import { assertLength, mapTuple } from '@aztec/foundation/serialize';
 import { pushTestData } from '@aztec/foundation/testing';
+import { HintsBuilder } from './hints_builder.js';
 import { KernelProofCreator } from './proof_creator.js';
 /**
  * The KernelProver class is responsible for generating kernel proofs.
@@ -14,6 +16,8 @@ export class KernelProver {
     constructor(oracle, proofCreator = new KernelProofCreator()) {
         this.oracle = oracle;
         this.proofCreator = proofCreator;
+        this.log = createDebugLogger('aztec:kernel-prover');
+        this.hintsBuilder = new HintsBuilder(oracle);
     }
     /**
      * Generate a proof for a given transaction request and execution result.
@@ -37,12 +41,12 @@ export class KernelProver {
         while (executionStack.length) {
             const currentExecution = executionStack.pop();
             executionStack.push(...currentExecution.nestedExecutions);
-            const privateCallRequests = currentExecution.nestedExecutions.map(result => result.callStackItem.toCallRequest());
+            const privateCallRequests = currentExecution.nestedExecutions.map(result => result.callStackItem.toCallRequest(currentExecution.callStackItem.publicInputs.callContext));
             const publicCallRequests = currentExecution.enqueuedPublicFunctionCalls.map(result => result.toCallRequest());
             // Start with the partially filled in read request witnesses from the simulator
             // and fill the non-transient ones in with sibling paths via oracle.
-            const readRequestMembershipWitnesses = currentExecution.readRequestPartialWitnesses;
-            for (let rr = 0; rr < readRequestMembershipWitnesses.length; rr++) {
+            const noteHashReadRequestMembershipWitnesses = currentExecution.noteHashReadRequestPartialWitnesses;
+            for (let rr = 0; rr < noteHashReadRequestMembershipWitnesses.length; rr++) {
                 // Pretty sure this check was forever broken. I made some changes to Fr and this started triggering.
                 // The conditional makes no sense to me anyway.
                 // if (currentExecution.callStackItem.publicInputs.readRequests[rr] == Fr.ZERO) {
@@ -50,7 +54,7 @@ export class KernelProver {
                 //     'Number of read requests output from Noir circuit does not match number of read request commitment indices output from simulator.',
                 //   );
                 // }
-                const rrWitness = readRequestMembershipWitnesses[rr];
+                const rrWitness = noteHashReadRequestMembershipWitnesses[rr];
                 if (!rrWitness.isTransient) {
                     // Non-transient reads must contain full membership witness with sibling path from commitment to root.
                     // Get regular membership witness to fill in sibling path in the read request witness.
@@ -59,10 +63,10 @@ export class KernelProver {
                 }
             }
             // fill in witnesses for remaining/empty read requests
-            readRequestMembershipWitnesses.push(...Array(MAX_READ_REQUESTS_PER_CALL - readRequestMembershipWitnesses.length)
+            noteHashReadRequestMembershipWitnesses.push(...Array(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL - noteHashReadRequestMembershipWitnesses.length)
                 .fill(0)
-                .map(() => ReadRequestMembershipWitness.empty(BigInt(0))));
-            const privateCallData = await this.createPrivateCallData(currentExecution, privateCallRequests, publicCallRequests, readRequestMembershipWitnesses);
+                .map(() => NoteHashReadRequestMembershipWitness.empty(BigInt(0))));
+            const privateCallData = await this.createPrivateCallData(currentExecution, privateCallRequests, publicCallRequests, noteHashReadRequestMembershipWitnesses);
             if (firstIteration) {
                 const proofInput = new PrivateKernelInitCircuitPrivateInputs(txRequest, privateCallData);
                 pushTestData('private-kernel-inputs-init', proofInput);
@@ -83,36 +87,22 @@ export class KernelProver {
         }
         const previousVkMembershipWitness = await this.oracle.getVkMembershipWitness(previousVerificationKey);
         const previousKernelData = new PrivateKernelInnerData(output.publicInputs, output.proof, previousVerificationKey, Number(previousVkMembershipWitness.leafIndex), assertLength(previousVkMembershipWitness.siblingPath, VK_TREE_HEIGHT));
-        const [sortedCommitments, sortedCommitmentsIndexes] = this.sortSideEffects(output.publicInputs.end.newCommitments);
-        const [sortedNullifiers, sortedNullifiersIndexes] = this.sortSideEffects(output.publicInputs.end.newNullifiers);
-        const readCommitmentHints = this.getReadRequestHints(output.publicInputs.end.readRequests, sortedCommitments);
-        const nullifierCommitmentHints = this.getNullifierHints(mapTuple(sortedNullifiers, n => n.noteHash), sortedCommitments);
-        const masterNullifierSecretKeys = await this.getMasterNullifierSecretKeys(output.publicInputs.end.nullifierKeyValidationRequests);
-        const privateInputs = new PrivateKernelTailCircuitPrivateInputs(previousKernelData, sortedCommitments, sortedCommitmentsIndexes, readCommitmentHints, sortedNullifiers, sortedNullifiersIndexes, nullifierCommitmentHints, masterNullifierSecretKeys);
+        const [sortedNoteHashes, sortedNoteHashesIndexes] = this.hintsBuilder.sortSideEffects(output.publicInputs.end.newNoteHashes);
+        const [sortedNullifiers, sortedNullifiersIndexes] = this.hintsBuilder.sortSideEffects(output.publicInputs.end.newNullifiers);
+        const readNoteHashHints = this.hintsBuilder.getNoteHashReadRequestHints(output.publicInputs.end.noteHashReadRequests, sortedNoteHashes);
+        const nullifierReadRequestResetHints = await this.hintsBuilder.getNullifierReadRequestResetHints(output.publicInputs.end.nullifierReadRequests, output.publicInputs.end.newNullifiers);
+        const nullifierNoteHashHints = this.hintsBuilder.getNullifierHints(mapTuple(sortedNullifiers, n => n.noteHash), sortedNoteHashes);
+        const masterNullifierSecretKeys = await this.hintsBuilder.getMasterNullifierSecretKeys(output.publicInputs.end.nullifierKeyValidationRequests);
+        this.log.debug(`Calling private kernel tail with hwm ${previousKernelData.publicInputs.minRevertibleSideEffectCounter}`);
+        const privateInputs = new PrivateKernelTailCircuitPrivateInputs(previousKernelData, sortedNoteHashes, sortedNoteHashesIndexes, readNoteHashHints, sortedNullifiers, sortedNullifiersIndexes, nullifierReadRequestResetHints, nullifierNoteHashHints, masterNullifierSecretKeys);
         pushTestData('private-kernel-inputs-ordering', privateInputs);
         const outputFinal = await this.proofCreator.createProofTail(privateInputs);
         // Only return the notes whose commitment is in the commitments of the final proof.
-        const finalNewCommitments = outputFinal.publicInputs.end.newCommitments;
+        const finalNewCommitments = outputFinal.publicInputs.end.newNoteHashes;
         const outputNotes = finalNewCommitments.map(c => newNotes[c.value.toString()]).filter(c => !!c);
         return { ...outputFinal, outputNotes };
     }
-    sortSideEffects(sideEffects) {
-        const sorted = sideEffects
-            .map((sideEffect, index) => ({ sideEffect, index }))
-            .sort((a, b) => {
-            // Empty ones go to the right
-            if (a.sideEffect.isEmpty()) {
-                return 1;
-            }
-            return Number(a.sideEffect.counter.toBigInt() - b.sideEffect.counter.toBigInt());
-        });
-        const originalToSorted = sorted.map(() => 0);
-        sorted.forEach(({ index }, i) => {
-            originalToSorted[index] = i;
-        });
-        return [sorted.map(({ sideEffect }) => sideEffect), originalToSorted];
-    }
-    async createPrivateCallData({ callStackItem, vk }, privateCallRequests, publicCallRequests, readRequestMembershipWitnesses) {
+    async createPrivateCallData({ callStackItem, vk }, privateCallRequests, publicCallRequests, noteHashReadRequestMembershipWitnesses) {
         const { contractAddress, functionData, publicInputs } = callStackItem;
         const { portalContractAddress } = publicInputs.callContext;
         // Pad with empty items to reach max/const length expected by circuit.
@@ -137,7 +127,7 @@ export class KernelProver {
             contractClassPublicBytecodeCommitment,
             saltedInitializationHash,
             functionLeafMembershipWitness,
-            readRequestMembershipWitnesses: makeTuple(MAX_READ_REQUESTS_PER_CALL, i => readRequestMembershipWitnesses[i], 0),
+            noteHashReadRequestMembershipWitnesses: makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, i => noteHashReadRequestMembershipWitnesses[i], 0),
             portalContractAddress: portalContractAddress.toField(),
             acirHash,
         });
@@ -155,73 +145,12 @@ export class KernelProver {
         const { callStackItem: { publicInputs }, newNotes, } = executionResult;
         const contractAddress = publicInputs.callContext.storageContractAddress;
         // Assuming that for each new commitment there's an output note added to the execution result.
-        const newCommitments = await this.proofCreator.getSiloedCommitments(publicInputs);
+        const newNoteHashes = await this.proofCreator.getSiloedCommitments(publicInputs);
         return newNotes.map((data, i) => ({
             contractAddress,
             data,
-            commitment: newCommitments[i],
+            commitment: newNoteHashes[i],
         }));
     }
-    /**
-     * Performs the matching between an array of read request and an array of commitments. This produces
-     * hints for the private kernel ordering circuit to efficiently match a read request with the corresponding
-     * commitment.
-     *
-     * @param readRequests - The array of read requests.
-     * @param commitments - The array of commitments.
-     * @returns An array of hints where each element is the index of the commitment in commitments array
-     *  corresponding to the read request. In other words we have readRequests[i] == commitments[hints[i]].
-     */
-    getReadRequestHints(readRequests, commitments) {
-        const hints = makeTuple(MAX_READ_REQUESTS_PER_TX, Fr.zero);
-        for (let i = 0; i < MAX_READ_REQUESTS_PER_TX && !readRequests[i].isEmpty(); i++) {
-            const equalToRR = (cmt) => cmt.value.equals(readRequests[i].value);
-            const result = commitments.findIndex(equalToRR);
-            if (result == -1) {
-                throw new Error(`The read request at index ${i} with value ${readRequests[i].toString()} does not match to any commitment.`);
-            }
-            else {
-                hints[i] = new Fr(result);
-            }
-        }
-        return hints;
-    }
-    /**
-     *  Performs the matching between an array of nullified commitments and an array of commitments. This produces
-     * hints for the private kernel ordering circuit to efficiently match a nullifier with the corresponding
-     * commitment.
-     *
-     * @param nullifiedCommitments - The array of nullified commitments.
-     * @param commitments - The array of commitments.
-     * @returns An array of hints where each element is the index of the commitment in commitments array
-     *  corresponding to the nullified commitments. In other words we have nullifiedCommitments[i] == commitments[hints[i]].
-     */
-    getNullifierHints(nullifiedCommitments, commitments) {
-        const hints = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, Fr.zero);
-        for (let i = 0; i < MAX_NEW_NULLIFIERS_PER_TX; i++) {
-            if (!nullifiedCommitments[i].isZero()) {
-                const equalToCommitment = (cmt) => cmt.value.equals(nullifiedCommitments[i]);
-                const result = commitments.findIndex(equalToCommitment);
-                if (result == -1) {
-                    throw new Error(`The nullified commitment at index ${i} with value ${nullifiedCommitments[i].toString()} does not match to any commitment.`);
-                }
-                else {
-                    hints[i] = new Fr(result);
-                }
-            }
-        }
-        return hints;
-    }
-    async getMasterNullifierSecretKeys(nullifierKeyValidationRequests) {
-        const keys = makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, GrumpkinScalar.zero);
-        for (let i = 0; i < nullifierKeyValidationRequests.length; ++i) {
-            const request = nullifierKeyValidationRequests[i];
-            if (request.isEmpty()) {
-                break;
-            }
-            keys[i] = await this.oracle.getMasterNullifierSecretKey(request.publicKey);
-        }
-        return keys;
-    }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kernel_prover.js","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kernel_prover.js","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"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"}

package/dest/kernel_prover/proof_creator.d.ts

@@ -36,7 +36,7 @@ export interface ProofCreator {
     /**
      * Computes the siloed commitments for a given set of public inputs.
      *
-     * @param publicInputs - The public inputs containing the contract address and new commitments to be used in generating siloed commitments.
+     * @param publicInputs - The public inputs containing the contract address and new note hashes to be used in generating siloed note hashes.
      * @returns An array of Fr (finite field) elements representing the siloed commitments.
      */
     getSiloedCommitments(publicInputs: PrivateCircuitPublicInputs): Promise<Fr[]>;

package/dest/kernel_prover/proof_creator.js

@@ -1,5 +1,5 @@
 import { makeEmptyProof, } from '@aztec/circuits.js';
-import { siloCommitment } from '@aztec/circuits.js/abis';
+import { siloNoteHash } from '@aztec/circuits.js/hash';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { elapsed } from '@aztec/foundation/timer';
 import { executeInit, executeInner, executeTail } from '@aztec/noir-protocol-circuits-types';
@@ -16,7 +16,7 @@ export class KernelProofCreator {
     }
     getSiloedCommitments(publicInputs) {
         const contractAddress = publicInputs.callContext.storageContractAddress;
-        return Promise.resolve(publicInputs.newCommitments.map(commitment => siloCommitment(contractAddress, commitment.value)));
+        return Promise.resolve(publicInputs.newNoteHashes.map(commitment => siloNoteHash(contractAddress, commitment.value)));
     }
     async createProofInit(privateInputs) {
         const [duration, result] = await elapsed(() => executeInit(privateInputs));
@@ -67,4 +67,4 @@ export class KernelProofCreator {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvb2ZfY3JlYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL3Byb29mX2NyZWF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQVFMLGNBQWMsR0FDZixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFzRTdGOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFBb0IsTUFBTSxpQkFBaUIsQ0FBQyw0QkFBNEIsQ0FBQztRQUFyRCxRQUFHLEdBQUgsR0FBRyxDQUFrRDtJQUFHLENBQUM7SUFFdEUsb0JBQW9CLENBQUMsWUFBd0M7UUFDbEUsTUFBTSxlQUFlLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxzQkFBc0IsQ0FBQztRQUV4RSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQ3BCLFlBQVksQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLGVBQWUsRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FDakcsQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsZUFBZSxDQUFDLGFBQW9EO1FBQy9FLE1BQU0sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsRUFBRTtZQUN4QyxTQUFTLEVBQUUsb0JBQW9CO1lBQy9CLFdBQVcsRUFBRSxxQkFBcUI7WUFDbEMsUUFBUTtZQUNSLFNBQVMsRUFBRSxhQUFhLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtZQUMxQyxVQUFVLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07U0FDSixDQUFDLENBQUM7UUFDcEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1FBQ3BELE1BQU0sS0FBSyxHQUFHLGNBQWMsRUFBRSxDQUFDO1FBRS9CLE9BQU87WUFDTCxZQUFZLEVBQUUsTUFBTTtZQUNwQixLQUFLLEVBQUUsS0FBSztTQUNiLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLGFBQXFEO1FBQ2pGLE1BQU0sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDNUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxnQ0FBZ0MsRUFBRTtZQUN6QyxTQUFTLEVBQUUsb0JBQW9CO1lBQy9CLFdBQVcsRUFBRSxzQkFBc0I7WUFDbkMsUUFBUTtZQUNSLFNBQVMsRUFBRSxhQUFhLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtZQUMxQyxVQUFVLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07U0FDSixDQUFDLENBQUM7UUFDcEMsSUFBSSxDQUFDLEdBQUcsQ0FBQywwQ0FBMEMsQ0FBQyxDQUFDO1FBQ3JELE1BQU0sS0FBSyxHQUFHLGNBQWMsRUFBRSxDQUFDO1FBRS9CLE9BQU87WUFDTCxZQUFZLEVBQUUsTUFBTTtZQUNwQixLQUFLLEVBQUUsS0FBSztTQUNiLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLGVBQWUsQ0FBQyxhQUFvRDtRQUMvRSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyxHQUFHLENBQUMsbUNBQW1DLEVBQUU7WUFDNUMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUseUJBQXlCO1lBQ3RDLFFBQVE7WUFDUixTQUFTLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDMUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsNkNBQTZDLENBQUMsQ0FBQztRQUN4RCxNQUFNLEtBQUssR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUUvQixPQUFPO1lBQ0wsWUFBWSxFQUFFLE1BQU07WUFDcEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDO0lBQ0osQ0FBQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvb2ZfY3JlYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL3Byb29mX2NyZWF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQVFMLGNBQWMsR0FDZixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFzRTdGOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFBb0IsTUFBTSxpQkFBaUIsQ0FBQyw0QkFBNEIsQ0FBQztRQUFyRCxRQUFHLEdBQUgsR0FBRyxDQUFrRDtJQUFHLENBQUM7SUFFdEUsb0JBQW9CLENBQUMsWUFBd0M7UUFDbEUsTUFBTSxlQUFlLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxzQkFBc0IsQ0FBQztRQUV4RSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQ3BCLFlBQVksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLGVBQWUsRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FDOUYsQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsZUFBZSxDQUFDLGFBQW9EO1FBQy9FLE1BQU0sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDM0UsSUFBSSxDQUFDLEdBQUcsQ0FBQywrQkFBK0IsRUFBRTtZQUN4QyxTQUFTLEVBQUUsb0JBQW9CO1lBQy9CLFdBQVcsRUFBRSxxQkFBcUI7WUFDbEMsUUFBUTtZQUNSLFNBQVMsRUFBRSxhQUFhLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtZQUMxQyxVQUFVLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07U0FDSixDQUFDLENBQUM7UUFDcEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1FBQ3BELE1BQU0sS0FBSyxHQUFHLGNBQWMsRUFBRSxDQUFDO1FBRS9CLE9BQU87WUFDTCxZQUFZLEVBQUUsTUFBTTtZQUNwQixLQUFLLEVBQUUsS0FBSztTQUNiLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLGFBQXFEO1FBQ2pGLE1BQU0sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFDNUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxnQ0FBZ0MsRUFBRTtZQUN6QyxTQUFTLEVBQUUsb0JBQW9CO1lBQy9CLFdBQVcsRUFBRSxzQkFBc0I7WUFDbkMsUUFBUTtZQUNSLFNBQVMsRUFBRSxhQUFhLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTTtZQUMxQyxVQUFVLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07U0FDSixDQUFDLENBQUM7UUFDcEMsSUFBSSxDQUFDLEdBQUcsQ0FBQywwQ0FBMEMsQ0FBQyxDQUFDO1FBQ3JELE1BQU0sS0FBSyxHQUFHLGNBQWMsRUFBRSxDQUFDO1FBRS9CLE9BQU87WUFDTCxZQUFZLEVBQUUsTUFBTTtZQUNwQixLQUFLLEVBQUUsS0FBSztTQUNiLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLGVBQWUsQ0FBQyxhQUFvRDtRQUMvRSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyxHQUFHLENBQUMsbUNBQW1DLEVBQUU7WUFDNUMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUseUJBQXlCO1lBQ3RDLFFBQVE7WUFDUixTQUFTLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDMUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsNkNBQTZDLENBQUMsQ0FBQztRQUN4RCxNQUFNLEtBQUssR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUUvQixPQUFPO1lBQ0wsWUFBWSxFQUFFLE1BQU07WUFDcEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDO0lBQ0osQ0FBQztDQUNGIn0=

package/dest/kernel_prover/proving_data_oracle.d.ts

@@ -1,3 +1,4 @@
+import { NullifierMembershipWitness } from '@aztec/circuit-types';
 import { FUNCTION_TREE_HEIGHT, Fr, FunctionSelector, GrumpkinPrivateKey, MembershipWitness, NOTE_HASH_TREE_HEIGHT, Point, VK_TREE_HEIGHT, VerificationKey } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 /**
@@ -44,6 +45,7 @@ export interface ProvingDataOracle {
      * @returns the MembershipWitness for the note.
      */
     getNoteMembershipWitness(leafIndex: bigint): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>>;
+    getNullifierMembershipWitness(blockNumber: number, nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
     /**
      * Get the root of the note hash tree.
      *

package/dest/kernel_prover/proving_data_oracle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proving_data_oracle.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/proving_data_oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,EAAE,EACF,gBAAgB,EAChB,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,KAAK,EACL,cAAc,EACd,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,8FAA8F;IAC9F,0BAA0B,CACxB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC;QAAE,wBAAwB,EAAE,EAAE,CAAC;QAAC,cAAc,EAAE,EAAE,CAAC;QAAC,eAAe,EAAE,EAAE,CAAA;KAAE,CAAC,CAAC;IAEtF,kFAAkF;IAClF,0BAA0B,CACxB,eAAe,EAAE,EAAE,GAClB,OAAO,CAAC;QAAE,YAAY,EAAE,EAAE,CAAC;QAAC,wBAAwB,EAAE,EAAE,CAAC;QAAC,oBAAoB,EAAE,EAAE,CAAA;KAAE,CAAC,CAAC;IAEzF;;;;;;;;OAQG;IACH,4BAA4B,CAC1B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC;IAE3D;;;;;;;;OAQG;IACH,sBAAsB,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IAE/F;;;;;OAKG;IACH,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC;IAEtG;;;;OAIG;IACH,mBAAmB,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,2BAA2B,CAAC,kBAAkB,EAAE,KAAK,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACrF"}
+{"version":3,"file":"proving_data_oracle.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/proving_data_oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EACL,oBAAoB,EACpB,EAAE,EACF,gBAAgB,EAChB,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,KAAK,EACL,cAAc,EACd,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,8FAA8F;IAC9F,0BAA0B,CACxB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC;QAAE,wBAAwB,EAAE,EAAE,CAAC;QAAC,cAAc,EAAE,EAAE,CAAC;QAAC,eAAe,EAAE,EAAE,CAAA;KAAE,CAAC,CAAC;IAEtF,kFAAkF;IAClF,0BAA0B,CACxB,eAAe,EAAE,EAAE,GAClB,OAAO,CAAC;QAAE,YAAY,EAAE,EAAE,CAAC;QAAC,wBAAwB,EAAE,EAAE,CAAC;QAAC,oBAAoB,EAAE,EAAE,CAAA;KAAE,CAAC,CAAC;IAEzF;;;;;;;;OAQG;IACH,4BAA4B,CAC1B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC;IAE3D;;;;;;;;OAQG;IACH,sBAAsB,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IAE/F;;;;;OAKG;IACH,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC;IAEtG,6BAA6B,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC,CAAC;IAEnH;;;;OAIG;IACH,mBAAmB,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,2BAA2B,CAAC,kBAAkB,EAAE,KAAK,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACrF"}

package/dest/note_processor/note_processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_processor.d.ts","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,QAAQ,EAER,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAA8B,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI3E,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGhD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAkBlD;;;GAGG;AACH,qBAAa,aAAa;IAQtB;;OAEG;aACa,SAAS,EAAE,SAAS;IACpC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAhBb,mEAAmE;IACnE,SAAgB,KAAK,EAAE,KAAK,CAAe;IAE3C,4CAA4C;IAC5C,SAAgB,KAAK,EAAE,kBAAkB,CAAwE;;IAG/G;;OAEG;IACa,SAAS,EAAE,SAAS,EAC5B,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,SAAS,EACf,aAAa,GAAE,MAA6B,EAC5C,SAAS,2CAAuC,EAChD,GAAG,8CAA4C;IAGzD;;;;;;OAMG;IACU,cAAc;IAK3B;;OAEG;IACH,IAAW,MAAM;;MAEhB;IAED,OAAO,CAAC,gBAAgB;IAIxB;;;;;;;;;OASG;IACU,OAAO,CAAC,eAAe,EAAE,cAAc,EAAE,EAAE,oBAAoB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoG7G;;;;;;;;OAQG;YACW,qBAAqB;IAwBnC;;;;OAIG;YACW,oBAAoB;IAalC;;;;;;;;OAQG;IACU,mBAAmB,CAAC,gBAAgB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA4B1F"}
+{"version":3,"file":"note_processor.d.ts","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAiB,cAAc,EAAE,aAAa,EAAc,MAAM,sBAAsB,CAAC;AACrH,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAoD,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIjG,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGhD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAkBlD;;;GAGG;AACH,qBAAa,aAAa;IAQtB;;OAEG;aACa,SAAS,EAAE,SAAS;IACpC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAhBb,mEAAmE;IACnE,SAAgB,KAAK,EAAE,KAAK,CAAe;IAE3C,4CAA4C;IAC5C,SAAgB,KAAK,EAAE,kBAAkB,CAAwE;;IAG/G;;OAEG;IACa,SAAS,EAAE,SAAS,EAC5B,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,SAAS,EACf,aAAa,GAAE,MAA6B,EAC5C,SAAS,2CAAuC,EAChD,GAAG,8CAA4C;IAGzD;;;;;;OAMG;IACU,cAAc;IAK3B;;OAEG;IACH,IAAW,MAAM;;MAEhB;IAED,OAAO,CAAC,gBAAgB;IAIxB;;;;;;;;;OASG;IACU,OAAO,CAAC,eAAe,EAAE,cAAc,EAAE,EAAE,oBAAoB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkG7G;;;;;;;;OAQG;YACW,qBAAqB;IA0BnC;;;;OAIG;YACW,oBAAoB;IAalC;;;;;;;;OAQG;IACU,mBAAmB,CAAC,gBAAgB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA4B1F"}

package/dest/note_processor/note_processor.js

@@ -1,5 +1,5 @@
-import { INITIAL_L2_BLOCK_NUM, L1NotePayload, } from '@aztec/circuit-types';
-import { MAX_NEW_COMMITMENTS_PER_TX } from '@aztec/circuits.js';
+import { L1NotePayload, TaggedNote } from '@aztec/circuit-types';
+import { INITIAL_L2_BLOCK_NUM, MAX_NEW_NOTE_HASHES_PER_TX } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
@@ -84,21 +84,22 @@ export class NoteProcessor {
             // Iterate over all the encrypted logs and try decrypting them. If successful, store the note.
             for (let indexOfTxInABlock = 0; indexOfTxInABlock < txLogs.length; ++indexOfTxInABlock) {
                 this.stats.txs++;
-                const dataStartIndexForTx = dataEndIndexForBlock - (txLogs.length - indexOfTxInABlock) * MAX_NEW_COMMITMENTS_PER_TX;
-                const newCommitments = block.newCommitments.slice(indexOfTxInABlock * MAX_NEW_COMMITMENTS_PER_TX, (indexOfTxInABlock + 1) * MAX_NEW_COMMITMENTS_PER_TX);
+                const dataStartIndexForTx = dataEndIndexForBlock - (txLogs.length - indexOfTxInABlock) * MAX_NEW_NOTE_HASHES_PER_TX;
+                const newNoteHashes = block.body.txEffects[indexOfTxInABlock].noteHashes;
                 // Note: Each tx generates a `TxL2Logs` object and for this reason we can rely on its index corresponding
                 //       to the index of a tx in a block.
                 const txFunctionLogs = txLogs[indexOfTxInABlock].functionLogs;
                 const excludedIndices = new Set();
                 for (const functionLogs of txFunctionLogs) {
-                    for (const logs of functionLogs.logs) {
+                    for (const log of functionLogs.logs) {
                         this.stats.seen++;
-                        const payload = L1NotePayload.fromEncryptedBuffer(logs, privateKey, curve);
-                        if (payload) {
+                        const taggedNote = TaggedNote.fromEncryptedBuffer(log, privateKey, curve);
+                        if (taggedNote?.notePayload) {
+                            const { notePayload: payload } = taggedNote;
                             // We have successfully decrypted the data.
                             const txHash = blockContext.getTxHash(indexOfTxInABlock);
                             try {
-                                const noteDao = await produceNoteDao(this.simulator, this.publicKey, payload, txHash, newCommitments, dataStartIndexForTx, excludedIndices);
+                                const noteDao = await produceNoteDao(this.simulator, this.publicKey, payload, txHash, newNoteHashes, dataStartIndexForTx, excludedIndices);
                                 noteDaos.push(noteDao);
                                 this.stats.decrypted++;
                             }
@@ -106,7 +107,7 @@ export class NoteProcessor {
                                 if (e instanceof ContractNotFoundError) {
                                     this.stats.deferred++;
                                     this.log.warn(e.message);
-                                    const deferredNoteDao = new DeferredNoteDao(this.publicKey, payload.note, payload.contractAddress, payload.storageSlot, payload.noteTypeId, txHash, newCommitments, dataStartIndexForTx);
+                                    const deferredNoteDao = new DeferredNoteDao(this.publicKey, payload.note, payload.contractAddress, payload.storageSlot, payload.noteTypeId, txHash, newNoteHashes, dataStartIndexForTx);
                                     deferredNoteDaos.push(deferredNoteDao);
                                 }
                                 else {
@@ -146,7 +147,7 @@ export class NoteProcessor {
                 this.log(`Added note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
             });
         }
-        const newNullifiers = blocksAndNotes.flatMap(b => b.blockContext.block.newNullifiers);
+        const newNullifiers = blocksAndNotes.flatMap(b => b.blockContext.block.body.txEffects.flatMap(txEffect => txEffect.nullifiers));
         const removedNotes = await this.db.removeNullifiedNotes(newNullifiers, this.publicKey);
         removedNotes.forEach(noteDao => {
             this.log(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
@@ -178,10 +179,10 @@ export class NoteProcessor {
         const excludedIndices = new Set();
         const noteDaos = [];
         for (const deferredNote of deferredNoteDaos) {
-            const { note, contractAddress, storageSlot, noteTypeId, txHash, newCommitments, dataStartIndexForTx } = deferredNote;
+            const { note, contractAddress, storageSlot, noteTypeId, txHash, newNoteHashes, dataStartIndexForTx } = deferredNote;
             const payload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
             try {
-                const noteDao = await produceNoteDao(this.simulator, this.publicKey, payload, txHash, newCommitments, dataStartIndexForTx, excludedIndices);
+                const noteDao = await produceNoteDao(this.simulator, this.publicKey, payload, txHash, newNoteHashes, dataStartIndexForTx, excludedIndices);
                 noteDaos.push(noteDao);
                 this.stats.decrypted++;
             }
@@ -193,4 +194,4 @@ export class NoteProcessor {
         return noteDaos;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"note_processor.js","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"note_processor.js","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"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"}

package/dest/note_processor/produce_note_dao.d.ts

@@ -11,11 +11,11 @@ import { NoteDao } from '../database/note_dao.js';
  * @param publicKey - The public counterpart to the private key to be used in note decryption.
  * @param payload - An instance of l1NotePayload.
  * @param txHash - The hash of the transaction that created the note. Equivalent to the first nullifier of the transaction.
- * @param newCommitments - New commitments in this transaction, one of which belongs to this note.
+ * @param newNoteHashes - New note hashes in this transaction, one of which belongs to this note.
  * @param dataStartIndexForTx - The next available leaf index for the note hash tree for this transaction.
  * @param excludedIndices - Indices that have been assigned a note in the same tx. Notes in a tx can have the same l1NotePayload, we need to find a different index for each replicate.
  * @param simulator - An instance of AcirSimulator.
  * @returns an instance of NoteDao, or throws. inserts the index of the note into the excludedIndices set.
  */
-export declare function produceNoteDao(simulator: AcirSimulator, publicKey: PublicKey, payload: L1NotePayload, txHash: TxHash, newCommitments: Fr[], dataStartIndexForTx: number, excludedIndices: Set<number>): Promise<NoteDao>;
+export declare function produceNoteDao(simulator: AcirSimulator, publicKey: PublicKey, payload: L1NotePayload, txHash: TxHash, newNoteHashes: Fr[], dataStartIndexForTx: number, excludedIndices: Set<number>): Promise<NoteDao>;
 //# sourceMappingURL=produce_note_dao.d.ts.map

package/dest/note_processor/produce_note_dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"produce_note_dao.d.ts","sourceRoot":"","sources":["../../src/note_processor/produce_note_dao.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,cAAc,CAClC,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,EAAE,EAAE,EACpB,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,OAAO,CAAC,OAAO,CAAC,CAsBlB"}
+{"version":3,"file":"produce_note_dao.d.ts","sourceRoot":"","sources":["../../src/note_processor/produce_note_dao.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,cAAc,CAClC,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,EAAE,EAAE,EACnB,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,OAAO,CAAC,OAAO,CAAC,CAsBlB"}

package/dest/note_processor/produce_note_dao.js

@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/circuits.js';
-import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/abis';
+import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/hash';
 import { NoteDao } from '../database/note_dao.js';
 /**
  * Decodes a note from a transaction that we know was intended for us.
@@ -10,14 +10,14 @@ import { NoteDao } from '../database/note_dao.js';
  * @param publicKey - The public counterpart to the private key to be used in note decryption.
  * @param payload - An instance of l1NotePayload.
  * @param txHash - The hash of the transaction that created the note. Equivalent to the first nullifier of the transaction.
- * @param newCommitments - New commitments in this transaction, one of which belongs to this note.
+ * @param newNoteHashes - New note hashes in this transaction, one of which belongs to this note.
  * @param dataStartIndexForTx - The next available leaf index for the note hash tree for this transaction.
  * @param excludedIndices - Indices that have been assigned a note in the same tx. Notes in a tx can have the same l1NotePayload, we need to find a different index for each replicate.
  * @param simulator - An instance of AcirSimulator.
  * @returns an instance of NoteDao, or throws. inserts the index of the note into the excludedIndices set.
  */
-export async function produceNoteDao(simulator, publicKey, payload, txHash, newCommitments, dataStartIndexForTx, excludedIndices) {
-    const { commitmentIndex, nonce, innerNoteHash, siloedNullifier } = await findNoteIndexAndNullifier(simulator, newCommitments, txHash, payload, excludedIndices);
+export async function produceNoteDao(simulator, publicKey, payload, txHash, newNoteHashes, dataStartIndexForTx, excludedIndices) {
+    const { commitmentIndex, nonce, innerNoteHash, siloedNullifier } = await findNoteIndexAndNullifier(simulator, newNoteHashes, txHash, payload, excludedIndices);
     const index = BigInt(dataStartIndexForTx + commitmentIndex);
     excludedIndices?.add(commitmentIndex);
     return new NoteDao(payload.note, payload.contractAddress, payload.storageSlot, payload.noteTypeId, txHash, nonce, innerNoteHash, siloedNullifier, index, publicKey);
@@ -89,4 +89,4 @@ https://github.com/AztecProtocol/aztec-packages/issues/1641`;
         siloedNullifier: siloNullifier(contractAddress, innerNullifier),
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZHVjZV9ub3RlX2Rhby5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub3RlX3Byb2Nlc3Nvci9wcm9kdWNlX25vdGVfZGFvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQWEsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsYUFBYSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHaEYsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWxEOzs7Ozs7Ozs7Ozs7OztHQWNHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxjQUFjLENBQ2xDLFNBQXdCLEVBQ3hCLFNBQW9CLEVBQ3BCLE9BQXNCLEVBQ3RCLE1BQWMsRUFDZCxjQUFvQixFQUNwQixtQkFBMkIsRUFDM0IsZUFBNEI7SUFFNUIsTUFBTSxFQUFFLGVBQWUsRUFBRSxLQUFLLEVBQUUsYUFBYSxFQUFFLGVBQWUsRUFBRSxHQUFHLE1BQU0seUJBQXlCLENBQ2hHLFNBQVMsRUFDVCxjQUFjLEVBQ2QsTUFBTSxFQUNOLE9BQU8sRUFDUCxlQUFlLENBQ2hCLENBQUM7SUFDRixNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsbUJBQW1CLEdBQUcsZUFBZSxDQUFDLENBQUM7SUFDNUQsZUFBZSxFQUFFLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUN0QyxPQUFPLElBQUksT0FBTyxDQUNoQixPQUFPLENBQUMsSUFBSSxFQUNaLE9BQU8sQ0FBQyxlQUFlLEVBQ3ZCLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLE9BQU8sQ0FBQyxVQUFVLEVBQ2xCLE1BQU0sRUFDTixLQUFLLEVBQ0wsYUFBYSxFQUNiLGVBQWUsRUFDZixLQUFLLEVBQ0wsU0FBUyxDQUNWLENBQUM7QUFDSixDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxLQUFLLFVBQVUseUJBQXlCLENBQ3RDLFNBQXdCLEVBQ3hCLFdBQWlCLEVBQ2pCLE1BQWMsRUFDZCxFQUFFLGVBQWUsRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBaUIsRUFDakUsZUFBNEI7SUFFNUIsSUFBSSxlQUFlLEdBQUcsQ0FBQyxDQUFDO0lBQ3hCLElBQUksS0FBcUIsQ0FBQztJQUMxQixJQUFJLGFBQTZCLENBQUM7SUFDbEMsSUFBSSxjQUE4QixDQUFDO0lBQ25DLElBQUksb0JBQW9DLENBQUM7SUFDekMsSUFBSSxjQUE4QixDQUFDO0lBQ25DLE1BQU0sY0FBYyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFFeEQsT0FBTyxlQUFlLEdBQUcsV0FBVyxDQUFDLE1BQU0sRUFBRSxFQUFFLGVBQWUsRUFBRSxDQUFDO1FBQy9ELElBQUksZUFBZSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1lBQ3pDLFNBQVM7UUFDWCxDQUFDO1FBRUQsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2hELElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUMvQixNQUFNO1FBQ1IsQ0FBQztRQUVELE1BQU0sYUFBYSxHQUFHLHNCQUFzQixDQUFDLGNBQWMsRUFBRSxlQUFlLENBQUMsQ0FBQztRQUM5RSxDQUFDLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxvQkFBb0IsRUFBRSxjQUFjLEVBQUU7WUFDdEUsTUFBTSxTQUFTLENBQUMsMkJBQTJCLENBQUMsZUFBZSxFQUFFLGFBQWEsRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDOUcsSUFBSSxVQUFVLENBQUMsTUFBTSxDQUFDLG9CQUFvQixDQUFDLEVBQUUsQ0FBQztZQUM1QyxLQUFLLEdBQUcsYUFBYSxDQUFDO1lBQ3RCLE1BQU07UUFDUixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNYLElBQUksV0FBVyxDQUFDO1FBQ2hCLElBQUksY0FBYyxJQUFJLFNBQVMsRUFBRSxDQUFDO1lBQ2hDLFdBQVcsR0FBRyxpREFBaUQsQ0FBQztRQUNsRSxDQUFDO2FBQU0sQ0FBQztZQUNOLFdBQVcsR0FBRzs7Ozs7RUFLbEIsY0FBYyxDQUFDLFFBQVEsRUFBRTs7Ozs7OzREQU1pQyxDQUFDO1FBQ3pELENBQUM7UUFFRCxNQUFNLElBQUksS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFRCxPQUFPO1FBQ0wsZUFBZTtRQUNmLEtBQUs7UUFDTCxhQUFhLEVBQUUsYUFBYztRQUM3QixlQUFlLEVBQUUsYUFBYSxDQUFDLGVBQWUsRUFBRSxjQUFlLENBQUM7S0FDakUsQ0FBQztBQUNKLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZHVjZV9ub3RlX2Rhby5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub3RlX3Byb2Nlc3Nvci9wcm9kdWNlX25vdGVfZGFvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQWEsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsYUFBYSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHaEYsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWxEOzs7Ozs7Ozs7Ozs7OztHQWNHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxjQUFjLENBQ2xDLFNBQXdCLEVBQ3hCLFNBQW9CLEVBQ3BCLE9BQXNCLEVBQ3RCLE1BQWMsRUFDZCxhQUFtQixFQUNuQixtQkFBMkIsRUFDM0IsZUFBNEI7SUFFNUIsTUFBTSxFQUFFLGVBQWUsRUFBRSxLQUFLLEVBQUUsYUFBYSxFQUFFLGVBQWUsRUFBRSxHQUFHLE1BQU0seUJBQXlCLENBQ2hHLFNBQVMsRUFDVCxhQUFhLEVBQ2IsTUFBTSxFQUNOLE9BQU8sRUFDUCxlQUFlLENBQ2hCLENBQUM7SUFDRixNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsbUJBQW1CLEdBQUcsZUFBZSxDQUFDLENBQUM7SUFDNUQsZUFBZSxFQUFFLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUN0QyxPQUFPLElBQUksT0FBTyxDQUNoQixPQUFPLENBQUMsSUFBSSxFQUNaLE9BQU8sQ0FBQyxlQUFlLEVBQ3ZCLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLE9BQU8sQ0FBQyxVQUFVLEVBQ2xCLE1BQU0sRUFDTixLQUFLLEVBQ0wsYUFBYSxFQUNiLGVBQWUsRUFDZixLQUFLLEVBQ0wsU0FBUyxDQUNWLENBQUM7QUFDSixDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxLQUFLLFVBQVUseUJBQXlCLENBQ3RDLFNBQXdCLEVBQ3hCLFdBQWlCLEVBQ2pCLE1BQWMsRUFDZCxFQUFFLGVBQWUsRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBaUIsRUFDakUsZUFBNEI7SUFFNUIsSUFBSSxlQUFlLEdBQUcsQ0FBQyxDQUFDO0lBQ3hCLElBQUksS0FBcUIsQ0FBQztJQUMxQixJQUFJLGFBQTZCLENBQUM7SUFDbEMsSUFBSSxjQUE4QixDQUFDO0lBQ25DLElBQUksb0JBQW9DLENBQUM7SUFDekMsSUFBSSxjQUE4QixDQUFDO0lBQ25DLE1BQU0sY0FBYyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFFeEQsT0FBTyxlQUFlLEdBQUcsV0FBVyxDQUFDLE1BQU0sRUFBRSxFQUFFLGVBQWUsRUFBRSxDQUFDO1FBQy9ELElBQUksZUFBZSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1lBQ3pDLFNBQVM7UUFDWCxDQUFDO1FBRUQsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2hELElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUMvQixNQUFNO1FBQ1IsQ0FBQztRQUVELE1BQU0sYUFBYSxHQUFHLHNCQUFzQixDQUFDLGNBQWMsRUFBRSxlQUFlLENBQUMsQ0FBQztRQUM5RSxDQUFDLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxvQkFBb0IsRUFBRSxjQUFjLEVBQUU7WUFDdEUsTUFBTSxTQUFTLENBQUMsMkJBQTJCLENBQUMsZUFBZSxFQUFFLGFBQWEsRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDOUcsSUFBSSxVQUFVLENBQUMsTUFBTSxDQUFDLG9CQUFvQixDQUFDLEVBQUUsQ0FBQztZQUM1QyxLQUFLLEdBQUcsYUFBYSxDQUFDO1lBQ3RCLE1BQU07UUFDUixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNYLElBQUksV0FBVyxDQUFDO1FBQ2hCLElBQUksY0FBYyxJQUFJLFNBQVMsRUFBRSxDQUFDO1lBQ2hDLFdBQVcsR0FBRyxpREFBaUQsQ0FBQztRQUNsRSxDQUFDO2FBQU0sQ0FBQztZQUNOLFdBQVcsR0FBRzs7Ozs7RUFLbEIsY0FBYyxDQUFDLFFBQVEsRUFBRTs7Ozs7OzREQU1pQyxDQUFDO1FBQ3pELENBQUM7UUFFRCxNQUFNLElBQUksS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFRCxPQUFPO1FBQ0wsZUFBZTtRQUNmLEtBQUs7UUFDTCxhQUFhLEVBQUUsYUFBYztRQUM3QixlQUFlLEVBQUUsYUFBYSxDQUFDLGVBQWUsRUFBRSxjQUFlLENBQUM7S0FDakUsQ0FBQztBQUNKLENBQUMifQ==

package/dest/pxe_http/pxe_http_server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pxe_http_server.d.ts","sourceRoot":"","sources":["../../src/pxe_http/pxe_http_server.ts"],"names":[],"mappings":";AAAA,OAAO,EAYL,GAAG,EAKJ,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,GAAG,GAAG,aAAa,CA0BjE;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,MAAM,CAQtF"}
+{"version":3,"file":"pxe_http_server.d.ts","sourceRoot":"","sources":["../../src/pxe_http/pxe_http_server.ts"],"names":[],"mappings":";AAAA,OAAO,EAYL,GAAG,EAMJ,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,aAAa,EAAiC,MAAM,mCAAmC,CAAC;AAEjG,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,GAAG,GAAG,aAAa,CA0BjE;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,MAAM,CAStF"}

package/dest/pxe_http/pxe_http_server.js

@@ -1,9 +1,9 @@
-import { AuthWitness, CompleteAddress, ContractData, ExtendedContractData, ExtendedNote, ExtendedUnencryptedL2Log, L2Block, L2BlockL2Logs, L2Tx, LogId, Note, Tx, TxExecutionRequest, TxHash, TxReceipt, } from '@aztec/circuit-types';
+import { AuthWitness, CompleteAddress, ContractData, ExtendedContractData, ExtendedNote, ExtendedUnencryptedL2Log, L2Block, L2BlockL2Logs, LogId, Note, NullifierMembershipWitness, Tx, TxEffect, TxExecutionRequest, TxHash, TxReceipt, } from '@aztec/circuit-types';
 import { FunctionSelector } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields';
-import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
+import { JsonRpcServer, createNamespacedJsonRpcServer } from '@aztec/foundation/json-rpc/server';
 import http from 'http';
 /**
  * Wraps an instance of Private eXecution Environment (PXE) implementation to a JSON RPC HTTP interface.
@@ -27,9 +27,9 @@ export function createPXERpcServer(pxeService) {
         ExtendedNote,
         AuthWitness,
         L2Block,
-        L2Tx,
+        TxEffect,
         LogId,
-    }, { Tx, TxReceipt, L2BlockL2Logs }, ['start', 'stop']);
+    }, { Tx, TxReceipt, L2BlockL2Logs, NullifierMembershipWitness }, ['start', 'stop']);
 }
 /**
  * Creates an http server that forwards calls to the PXE and starts it on the given port.
@@ -38,10 +38,11 @@ export function createPXERpcServer(pxeService) {
  * @returns A running http server.
  */
 export function startPXEHttpServer(pxeService, port) {
-    const rpcServer = createPXERpcServer(pxeService);
+    const pxeServer = createPXERpcServer(pxeService);
+    const rpcServer = createNamespacedJsonRpcServer([{ pxe: pxeServer }]);
     const app = rpcServer.getApp();
     const httpServer = http.createServer(app.callback());
     httpServer.listen(port);
     return httpServer;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2h0dHBfc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B4ZV9odHRwL3B4ZV9odHRwX3NlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsV0FBVyxFQUNYLGVBQWUsRUFDZixZQUFZLEVBQ1osb0JBQW9CLEVBQ3BCLFlBQVksRUFDWix3QkFBd0IsRUFDeEIsT0FBTyxFQUNQLGFBQWEsRUFDYixJQUFJLEVBQ0osS0FBSyxFQUNMLElBQUksRUFFSixFQUFFLEVBQ0Ysa0JBQWtCLEVBQ2xCLE1BQU0sRUFDTixTQUFTLEdBQ1YsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sRUFBRSxFQUFFLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVsRSxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFFeEI7OztHQUdHO0FBQ0gsTUFBTSxVQUFVLGtCQUFrQixDQUFDLFVBQWU7SUFDaEQsT0FBTyxJQUFJLGFBQWEsQ0FDdEIsVUFBVSxFQUNWO1FBQ0UsZUFBZTtRQUNmLFlBQVk7UUFDWixrQkFBa0I7UUFDbEIsWUFBWTtRQUNaLG9CQUFvQjtRQUNwQix3QkFBd0I7UUFDeEIsZ0JBQWdCO1FBQ2hCLE1BQU07UUFDTixVQUFVO1FBQ1YsS0FBSztRQUNMLEVBQUU7UUFDRixjQUFjO1FBQ2QsSUFBSTtRQUNKLFlBQVk7UUFDWixXQUFXO1FBQ1gsT0FBTztRQUNQLElBQUk7UUFDSixLQUFLO0tBQ04sRUFDRCxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLEVBQ2hDLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUNsQixDQUFDO0FBQ0osQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGtCQUFrQixDQUFDLFVBQWUsRUFBRSxJQUFxQjtJQUN2RSxNQUFNLFNBQVMsR0FBRyxrQkFBa0IsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUVqRCxNQUFNLEdBQUcsR0FBRyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDL0IsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUNyRCxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXhCLE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2h0dHBfc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B4ZV9odHRwL3B4ZV9odHRwX3NlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsV0FBVyxFQUNYLGVBQWUsRUFDZixZQUFZLEVBQ1osb0JBQW9CLEVBQ3BCLFlBQVksRUFDWix3QkFBd0IsRUFDeEIsT0FBTyxFQUNQLGFBQWEsRUFDYixLQUFLLEVBQ0wsSUFBSSxFQUNKLDBCQUEwQixFQUUxQixFQUFFLEVBQ0YsUUFBUSxFQUNSLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sU0FBUyxHQUNWLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxLQUFLLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsYUFBYSxFQUFFLDZCQUE2QixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFakcsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRXhCOzs7R0FHRztBQUNILE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxVQUFlO0lBQ2hELE9BQU8sSUFBSSxhQUFhLENBQ3RCLFVBQVUsRUFDVjtRQUNFLGVBQWU7UUFDZixZQUFZO1FBQ1osa0JBQWtCO1FBQ2xCLFlBQVk7UUFDWixvQkFBb0I7UUFDcEIsd0JBQXdCO1FBQ3hCLGdCQUFnQjtRQUNoQixNQUFNO1FBQ04sVUFBVTtRQUNWLEtBQUs7UUFDTCxFQUFFO1FBQ0YsY0FBYztRQUNkLElBQUk7UUFDSixZQUFZO1FBQ1osV0FBVztRQUNYLE9BQU87UUFDUCxRQUFRO1FBQ1IsS0FBSztLQUNOLEVBQ0QsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSwwQkFBMEIsRUFBRSxFQUM1RCxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FDbEIsQ0FBQztBQUNKLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxVQUFlLEVBQUUsSUFBcUI7SUFDdkUsTUFBTSxTQUFTLEdBQUcsa0JBQWtCLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDakQsTUFBTSxTQUFTLEdBQUcsNkJBQTZCLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFFdEUsTUFBTSxHQUFHLEdBQUcsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQy9CLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDckQsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV4QixPQUFPLFVBQVUsQ0FBQztBQUNwQixDQUFDIn0=

package/dest/pxe_service/create_pxe_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create_pxe_service.d.ts","sourceRoot":"","sources":["../../src/pxe_service/create_pxe_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAUjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EACxB,YAAY,GAAE,MAAM,GAAG,OAAO,GAAG,SAAqB,uBAwBvD"}
+{"version":3,"file":"create_pxe_service.d.ts","sourceRoot":"","sources":["../../src/pxe_service/create_pxe_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAWjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EACxB,YAAY,GAAE,MAAM,GAAG,OAAO,GAAG,SAAqB,uBAwBvD"}

package/dest/pxe_service/create_pxe_service.js

@@ -3,6 +3,7 @@ import { TestKeyStore } from '@aztec/key-store';
 import { AztecLmdbStore } from '@aztec/kv-store/lmdb';
 import { initStoreForRollup } from '@aztec/kv-store/utils';
 import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
+import { getCanonicalGasToken } from '@aztec/protocol-contracts/gas-token';
 import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
 import { join } from 'path';
 import { KVPxeDatabase } from '../database/kv_pxe_database.js';
@@ -29,8 +30,8 @@ export async function createPXEService(aztecNode, config, useLogSuffix = undefin
     const keyStore = new TestKeyStore(new Grumpkin(), await initStoreForRollup(AztecLmdbStore.open(keyStorePath), l1Contracts.rollupAddress));
     const db = new KVPxeDatabase(await initStoreForRollup(AztecLmdbStore.open(pxeDbPath), l1Contracts.rollupAddress));
     const server = new PXEService(keyStore, aztecNode, db, config, logSuffix);
-    await server.addContracts([getCanonicalClassRegisterer(), getCanonicalInstanceDeployer()]);
+    await server.addContracts([getCanonicalClassRegisterer(), getCanonicalInstanceDeployer(), getCanonicalGasToken()]);
     await server.start();
     return server;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3B4ZV9zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B4ZV9zZXJ2aWNlL2NyZWF0ZV9weGVfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUN6RixPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUUzRixPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRzVCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFOUM7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxnQkFBZ0IsQ0FDcEMsU0FBb0IsRUFDcEIsTUFBd0IsRUFDeEIsZUFBNkMsU0FBUztJQUV0RCxNQUFNLFNBQVMsR0FDYixPQUFPLFlBQVksS0FBSyxTQUFTO1FBQy9CLENBQUMsQ0FBQyxZQUFZO1lBQ1osQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDeEMsQ0FBQyxDQUFDLFNBQVM7UUFDYixDQUFDLENBQUMsWUFBWSxDQUFDO0lBRW5CLE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDNUYsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLEVBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUNwRyxNQUFNLFdBQVcsR0FBRyxNQUFNLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBRTdELE1BQU0sUUFBUSxHQUFHLElBQUksWUFBWSxDQUMvQixJQUFJLFFBQVEsRUFBRSxFQUNkLE1BQU0sa0JBQWtCLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxXQUFXLENBQUMsYUFBYSxDQUFDLENBQ3ZGLENBQUM7SUFDRixNQUFNLEVBQUUsR0FBRyxJQUFJLGFBQWEsQ0FBQyxNQUFNLGtCQUFrQixDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7SUFFbEgsTUFBTSxNQUFNLEdBQUcsSUFBSSxVQUFVLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDLDJCQUEyQixFQUFFLEVBQUUsNEJBQTRCLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFFM0YsTUFBTSxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDckIsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3B4ZV9zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B4ZV9zZXJ2aWNlL2NyZWF0ZV9weGVfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUN6RixPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUMzRSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUUzRixPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRzVCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFOUM7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxnQkFBZ0IsQ0FDcEMsU0FBb0IsRUFDcEIsTUFBd0IsRUFDeEIsZUFBNkMsU0FBUztJQUV0RCxNQUFNLFNBQVMsR0FDYixPQUFPLFlBQVksS0FBSyxTQUFTO1FBQy9CLENBQUMsQ0FBQyxZQUFZO1lBQ1osQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDeEMsQ0FBQyxDQUFDLFNBQVM7UUFDYixDQUFDLENBQUMsWUFBWSxDQUFDO0lBRW5CLE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDNUYsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLEVBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUNwRyxNQUFNLFdBQVcsR0FBRyxNQUFNLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBRTdELE1BQU0sUUFBUSxHQUFHLElBQUksWUFBWSxDQUMvQixJQUFJLFFBQVEsRUFBRSxFQUNkLE1BQU0sa0JBQWtCLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRSxXQUFXLENBQUMsYUFBYSxDQUFDLENBQ3ZGLENBQUM7SUFDRixNQUFNLEVBQUUsR0FBRyxJQUFJLGFBQWEsQ0FBQyxNQUFNLGtCQUFrQixDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7SUFFbEgsTUFBTSxNQUFNLEdBQUcsSUFBSSxVQUFVLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDLDJCQUEyQixFQUFFLEVBQUUsNEJBQTRCLEVBQUUsRUFBRSxvQkFBb0IsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUVuSCxNQUFNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNyQixPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDIn0=