@aztec/pxe 0.35.1 → 0.37.0

package/src/pxe_service/test/pxe_test_suite.ts

@@ -10,14 +10,11 @@ import {
   CompleteAddress,
   Fr,
   FunctionData,
-  GasSettings,
   INITIAL_L2_BLOCK_NUM,
   Point,
   TxContext,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
-import { Grumpkin } from '@aztec/circuits.js/barretenberg';
-import { ConstantKeyPair } from '@aztec/key-store';
 
 export const pxeTestSuite = (testName: string, pxeSetup: () => Promise<PXE>) => {
   describe(testName, () => {
@@ -28,10 +25,9 @@ export const pxeTestSuite = (testName: string, pxeSetup: () => Promise<PXE>) =>
     }, 120_000);
 
     it('registers an account and returns it as an account only and not as a recipient', async () => {
-      const keyPair = ConstantKeyPair.random(new Grumpkin());
-      const completeAddress = CompleteAddress.fromPrivateKeyAndPartialAddress(keyPair.getPrivateKey(), Fr.random());
-
-      await pxe.registerAccount(keyPair.getPrivateKey(), completeAddress.partialAddress);
+      const randomSecretKey = Fr.random();
+      const randomPartialAddress = Fr.random();
+      const completeAddress = await pxe.registerAccount(randomSecretKey, randomPartialAddress);
 
       // Check that the account is correctly registered using the getAccounts and getRecipients methods
       const accounts = await pxe.getRegisteredAccounts();
@@ -65,11 +61,11 @@ export const pxeTestSuite = (testName: string, pxeSetup: () => Promise<PXE>) =>
     });
 
     it('does not throw when registering the same account twice (just ignores the second attempt)', async () => {
-      const keyPair = ConstantKeyPair.random(new Grumpkin());
-      const completeAddress = CompleteAddress.fromPrivateKeyAndPartialAddress(keyPair.getPrivateKey(), Fr.random());
+      const randomSecretKey = Fr.random();
+      const randomPartialAddress = Fr.random();
 
-      await pxe.registerAccount(keyPair.getPrivateKey(), completeAddress.partialAddress);
-      await pxe.registerAccount(keyPair.getPrivateKey(), completeAddress.partialAddress);
+      await pxe.registerAccount(randomSecretKey, randomPartialAddress);
+      await pxe.registerAccount(randomSecretKey, randomPartialAddress);
     });
 
     it('cannot register a recipient with the same aztec address but different pub key or partial address', async () => {
@@ -129,12 +125,11 @@ export const pxeTestSuite = (testName: string, pxeSetup: () => Promise<PXE>) =>
       functionData.isPrivate = false;
       const txExecutionRequest = TxExecutionRequest.from({
         origin: AztecAddress.random(),
-        argsHash: new Fr(0),
+        firstCallArgsHash: new Fr(0),
         functionData,
         txContext: TxContext.empty(),
-        packedArguments: [],
+        argsOfCalls: [],
         authWitnesses: [],
-        gasSettings: GasSettings.default(),
       });
 
       await expect(async () => await pxe.proveTx(txExecutionRequest, false)).rejects.toThrow(

package/src/simulator_oracle/index.ts

@@ -11,16 +11,16 @@ import {
 import {
   type AztecAddress,
   type CompleteAddress,
-  type EthAddress,
   type Fr,
   type FunctionSelector,
   type Header,
   type L1_TO_L2_MSG_TREE_HEIGHT,
+  type Point,
 } from '@aztec/circuits.js';
 import { computeL1ToL2MessageNullifier } from '@aztec/circuits.js/hash';
 import { type FunctionArtifactWithDebugMetadata, getFunctionArtifactWithDebugMetadata } from '@aztec/foundation/abi';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { type DBOracle, type KeyPair, MessageLoadOracleInputs } from '@aztec/simulator';
+import { type DBOracle, MessageLoadOracleInputs, type NullifierKeys } from '@aztec/simulator';
 import { type ContractInstance } from '@aztec/types/contracts';
 
 import { type ContractDataOracle } from '../contract_data_oracle/index.js';
@@ -38,13 +38,13 @@ export class SimulatorOracle implements DBOracle {
     private log = createDebugLogger('aztec:pxe:simulator_oracle'),
   ) {}
 
-  async getNullifierKeyPair(accountAddress: AztecAddress, contractAddress: AztecAddress): Promise<KeyPair> {
-    const accountPublicKey = (await this.db.getCompleteAddress(accountAddress))!.publicKey;
-    const publicKey = await this.keyStore.getNullifierPublicKey(accountPublicKey);
-    const secretKey = await this.keyStore.getSiloedNullifierSecretKey(accountPublicKey, contractAddress);
-    return { publicKey, secretKey };
+  async getNullifierKeys(accountAddress: AztecAddress, contractAddress: AztecAddress): Promise<NullifierKeys> {
+    const masterNullifierPublicKey = await this.keyStore.getMasterNullifierPublicKey(accountAddress);
+    const appNullifierSecretKey = await this.keyStore.getAppNullifierSecretKey(accountAddress, contractAddress);
+    return { masterNullifierPublicKey, appNullifierSecretKey };
   }
 
+  // TODO: #5834
   async getCompleteAddress(address: AztecAddress): Promise<CompleteAddress> {
     const completeAddress = await this.db.getCompleteAddress(address);
     if (!completeAddress) {
@@ -79,6 +79,16 @@ export class SimulatorOracle implements DBOracle {
     return capsule;
   }
 
+  // TODO: #5834
+  async getPublicKeysForAddress(address: AztecAddress): Promise<Point[]> {
+    const nullifierPublicKey = await this.keyStore.getMasterNullifierPublicKey(address);
+    const incomingViewingPublicKey = await this.keyStore.getMasterIncomingViewingPublicKey(address);
+    const outgoingViewingPublicKey = await this.keyStore.getMasterOutgoingViewingPublicKey(address);
+    const taggingPublicKey = await this.keyStore.getMasterTaggingPublicKey(address);
+
+    return [nullifierPublicKey, incomingViewingPublicKey, outgoingViewingPublicKey, taggingPublicKey];
+  }
+
   async getNotes(contractAddress: AztecAddress, storageSlot: Fr, status: NoteStatus) {
     const noteDaos = await this.db.getNotes({
       contractAddress,
@@ -118,10 +128,6 @@ export class SimulatorOracle implements DBOracle {
     return artifact && getFunctionArtifactWithDebugMetadata(artifact, functionName);
   }
 
-  async getPortalContractAddress(contractAddress: AztecAddress): Promise<EthAddress> {
-    return await this.contractDataOracle.getPortalContractAddress(contractAddress);
-  }
-
   /**
    * Fetches a message from the db, given its key.
    * @param contractAddress - Address of a contract by which the message was emitted.
@@ -159,6 +165,11 @@ export class SimulatorOracle implements DBOracle {
     return new MessageLoadOracleInputs(messageIndex, siblingPath);
   }
 
+  // Only used in public.
+  public getL1ToL2LeafValue(_leafIndex: bigint): Promise<Fr | undefined> {
+    throw new Error('Unimplemented in private!');
+  }
+
   /**
    * Gets the index of a commitment in the note hash tree.
    * @param commitment - The commitment.

package/src/synchronizer/synchronizer.ts

@@ -198,7 +198,7 @@ export class Synchronizer {
         }
 
         this.log.debug(
-          `Catching up note processor ${noteProcessor.publicKey.toString()} by processing ${
+          `Catching up note processor ${noteProcessor.masterIncomingViewingPublicKey.toString()} by processing ${
             blocks.length - index
           } blocks`,
         );
@@ -206,16 +206,19 @@ export class Synchronizer {
 
         if (noteProcessor.status.syncedToBlock === toBlockNumber) {
           // Note processor caught up, move it to `noteProcessors` from `noteProcessorsToCatchUp`.
-          this.log.debug(`Note processor for ${noteProcessor.publicKey.toString()} has caught up`, {
-            eventName: 'note-processor-caught-up',
-            publicKey: noteProcessor.publicKey.toString(),
-            duration: noteProcessor.timer.ms(),
-            dbSize: this.db.estimateSize(),
-            ...noteProcessor.stats,
-          } satisfies NoteProcessorCaughtUpStats);
+          this.log.debug(
+            `Note processor for ${noteProcessor.masterIncomingViewingPublicKey.toString()} has caught up`,
+            {
+              eventName: 'note-processor-caught-up',
+              publicKey: noteProcessor.masterIncomingViewingPublicKey.toString(),
+              duration: noteProcessor.timer.ms(),
+              dbSize: this.db.estimateSize(),
+              ...noteProcessor.stats,
+            } satisfies NoteProcessorCaughtUpStats,
+          );
 
           this.noteProcessorsToCatchUp = this.noteProcessorsToCatchUp.filter(
-            np => !np.publicKey.equals(noteProcessor.publicKey),
+            np => !np.masterIncomingViewingPublicKey.equals(noteProcessor.masterIncomingViewingPublicKey),
           );
           this.noteProcessors.push(noteProcessor);
         }
@@ -260,7 +263,7 @@ export class Synchronizer {
    * @returns A promise that resolves once the account is added to the Synchronizer.
    */
   public addAccount(publicKey: PublicKey, keyStore: KeyStore, startingBlock: number) {
-    const predicate = (x: NoteProcessor) => x.publicKey.equals(publicKey);
+    const predicate = (x: NoteProcessor) => x.masterIncomingViewingPublicKey.equals(publicKey);
     const processor = this.noteProcessors.find(predicate) ?? this.noteProcessorsToCatchUp.find(predicate);
     if (processor) {
       return;
@@ -282,7 +285,7 @@ export class Synchronizer {
     if (!completeAddress) {
       throw new Error(`Checking if account is synched is not possible for ${account} because it is not registered.`);
     }
-    const findByPublicKey = (x: NoteProcessor) => x.publicKey.equals(completeAddress.publicKey);
+    const findByPublicKey = (x: NoteProcessor) => x.masterIncomingViewingPublicKey.equals(completeAddress.publicKey);
     const processor = this.noteProcessors.find(findByPublicKey) ?? this.noteProcessorsToCatchUp.find(findByPublicKey);
     if (!processor) {
       throw new Error(
@@ -315,7 +318,9 @@ export class Synchronizer {
     const lastBlockNumber = this.getSynchedBlockNumber();
     return {
       blocks: lastBlockNumber,
-      notes: Object.fromEntries(this.noteProcessors.map(n => [n.publicKey.toString(), n.status.syncedToBlock])),
+      notes: Object.fromEntries(
+        this.noteProcessors.map(n => [n.masterIncomingViewingPublicKey.toString(), n.status.syncedToBlock]),
+      ),
     };
   }
 
@@ -345,7 +350,7 @@ export class Synchronizer {
       // to be safe, try each note processor in case the deferred notes are for different accounts.
       for (const processor of this.noteProcessors) {
         const decodedNotes = await processor.decodeDeferredNotes(
-          deferredNotes.filter(n => n.publicKey.equals(processor.publicKey)),
+          deferredNotes.filter(n => n.publicKey.equals(processor.masterIncomingViewingPublicKey)),
         );
         newNotes.push(...decodedNotes);
       }

package/dest/kernel_prover/hints_builder.d.ts

@@ -1,40 +0,0 @@
-import { Fr, type MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, type MAX_NULLIFIER_READ_REQUESTS_PER_TX, MembershipWitness, type NullifierKeyValidationRequestContext, type ReadRequestContext, type SideEffect, type SideEffectLinkedToNoteHash, type SideEffectType } from '@aztec/circuits.js';
-import { type Tuple } from '@aztec/foundation/serialize';
-import { type ProvingDataOracle } from './proving_data_oracle.js';
-export declare class HintsBuilder {
-    private oracle;
-    constructor(oracle: ProvingDataOracle);
-    sortSideEffects<T extends SideEffectType, K extends number>(sideEffects: Tuple<T, K>): [Tuple<T, K>, Tuple<number, K>];
-    /**
-     * Performs the matching between an array of read request and an array of note hashes. This produces
-     * hints for the private kernel tail circuit to efficiently match a read request with the corresponding
-     * note hash. Several read requests might be pointing to the same note hash. It is therefore valid
-     * to return more than one hint with the same index (contrary to getNullifierHints).
-     *
-     * @param noteHashReadRequests - The array of read requests.
-     * @param noteHashes - The array of note hashes.
-     * @returns An array of hints where each element is the index of the note hash in note hashes array
-     *  corresponding to the read request. In other words we have readRequests[i] == noteHashes[hints[i]].
-     */
-    getNoteHashReadRequestHints(noteHashReadRequests: Tuple<SideEffect, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>, noteHashes: Tuple<SideEffect, typeof MAX_NEW_NOTE_HASHES_PER_TX>): Tuple<Fr, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>;
-    getNullifierReadRequestHints(nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestHints>;
-    getNullifierMembershipWitness(nullifier: Fr): Promise<{
-        membershipWitness: MembershipWitness<20>;
-        leafPreimage: import("@aztec/circuits.js").NullifierLeafPreimage;
-    } | undefined>;
-    /**
-     * Performs the matching between an array of nullified note hashes and an array of note hashes. This produces
-     * hints for the private kernel tail circuit to efficiently match a nullifier with the corresponding
-     * note hash. Note that the same note hash value might appear more than once in the note hashes
-     * (resp. nullified note hashes) array. It is crucial in this case that each hint points to a different index
-     * of the nullified note hashes array. Otherwise, the private kernel will fail to validate.
-     *
-     * @param nullifiedNoteHashes - The array of nullified note hashes.
-     * @param noteHashes - The array of note hashes.
-     * @returns An array of hints where each element is the index of the note hash in note hashes array
-     *  corresponding to the nullified note hash. In other words we have nullifiedNoteHashes[i] == noteHashes[hints[i]].
-     */
-    getNullifierHints(nullifiedNoteHashes: Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>, noteHashes: Tuple<SideEffect, typeof MAX_NEW_NOTE_HASHES_PER_TX>): Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>;
-    getMasterNullifierSecretKeys(nullifierKeyValidationRequests: Tuple<NullifierKeyValidationRequestContext, typeof MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX>): Promise<[import("@aztec/circuits.js").Fq, import("@aztec/circuits.js").Fq, import("@aztec/circuits.js").Fq, import("@aztec/circuits.js").Fq]>;
-}
-//# sourceMappingURL=hints_builder.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"hints_builder.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/hints_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EAEF,KAAK,0BAA0B,EAC/B,yBAAyB,EACzB,kCAAkC,EAClC,4CAA4C,EAC5C,KAAK,kCAAkC,EACvC,iBAAiB,EAEjB,KAAK,oCAAoC,EACzC,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,0BAA0B,EAC/B,KAAK,cAAc,EAEpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,qBAAa,YAAY;IACX,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,iBAAiB;IAE7C,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,MAAM,EACxD,WAAW,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GACvB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAmBlC;;;;;;;;;;OAUG;IACH,2BAA2B,CACzB,oBAAoB,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,kCAAkC,CAAC,EAClF,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,0BAA0B,CAAC,GAC/D,KAAK,CAAC,EAAE,EAAE,OAAO,kCAAkC,CAAC;IAgBvD,4BAA4B,CAC1B,qBAAqB,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,kCAAkC,CAAC,EAC3F,UAAU,EAAE,KAAK,CAAC,0BAA0B,EAAE,OAAO,yBAAyB,CAAC;IAK3E,6BAA6B,CAAC,SAAS,EAAE,EAAE;;;;IAiBjD;;;;;;;;;;;OAWG;IACH,iBAAiB,CACf,mBAAmB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,yBAAyB,CAAC,EAChE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,0BAA0B,CAAC,GAC/D,KAAK,CAAC,EAAE,EAAE,OAAO,yBAAyB,CAAC;IAuBxC,4BAA4B,CAChC,8BAA8B,EAAE,KAAK,CACnC,oCAAoC,EACpC,OAAO,4CAA4C,CACpD;CAYJ"}

package/dest/kernel_prover/hints_builder.js

@@ -1,103 +0,0 @@
-import { Fr, GrumpkinScalar, MAX_NEW_NULLIFIERS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, buildNullifierReadRequestHints, } from '@aztec/circuits.js';
-import { makeTuple } from '@aztec/foundation/array';
-export class HintsBuilder {
-    constructor(oracle) {
-        this.oracle = oracle;
-    }
-    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];
-    }
-    /**
-     * Performs the matching between an array of read request and an array of note hashes. This produces
-     * hints for the private kernel tail circuit to efficiently match a read request with the corresponding
-     * note hash. Several read requests might be pointing to the same note hash. It is therefore valid
-     * to return more than one hint with the same index (contrary to getNullifierHints).
-     *
-     * @param noteHashReadRequests - The array of read requests.
-     * @param noteHashes - The array of note hashes.
-     * @returns An array of hints where each element is the index of the note hash in note hashes array
-     *  corresponding to the read request. In other words we have readRequests[i] == noteHashes[hints[i]].
-     */
-    getNoteHashReadRequestHints(noteHashReadRequests, noteHashes) {
-        const hints = makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, Fr.zero);
-        for (let i = 0; i < MAX_NOTE_HASH_READ_REQUESTS_PER_TX && !noteHashReadRequests[i].isEmpty(); i++) {
-            const equalToRR = (cmt) => cmt.value.equals(noteHashReadRequests[i].value);
-            const result = noteHashes.findIndex(equalToRR);
-            if (result == -1) {
-                throw new Error(`The read request at index ${i} ${noteHashReadRequests[i].toString()} does not match to any note hash.`);
-            }
-            else {
-                hints[i] = new Fr(result);
-            }
-        }
-        return hints;
-    }
-    getNullifierReadRequestHints(nullifierReadRequests, nullifiers) {
-        return buildNullifierReadRequestHints(this, nullifierReadRequests, nullifiers);
-    }
-    async getNullifierMembershipWitness(nullifier) {
-        const res = await this.oracle.getNullifierMembershipWitness(nullifier);
-        if (!res) {
-            return;
-        }
-        const { index, siblingPath, leafPreimage } = res;
-        return {
-            membershipWitness: new MembershipWitness(NULLIFIER_TREE_HEIGHT, index, siblingPath.toTuple()),
-            leafPreimage,
-        };
-    }
-    /**
-     * Performs the matching between an array of nullified note hashes and an array of note hashes. This produces
-     * hints for the private kernel tail circuit to efficiently match a nullifier with the corresponding
-     * note hash. Note that the same note hash value might appear more than once in the note hashes
-     * (resp. nullified note hashes) array. It is crucial in this case that each hint points to a different index
-     * of the nullified note hashes array. Otherwise, the private kernel will fail to validate.
-     *
-     * @param nullifiedNoteHashes - The array of nullified note hashes.
-     * @param noteHashes - The array of note hashes.
-     * @returns An array of hints where each element is the index of the note hash in note hashes array
-     *  corresponding to the nullified note hash. In other words we have nullifiedNoteHashes[i] == noteHashes[hints[i]].
-     */
-    getNullifierHints(nullifiedNoteHashes, noteHashes) {
-        const hints = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, Fr.zero);
-        const alreadyUsed = new Set();
-        for (let i = 0; i < MAX_NEW_NULLIFIERS_PER_TX; i++) {
-            if (!nullifiedNoteHashes[i].isZero()) {
-                const result = noteHashes.findIndex((cmt, index) => cmt.value.equals(nullifiedNoteHashes[i]) && !alreadyUsed.has(index));
-                alreadyUsed.add(result);
-                if (result == -1) {
-                    throw new Error(`The nullified note hash at index ${i} with value ${nullifiedNoteHashes[i].toString()} does not match to any note hash.`);
-                }
-                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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGludHNfYnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL2hpbnRzX2J1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEVBQUUsRUFDRixjQUFjLEVBRWQseUJBQXlCLEVBQ3pCLGtDQUFrQyxFQUNsQyw0Q0FBNEMsRUFFNUMsaUJBQWlCLEVBQ2pCLHFCQUFxQixFQU1yQiw4QkFBOEIsR0FDL0IsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFLcEQsTUFBTSxPQUFPLFlBQVk7SUFDdkIsWUFBb0IsTUFBeUI7UUFBekIsV0FBTSxHQUFOLE1BQU0sQ0FBbUI7SUFBRyxDQUFDO0lBRWpELGVBQWUsQ0FDYixXQUF3QjtRQUV4QixNQUFNLE1BQU0sR0FBRyxXQUFXO2FBQ3ZCLEdBQUcsQ0FBQyxDQUFDLFVBQVUsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQzthQUNuRCxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDYiw2QkFBNkI7WUFDN0IsSUFBSSxDQUFDLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7Z0JBQzNCLE9BQU8sQ0FBQyxDQUFDO1lBQ1gsQ0FBQztZQUNELE9BQU8sTUFBTSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDbkYsQ0FBQyxDQUFDLENBQUM7UUFFTCxNQUFNLGdCQUFnQixHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDN0MsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDOUIsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzlCLENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQWdCLEVBQUUsZ0JBQW9DLENBQUMsQ0FBQztJQUMzRyxDQUFDO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNILDJCQUEyQixDQUN6QixvQkFBa0YsRUFDbEYsVUFBZ0U7UUFFaEUsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLGtDQUFrQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNyRSxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsa0NBQWtDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2xHLE1BQU0sU0FBUyxHQUFHLENBQUMsR0FBZSxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUN2RixNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQy9DLElBQUksTUFBTSxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQ2IsNkJBQTZCLENBQUMsSUFBSSxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsbUNBQW1DLENBQ3hHLENBQUM7WUFDSixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzVCLENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQsNEJBQTRCLENBQzFCLHFCQUEyRixFQUMzRixVQUErRTtRQUUvRSxPQUFPLDhCQUE4QixDQUFDLElBQUksRUFBRSxxQkFBcUIsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNqRixDQUFDO0lBRUQsS0FBSyxDQUFDLDZCQUE2QixDQUFDLFNBQWE7UUFDL0MsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLDZCQUE2QixDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3ZFLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNULE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsWUFBWSxFQUFFLEdBQUcsR0FBRyxDQUFDO1FBQ2pELE9BQU87WUFDTCxpQkFBaUIsRUFBRSxJQUFJLGlCQUFpQixDQUN0QyxxQkFBcUIsRUFDckIsS0FBSyxFQUNMLFdBQVcsQ0FBQyxPQUFPLEVBQWdDLENBQ3BEO1lBQ0QsWUFBWTtTQUNiLENBQUM7SUFDSixDQUFDO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDSCxpQkFBaUIsQ0FDZixtQkFBZ0UsRUFDaEUsVUFBZ0U7UUFFaEUsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLHlCQUF5QixFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM1RCxNQUFNLFdBQVcsR0FBRyxJQUFJLEdBQUcsRUFBVSxDQUFDO1FBQ3RDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyx5QkFBeUIsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ25ELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO2dCQUNyQyxNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsU0FBUyxDQUNqQyxDQUFDLEdBQWUsRUFBRSxLQUFhLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUN4RyxDQUFDO2dCQUNGLFdBQVcsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ3hCLElBQUksTUFBTSxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUM7b0JBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQ2Isb0NBQW9DLENBQUMsZUFBZSxtQkFBbUIsQ0FDckUsQ0FBQyxDQUNGLENBQUMsUUFBUSxFQUFFLG1DQUFtQyxDQUNoRCxDQUFDO2dCQUNKLENBQUM7cUJBQU0sQ0FBQztvQkFDTixLQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQzVCLENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyw0QkFBNEIsQ0FDaEMsOEJBR0M7UUFFRCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsNENBQTRDLEVBQUUsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFGLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyw4QkFBOEIsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUMvRCxNQUFNLE9BQU8sR0FBRyw4QkFBOEIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNsRCxJQUFJLE9BQU8sQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO2dCQUN0QixNQUFNO1lBQ1IsQ0FBQztZQUNELElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsMkJBQTJCLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzdFLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7Q0FDRiJ9

package/src/kernel_prover/hints_builder.ts

@@ -1,155 +0,0 @@
-import {
-  Fr,
-  GrumpkinScalar,
-  type MAX_NEW_NOTE_HASHES_PER_TX,
-  MAX_NEW_NULLIFIERS_PER_TX,
-  MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
-  MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-  type MAX_NULLIFIER_READ_REQUESTS_PER_TX,
-  MembershipWitness,
-  NULLIFIER_TREE_HEIGHT,
-  type NullifierKeyValidationRequestContext,
-  type ReadRequestContext,
-  type SideEffect,
-  type SideEffectLinkedToNoteHash,
-  type SideEffectType,
-  buildNullifierReadRequestHints,
-} from '@aztec/circuits.js';
-import { makeTuple } from '@aztec/foundation/array';
-import { type Tuple } from '@aztec/foundation/serialize';
-
-import { type ProvingDataOracle } from './proving_data_oracle.js';
-
-export class HintsBuilder {
-  constructor(private oracle: ProvingDataOracle) {}
-
-  sortSideEffects<T extends SideEffectType, K extends number>(
-    sideEffects: Tuple<T, K>,
-  ): [Tuple<T, K>, Tuple<number, K>] {
-    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) as Tuple<T, K>, originalToSorted as Tuple<number, K>];
-  }
-
-  /**
-   * Performs the matching between an array of read request and an array of note hashes. This produces
-   * hints for the private kernel tail circuit to efficiently match a read request with the corresponding
-   * note hash. Several read requests might be pointing to the same note hash. It is therefore valid
-   * to return more than one hint with the same index (contrary to getNullifierHints).
-   *
-   * @param noteHashReadRequests - The array of read requests.
-   * @param noteHashes - The array of note hashes.
-   * @returns An array of hints where each element is the index of the note hash in note hashes array
-   *  corresponding to the read request. In other words we have readRequests[i] == noteHashes[hints[i]].
-   */
-  getNoteHashReadRequestHints(
-    noteHashReadRequests: Tuple<SideEffect, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>,
-    noteHashes: Tuple<SideEffect, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
-  ): Tuple<Fr, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX> {
-    const hints = makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, Fr.zero);
-    for (let i = 0; i < MAX_NOTE_HASH_READ_REQUESTS_PER_TX && !noteHashReadRequests[i].isEmpty(); i++) {
-      const equalToRR = (cmt: SideEffect) => cmt.value.equals(noteHashReadRequests[i].value);
-      const result = noteHashes.findIndex(equalToRR);
-      if (result == -1) {
-        throw new Error(
-          `The read request at index ${i} ${noteHashReadRequests[i].toString()} does not match to any note hash.`,
-        );
-      } else {
-        hints[i] = new Fr(result);
-      }
-    }
-    return hints;
-  }
-
-  getNullifierReadRequestHints(
-    nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
-    nullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>,
-  ) {
-    return buildNullifierReadRequestHints(this, nullifierReadRequests, nullifiers);
-  }
-
-  async getNullifierMembershipWitness(nullifier: Fr) {
-    const res = await this.oracle.getNullifierMembershipWitness(nullifier);
-    if (!res) {
-      return;
-    }
-
-    const { index, siblingPath, leafPreimage } = res;
-    return {
-      membershipWitness: new MembershipWitness(
-        NULLIFIER_TREE_HEIGHT,
-        index,
-        siblingPath.toTuple<typeof NULLIFIER_TREE_HEIGHT>(),
-      ),
-      leafPreimage,
-    };
-  }
-
-  /**
-   * Performs the matching between an array of nullified note hashes and an array of note hashes. This produces
-   * hints for the private kernel tail circuit to efficiently match a nullifier with the corresponding
-   * note hash. Note that the same note hash value might appear more than once in the note hashes
-   * (resp. nullified note hashes) array. It is crucial in this case that each hint points to a different index
-   * of the nullified note hashes array. Otherwise, the private kernel will fail to validate.
-   *
-   * @param nullifiedNoteHashes - The array of nullified note hashes.
-   * @param noteHashes - The array of note hashes.
-   * @returns An array of hints where each element is the index of the note hash in note hashes array
-   *  corresponding to the nullified note hash. In other words we have nullifiedNoteHashes[i] == noteHashes[hints[i]].
-   */
-  getNullifierHints(
-    nullifiedNoteHashes: Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>,
-    noteHashes: Tuple<SideEffect, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
-  ): Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX> {
-    const hints = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, Fr.zero);
-    const alreadyUsed = new Set<number>();
-    for (let i = 0; i < MAX_NEW_NULLIFIERS_PER_TX; i++) {
-      if (!nullifiedNoteHashes[i].isZero()) {
-        const result = noteHashes.findIndex(
-          (cmt: SideEffect, index: number) => cmt.value.equals(nullifiedNoteHashes[i]) && !alreadyUsed.has(index),
-        );
-        alreadyUsed.add(result);
-        if (result == -1) {
-          throw new Error(
-            `The nullified note hash at index ${i} with value ${nullifiedNoteHashes[
-              i
-            ].toString()} does not match to any note hash.`,
-          );
-        } else {
-          hints[i] = new Fr(result);
-        }
-      }
-    }
-    return hints;
-  }
-
-  async getMasterNullifierSecretKeys(
-    nullifierKeyValidationRequests: Tuple<
-      NullifierKeyValidationRequestContext,
-      typeof MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX
-    >,
-  ) {
-    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;
-  }
-}