@zkpassport/sdk 0.2.11 → 0.2.13

package/dist/cjs/index.js

@@ -218,7 +218,15 @@ class ZKPassport {
         }
         else if (request.method === "done") {
             logger_1.noLogger.debug(`User sent the query result`);
-            this.topicToResults[topic] = request.params;
+            const formattedResult = request.params;
+            // Make sure to reconvert the dates to Date objects
+            if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
+                formattedResult.birthdate.disclose.result = new Date(formattedResult.birthdate.disclose.result);
+            }
+            if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
+                formattedResult.expiry_date.disclose.result = new Date(formattedResult.expiry_date.disclose.result);
+            }
+            this.topicToResults[topic] = formattedResult;
             // Make sure all the proofs have been received, otherwise we'll handle the result later
             // once the proofs have all been received
             if (this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
@@ -403,7 +411,10 @@ class ZKPassport {
         let commitmentOut;
         let isCorrect = true;
         let uniqueIdentifier;
-        const expectedMerkleRoot = BigInt("21301853597069384763054217328384418971999152625381818922211526730996340553696");
+        const VALID_CERTIFICATE_REGISTRY_ROOT = [
+            BigInt("20192042006788880778219739574377003123593792072535937278552252195461520776494"),
+            BigInt("21301853597069384763054217328384418971999152625381818922211526730996340553696"),
+        ];
         const defaultDateValue = new Date(1111, 10, 11);
         const currentTime = new Date();
         const today = new Date(currentTime.getFullYear(), currentTime.getMonth(), currentTime.getDate(), 0, 0, 0, 0);
@@ -451,11 +462,11 @@ class ZKPassport {
             if (proof.name?.startsWith("sig_check_dsc")) {
                 commitmentOut = (0, utils_1.getCommitmentFromDSCProof)(proofData);
                 const merkleRoot = (0, utils_1.getMerkleRootFromDSCProof)(proofData);
-                if (merkleRoot !== expectedMerkleRoot) {
+                if (!VALID_CERTIFICATE_REGISTRY_ROOT.includes(merkleRoot)) {
                     console.warn("The ID was signed by an unrecognized root certificate");
                     isCorrect = false;
                     queryResultErrors.sig_check_dsc.certificate = {
-                        expected: `Certificate registry root: ${expectedMerkleRoot.toString()}`,
+                        expected: `Certificate registry root: ${VALID_CERTIFICATE_REGISTRY_ROOT.join(", ")}`,
                         received: `Certificate registry root: ${merkleRoot.toString()}`,
                         message: "The ID was signed by an unrecognized root certificate",
                     };
@@ -1240,12 +1251,20 @@ class ZKPassport {
      * and a boolean indicating whether the proofs were successfully verified.
      */
     async verify({ proofs, queryResult, validity, }) {
+        const formattedResult = queryResult;
+        // Make sure to reconvert the dates to Date objects
+        if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
+            formattedResult.birthdate.disclose.result = new Date(formattedResult.birthdate.disclose.result);
+        }
+        if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
+            formattedResult.expiry_date.disclose.result = new Date(formattedResult.expiry_date.disclose.result);
+        }
         const { BarretenbergVerifier } = await Promise.resolve().then(() => tslib_1.__importStar(require("@aztec/bb.js")));
         const verifier = new BarretenbergVerifier();
         let verified = true;
         let uniqueIdentifier;
         let queryResultErrors;
-        const { isCorrect, uniqueIdentifier: uniqueIdentifierFromPublicInputs, queryResultErrors: queryResultErrorsFromPublicInputs, } = await this.checkPublicInputs(proofs, queryResult, validity);
+        const { isCorrect, uniqueIdentifier: uniqueIdentifierFromPublicInputs, queryResultErrors: queryResultErrorsFromPublicInputs, } = await this.checkPublicInputs(proofs, formattedResult, validity);
         uniqueIdentifier = uniqueIdentifierFromPublicInputs;
         verified = isCorrect;
         queryResultErrors = isCorrect ? undefined : queryResultErrorsFromPublicInputs;

package/dist/esm/index.js

@@ -208,7 +208,15 @@ export class ZKPassport {
         }
         else if (request.method === "done") {
             logger.debug(`User sent the query result`);
-            this.topicToResults[topic] = request.params;
+            const formattedResult = request.params;
+            // Make sure to reconvert the dates to Date objects
+            if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
+                formattedResult.birthdate.disclose.result = new Date(formattedResult.birthdate.disclose.result);
+            }
+            if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
+                formattedResult.expiry_date.disclose.result = new Date(formattedResult.expiry_date.disclose.result);
+            }
+            this.topicToResults[topic] = formattedResult;
             // Make sure all the proofs have been received, otherwise we'll handle the result later
             // once the proofs have all been received
             if (this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
@@ -393,7 +401,10 @@ export class ZKPassport {
         let commitmentOut;
         let isCorrect = true;
         let uniqueIdentifier;
-        const expectedMerkleRoot = BigInt("21301853597069384763054217328384418971999152625381818922211526730996340553696");
+        const VALID_CERTIFICATE_REGISTRY_ROOT = [
+            BigInt("20192042006788880778219739574377003123593792072535937278552252195461520776494"),
+            BigInt("21301853597069384763054217328384418971999152625381818922211526730996340553696"),
+        ];
         const defaultDateValue = new Date(1111, 10, 11);
         const currentTime = new Date();
         const today = new Date(currentTime.getFullYear(), currentTime.getMonth(), currentTime.getDate(), 0, 0, 0, 0);
@@ -441,11 +452,11 @@ export class ZKPassport {
             if (proof.name?.startsWith("sig_check_dsc")) {
                 commitmentOut = getCommitmentFromDSCProof(proofData);
                 const merkleRoot = getMerkleRootFromDSCProof(proofData);
-                if (merkleRoot !== expectedMerkleRoot) {
+                if (!VALID_CERTIFICATE_REGISTRY_ROOT.includes(merkleRoot)) {
                     console.warn("The ID was signed by an unrecognized root certificate");
                     isCorrect = false;
                     queryResultErrors.sig_check_dsc.certificate = {
-                        expected: `Certificate registry root: ${expectedMerkleRoot.toString()}`,
+                        expected: `Certificate registry root: ${VALID_CERTIFICATE_REGISTRY_ROOT.join(", ")}`,
                         received: `Certificate registry root: ${merkleRoot.toString()}`,
                         message: "The ID was signed by an unrecognized root certificate",
                     };
@@ -1230,12 +1241,20 @@ export class ZKPassport {
      * and a boolean indicating whether the proofs were successfully verified.
      */
     async verify({ proofs, queryResult, validity, }) {
+        const formattedResult = queryResult;
+        // Make sure to reconvert the dates to Date objects
+        if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
+            formattedResult.birthdate.disclose.result = new Date(formattedResult.birthdate.disclose.result);
+        }
+        if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
+            formattedResult.expiry_date.disclose.result = new Date(formattedResult.expiry_date.disclose.result);
+        }
         const { BarretenbergVerifier } = await import("@aztec/bb.js");
         const verifier = new BarretenbergVerifier();
         let verified = true;
         let uniqueIdentifier;
         let queryResultErrors;
-        const { isCorrect, uniqueIdentifier: uniqueIdentifierFromPublicInputs, queryResultErrors: queryResultErrorsFromPublicInputs, } = await this.checkPublicInputs(proofs, queryResult, validity);
+        const { isCorrect, uniqueIdentifier: uniqueIdentifierFromPublicInputs, queryResultErrors: queryResultErrorsFromPublicInputs, } = await this.checkPublicInputs(proofs, formattedResult, validity);
         uniqueIdentifier = uniqueIdentifierFromPublicInputs;
         verified = isCorrect;
         queryResultErrors = isCorrect ? undefined : queryResultErrorsFromPublicInputs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zkpassport/sdk",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "Privacy-preserving identity verification using passports and ID cards",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -41,7 +41,7 @@
     "@aztec/bb.js": "^0.76.4",
     "@noble/ciphers": "^1.2.1",
     "@noble/secp256k1": "^2.2.3",
-    "@zkpassport/utils": "^0.2.23",
+    "@zkpassport/utils": "^0.2.24",
     "buffer": "^6.0.3",
     "i18n-iso-countries": "^7.12.0",
     "pako": "^2.1.0",

package/src/index.ts

@@ -479,7 +479,19 @@ export class ZKPassport {
       }
     } else if (request.method === "done") {
       logger.debug(`User sent the query result`)
-      this.topicToResults[topic] = request.params
+      const formattedResult: QueryResult = request.params
+      // Make sure to reconvert the dates to Date objects
+      if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
+        formattedResult.birthdate.disclose.result = new Date(
+          formattedResult.birthdate.disclose.result,
+        )
+      }
+      if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
+        formattedResult.expiry_date.disclose.result = new Date(
+          formattedResult.expiry_date.disclose.result,
+        )
+      }
+      this.topicToResults[topic] = formattedResult
       // Make sure all the proofs have been received, otherwise we'll handle the result later
       // once the proofs have all been received
       if (this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
@@ -726,9 +738,10 @@ export class ZKPassport {
     let commitmentOut: bigint | undefined
     let isCorrect = true
     let uniqueIdentifier: string | undefined
-    const expectedMerkleRoot = BigInt(
-      "21301853597069384763054217328384418971999152625381818922211526730996340553696",
-    )
+    const VALID_CERTIFICATE_REGISTRY_ROOT = [
+      BigInt("20192042006788880778219739574377003123593792072535937278552252195461520776494"),
+      BigInt("21301853597069384763054217328384418971999152625381818922211526730996340553696"),
+    ]
     const defaultDateValue = new Date(1111, 10, 11)
     const currentTime = new Date()
     const today = new Date(
@@ -786,11 +799,11 @@ export class ZKPassport {
       if (proof.name?.startsWith("sig_check_dsc")) {
         commitmentOut = getCommitmentFromDSCProof(proofData)
         const merkleRoot = getMerkleRootFromDSCProof(proofData)
-        if (merkleRoot !== expectedMerkleRoot) {
+        if (!VALID_CERTIFICATE_REGISTRY_ROOT.includes(merkleRoot)) {
           console.warn("The ID was signed by an unrecognized root certificate")
           isCorrect = false
           queryResultErrors.sig_check_dsc.certificate = {
-            expected: `Certificate registry root: ${expectedMerkleRoot.toString()}`,
+            expected: `Certificate registry root: ${VALID_CERTIFICATE_REGISTRY_ROOT.join(", ")}`,
             received: `Certificate registry root: ${merkleRoot.toString()}`,
             message: "The ID was signed by an unrecognized root certificate",
           }
@@ -1709,6 +1722,19 @@ export class ZKPassport {
     verified: boolean
     queryResultErrors?: QueryResultErrors
   }> {
+    const formattedResult: QueryResult = queryResult
+    // Make sure to reconvert the dates to Date objects
+    if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
+      formattedResult.birthdate.disclose.result = new Date(
+        formattedResult.birthdate.disclose.result,
+      )
+    }
+    if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
+      formattedResult.expiry_date.disclose.result = new Date(
+        formattedResult.expiry_date.disclose.result,
+      )
+    }
+
     const { BarretenbergVerifier } = await import("@aztec/bb.js")
     const verifier = new BarretenbergVerifier()
     let verified = true
@@ -1718,7 +1744,7 @@ export class ZKPassport {
       isCorrect,
       uniqueIdentifier: uniqueIdentifierFromPublicInputs,
       queryResultErrors: queryResultErrorsFromPublicInputs,
-    } = await this.checkPublicInputs(proofs, queryResult, validity)
+    } = await this.checkPublicInputs(proofs, formattedResult, validity)
     uniqueIdentifier = uniqueIdentifierFromPublicInputs
     verified = isCorrect
     queryResultErrors = isCorrect ? undefined : queryResultErrorsFromPublicInputs