@zkpassport/sdk 0.2.3 → 0.2.5

package/dist/cjs/index.d.ts

@@ -134,6 +134,8 @@ export declare class ZKPassport {
     private topicToRequestReceived;
     private topicToService;
     private topicToProofs;
+    private topicToExpectedProofCount;
+    private topicToResults;
     private onRequestReceivedCallbacks;
     private onGeneratingProofCallbacks;
     private onBridgeConnectCallbacks;
@@ -142,6 +144,8 @@ export declare class ZKPassport {
     private onRejectCallbacks;
     private onErrorCallbacks;
     constructor(_domain?: string);
+    private handleResult;
+    private setExpectedProofCount;
     /**
      * @notice Handle an encrypted message.
      * @param request The request.

package/dist/cjs/index.js

@@ -1,29 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZKPassport = exports.MERCOSUR_COUNTRIES = exports.ASEAN_COUNTRIES = exports.SCHENGEN_COUNTRIES = exports.EEA_COUNTRIES = exports.EU_COUNTRIES = exports.SANCTIONED_COUNTRIES = void 0;
+const tslib_1 = require("tslib");
 const crypto_1 = require("crypto");
 const i18n_iso_countries_1 = require("i18n-iso-countries");
 const utils_1 = require("@zkpassport/utils");
@@ -35,7 +13,22 @@ const logger_1 = require("./logger");
 const node_gzip_1 = require("node-gzip");
 //import initNoirC from '@noir-lang/noirc_abi'
 //import initACVM from '@noir-lang/acvm_js'
-(0, i18n_iso_countries_1.registerLocale)(require("i18n-iso-countries/langs/en.json"));
+const en_json_1 = tslib_1.__importDefault(require("i18n-iso-countries/langs/en.json"));
+(0, i18n_iso_countries_1.registerLocale)(en_json_1.default);
+function hasRequestedAccessToField(credentialsRequest, field) {
+    const fieldValue = credentialsRequest[field];
+    const isDefined = fieldValue !== undefined && fieldValue !== null;
+    if (!isDefined) {
+        return false;
+    }
+    for (const key in fieldValue) {
+        if (fieldValue[key] !== undefined &&
+            fieldValue[key] !== null) {
+            return true;
+        }
+    }
+    return false;
+}
 function normalizeCountry(country) {
     let normalizedCountry;
     const alpha3 = (0, i18n_iso_countries_1.getAlpha3Code)(country, "en");
@@ -77,6 +70,8 @@ class ZKPassport {
         this.topicToRequestReceived = {};
         this.topicToService = {};
         this.topicToProofs = {};
+        this.topicToExpectedProofCount = {};
+        this.topicToResults = {};
         this.onRequestReceivedCallbacks = {};
         this.onGeneratingProofCallbacks = {};
         this.onBridgeConnectCallbacks = {};
@@ -95,6 +90,70 @@ class ZKPassport {
       await Promise.all([initACVM(acvm), initNoirC(noirc)])
       this.wasmVerifierInit = true
     }*/
+    async handleResult(topic) {
+        const result = this.topicToResults[topic];
+        // Clear the results straight away to avoid concurrency issues
+        delete this.topicToResults[topic];
+        // Verify the proofs and extract the unique identifier (aka nullifier) and the verification result
+        const { uniqueIdentifier, verified } = await this.verify(topic, this.topicToProofs[topic], result);
+        await Promise.all(this.onResultCallbacks[topic].map((callback) => callback({
+            uniqueIdentifier,
+            verified,
+            result,
+        })));
+        // Clear the expected proof count
+        delete this.topicToExpectedProofCount[topic];
+    }
+    setExpectedProofCount(topic) {
+        const fields = Object.keys(this.topicToConfig[topic]).filter((key) => hasRequestedAccessToField(this.topicToConfig[topic], key));
+        const neededCircuits = [];
+        // Determine which circuits are needed based on the requested fields
+        for (const field of fields) {
+            for (const key in this.topicToConfig[topic][field]) {
+                switch (key) {
+                    case "eq":
+                    case "disclose":
+                        if (field !== "age" && !neededCircuits.includes("disclose_bytes")) {
+                            neededCircuits.push("disclose_bytes");
+                        }
+                        else if (field === "age" && !neededCircuits.includes("compare_age")) {
+                            neededCircuits.push("compare_age");
+                        }
+                        break;
+                    case "gte":
+                    case "gt":
+                    case "lte":
+                    case "lt":
+                    case "range":
+                        if (field === "age" && !neededCircuits.includes("compare_age")) {
+                            neededCircuits.push("compare_age");
+                        }
+                        else if (field === "expiry_date" && !neededCircuits.includes("compare_expiry")) {
+                            neededCircuits.push("compare_expiry");
+                        }
+                        else if (field === "birthdate" && !neededCircuits.includes("compare_birthdate")) {
+                            neededCircuits.push("compare_birthdate");
+                        }
+                        break;
+                    case "in":
+                        if (field === "nationality" && !neededCircuits.includes("inclusion_check_country")) {
+                            neededCircuits.push("inclusion_check_country");
+                        }
+                        break;
+                    case "out":
+                        if (field === "nationality" && !neededCircuits.includes("exclusion_check_country")) {
+                            neededCircuits.push("exclusion_check_country");
+                        }
+                        break;
+                }
+            }
+        }
+        // From the circuits needed, determine the expected proof count
+        // There are at least 4 proofs, 3 base proofs and 1 disclosure proof minimum
+        // Each separate needed circuit adds 1 disclosure proof
+        this.topicToExpectedProofCount[topic] =
+            neededCircuits.length === 0 ? 4 : 3 + neededCircuits.length;
+    }
     /**
      * @notice Handle an encrypted message.
      * @param request The request.
@@ -127,19 +186,44 @@ class ZKPassport {
             };
             this.topicToProofs[topic].push(processedProof);
             await Promise.all(this.onProofGeneratedCallbacks[topic].map((callback) => callback(processedProof)));
+            // If the results were received before all the proofs were generated,
+            // we can handle the result now
+            if (this.topicToResults[topic] &&
+                this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
+                await this.handleResult(topic);
+            }
         }
         else if (request.method === "done") {
             logger_1.noLogger.debug(`User sent the query result`);
-            // Verify the proofs and extract the unique identifier (aka nullifier) and the verification result
-            const { uniqueIdentifier, verified } = await this.verify(topic, this.topicToProofs[topic], request.params);
-            await Promise.all(this.onResultCallbacks[topic].map((callback) => callback({
-                uniqueIdentifier,
-                verified,
-                result: request.params,
-            })));
+            this.topicToResults[topic] = request.params;
+            // 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) {
+                await this.handleResult(topic);
+            }
         }
         else if (request.method === "error") {
-            await Promise.all(this.onErrorCallbacks[topic].map((callback) => callback(request.params.error)));
+            const error = request.params.error;
+            if (error && error === "This ID is not supported yet") {
+                // This means the user has an ID that is not supported yet
+                // So we won't receive any proofs and we can handle the result now
+                this.topicToExpectedProofCount[topic] = 0;
+                if (this.topicToResults[topic]) {
+                    await this.handleResult(topic);
+                }
+            }
+            else if (error && error.startsWith("Cannot generate proof")) {
+                // This means one of the disclosure proofs failed to be generated
+                // So we need to remove one from the expected proof count
+                this.topicToExpectedProofCount[topic] -= 1;
+                // If the expected proof count is now equal to the number of proofs received
+                // and the results were received, we can handle the result now
+                if (this.topicToResults[topic] &&
+                    this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
+                    await this.handleResult(topic);
+                }
+            }
+            await Promise.all(this.onErrorCallbacks[topic].map((callback) => callback(error)));
         }
     }
     getZkPassportRequest(topic) {
@@ -195,6 +279,7 @@ class ZKPassport {
                 const base64Config = Buffer.from(JSON.stringify(this.topicToConfig[topic])).toString("base64");
                 const base64Service = Buffer.from(JSON.stringify(this.topicToService[topic])).toString("base64");
                 const pubkey = (0, utils_2.bytesToHex)(this.topicToKeyPair[topic].publicKey);
+                this.setExpectedProofCount(topic);
                 return {
                     url: `https://zkpassport.id/r?d=${this.domain}&t=${topic}&c=${base64Config}&s=${base64Service}&p=${pubkey}`,
                     requestId: topic,
@@ -225,6 +310,7 @@ class ZKPassport {
         this.topicToConfig[topic] = {};
         this.topicToService[topic] = { name, logo, purpose, scope };
         this.topicToProofs[topic] = [];
+        this.topicToExpectedProofCount[topic] = 0;
         this.onRequestReceivedCallbacks[topic] = [];
         this.onGeneratingProofCallbacks[topic] = [];
         this.onBridgeConnectCallbacks[topic] = [];
@@ -766,6 +852,16 @@ class ZKPassport {
                     isCorrect = false;
                     break;
                 }
+                // Check the countryList is in ascending order
+                // If the prover doesn't use a sorted list then the proof cannot be trusted
+                // as it is requirement in the circuit for the exclusion check to work
+                for (let i = 1; i < countryList.length; i++) {
+                    if (countryList[i] < countryList[i - 1]) {
+                        console.warn("The nationality exclusion list has not been sorted, and thus the proof cannot be trusted");
+                        isCorrect = false;
+                        break;
+                    }
+                }
                 uniqueIdentifier = (0, utils_1.getNullifierFromDisclosureProof)(proofData).toString(10);
             }
             else if (proof.name === "inclusion_check_country") {
@@ -810,12 +906,12 @@ class ZKPassport {
             proofsToVerify = this.topicToProofs[requestId];
             if (!proofsToVerify || proofsToVerify.length < 4) {
                 // It may happen that a request returns a result without proofs
-                // Meaning the ID is supported yet by ZKPassport circuits,
+                // Meaning the ID is not supported yet by ZKPassport circuits,
                 // so the results has to be trusted and cannot be independently verified
                 return { uniqueIdentifier: undefined, verified: false };
             }
         }
-        const { BarretenbergVerifier } = await Promise.resolve().then(() => __importStar(require("@aztec/bb.js")));
+        const { BarretenbergVerifier } = await Promise.resolve().then(() => tslib_1.__importStar(require("@aztec/bb.js")));
         const verifier = new BarretenbergVerifier();
         /*if (!this.wasmVerifierInit) {
           await this.initWasmVerifier()
@@ -872,6 +968,8 @@ class ZKPassport {
         delete this.topicToConfig[requestId];
         delete this.topicToSharedSecret[requestId];
         delete this.topicToProofs[requestId];
+        delete this.topicToExpectedProofCount[requestId];
+        delete this.topicToResults[requestId];
         this.onRequestReceivedCallbacks[requestId] = [];
         this.onGeneratingProofCallbacks[requestId] = [];
         this.onBridgeConnectCallbacks[requestId] = [];

package/dist/esm/index.d.ts

@@ -134,6 +134,8 @@ export declare class ZKPassport {
     private topicToRequestReceived;
     private topicToService;
     private topicToProofs;
+    private topicToExpectedProofCount;
+    private topicToResults;
     private onRequestReceivedCallbacks;
     private onGeneratingProofCallbacks;
     private onBridgeConnectCallbacks;
@@ -142,6 +144,8 @@ export declare class ZKPassport {
     private onRejectCallbacks;
     private onErrorCallbacks;
     constructor(_domain?: string);
+    private handleResult;
+    private setExpectedProofCount;
     /**
      * @notice Handle an encrypted message.
      * @param request The request.

package/dist/esm/index.js

@@ -9,7 +9,22 @@ import { noLogger as logger } from "./logger";
 import { ungzip } from "node-gzip";
 //import initNoirC from '@noir-lang/noirc_abi'
 //import initACVM from '@noir-lang/acvm_js'
-registerLocale(require("i18n-iso-countries/langs/en.json"));
+import i18en from "i18n-iso-countries/langs/en.json";
+registerLocale(i18en);
+function hasRequestedAccessToField(credentialsRequest, field) {
+    const fieldValue = credentialsRequest[field];
+    const isDefined = fieldValue !== undefined && fieldValue !== null;
+    if (!isDefined) {
+        return false;
+    }
+    for (const key in fieldValue) {
+        if (fieldValue[key] !== undefined &&
+            fieldValue[key] !== null) {
+            return true;
+        }
+    }
+    return false;
+}
 function normalizeCountry(country) {
     let normalizedCountry;
     const alpha3 = getAlpha3Code(country, "en");
@@ -45,6 +60,8 @@ export class ZKPassport {
         this.topicToRequestReceived = {};
         this.topicToService = {};
         this.topicToProofs = {};
+        this.topicToExpectedProofCount = {};
+        this.topicToResults = {};
         this.onRequestReceivedCallbacks = {};
         this.onGeneratingProofCallbacks = {};
         this.onBridgeConnectCallbacks = {};
@@ -63,6 +80,70 @@ export class ZKPassport {
       await Promise.all([initACVM(acvm), initNoirC(noirc)])
       this.wasmVerifierInit = true
     }*/
+    async handleResult(topic) {
+        const result = this.topicToResults[topic];
+        // Clear the results straight away to avoid concurrency issues
+        delete this.topicToResults[topic];
+        // Verify the proofs and extract the unique identifier (aka nullifier) and the verification result
+        const { uniqueIdentifier, verified } = await this.verify(topic, this.topicToProofs[topic], result);
+        await Promise.all(this.onResultCallbacks[topic].map((callback) => callback({
+            uniqueIdentifier,
+            verified,
+            result,
+        })));
+        // Clear the expected proof count
+        delete this.topicToExpectedProofCount[topic];
+    }
+    setExpectedProofCount(topic) {
+        const fields = Object.keys(this.topicToConfig[topic]).filter((key) => hasRequestedAccessToField(this.topicToConfig[topic], key));
+        const neededCircuits = [];
+        // Determine which circuits are needed based on the requested fields
+        for (const field of fields) {
+            for (const key in this.topicToConfig[topic][field]) {
+                switch (key) {
+                    case "eq":
+                    case "disclose":
+                        if (field !== "age" && !neededCircuits.includes("disclose_bytes")) {
+                            neededCircuits.push("disclose_bytes");
+                        }
+                        else if (field === "age" && !neededCircuits.includes("compare_age")) {
+                            neededCircuits.push("compare_age");
+                        }
+                        break;
+                    case "gte":
+                    case "gt":
+                    case "lte":
+                    case "lt":
+                    case "range":
+                        if (field === "age" && !neededCircuits.includes("compare_age")) {
+                            neededCircuits.push("compare_age");
+                        }
+                        else if (field === "expiry_date" && !neededCircuits.includes("compare_expiry")) {
+                            neededCircuits.push("compare_expiry");
+                        }
+                        else if (field === "birthdate" && !neededCircuits.includes("compare_birthdate")) {
+                            neededCircuits.push("compare_birthdate");
+                        }
+                        break;
+                    case "in":
+                        if (field === "nationality" && !neededCircuits.includes("inclusion_check_country")) {
+                            neededCircuits.push("inclusion_check_country");
+                        }
+                        break;
+                    case "out":
+                        if (field === "nationality" && !neededCircuits.includes("exclusion_check_country")) {
+                            neededCircuits.push("exclusion_check_country");
+                        }
+                        break;
+                }
+            }
+        }
+        // From the circuits needed, determine the expected proof count
+        // There are at least 4 proofs, 3 base proofs and 1 disclosure proof minimum
+        // Each separate needed circuit adds 1 disclosure proof
+        this.topicToExpectedProofCount[topic] =
+            neededCircuits.length === 0 ? 4 : 3 + neededCircuits.length;
+    }
     /**
      * @notice Handle an encrypted message.
      * @param request The request.
@@ -95,19 +176,44 @@ export class ZKPassport {
             };
             this.topicToProofs[topic].push(processedProof);
             await Promise.all(this.onProofGeneratedCallbacks[topic].map((callback) => callback(processedProof)));
+            // If the results were received before all the proofs were generated,
+            // we can handle the result now
+            if (this.topicToResults[topic] &&
+                this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
+                await this.handleResult(topic);
+            }
         }
         else if (request.method === "done") {
             logger.debug(`User sent the query result`);
-            // Verify the proofs and extract the unique identifier (aka nullifier) and the verification result
-            const { uniqueIdentifier, verified } = await this.verify(topic, this.topicToProofs[topic], request.params);
-            await Promise.all(this.onResultCallbacks[topic].map((callback) => callback({
-                uniqueIdentifier,
-                verified,
-                result: request.params,
-            })));
+            this.topicToResults[topic] = request.params;
+            // 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) {
+                await this.handleResult(topic);
+            }
         }
         else if (request.method === "error") {
-            await Promise.all(this.onErrorCallbacks[topic].map((callback) => callback(request.params.error)));
+            const error = request.params.error;
+            if (error && error === "This ID is not supported yet") {
+                // This means the user has an ID that is not supported yet
+                // So we won't receive any proofs and we can handle the result now
+                this.topicToExpectedProofCount[topic] = 0;
+                if (this.topicToResults[topic]) {
+                    await this.handleResult(topic);
+                }
+            }
+            else if (error && error.startsWith("Cannot generate proof")) {
+                // This means one of the disclosure proofs failed to be generated
+                // So we need to remove one from the expected proof count
+                this.topicToExpectedProofCount[topic] -= 1;
+                // If the expected proof count is now equal to the number of proofs received
+                // and the results were received, we can handle the result now
+                if (this.topicToResults[topic] &&
+                    this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
+                    await this.handleResult(topic);
+                }
+            }
+            await Promise.all(this.onErrorCallbacks[topic].map((callback) => callback(error)));
         }
     }
     getZkPassportRequest(topic) {
@@ -163,6 +269,7 @@ export class ZKPassport {
                 const base64Config = Buffer.from(JSON.stringify(this.topicToConfig[topic])).toString("base64");
                 const base64Service = Buffer.from(JSON.stringify(this.topicToService[topic])).toString("base64");
                 const pubkey = bytesToHex(this.topicToKeyPair[topic].publicKey);
+                this.setExpectedProofCount(topic);
                 return {
                     url: `https://zkpassport.id/r?d=${this.domain}&t=${topic}&c=${base64Config}&s=${base64Service}&p=${pubkey}`,
                     requestId: topic,
@@ -193,6 +300,7 @@ export class ZKPassport {
         this.topicToConfig[topic] = {};
         this.topicToService[topic] = { name, logo, purpose, scope };
         this.topicToProofs[topic] = [];
+        this.topicToExpectedProofCount[topic] = 0;
         this.onRequestReceivedCallbacks[topic] = [];
         this.onGeneratingProofCallbacks[topic] = [];
         this.onBridgeConnectCallbacks[topic] = [];
@@ -734,6 +842,16 @@ export class ZKPassport {
                     isCorrect = false;
                     break;
                 }
+                // Check the countryList is in ascending order
+                // If the prover doesn't use a sorted list then the proof cannot be trusted
+                // as it is requirement in the circuit for the exclusion check to work
+                for (let i = 1; i < countryList.length; i++) {
+                    if (countryList[i] < countryList[i - 1]) {
+                        console.warn("The nationality exclusion list has not been sorted, and thus the proof cannot be trusted");
+                        isCorrect = false;
+                        break;
+                    }
+                }
                 uniqueIdentifier = getNullifierFromDisclosureProof(proofData).toString(10);
             }
             else if (proof.name === "inclusion_check_country") {
@@ -778,7 +896,7 @@ export class ZKPassport {
             proofsToVerify = this.topicToProofs[requestId];
             if (!proofsToVerify || proofsToVerify.length < 4) {
                 // It may happen that a request returns a result without proofs
-                // Meaning the ID is supported yet by ZKPassport circuits,
+                // Meaning the ID is not supported yet by ZKPassport circuits,
                 // so the results has to be trusted and cannot be independently verified
                 return { uniqueIdentifier: undefined, verified: false };
             }
@@ -840,6 +958,8 @@ export class ZKPassport {
         delete this.topicToConfig[requestId];
         delete this.topicToSharedSecret[requestId];
         delete this.topicToProofs[requestId];
+        delete this.topicToExpectedProofCount[requestId];
+        delete this.topicToResults[requestId];
         this.onRequestReceivedCallbacks[requestId] = [];
         this.onGeneratingProofCallbacks[requestId] = [];
         this.onBridgeConnectCallbacks[requestId] = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zkpassport/sdk",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Privacy-preserving identity verification using passports and ID cards",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

package/src/index.ts

@@ -30,6 +30,7 @@ import {
   DisclosedData,
   formatName,
   getHostedPackagedCircuitByName,
+  Query,
 } from "@zkpassport/utils"
 import { bytesToHex } from "@noble/ciphers/utils"
 import { getWebSocketClient, WebSocketClient } from "./websocket"
@@ -39,8 +40,26 @@ import { noLogger as logger } from "./logger"
 import { ungzip } from "node-gzip"
 //import initNoirC from '@noir-lang/noirc_abi'
 //import initACVM from '@noir-lang/acvm_js'
+import i18en from "i18n-iso-countries/langs/en.json"
 
-registerLocale(require("i18n-iso-countries/langs/en.json"))
+registerLocale(i18en)
+
+function hasRequestedAccessToField(credentialsRequest: Query, field: IDCredential): boolean {
+  const fieldValue = credentialsRequest[field as keyof Query]
+  const isDefined = fieldValue !== undefined && fieldValue !== null
+  if (!isDefined) {
+    return false
+  }
+  for (const key in fieldValue) {
+    if (
+      fieldValue[key as keyof typeof fieldValue] !== undefined &&
+      fieldValue[key as keyof typeof fieldValue] !== null
+    ) {
+      return true
+    }
+  }
+  return false
+}
 
 function normalizeCountry(country: CountryName | Alpha3Code) {
   let normalizedCountry: Alpha3Code | undefined
@@ -241,6 +260,8 @@ export class ZKPassport {
     { name: string; logo: string; purpose: string; scope?: string }
   > = {}
   private topicToProofs: Record<string, Array<ProofResult>> = {}
+  private topicToExpectedProofCount: Record<string, number> = {}
+  private topicToResults: Record<string, QueryResult> = {}
 
   private onRequestReceivedCallbacks: Record<string, Array<() => void>> = {}
   private onGeneratingProofCallbacks: Record<string, Array<(topic: string) => void>> = {}
@@ -274,6 +295,79 @@ export class ZKPassport {
     this.wasmVerifierInit = true
   }*/
 
+  private async handleResult(topic: string) {
+    const result = this.topicToResults[topic]
+    // Clear the results straight away to avoid concurrency issues
+    delete this.topicToResults[topic]
+    // Verify the proofs and extract the unique identifier (aka nullifier) and the verification result
+    const { uniqueIdentifier, verified } = await this.verify(
+      topic,
+      this.topicToProofs[topic],
+      result,
+    )
+    await Promise.all(
+      this.onResultCallbacks[topic].map((callback) =>
+        callback({
+          uniqueIdentifier,
+          verified,
+          result,
+        }),
+      ),
+    )
+    // Clear the expected proof count
+    delete this.topicToExpectedProofCount[topic]
+  }
+
+  private setExpectedProofCount(topic: string) {
+    const fields = Object.keys(this.topicToConfig[topic] as Query).filter((key) =>
+      hasRequestedAccessToField(this.topicToConfig[topic] as Query, key as IDCredential),
+    )
+    const neededCircuits: string[] = []
+    // Determine which circuits are needed based on the requested fields
+    for (const field of fields) {
+      for (const key in this.topicToConfig[topic][field as IDCredential]) {
+        switch (key) {
+          case "eq":
+          case "disclose":
+            if (field !== "age" && !neededCircuits.includes("disclose_bytes")) {
+              neededCircuits.push("disclose_bytes")
+            } else if (field === "age" && !neededCircuits.includes("compare_age")) {
+              neededCircuits.push("compare_age")
+            }
+            break
+          case "gte":
+          case "gt":
+          case "lte":
+          case "lt":
+          case "range":
+            if (field === "age" && !neededCircuits.includes("compare_age")) {
+              neededCircuits.push("compare_age")
+            } else if (field === "expiry_date" && !neededCircuits.includes("compare_expiry")) {
+              neededCircuits.push("compare_expiry")
+            } else if (field === "birthdate" && !neededCircuits.includes("compare_birthdate")) {
+              neededCircuits.push("compare_birthdate")
+            }
+            break
+          case "in":
+            if (field === "nationality" && !neededCircuits.includes("inclusion_check_country")) {
+              neededCircuits.push("inclusion_check_country")
+            }
+            break
+          case "out":
+            if (field === "nationality" && !neededCircuits.includes("exclusion_check_country")) {
+              neededCircuits.push("exclusion_check_country")
+            }
+            break
+        }
+      }
+    }
+    // From the circuits needed, determine the expected proof count
+    // There are at least 4 proofs, 3 base proofs and 1 disclosure proof minimum
+    // Each separate needed circuit adds 1 disclosure proof
+    this.topicToExpectedProofCount[topic] =
+      neededCircuits.length === 0 ? 4 : 3 + neededCircuits.length
+  }
+
   /**
    * @notice Handle an encrypted message.
    * @param request The request.
@@ -310,27 +404,45 @@ export class ZKPassport {
       await Promise.all(
         this.onProofGeneratedCallbacks[topic].map((callback) => callback(processedProof)),
       )
+      // If the results were received before all the proofs were generated,
+      // we can handle the result now
+      if (
+        this.topicToResults[topic] &&
+        this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length
+      ) {
+        await this.handleResult(topic)
+      }
     } else if (request.method === "done") {
       logger.debug(`User sent the query result`)
-      // Verify the proofs and extract the unique identifier (aka nullifier) and the verification result
-      const { uniqueIdentifier, verified } = await this.verify(
-        topic,
-        this.topicToProofs[topic],
-        request.params,
-      )
-      await Promise.all(
-        this.onResultCallbacks[topic].map((callback) =>
-          callback({
-            uniqueIdentifier,
-            verified,
-            result: request.params,
-          }),
-        ),
-      )
+      this.topicToResults[topic] = request.params
+      // 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) {
+        await this.handleResult(topic)
+      }
     } else if (request.method === "error") {
-      await Promise.all(
-        this.onErrorCallbacks[topic].map((callback) => callback(request.params.error)),
-      )
+      const error = request.params.error
+      if (error && error === "This ID is not supported yet") {
+        // This means the user has an ID that is not supported yet
+        // So we won't receive any proofs and we can handle the result now
+        this.topicToExpectedProofCount[topic] = 0
+        if (this.topicToResults[topic]) {
+          await this.handleResult(topic)
+        }
+      } else if (error && error.startsWith("Cannot generate proof")) {
+        // This means one of the disclosure proofs failed to be generated
+        // So we need to remove one from the expected proof count
+        this.topicToExpectedProofCount[topic] -= 1
+        // If the expected proof count is now equal to the number of proofs received
+        // and the results were received, we can handle the result now
+        if (
+          this.topicToResults[topic] &&
+          this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length
+        ) {
+          await this.handleResult(topic)
+        }
+      }
+      await Promise.all(this.onErrorCallbacks[topic].map((callback) => callback(error)))
     }
   }
 
@@ -395,6 +507,7 @@ export class ZKPassport {
           "base64",
         )
         const pubkey = bytesToHex(this.topicToKeyPair[topic].publicKey)
+        this.setExpectedProofCount(topic)
         return {
           url: `https://zkpassport.id/r?d=${this.domain}&t=${topic}&c=${base64Config}&s=${base64Service}&p=${pubkey}`,
           requestId: topic,
@@ -453,6 +566,7 @@ export class ZKPassport {
     this.topicToConfig[topic] = {}
     this.topicToService[topic] = { name, logo, purpose, scope }
     this.topicToProofs[topic] = []
+    this.topicToExpectedProofCount[topic] = 0
 
     this.onRequestReceivedCallbacks[topic] = []
     this.onGeneratingProofCallbacks[topic] = []
@@ -1107,6 +1221,18 @@ export class ZKPassport {
           isCorrect = false
           break
         }
+        // Check the countryList is in ascending order
+        // If the prover doesn't use a sorted list then the proof cannot be trusted
+        // as it is requirement in the circuit for the exclusion check to work
+        for (let i = 1; i < countryList.length; i++) {
+          if (countryList[i] < countryList[i - 1]) {
+            console.warn(
+              "The nationality exclusion list has not been sorted, and thus the proof cannot be trusted",
+            )
+            isCorrect = false
+            break
+          }
+        }
         uniqueIdentifier = getNullifierFromDisclosureProof(proofData).toString(10)
       } else if (proof.name === "inclusion_check_country") {
         commitmentIn = getCommitmentInFromDisclosureProof(proofData)
@@ -1160,7 +1286,7 @@ export class ZKPassport {
       proofsToVerify = this.topicToProofs[requestId]
       if (!proofsToVerify || proofsToVerify.length < 4) {
         // It may happen that a request returns a result without proofs
-        // Meaning the ID is supported yet by ZKPassport circuits,
+        // Meaning the ID is not supported yet by ZKPassport circuits,
         // so the results has to be trusted and cannot be independently verified
         return { uniqueIdentifier: undefined, verified: false }
       }
@@ -1231,6 +1357,8 @@ export class ZKPassport {
     delete this.topicToConfig[requestId]
     delete this.topicToSharedSecret[requestId]
     delete this.topicToProofs[requestId]
+    delete this.topicToExpectedProofCount[requestId]
+    delete this.topicToResults[requestId]
     this.onRequestReceivedCallbacks[requestId] = []
     this.onGeneratingProofCallbacks[requestId] = []
     this.onBridgeConnectCallbacks[requestId] = []