rm nullifier & reuse metadata params

0xPolygonID · Feb 14, 2024 · ab90fa5 · ab90fa5
1 parent 0b95bd2
commit ab90fa5
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 186 deletions.
diff --git a/src/circuits/linked-nullifier.ts b/src/circuits/linked-nullifier.ts
diff --git a/src/circuits/models.ts b/src/circuits/models.ts
@@ -81,11 +81,6 @@ export enum CircuitId {
    */
   // AtomicQueryV3OnChainCircuitID is a type for credentialAtomicQueryV3OnChain.circom
   AtomicQueryV3OnChain = 'credentialAtomicQueryV3OnChain-beta.0',
-  /**
-   * @beta
-   */
-  // LinkedNullifier is a type for linkedNullifier.circom
-  LinkedNullifier = 'linkedNullifier-beta.0',
   /**
    * @beta
    */

diff --git a/src/circuits/verifiers/query.ts b/src/circuits/verifiers/query.ts
@@ -147,22 +147,11 @@ export async function checkQueryRequest(
         throw new Error(`proof doesn't contains target query key`);
       }
 
-      const path = await buildFieldPath(JSON.stringify(schema), query.type, metadata.fieldName, {
-        documentLoader: schemaLoader
-      });
-      const claimPathKey = await path.mtEntry();
-
-      if (outputs.claimPathKey !== claimPathKey) {
+      if (outputs.claimPathKey !== metadata.claimPathKey) {
         throw new Error(`proof was generated for another path`);
       }
     } else {
-      const slotIndex = await Parser.getFieldSlotIndex(
-        metadata.fieldName,
-        query.type,
-        byteEncoder.encode(JSON.stringify(schema))
-      );
-
-      if (outputs.slotIndex !== slotIndex) {
+      if (outputs.slotIndex !== metadata.slotIndex) {
         throw new Error(`wrong claim slot was used in claim`);
       }
     }

diff --git a/src/proof/inputs-generator.ts b/src/proof/inputs-generator.ts
@@ -16,7 +16,6 @@ import {
   CircuitClaim,
   CircuitId,
   LinkedMultiQueryInputs,
-  LinkedNullifierInputs,
   MTProof,
   Operators,
   Query,
@@ -83,8 +82,7 @@ export const circuitValidator: {
   [CircuitId.AtomicQueryV3OnChain]: { maxQueriesCount: 1, supportedOperations: allOperations },
   [CircuitId.AuthV2]: { maxQueriesCount: 0, supportedOperations: [] },
   [CircuitId.StateTransition]: { maxQueriesCount: 0, supportedOperations: [] },
-  [CircuitId.LinkedNullifier]: { maxQueriesCount: 1, supportedOperations: [] },
-  [CircuitId.LinkedMultiQuery10]: { maxQueriesCount: 10, supportedOperations: [] }
+  [CircuitId.LinkedMultiQuery10]: { maxQueriesCount: 10, supportedOperations: allOperations }
 };
 
 export class InputGenerator {
@@ -590,30 +588,6 @@ export class InputGenerator {
     return circuitInputs.inputsMarshal();
   };
 
-  private linkedNullifierPrepareInputs = async ({
-    preparedCredential,
-    identifier,
-    proofReq,
-    params
-  }: InputContext): Promise<Uint8Array> => {
-    const circuitClaimData = await this.newCircuitClaimData(preparedCredential);
-
-    circuitClaimData.nonRevProof = toClaimNonRevStatus(preparedCredential.revStatus);
-
-    const circuitInputs = new LinkedNullifierInputs();
-    circuitInputs.linkNonce = params.linkNonce ?? BigInt(0);
-    circuitInputs.issuerClaim = circuitClaimData.claim;
-    circuitInputs.id = DID.idFromDID(identifier);
-    circuitInputs.claimSubjectProfileNonce = BigInt(params.credentialSubjectProfileNonce);
-
-    circuitInputs.verifierID = params.verifierDid ? DID.idFromDID(params.verifierDid) : undefined;
-    circuitInputs.nullifierSessionID = proofReq.params?.nullifierSessionID
-      ? BigInt(proofReq.params?.nullifierSessionID?.toString())
-      : BigInt(0);
-
-    return circuitInputs.inputsMarshal();
-  };
-
   linkedMultiQuery10PrepareInputs = async ({
     preparedCredential,
     proofReq,

diff --git a/tests/circuits/linked-nullifier.test.ts b/tests/circuits/linked-nullifier.test.ts