@zkpassport/sdk 0.10.0 → 0.11.0-beta.2

package/dist/cjs/public-input-checker.cjs

@@ -426,21 +426,6 @@ var PublicInputChecker = class {
         }
       };
     }
-    const currentDate = (0, import_utils.getCurrentDateFromCommittedInputs)(
-      proof.committedInputs?.compare_age ?? proof.committedInputs?.compare_age_evm
-    );
-    if (!(0, import_utils.areDatesEqual)(currentDate, today) && !(0, import_utils.areDatesEqual)(currentDate, today.getTime() - 864e5)) {
-      console.warn("Current date in the proof is too old");
-      isCorrect = false;
-      queryResultErrors.age = {
-        ...queryResultErrors.age,
-        disclose: {
-          expected: `${today.toISOString()}`,
-          received: `${currentDate.toISOString()}`,
-          message: "Current date in the proof is too old"
-        }
-      };
-    }
     return { isCorrect, queryResultErrors };
   }
   static checkBirthdatePublicInputs(proof, queryResult) {
@@ -463,9 +448,6 @@ var PublicInputChecker = class {
       proof.committedInputs?.compare_birthdate ?? proof.committedInputs?.compare_birthdate_evm,
       -1 * import_utils.SECONDS_BETWEEN_1900_AND_1970
     );
-    const currentDate = (0, import_utils.getCurrentDateFromCommittedInputs)(
-      proof.committedInputs?.compare_birthdate ?? proof.committedInputs?.compare_birthdate_evm
-    );
     if (queryResult.birthdate) {
       if (queryResult.birthdate.gte && queryResult.birthdate.gte.result && !(0, import_utils.areDatesEqual)(minDate, queryResult.birthdate.gte.expected)) {
         console.warn("Birthdate is not greater than or equal to the expected birthdate");
@@ -539,18 +521,6 @@ var PublicInputChecker = class {
         }
       };
     }
-    if (!(0, import_utils.areDatesEqual)(currentDate, today) && !(0, import_utils.areDatesEqual)(currentDate, today.getTime() - 864e5)) {
-      console.warn("Current date in the proof is too old");
-      isCorrect = false;
-      queryResultErrors.birthdate = {
-        ...queryResultErrors.birthdate,
-        disclose: {
-          expected: `${today.toISOString()}`,
-          received: `${currentDate.toISOString()}`,
-          message: "Current date in the proof is too old"
-        }
-      };
-    }
     return { isCorrect, queryResultErrors };
   }
   static checkExpiryDatePublicInputs(proof, queryResult) {
@@ -571,9 +541,6 @@ var PublicInputChecker = class {
     const maxDate = (0, import_utils.getMaxDateFromCommittedInputs)(
       proof.committedInputs?.compare_expiry ?? proof.committedInputs?.compare_expiry_evm
     );
-    const currentDate = (0, import_utils.getCurrentDateFromCommittedInputs)(
-      proof.committedInputs?.compare_expiry ?? proof.committedInputs?.compare_expiry_evm
-    );
     if (queryResult.expiry_date) {
       if (queryResult.expiry_date.gte && queryResult.expiry_date.gte.result && !(0, import_utils.areDatesEqual)(minDate, queryResult.expiry_date.gte.expected)) {
         console.warn("Expiry date is not greater than or equal to the expected expiry date");
@@ -647,18 +614,6 @@ var PublicInputChecker = class {
         }
       };
     }
-    if (!(0, import_utils.areDatesEqual)(currentDate, today) && !(0, import_utils.areDatesEqual)(currentDate, today.getTime() - 864e5)) {
-      console.warn("Current date in the proof is too old");
-      isCorrect = false;
-      queryResultErrors.expiry_date = {
-        ...queryResultErrors.expiry_date,
-        disclose: {
-          expected: `${today.toISOString()}`,
-          received: `${currentDate.toISOString()}`,
-          message: "Current date in the proof is too old"
-        }
-      };
-    }
     return { isCorrect, queryResultErrors };
   }
   static checkNationalityExclusionPublicInputs(queryResult, countryList) {
@@ -803,7 +758,7 @@ var PublicInputChecker = class {
   }
   static checkScopeFromDisclosureProof(domain, proofData, queryResultErrors, key, scope) {
     let isCorrect = true;
-    if (domain && (0, import_utils.getServiceScopeHash)(domain) !== BigInt(proofData.publicInputs[1])) {
+    if (domain && (0, import_utils.getServiceScopeHash)(domain) !== (0, import_utils.getServiceScopeFromDisclosureProof)(proofData)) {
       console.warn("The proof comes from a different domain than the one expected");
       isCorrect = false;
       if (!queryResultErrors[key]) {
@@ -815,7 +770,7 @@ var PublicInputChecker = class {
         message: "The proof comes from a different domain than the one expected"
       };
     }
-    if (scope && (0, import_utils.getScopeHash)(scope) !== BigInt(proofData.publicInputs[2])) {
+    if (scope && (0, import_utils.getScopeHash)(scope) !== (0, import_utils.getServiceSubScopeFromDisclosureProof)(proofData)) {
       console.warn("The proof uses a different scope than the one expected");
       isCorrect = false;
       if (!queryResultErrors[key]) {
@@ -996,6 +951,36 @@ var PublicInputChecker = class {
     }
     return { isCorrect, queryResultErrors };
   }
+  static async checkCurrentDate(circuitName, proofData, validity, queryResultErrors) {
+    const currentTime = /* @__PURE__ */ new Date();
+    const today = new Date(
+      currentTime.getFullYear(),
+      currentTime.getMonth(),
+      currentTime.getDate(),
+      0,
+      0,
+      0,
+      0
+    );
+    const currentDate = (0, import_utils.getCurrentDateFromDisclosureProof)(proofData);
+    const todayToCurrentDate = today.getTime() - currentDate.getTime();
+    const expectedDifference = validity ? validity * 1e3 : DEFAULT_VALIDITY * 1e3;
+    const actualDifference = today.getTime() - (today.getTime() - expectedDifference);
+    let isCorrect = true;
+    if (todayToCurrentDate >= actualDifference) {
+      console.warn("The date used to check the validity of the ID falls out of the validity period");
+      isCorrect = false;
+      if (!queryResultErrors[circuitName]) {
+        queryResultErrors[circuitName] = {};
+      }
+      queryResultErrors[circuitName].date = {
+        expected: `Difference: ${validity} seconds`,
+        received: `Difference: ${Math.round(todayToCurrentDate / 1e3)} seconds`,
+        message: "The date used to check the validity of the ID falls out of the validity period"
+      };
+    }
+    return { isCorrect, queryResultErrors };
+  }
   static async checkPublicInputs(domain, proofs, queryResult, validity, scope) {
     let commitmentIn;
     let commitmentOut;
@@ -1124,14 +1109,9 @@ var PublicInputChecker = class {
         if (!!committedInputs?.compare_age || !!committedInputs?.compare_age_evm) {
           const ageCommittedInputs = committedInputs?.compare_age ?? committedInputs?.compare_age_evm;
           const ageParameterCommitment = isForEVM ? await (0, import_utils.getAgeEVMParameterCommitment)(
-            ageCommittedInputs.currentDateTimestamp,
-            ageCommittedInputs.minAge,
-            ageCommittedInputs.maxAge
-          ) : await (0, import_utils.getAgeParameterCommitment)(
-            ageCommittedInputs.currentDateTimestamp,
             ageCommittedInputs.minAge,
             ageCommittedInputs.maxAge
-          );
+          ) : await (0, import_utils.getAgeParameterCommitment)(ageCommittedInputs.minAge, ageCommittedInputs.maxAge);
           if (!paramCommitments.includes(ageParameterCommitment)) {
             console.warn("This proof does not verify the age");
             isCorrect = false;
@@ -1155,16 +1135,12 @@ var PublicInputChecker = class {
           const birthdateCommittedInputs = committedInputs?.compare_birthdate ?? committedInputs?.compare_birthdate_evm;
           const birthdateParameterCommitment = isForEVM ? await (0, import_utils.getDateEVMParameterCommitment)(
             import_utils.ProofType.BIRTHDATE,
-            birthdateCommittedInputs.currentDateTimestamp,
             birthdateCommittedInputs.minDateTimestamp,
-            birthdateCommittedInputs.maxDateTimestamp,
-            0
+            birthdateCommittedInputs.maxDateTimestamp
           ) : await (0, import_utils.getDateParameterCommitment)(
             import_utils.ProofType.BIRTHDATE,
-            birthdateCommittedInputs.currentDateTimestamp,
             birthdateCommittedInputs.minDateTimestamp,
-            birthdateCommittedInputs.maxDateTimestamp,
-            0
+            birthdateCommittedInputs.maxDateTimestamp
           );
           if (!paramCommitments.includes(birthdateParameterCommitment)) {
             console.warn("This proof does not verify the birthdate");
@@ -1189,12 +1165,10 @@ var PublicInputChecker = class {
           const expiryCommittedInputs = committedInputs?.compare_expiry ?? committedInputs?.compare_expiry_evm;
           const expiryParameterCommitment = isForEVM ? await (0, import_utils.getDateEVMParameterCommitment)(
             import_utils.ProofType.EXPIRY_DATE,
-            expiryCommittedInputs.currentDateTimestamp,
             expiryCommittedInputs.minDateTimestamp,
             expiryCommittedInputs.maxDateTimestamp
           ) : await (0, import_utils.getDateParameterCommitment)(
             import_utils.ProofType.EXPIRY_DATE,
-            expiryCommittedInputs.currentDateTimestamp,
             expiryCommittedInputs.minDateTimestamp,
             expiryCommittedInputs.maxDateTimestamp
           );
@@ -1398,7 +1372,11 @@ var PublicInputChecker = class {
         if (!!committedInputs?.exclusion_check_sanctions || !!committedInputs?.exclusion_check_sanctions_evm) {
           const sanctionsBuilder = await import_utils.SanctionsBuilder.create();
           const exclusionCheckSanctionsCommittedInputs = committedInputs?.exclusion_check_sanctions ?? committedInputs?.exclusion_check_sanctions_evm;
-          const exclusionCheckSanctionsParameterCommitment = isForEVM ? await sanctionsBuilder.getSanctionsEvmParameterCommitment() : await sanctionsBuilder.getSanctionsParameterCommitment();
+          const exclusionCheckSanctionsParameterCommitment = isForEVM ? await sanctionsBuilder.getSanctionsEvmParameterCommitment(
+            exclusionCheckSanctionsCommittedInputs.isStrict
+          ) : await sanctionsBuilder.getSanctionsParameterCommitment(
+            exclusionCheckSanctionsCommittedInputs.isStrict
+          );
           if (!paramCommitments.includes(exclusionCheckSanctionsParameterCommitment)) {
             console.warn("This proof does not verify the exclusion from the sanction lists");
             isCorrect = false;
@@ -1507,24 +1485,6 @@ var PublicInputChecker = class {
           };
         }
         commitmentOut = (0, import_utils.getCommitmentOutFromIntegrityProof)(proofData);
-        const currentDate = (0, import_utils.getCurrentDateFromIntegrityProof)(proofData);
-        const todayToCurrentDate = today.getTime() - currentDate.getTime();
-        const expectedDifference = validity ? validity * 1e3 : DEFAULT_VALIDITY * 1e3;
-        const actualDifference = today.getTime() - (today.getTime() - expectedDifference);
-        if (todayToCurrentDate >= actualDifference) {
-          console.warn(
-            `The date used to check the validity of the ID is older than the validity period`
-          );
-          isCorrect = false;
-          queryResultErrors.data_check_integrity = {
-            ...queryResultErrors.data_check_integrity,
-            date: {
-              expected: `Difference: ${validity} seconds`,
-              received: `Difference: ${Math.round(todayToCurrentDate / 1e3)} seconds`,
-              message: "The date used to check the validity of the ID is older than the validity period"
-            }
-          };
-        }
       } else if (proof.name === "disclose_bytes") {
         commitmentIn = (0, import_utils.getCommitmentInFromDisclosureProof)(proofData);
         if (commitmentIn !== commitmentOut) {
@@ -1577,6 +1537,17 @@ var PublicInputChecker = class {
           ...queryResultErrorsDisclose,
           ...queryResultErrorsScope
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "disclose",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "compare_age") {
@@ -1598,7 +1569,6 @@ var PublicInputChecker = class {
         const paramCommitment = (0, import_utils.getParameterCommitmentFromDisclosureProof)(proofData);
         const committedInputs = proof.committedInputs?.compare_age;
         const calculatedParamCommitment = await (0, import_utils.getAgeParameterCommitment)(
-          committedInputs.currentDateTimestamp,
           committedInputs.minAge,
           committedInputs.maxAge
         );
@@ -1624,6 +1594,17 @@ var PublicInputChecker = class {
           ...queryResultErrorsAge,
           ...queryResultErrorsScope
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "age",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "compare_birthdate") {
@@ -1646,7 +1627,6 @@ var PublicInputChecker = class {
         const committedInputs = proof.committedInputs?.compare_birthdate;
         const calculatedParamCommitment = await (0, import_utils.getDateParameterCommitment)(
           import_utils.ProofType.BIRTHDATE,
-          committedInputs.currentDateTimestamp,
           committedInputs.minDateTimestamp,
           committedInputs.maxDateTimestamp,
           0
@@ -1679,6 +1659,17 @@ var PublicInputChecker = class {
           ...queryResultErrorsBirthdate,
           ...queryResultErrorsScope
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "birthdate",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "compare_expiry") {
@@ -1701,7 +1692,6 @@ var PublicInputChecker = class {
         const committedInputs = proof.committedInputs?.compare_expiry;
         const calculatedParamCommitment = await (0, import_utils.getDateParameterCommitment)(
           import_utils.ProofType.EXPIRY_DATE,
-          committedInputs.currentDateTimestamp,
           committedInputs.minDateTimestamp,
           committedInputs.maxDateTimestamp
         );
@@ -1733,6 +1723,17 @@ var PublicInputChecker = class {
           ...queryResultErrorsExpiryDate,
           ...queryResultErrorsScope
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "expiry_date",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "exclusion_check_nationality") {
@@ -1789,6 +1790,17 @@ var PublicInputChecker = class {
           ...queryResultErrorsNationalityExclusion,
           ...queryResultErrorsScope
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "nationality",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "exclusion_check_issuing_country") {
@@ -1845,6 +1857,17 @@ var PublicInputChecker = class {
           ...queryResultErrorsIssuingCountryExclusion,
           ...queryResultErrorsScope
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "issuing_country",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "inclusion_check_nationality") {
@@ -1901,6 +1924,17 @@ var PublicInputChecker = class {
           ...queryResultErrorsNationalityInclusion,
           ...queryResultErrorsScope
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "nationality",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "inclusion_check_issuing_country") {
@@ -1957,6 +1991,17 @@ var PublicInputChecker = class {
           ...queryResultErrorsIssuingCountryInclusion,
           ...queryResultErrorsScope
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "issuing_country",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "bind") {
@@ -1983,12 +2028,25 @@ var PublicInputChecker = class {
           ...queryResultErrors,
           ...queryResultErrorsBind
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "bind",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name === "exclusion_check_sanctions") {
         const sanctionsBuilder = await import_utils.SanctionsBuilder.create();
         const exclusionCheckSanctionsCommittedInputs = proof.committedInputs?.exclusion_check_sanctions;
-        const calculatedParamCommitment = await sanctionsBuilder.getSanctionsParameterCommitment();
+        const calculatedParamCommitment = await sanctionsBuilder.getSanctionsParameterCommitment(
+          exclusionCheckSanctionsCommittedInputs.isStrict
+        );
         const paramCommittment = (0, import_utils.getParameterCommitmentFromDisclosureProof)(proofData);
         if (paramCommittment !== calculatedParamCommitment) {
           console.warn(
@@ -2017,6 +2075,17 @@ var PublicInputChecker = class {
           ...queryResultErrors,
           ...queryResultErrorsSanctionsExclusion
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "sanctions",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       } else if (proof.name?.startsWith("facematch") && !proof.name?.endsWith("_evm")) {
@@ -2046,6 +2115,17 @@ var PublicInputChecker = class {
           ...queryResultErrors,
           ...queryResultErrorsFacematch
         };
+        const { isCorrect: isCorrectCurrentDate, queryResultErrors: queryResultErrorsCurrentDate } = await this.checkCurrentDate(
+          "facematch",
+          proofData,
+          validity ?? DEFAULT_VALIDITY,
+          queryResultErrors
+        );
+        isCorrect = isCorrect && isCorrectCurrentDate;
+        queryResultErrors = {
+          ...queryResultErrors,
+          ...queryResultErrorsCurrentDate
+        };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
       }

package/dist/cjs/public-input-checker.d.cts

@@ -58,6 +58,7 @@ declare class PublicInputChecker {
         isCorrect: boolean;
         queryResultErrors: Partial<QueryResultErrors>;
     }>;
+    private static checkCurrentDate;
     static checkPublicInputs(domain: string, proofs: Array<ProofResult>, queryResult: QueryResult, validity?: number, scope?: string): Promise<{
         isCorrect: boolean;
         uniqueIdentifier: string | undefined;