addressing review comments

AztecProtocol · May 20, 2024 · d42f0bc · d42f0bc
1 parent 7007e8d
commit d42f0bc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_reset_circuit_private_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_reset_circuit_private_inputs.ts
@@ -68,7 +68,8 @@ export class PrivateKernelResetHints {
      */
     public masterSecretKeys: Tuple<GrumpkinPrivateKey, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>,
     /**
-     * Generators used to derive app secret keys from secret. In 1 to 1 correspondence with master secret keys.
+     * Generators used to derive app secret keys from secret. In 1 to 1 correspondence with `masterSecretKeys`
+     * (e.g. app secret key generator at index 2 corresponds to master secret key at the same index).
      */
     public appSecretKeysGenerators: Tuple<Fr, typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX>,
   ) {}

diff --git a/yarn-project/simulator/src/acvm/oracle/oracle.ts b/yarn-project/simulator/src/acvm/oracle/oracle.ts
@@ -40,15 +40,12 @@ export class Oracle {
     return unpacked.map(toACVMField);
   }
 
-  async getKeyValidationRequest([masterNullifierPublicKeyHash]: ACVMField[]): Promise<ACVMField[]> {
-    const { masterPublicKey: masterNullifierPublicKey, appSecretKey: appNullifierSecretKey } =
-      await this.typedOracle.getKeyValidationRequest(fromACVMField(masterNullifierPublicKeyHash));
+  async getKeyValidationRequest([masterPublicKeyHash]: ACVMField[]): Promise<ACVMField[]> {
+    const { masterPublicKey, appSecretKey } = await this.typedOracle.getKeyValidationRequest(
+      fromACVMField(masterPublicKeyHash),
+    );
 
-    return [
-      toACVMField(masterNullifierPublicKey.x),
-      toACVMField(masterNullifierPublicKey.y),
-      toACVMField(appNullifierSecretKey),
-    ];
+    return [toACVMField(masterPublicKey.x), toACVMField(masterPublicKey.y), toACVMField(appSecretKey)];
   }
 
   async getContractInstance([address]: ACVMField[]) {

diff --git a/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts
@@ -82,7 +82,7 @@ export abstract class TypedOracle {
     throw new OracleMethodNotAvailableError('unpackReturns');
   }
 
-  getKeyValidationRequest(_npkMHash: Fr): Promise<KeyValidationRequest> {
+  getKeyValidationRequest(_pkMHash: Fr): Promise<KeyValidationRequest> {
     throw new OracleMethodNotAvailableError('getKeyValidationRequest');
   }
 

diff --git a/yarn-project/simulator/src/client/db_oracle.ts b/yarn-project/simulator/src/client/db_oracle.ts
@@ -66,12 +66,12 @@ export interface DBOracle extends CommitmentsDB {
   popCapsule(): Promise<Fr[]>;
 
   /**
-   * Retrieve nullifier keys associated with a specific master nullifier public key and app address.
-   * @param npkMHash - The master nullifier public key hash.
+   * Retrieve keys associated with a specific master public key and app address.
+   * @param pkMHash - The master public key hash.
    * @returns A Promise that resolves to nullifier keys.
-   * @throws If the nullifier keys are not registered in the key store.
+   * @throws If the keys are not registered in the key store.
    */
-  getKeyValidationRequest(npkMHash: Fr, contractAddress: AztecAddress): Promise<KeyValidationRequest>;
+  getKeyValidationRequest(pkMHash: Fr, contractAddress: AztecAddress): Promise<KeyValidationRequest>;
 
   /**
    * Retrieves a set of notes stored in the database for a given contract address and storage slot.

diff --git a/yarn-project/simulator/src/client/view_data_oracle.ts b/yarn-project/simulator/src/client/view_data_oracle.ts
@@ -35,13 +35,13 @@ export class ViewDataOracle extends TypedOracle {
   }
 
   /**
-   * Retrieve nullifier keys associated with a specific master nullifier public key and app address.
-   * @param npkMHash - The master nullifier public key hash.
+   * Retrieve keys associated with a specific master public key and app address.
+   * @param pkMHash - The master public key hash.
    * @returns A Promise that resolves to nullifier keys.
-   * @throws If the nullifier keys are not registered in the key store.
+   * @throws If the keys are not registered in the key store.
    */
-  public override getKeyValidationRequest(npkMHash: Fr): Promise<KeyValidationRequest> {
-    return this.db.getKeyValidationRequest(npkMHash, this.contractAddress);
+  public override getKeyValidationRequest(pkMHash: Fr): Promise<KeyValidationRequest> {
+    return this.db.getKeyValidationRequest(pkMHash, this.contractAddress);
   }
 
   /**