@zkpassport/sdk 0.9.0 → 0.9.1

package/dist/cjs/index.d.cts

@@ -1,5 +1,5 @@
 import { QueryBuilder, QueryResultErrors, SolidityVerifierParameters } from './types.cjs';
-export { QueryBuilderResult, QueryResultError } from './types.cjs';
+export { QueryBuilderResult, QueryResultError, SolidityCommitments, SolidityProofVerificationData, SolidityServiceConfig } from './types.cjs';
 import { ProofMode, ProofResult, QueryResult, NullifierType, SupportedChain } from '@zkpassport/utils';
 export * from '@zkpassport/utils';
 export { ASEAN_COUNTRIES, EEA_COUNTRIES, EU_COUNTRIES, MERCOSUR_COUNTRIES, SANCTIONED_COUNTRIES, SCHENGEN_COUNTRIES } from '@zkpassport/utils';

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

@@ -29,22 +29,19 @@ var import_registry = require("@zkpassport/registry");
 // src/constants.ts
 var DEFAULT_VALIDITY = 7 * 24 * 60 * 60;
 var DEFAULT_DATE_VALUE = /* @__PURE__ */ new Date(0);
-var ZKPASSPORT_APP_ID_HASH = "0x1fa73686cf510f8f85757b0602de0dd72a13e68ae2092462be8b72662e7f179b";
+var ZKPASSPORT_IOS_APP_ID_HASH = "0x1fa73686cf510f8f85757b0602de0dd72a13e68ae2092462be8b72662e7f179b";
+var ZKPASSPORT_ANDROID_APP_ID_HASH = "0x24d9929b248be7eeecaa98e105c034a50539610f3fdd4cb9c8983ef4100d615d";
 var APPLE_APP_ATTEST_ROOT_KEY_HASH = "0x2532418a107c5306fa8308c22255792cf77e4a290cbce8a840a642a3e591340b";
+var GOOGLE_APP_ATTEST_RSA_ROOT_KEY_HASH = "0x16700a2d9168a194fc85f237af5829b5a2be05b8ae8ac4879ada34cf54a9c211";
 
 // src/public-input-checker.ts
 var PublicInputChecker = class {
   static checkDiscloseBytesPublicInputs(proof, queryResult) {
     const queryResultErrors = {};
     let isCorrect = true;
-    const disclosedDataPassport = import_utils.DisclosedData.fromDisclosedBytes(
-      (proof.committedInputs?.disclose_bytes).disclosedBytes,
-      "passport"
-    );
-    const disclosedDataIDCard = import_utils.DisclosedData.fromDisclosedBytes(
-      (proof.committedInputs?.disclose_bytes).disclosedBytes,
-      "id_card"
-    );
+    const disclosedBytes = (proof.committedInputs?.disclose_bytes).disclosedBytes ?? (proof.committedInputs?.disclose_bytes_evm).disclosedBytes;
+    const disclosedDataPassport = import_utils.DisclosedData.fromDisclosedBytes(disclosedBytes, "passport");
+    const disclosedDataIDCard = import_utils.DisclosedData.fromDisclosedBytes(disclosedBytes, "id_card");
     if (queryResult.document_type) {
       if (queryResult.document_type.eq && queryResult.document_type.eq.result && queryResult.document_type.eq.expected !== disclosedDataPassport.documentType) {
         console.warn("Document type does not match the expected document type");
@@ -339,10 +336,10 @@ var PublicInputChecker = class {
       0
     );
     const minAge = (0, import_utils.getMinAgeFromCommittedInputs)(
-      proof.committedInputs?.compare_age
+      proof.committedInputs?.compare_age ?? proof.committedInputs?.compare_age_evm
     );
     const maxAge = (0, import_utils.getMaxAgeFromCommittedInputs)(
-      proof.committedInputs?.compare_age
+      proof.committedInputs?.compare_age ?? proof.committedInputs?.compare_age_evm
     );
     if (queryResult.age) {
       if (queryResult.age.gte && queryResult.age.gte.result && minAge !== queryResult.age.gte.expected) {
@@ -430,7 +427,7 @@ var PublicInputChecker = class {
       };
     }
     const currentDate = (0, import_utils.getCurrentDateFromCommittedInputs)(
-      proof.committedInputs?.compare_age
+      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");
@@ -459,15 +456,15 @@ var PublicInputChecker = class {
       0
     );
     const minDate = (0, import_utils.getBirthdateMinDateTimestamp)(
-      proof.committedInputs?.compare_birthdate,
+      proof.committedInputs?.compare_birthdate ?? proof.committedInputs?.compare_birthdate_evm,
       -1 * import_utils.SECONDS_BETWEEN_1900_AND_1970
     );
     const maxDate = (0, import_utils.getBirthdateMaxDateTimestamp)(
-      proof.committedInputs?.compare_birthdate,
+      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 ?? 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)) {
@@ -569,13 +566,13 @@ var PublicInputChecker = class {
       0
     );
     const minDate = (0, import_utils.getMinDateFromCommittedInputs)(
-      proof.committedInputs?.compare_expiry
+      proof.committedInputs?.compare_expiry ?? proof.committedInputs?.compare_expiry_evm
     );
     const maxDate = (0, import_utils.getMaxDateFromCommittedInputs)(
-      proof.committedInputs?.compare_expiry
+      proof.committedInputs?.compare_expiry ?? proof.committedInputs?.compare_expiry_evm
     );
     const currentDate = (0, import_utils.getCurrentDateFromCommittedInputs)(
-      proof.committedInputs?.compare_expiry
+      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)) {
@@ -957,19 +954,25 @@ var PublicInputChecker = class {
     let isCorrect = true;
     let queryResultErrors = {};
     if (queryResult.facematch && queryResult.facematch.passed) {
-      if (facematchCommittedInputs.rootKeyLeaf !== APPLE_APP_ATTEST_ROOT_KEY_HASH) {
+      if (facematchCommittedInputs.rootKeyLeaf !== APPLE_APP_ATTEST_ROOT_KEY_HASH && facematchCommittedInputs.rootKeyLeaf !== GOOGLE_APP_ATTEST_RSA_ROOT_KEY_HASH) {
         console.warn("Invalid facematch root key hash");
         isCorrect = false;
         queryResultErrors.facematch = {
           ...queryResultErrors.facematch,
           eq: {
-            expected: APPLE_APP_ATTEST_ROOT_KEY_HASH,
+            expected: `${APPLE_APP_ATTEST_ROOT_KEY_HASH} (iOS) or ${GOOGLE_APP_ATTEST_RSA_ROOT_KEY_HASH} (Android)`,
             received: facematchCommittedInputs.rootKeyLeaf,
             message: "Invalid facematch root key hash"
           }
         };
       }
       const EXPECTED_ENVIRONMENT = "production";
+      console.log("facematchCommittedInputs.environment", facematchCommittedInputs.environment);
+      console.log("EXPECTED_ENVIRONMENT", EXPECTED_ENVIRONMENT);
+      console.log(
+        "facematchCommittedInputs.environment !== EXPECTED_ENVIRONMENT",
+        facematchCommittedInputs.environment !== EXPECTED_ENVIRONMENT
+      );
       if (facematchCommittedInputs.environment !== EXPECTED_ENVIRONMENT) {
         console.warn("Invalid facematch environment, it should be production");
         isCorrect = false;
@@ -982,7 +985,7 @@ var PublicInputChecker = class {
           }
         };
       }
-      if (facematchCommittedInputs.appId !== ZKPASSPORT_APP_ID_HASH) {
+      if (facematchCommittedInputs.appId !== ZKPASSPORT_IOS_APP_ID_HASH && facematchCommittedInputs.appId !== ZKPASSPORT_ANDROID_APP_ID_HASH) {
         console.warn(
           "Invalid facematch app id hash, the attestation should be coming from the ZKPassport app"
         );
@@ -990,7 +993,7 @@ var PublicInputChecker = class {
         queryResultErrors.facematch = {
           ...queryResultErrors.facematch,
           eq: {
-            expected: ZKPASSPORT_APP_ID_HASH,
+            expected: `${ZKPASSPORT_IOS_APP_ID_HASH} (iOS) or ${ZKPASSPORT_ANDROID_APP_ID_HASH} (Android)`,
             received: facematchCommittedInputs.appId,
             message: "Invalid facematch app id hash, the attestation should be coming from the ZKPassport app"
           }
@@ -1124,8 +1127,8 @@ var PublicInputChecker = class {
             }
           };
         }
-        if (!!committedInputs?.compare_age) {
-          const ageCommittedInputs = committedInputs?.compare_age;
+        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,
@@ -1153,8 +1156,9 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsAge
           };
-        } else if (!!committedInputs?.compare_birthdate) {
-          const birthdateCommittedInputs = committedInputs?.compare_birthdate;
+        }
+        if (!!committedInputs?.compare_birthdate || !!committedInputs?.compare_birthdate_evm) {
+          const birthdateCommittedInputs = committedInputs?.compare_birthdate ?? committedInputs?.compare_birthdate_evm;
           const birthdateParameterCommitment = isForEVM ? await (0, import_utils.getDateEVMParameterCommitment)(
             import_utils.ProofType.BIRTHDATE,
             birthdateCommittedInputs.currentDateTimestamp,
@@ -1186,8 +1190,9 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsBirthdate
           };
-        } else if (!!committedInputs?.compare_expiry) {
-          const expiryCommittedInputs = committedInputs?.compare_expiry;
+        }
+        if (!!committedInputs?.compare_expiry || !!committedInputs?.compare_expiry_evm) {
+          const expiryCommittedInputs = committedInputs?.compare_expiry ?? committedInputs?.compare_expiry_evm;
           const expiryParameterCommitment = isForEVM ? await (0, import_utils.getDateEVMParameterCommitment)(
             import_utils.ProofType.EXPIRY_DATE,
             expiryCommittedInputs.currentDateTimestamp,
@@ -1217,8 +1222,9 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsExpiryDate
           };
-        } else if (!!committedInputs?.disclose_bytes) {
-          const discloseCommittedInputs = committedInputs?.disclose_bytes;
+        }
+        if (!!committedInputs?.disclose_bytes || !!committedInputs?.disclose_bytes_evm) {
+          const discloseCommittedInputs = committedInputs?.disclose_bytes ?? committedInputs?.disclose_bytes_evm;
           const discloseParameterCommitment = isForEVM ? await (0, import_utils.getDiscloseEVMParameterCommitment)(
             discloseCommittedInputs.discloseMask,
             discloseCommittedInputs.disclosedBytes
@@ -1244,8 +1250,9 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsDisclose
           };
-        } else if (!!committedInputs?.inclusion_check_nationality) {
-          const inclusionCheckNationalityCommittedInputs = committedInputs?.inclusion_check_nationality;
+        }
+        if (!!committedInputs?.inclusion_check_nationality || !!committedInputs?.inclusion_check_nationality_evm) {
+          const inclusionCheckNationalityCommittedInputs = committedInputs?.inclusion_check_nationality ?? committedInputs?.inclusion_check_nationality_evm;
           const inclusionCheckNationalityParameterCommitment = isForEVM ? await (0, import_utils.getCountryEVMParameterCommitment)(
             import_utils.ProofType.NATIONALITY_INCLUSION,
             inclusionCheckNationalityCommittedInputs.countries
@@ -1275,8 +1282,9 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsNationalityInclusion
           };
-        } else if (!!committedInputs?.inclusion_check_issuing_country) {
-          const inclusionCheckIssuingCountryCommittedInputs = committedInputs?.inclusion_check_issuing_country;
+        }
+        if (!!committedInputs?.inclusion_check_issuing_country || !!committedInputs?.inclusion_check_issuing_country_evm) {
+          const inclusionCheckIssuingCountryCommittedInputs = committedInputs?.inclusion_check_issuing_country ?? committedInputs?.inclusion_check_issuing_country_evm;
           const inclusionCheckIssuingCountryParameterCommitment = isForEVM ? await (0, import_utils.getCountryEVMParameterCommitment)(
             import_utils.ProofType.ISSUING_COUNTRY_INCLUSION,
             inclusionCheckIssuingCountryCommittedInputs.countries
@@ -1306,8 +1314,9 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsIssuingCountryInclusion
           };
-        } else if (!!committedInputs?.exclusion_check_nationality) {
-          const exclusionCheckNationalityCommittedInputs = committedInputs?.exclusion_check_nationality;
+        }
+        if (!!committedInputs?.exclusion_check_nationality || !!committedInputs?.exclusion_check_nationality_evm) {
+          const exclusionCheckNationalityCommittedInputs = committedInputs?.exclusion_check_nationality ?? committedInputs?.exclusion_check_nationality_evm;
           const exclusionCheckNationalityParameterCommitment = isForEVM ? await (0, import_utils.getCountryEVMParameterCommitment)(
             import_utils.ProofType.NATIONALITY_EXCLUSION,
             exclusionCheckNationalityCommittedInputs.countries
@@ -1337,8 +1346,9 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsNationalityExclusion
           };
-        } else if (!!committedInputs?.exclusion_check_issuing_country) {
-          const exclusionCheckIssuingCountryCommittedInputs = committedInputs?.exclusion_check_issuing_country;
+        }
+        if (!!committedInputs?.exclusion_check_issuing_country || !!committedInputs?.exclusion_check_issuing_country_evm) {
+          const exclusionCheckIssuingCountryCommittedInputs = committedInputs?.exclusion_check_issuing_country ?? committedInputs?.exclusion_check_issuing_country_evm;
           const exclusionCheckIssuingCountryParameterCommitment = isForEVM ? await (0, import_utils.getCountryEVMParameterCommitment)(
             import_utils.ProofType.ISSUING_COUNTRY_EXCLUSION,
             exclusionCheckIssuingCountryCommittedInputs.countries
@@ -1368,8 +1378,9 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsIssuingCountryExclusion
           };
-        } else if (!!committedInputs?.bind) {
-          const bindCommittedInputs = committedInputs?.bind;
+        }
+        if (!!committedInputs?.bind || !!committedInputs?.bind_evm) {
+          const bindCommittedInputs = committedInputs?.bind ?? committedInputs?.bind_evm;
           const bindParameterCommitment = isForEVM ? await (0, import_utils.getBindEVMParameterCommitment)((0, import_utils.formatBoundData)(bindCommittedInputs.data)) : await (0, import_utils.getBindParameterCommitment)((0, import_utils.formatBoundData)(bindCommittedInputs.data));
           if (!paramCommitments.includes(bindParameterCommitment)) {
             console.warn("This proof does not verify the bound data");
@@ -1389,9 +1400,10 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsBind
           };
-        } else if (!!committedInputs?.exclusion_check_sanctions) {
+        }
+        if (!!committedInputs?.exclusion_check_sanctions || !!committedInputs?.exclusion_check_sanctions_evm) {
           const sanctionsBuilder = await import_utils.SanctionsBuilder.create();
-          const exclusionCheckSanctionsCommittedInputs = committedInputs?.exclusion_check_sanctions;
+          const exclusionCheckSanctionsCommittedInputs = committedInputs?.exclusion_check_sanctions ?? committedInputs?.exclusion_check_sanctions_evm;
           const exclusionCheckSanctionsParameterCommitment = isForEVM ? await sanctionsBuilder.getSanctionsEvmParameterCommitment() : await sanctionsBuilder.getSanctionsParameterCommitment();
           if (!paramCommitments.includes(exclusionCheckSanctionsParameterCommitment)) {
             console.warn("This proof does not verify the exclusion from the sanction lists");
@@ -1418,22 +1430,19 @@ var PublicInputChecker = class {
             ...queryResultErrors,
             ...queryResultErrorsSanctionsExclusion
           };
-        } else if (!!committedInputs?.facematch) {
-          const facematchCommittedInputs = committedInputs?.facematch;
+        }
+        if (!!committedInputs?.facematch || !!committedInputs?.facematch_evm) {
+          const facematchCommittedInputs = committedInputs?.facematch ?? committedInputs?.facematch_evm;
           const facematchParameterCommitment = isForEVM ? await (0, import_utils.getFacematchEvmParameterCommitment)(
             BigInt(facematchCommittedInputs.rootKeyLeaf),
             facematchCommittedInputs.environment === "development" ? 0n : 1n,
             BigInt(facematchCommittedInputs.appId),
-            // TODO: Uncomment this when the facematch mode is properly supported
-            // facematchCommittedInputs.mode === "regular" ? 1n : 2n,
-            1n
+            facematchCommittedInputs.mode === "regular" ? 1n : 2n
           ) : await (0, import_utils.getFacematchParameterCommitment)(
             BigInt(facematchCommittedInputs.rootKeyLeaf),
             facematchCommittedInputs.environment === "development" ? 0n : 1n,
             BigInt(facematchCommittedInputs.appId),
-            // TODO: Uncomment this when the facematch mode is properly supported
-            // facematchCommittedInputs.mode === "regular" ? 1n : 2n,
-            1n
+            facematchCommittedInputs.mode === "regular" ? 1n : 2n
           );
           if (!paramCommitments.includes(facematchParameterCommitment)) {
             console.warn("This proof does not verify FaceMatch");
@@ -2016,16 +2025,14 @@ var PublicInputChecker = class {
         };
         uniqueIdentifier = (0, import_utils.getNullifierFromDisclosureProof)(proofData).toString(10);
         uniqueIdentifierType = (0, import_utils.getNullifierTypeFromDisclosureProof)(proofData);
-      } else if (proof.name === "facematch") {
+      } else if (proof.name?.startsWith("facematch") && !proof.name?.endsWith("_evm")) {
         const facematchCommittedInputs = proof.committedInputs?.facematch;
         const paramCommittment = (0, import_utils.getParameterCommitmentFromDisclosureProof)(proofData);
         const calculatedParamCommitment = await (0, import_utils.getFacematchParameterCommitment)(
           BigInt(facematchCommittedInputs.rootKeyLeaf),
           facematchCommittedInputs.environment === "development" ? 0n : 1n,
           BigInt(facematchCommittedInputs.appId),
-          // TODO: Uncomment this when the facematch mode is properly supported
-          // facematchCommittedInputs.mode === "regular" ? 1n : 2n,
-          1n
+          facematchCommittedInputs.mode === "regular" ? 1n : 2n
         );
         if (paramCommittment !== calculatedParamCommitment) {
           console.warn("The FaceMatch verification does not match the ones from the proof");