@0xpolygonid/js-sdk 1.8.3 → 1.9.1

package/dist/node/cjs/circuits/atomic-query-v3-on-chain.js

@@ -26,13 +26,14 @@ class AtomicQueryV3OnChainInputs extends common_1.BaseConfig {
         if (!this.query.values) {
             throw new Error(models_1.CircuitError.EmptyQueryValue);
         }
+        this.query.validateValueArraySize(this.getValueArrSize());
         if (!this.proofType) {
             throw new Error(models_1.CircuitError.InvalidProofType);
         }
         if (!this.challenge) {
             throw new Error(models_1.CircuitError.EmptyChallenge);
         }
-        if (this.authEnabled === 1) {
+        if (this.isBJJAuthEnabled === 1) {
             if (!this.authClaimIncMtp) {
                 throw new Error(models_1.CircuitError.EmptyAuthClaimProof);
             }
@@ -148,7 +149,7 @@ class AtomicQueryV3OnChainInputs extends common_1.BaseConfig {
             isRevocationChecked: 1
         };
         s.challenge = this.challenge?.toString();
-        if (this.authEnabled === 1) {
+        if (this.isBJJAuthEnabled === 1) {
             s.authClaim = this.authClaim?.marshalJson();
             s.userClaimsTreeRoot = this.treeState.claimsRoot?.bigInt().toString();
             s.userRevTreeRoot = this.treeState.revocationRoot?.bigInt().toString();
@@ -223,18 +224,18 @@ class AtomicQueryV3OnChainInputs extends common_1.BaseConfig {
         s.issuerClaimNonRevMtpAuxHi = nodeAuxNonRev.key.bigInt().toString();
         s.issuerClaimNonRevMtpAuxHv = nodeAuxNonRev.value.bigInt().toString();
         s.issuerClaimNonRevMtpNoAux = nodeAuxNonRev.noAux;
-        s.claimPathNotExists = (0, common_1.existenceToInt)(valueProof.mtp.existence);
         const nodAuxJSONLD = (0, common_1.getNodeAuxValue)(valueProof.mtp);
         s.claimPathMtpNoAux = nodAuxJSONLD.noAux;
         s.claimPathMtpAuxHi = nodAuxJSONLD.key.bigInt().toString();
         s.claimPathMtpAuxHv = nodAuxJSONLD.value.bigInt().toString();
         s.claimPathKey = valueProof.path.toString();
+        s.valueArraySize = this.query.values.length;
         const values = (0, common_1.prepareCircuitArrayValues)(this.query.values, this.getValueArrSize());
         s.value = (0, common_1.bigIntArrayToStringArray)(values);
         s.linkNonce = this.linkNonce.toString();
         s.verifierID = this.verifierID?.bigInt().toString() ?? '0';
         s.nullifierSessionID = this.nullifierSessionID.toString();
-        s.authEnabled = this.authEnabled.toString();
+        s.isBJJAuthEnabled = this.isBJJAuthEnabled.toString();
         return utils_1.byteEncoder.encode(JSON.stringify(s));
     }
 }
@@ -247,7 +248,6 @@ class AtomicQueryV3OnChainPubSignals extends common_1.BaseConfig {
     // PubSignalsUnmarshal unmarshal credentialAtomicQueryV3.circom public signals
     pubSignalsUnmarshal(data) {
         // expected order:
-        // merklized
         // userID
         // circuitQueryHash
         // issuerState
@@ -259,17 +259,11 @@ class AtomicQueryV3OnChainPubSignals extends common_1.BaseConfig {
         // challenge
         // gistRoot
         // issuerID
-        // isRevocationChecked
         // issuerClaimNonRevState
         // timestamp
-        // verifierID
-        // nullifierSessionID
-        // authEnabled
+        // isBJJAuthEnabled
         const sVals = JSON.parse(utils_1.byteDecoder.decode(data));
         let fieldIdx = 0;
-        // -- merklized
-        this.merklized = parseInt(sVals[fieldIdx]);
-        fieldIdx++;
         //  - userID
         this.userID = js_iden3_core_1.Id.fromBigInt(BigInt(sVals[fieldIdx]));
         fieldIdx++;
@@ -303,25 +297,14 @@ class AtomicQueryV3OnChainPubSignals extends common_1.BaseConfig {
         // - issuerID
         this.issuerID = js_iden3_core_1.Id.fromBigInt(BigInt(sVals[fieldIdx]));
         fieldIdx++;
-        // - isRevocationChecked
-        this.isRevocationChecked = parseInt(sVals[fieldIdx]);
-        fieldIdx++;
         // - issuerClaimNonRevState
         this.issuerClaimNonRevState = js_merkletree_1.Hash.fromString(sVals[fieldIdx]);
         fieldIdx++;
         //  - timestamp
         this.timestamp = parseInt(sVals[fieldIdx]);
         fieldIdx++;
-        // - verifierID
-        if (sVals[fieldIdx] !== '0') {
-            this.verifierID = js_iden3_core_1.Id.fromBigInt(BigInt(sVals[fieldIdx]));
-        }
-        fieldIdx++;
-        // - nullifierSessionID
-        this.nullifierSessionID = BigInt(sVals[fieldIdx]);
-        fieldIdx++;
-        // - authEnabled
-        this.authEnabled = parseInt(sVals[fieldIdx]);
+        // - isBJJAuthEnabled
+        this.isBJJAuthEnabled = parseInt(sVals[fieldIdx]);
         return this;
     }
 }

package/dist/node/cjs/circuits/atomic-query-v3.js

@@ -26,6 +26,7 @@ class AtomicQueryV3Inputs extends common_1.BaseConfig {
         if (!this.query.values) {
             throw new Error(models_1.CircuitError.EmptyQueryValue);
         }
+        this.query.validateValueArraySize(this.getValueArrSize());
         if (!this.proofType) {
             throw new Error(models_1.CircuitError.InvalidProofType);
         }
@@ -155,12 +156,12 @@ class AtomicQueryV3Inputs extends common_1.BaseConfig {
         s.issuerClaimNonRevMtpAuxHi = nodeAuxNonRev.key.bigInt().toString();
         s.issuerClaimNonRevMtpAuxHv = nodeAuxNonRev.value.bigInt().toString();
         s.issuerClaimNonRevMtpNoAux = nodeAuxNonRev.noAux;
-        s.claimPathNotExists = (0, common_1.existenceToInt)(valueProof.mtp.existence);
         const nodAuxJSONLD = (0, common_1.getNodeAuxValue)(valueProof.mtp);
         s.claimPathMtpNoAux = nodAuxJSONLD.noAux;
         s.claimPathMtpAuxHi = nodAuxJSONLD.key.bigInt().toString();
         s.claimPathMtpAuxHv = nodAuxJSONLD.value.bigInt().toString();
         s.claimPathKey = valueProof.path.toString();
+        s.valueArraySize = this.query.values.length;
         const values = (0, common_1.prepareCircuitArrayValues)(this.query.values, this.getValueArrSize());
         s.value = (0, common_1.bigIntArrayToStringArray)(values);
         s.linkNonce = this.linkNonce.toString();
@@ -195,11 +196,11 @@ class AtomicQueryV3PubSignals extends common_1.BaseConfig {
         // issuerClaimNonRevState
         // timestamp
         // claimSchema
-        // claimPathNotExists
         // claimPathKey
         // slotIndex
         // operator
         // value
+        // valueArraySize
         // verifierID
         // nullifierSessionID
         // 19 is a number of fields in AtomicQueryV3PubSignals before values, values is last element in the proof and
@@ -250,9 +251,6 @@ class AtomicQueryV3PubSignals extends common_1.BaseConfig {
         //  - claimSchema
         this.claimSchema = js_iden3_core_1.SchemaHash.newSchemaHashFromInt(BigInt(sVals[fieldIdx]));
         fieldIdx++;
-        // - ClaimPathNotExists
-        this.claimPathNotExists = parseInt(sVals[fieldIdx]);
-        fieldIdx++;
         // - ClaimPathKey
         this.claimPathKey = BigInt(sVals[fieldIdx]);
         fieldIdx++;
@@ -267,6 +265,9 @@ class AtomicQueryV3PubSignals extends common_1.BaseConfig {
             this.value.push(BigInt(sVals[fieldIdx]));
             fieldIdx++;
         }
+        // - valueArraySize
+        this.valueArraySize = parseInt(sVals[fieldIdx]);
+        fieldIdx++;
         // - verifierID
         if (sVals[fieldIdx] !== '0') {
             this.verifierID = js_iden3_core_1.Id.fromBigInt(BigInt(sVals[fieldIdx]));

package/dist/node/cjs/circuits/common.js

@@ -45,7 +45,7 @@ class BaseConfig {
      * @returns number
      */
     getValueArrSize() {
-        return this.valueArraySize ? this.valueArraySize : exports.defaultValueArraySize;
+        return this.maxValueArraySize ? this.maxValueArraySize : exports.defaultValueArraySize;
     }
     /**
      * getMTLevelOnChain return level on chain for given circuit

package/dist/node/cjs/circuits/comparer.js

@@ -33,6 +33,8 @@ var Operators;
     Operators[Operators["LTE"] = 7] = "LTE";
     Operators[Operators["GTE"] = 8] = "GTE";
     Operators[Operators["BETWEEN"] = 9] = "BETWEEN";
+    Operators[Operators["NONBETWEEN"] = 10] = "NONBETWEEN";
+    Operators[Operators["EXISTS"] = 11] = "EXISTS";
     Operators[Operators["SD"] = 16] = "SD";
     Operators[Operators["NULLIFY"] = 17] = "NULLIFY";
 })(Operators = exports.Operators || (exports.Operators = {}));
@@ -48,12 +50,17 @@ exports.QueryOperators = {
     $lte: Operators.LTE,
     $gte: Operators.GTE,
     $between: Operators.BETWEEN,
+    $nonbetween: Operators.NONBETWEEN,
+    $exists: Operators.EXISTS,
     $sd: Operators.SD,
     $nullify: Operators.NULLIFY
 };
 const allOperations = Object.values(exports.QueryOperators);
 exports.availableTypesOperators = new Map([
-    [XSDNS.Boolean, [exports.QueryOperators.$eq, exports.QueryOperators.$ne, exports.QueryOperators.$sd]],
+    [
+        XSDNS.Boolean,
+        [exports.QueryOperators.$eq, exports.QueryOperators.$ne, exports.QueryOperators.$sd, exports.QueryOperators.$exists]
+    ],
     [XSDNS.Integer, allOperations],
     [XSDNS.NonNegativeInteger, allOperations],
     [XSDNS.PositiveInteger, allOperations],
@@ -64,7 +71,8 @@ exports.availableTypesOperators = new Map([
             exports.QueryOperators.$ne,
             exports.QueryOperators.$in,
             exports.QueryOperators.$nin,
-            exports.QueryOperators.$sd
+            exports.QueryOperators.$sd,
+            exports.QueryOperators.$exists
         ]
     ],
     [
@@ -74,7 +82,8 @@ exports.availableTypesOperators = new Map([
             exports.QueryOperators.$ne,
             exports.QueryOperators.$in,
             exports.QueryOperators.$nin,
-            exports.QueryOperators.$sd
+            exports.QueryOperators.$sd,
+            exports.QueryOperators.$exists
         ]
     ],
     [XSDNS.DateTime, allOperations]
@@ -167,6 +176,16 @@ class Vector {
                 return this.y.includes(this.x);
             case Operators.NIN:
                 return !this.y.includes(this.x);
+            case Operators.BETWEEN:
+                if (this.y.length !== 2) {
+                    return false;
+                }
+                return this.x >= this.y[0] && this.x <= this.y[1];
+            case Operators.NONBETWEEN:
+                if (this.y.length !== 2) {
+                    return false;
+                }
+                return this.x < this.y[0] || this.x > this.y[1];
             default:
                 throw new Error('unknown compare type for vector');
         }
@@ -193,6 +212,8 @@ const factoryComparer = (x, y, operator) => {
             return new Scalar(x, y[0]);
         case Operators.IN:
         case Operators.NIN:
+        case Operators.BETWEEN:
+        case Operators.NONBETWEEN:
             return new Vector(x, y);
         default:
             throw new Error('unknown compare type');

package/dist/node/cjs/circuits/linked-multi-query.js

@@ -15,8 +15,6 @@ const models_1 = require("./models");
 class LinkedMultiQueryInputs extends common_1.BaseConfig {
     // InputsMarshal returns Circom private inputs for linkedMultiQueryInputs.circom
     inputsMarshal() {
-        const enabled = [];
-        const claimPathNotExists = [];
         const claimPathMtp = [];
         const claimPathMtpNoAux = [];
         const claimPathMtpAuxHi = [];
@@ -26,10 +24,9 @@ class LinkedMultiQueryInputs extends common_1.BaseConfig {
         const slotIndex = [];
         const operator = [];
         const value = [];
+        const valueArraySize = [];
         for (let i = 0; i < LinkedMultiQueryInputs.queryCount; i++) {
             if (!this.query[i]) {
-                enabled.push(0);
-                claimPathNotExists.push(0);
                 claimPathMtp.push(new Array(this.getMTLevelsClaim()).fill('0'));
                 claimPathMtpNoAux.push('0');
                 claimPathMtpAuxHi.push('0');
@@ -40,9 +37,9 @@ class LinkedMultiQueryInputs extends common_1.BaseConfig {
                 operator.push(0);
                 const valuesArr = (0, common_1.prepareCircuitArrayValues)([], this.getValueArrSize());
                 value.push((0, common_1.bigIntArrayToStringArray)(valuesArr));
+                valueArraySize.push(0);
                 continue;
             }
-            enabled.push(1);
             let valueProof = this.query[i].valueProof;
             if (!valueProof) {
                 valueProof = new models_1.ValueProof();
@@ -50,7 +47,6 @@ class LinkedMultiQueryInputs extends common_1.BaseConfig {
                 valueProof.value = 0n;
                 valueProof.mtp = new js_merkletree_1.Proof();
             }
-            claimPathNotExists.push((0, common_1.existenceToInt)(valueProof.mtp.existence));
             claimPathMtp.push((0, common_1.prepareSiblingsStr)(valueProof.mtp, this.getMTLevelsClaim()));
             const nodAuxJSONLD = (0, common_1.getNodeAuxValue)(valueProof.mtp);
             claimPathMtpNoAux.push(nodAuxJSONLD.noAux);
@@ -60,15 +56,14 @@ class LinkedMultiQueryInputs extends common_1.BaseConfig {
             claimPathValue.push(valueProof.value.toString());
             slotIndex.push(this.query[i].slotIndex);
             operator.push(this.query[i].operator);
+            valueArraySize.push(this.query[i].values.length);
             const valuesArr = (0, common_1.prepareCircuitArrayValues)(this.query[i].values, this.getValueArrSize());
             value.push((0, common_1.bigIntArrayToStringArray)(valuesArr));
         }
         const s = {
             linkNonce: this.linkNonce.toString(),
             issuerClaim: this.claim.marshalJson(),
-            enabled,
             claimSchema: this.claim.getSchemaHash().bigInt().toString(),
-            claimPathNotExists,
             claimPathMtp,
             claimPathMtpNoAux,
             claimPathMtpAuxHi,
@@ -77,7 +72,8 @@ class LinkedMultiQueryInputs extends common_1.BaseConfig {
             claimPathValue,
             slotIndex,
             operator,
-            value
+            value,
+            valueArraySize
         };
         return utils_1.byteEncoder.encode(JSON.stringify(s));
     }
@@ -100,7 +96,7 @@ class LinkedMultiQueryPubSignals {
      * @returns LinkedMultiQueryPubSignals
      */
     pubSignalsUnmarshal(data) {
-        const len = 32;
+        const len = 22;
         const queryLength = LinkedMultiQueryInputs.queryCount;
         const sVals = JSON.parse(utils_1.byteDecoder.decode(data));
         if (sVals.length !== len) {
@@ -125,13 +121,6 @@ class LinkedMultiQueryPubSignals {
             this.circuitQueryHash.push(BigInt(sVals[fieldIdx]));
             fieldIdx++;
         }
-        // - enabled
-        this.enabled = [];
-        for (let i = 0; i < queryLength; i++) {
-            const enabledNum = parseInt(sVals[fieldIdx]);
-            this.enabled.push(enabledNum === 1);
-            fieldIdx++;
-        }
         return this;
     }
 }

package/dist/node/cjs/circuits/models.js

@@ -20,6 +20,48 @@ class Query {
             this.values?.some((v) => typeof v !== 'bigint'))
             throw new Error(CircuitError.EmptyQueryValue);
     }
+    validateValueArraySize(maxArrSize) {
+        switch (this.values.length) {
+            case 0: {
+                const zeroArrSizeOps = [comparer_1.Operators.NOOP, comparer_1.Operators.SD, comparer_1.Operators.NULLIFY];
+                if (!zeroArrSizeOps.includes(this.operator)) {
+                    throw new Error(CircuitError.InvalidValuesArrSize);
+                }
+                return;
+            }
+            case 1: {
+                const oneArrSizeOps = [
+                    comparer_1.Operators.EQ,
+                    comparer_1.Operators.LT,
+                    comparer_1.Operators.GT,
+                    comparer_1.Operators.NE,
+                    comparer_1.Operators.LTE,
+                    comparer_1.Operators.GTE,
+                    comparer_1.Operators.EXISTS
+                ];
+                if (!oneArrSizeOps.includes(this.operator)) {
+                    throw new Error(CircuitError.InvalidValuesArrSize);
+                }
+                return;
+            }
+            case 2: {
+                const twoArrSizeOps = [comparer_1.Operators.BETWEEN, comparer_1.Operators.NONBETWEEN];
+                if (!twoArrSizeOps.includes(this.operator)) {
+                    throw new Error(CircuitError.InvalidValuesArrSize);
+                }
+                return;
+            }
+            default: {
+                const maxArrSizeOps = [comparer_1.Operators.IN, comparer_1.Operators.NIN];
+                if (!maxArrSizeOps.includes(this.operator)) {
+                    throw new Error(CircuitError.InvalidOperationType);
+                }
+                if (!this.values.length || this.values.length > maxArrSize) {
+                    throw new Error(CircuitError.InvalidValuesArrSize);
+                }
+            }
+        }
+    }
 }
 exports.Query = Query;
 /**
@@ -45,17 +87,17 @@ var CircuitId;
      * @beta
      */
     // AtomicQueryV3CircuitID is a type for credentialAtomicQueryV3.circom
-    CircuitId["AtomicQueryV3"] = "credentialAtomicQueryV3-beta.0";
+    CircuitId["AtomicQueryV3"] = "credentialAtomicQueryV3-beta.1";
     /**
      * @beta
      */
     // AtomicQueryV3OnChainCircuitID is a type for credentialAtomicQueryV3OnChain.circom
-    CircuitId["AtomicQueryV3OnChain"] = "credentialAtomicQueryV3OnChain-beta.0";
+    CircuitId["AtomicQueryV3OnChain"] = "credentialAtomicQueryV3OnChain-beta.1";
     /**
      * @beta
      */
     // LinkedMultiQuery is a type for linkedMultiQuery.circom
-    CircuitId["LinkedMultiQuery10"] = "linkedMultiQuery10-beta.0";
+    CircuitId["LinkedMultiQuery10"] = "linkedMultiQuery10-beta.1";
 })(CircuitId = exports.CircuitId || (exports.CircuitId = {}));
 /**
  * Claim structure for circuit inputs
@@ -93,6 +135,8 @@ var CircuitError;
     CircuitError["EmptyTreeState"] = "empty tree state";
     CircuitError["EmptyRequestID"] = "empty request ID";
     CircuitError["InvalidProofType"] = "invalid proof type";
+    CircuitError["InvalidValuesArrSize"] = "invalid query Values array size";
+    CircuitError["InvalidOperationType"] = "invalid operation type";
 })(CircuitError = exports.CircuitError || (exports.CircuitError = {}));
 /**
  * ValueProof represents a Merkle Proof for a value stored as MT

package/dist/node/cjs/iden3comm/handlers/auth.js

@@ -30,7 +30,8 @@ const js_iden3_core_1 = require("@iden3/js-iden3-core");
 const js_jwz_1 = require("@iden3/js-jwz");
 const uuid = __importStar(require("uuid"));
 const utils_1 = require("../../utils");
-const js_crypto_1 = require("@iden3/js-crypto");
+const common_1 = require("./common");
+const circuits_1 = require("../../circuits");
 /**
  *  createAuthorizationRequest is a function to create protocol authorization request
  * @param {string} reason - reason to request proof
@@ -87,6 +88,12 @@ class AuthHandler {
     constructor(_packerMgr, _proofService) {
         this._packerMgr = _packerMgr;
         this._proofService = _proofService;
+        this._supportedCircuits = [
+            circuits_1.CircuitId.AtomicQueryV3,
+            circuits_1.CircuitId.AtomicQuerySigV2,
+            circuits_1.CircuitId.AtomicQueryMTPV2,
+            circuits_1.CircuitId.LinkedMultiQuery10
+        ];
     }
     /**
      * @inheritdoc IAuthHandler#parseAuthorizationRequest
@@ -121,6 +128,11 @@ class AuthHandler {
             did = js_iden3_core_1.DID.parse(authRequest.to);
         }
         const guid = uuid.v4();
+        if (!authRequest.from) {
+            throw new Error('auth request should contain from field');
+        }
+        const from = js_iden3_core_1.DID.parse(authRequest.from);
+        const responseScope = await (0, common_1.processZeroKnowledgeProofRequests)(did, authRequest?.body.scope, from, this._proofService, { ...opts, supportedCircuits: this._supportedCircuits });
         const authResponse = {
             id: guid,
             typ: opts.mediaType,
@@ -128,64 +140,11 @@ class AuthHandler {
             thid: authRequest.thid ?? guid,
             body: {
                 message: authRequest?.body?.message,
-                scope: []
+                scope: responseScope
             },
             from: did.string(),
             to: authRequest.from
         };
-        const requestScope = authRequest.body.scope;
-        const combinedQueries = requestScope.reduce((acc, proofReq) => {
-            const groupId = proofReq.query.groupId;
-            if (!groupId) {
-                return acc;
-            }
-            const existedData = acc.get(groupId);
-            if (!existedData) {
-                const seed = (0, js_crypto_1.getRandomBytes)(12);
-                const dataView = new DataView(seed.buffer);
-                const linkNonce = dataView.getUint32(0);
-                acc.set(groupId, { query: proofReq.query, linkNonce });
-                return acc;
-            }
-            const credentialSubject = (0, utils_1.mergeObjects)(existedData.query.credentialSubject, proofReq.query.credentialSubject);
-            acc.set(groupId, {
-                ...existedData,
-                query: {
-                    skipClaimRevocationCheck: existedData.query.skipClaimRevocationCheck || proofReq.query.skipClaimRevocationCheck,
-                    ...existedData.query,
-                    credentialSubject
-                }
-            });
-            return acc;
-        }, new Map());
-        const groupedCredentialsCache = new Map();
-        for (const proofReq of requestScope) {
-            const query = proofReq.query;
-            const groupId = query.groupId;
-            const combinedQueryData = combinedQueries.get(groupId);
-            if (groupId) {
-                if (!combinedQueryData) {
-                    throw new Error(`Invalid group id ${query.groupId}`);
-                }
-                const combinedQuery = combinedQueryData.query;
-                if (!groupedCredentialsCache.has(groupId)) {
-                    const credWithRevStatus = await this._proofService.findCredentialByProofQuery(did, combinedQueryData.query);
-                    if (!credWithRevStatus.cred) {
-                        throw new Error(`Credential not found for query ${JSON.stringify(combinedQuery)}`);
-                    }
-                    groupedCredentialsCache.set(groupId, credWithRevStatus);
-                }
-            }
-            const credWithRevStatus = groupedCredentialsCache.get(groupId);
-            const zkpRes = await this._proofService.generateProof(proofReq, did, {
-                verifierDid: js_iden3_core_1.DID.parse(authRequest.from),
-                skipRevocation: Boolean(query.skipClaimRevocationCheck),
-                credential: credWithRevStatus?.cred,
-                credentialRevocationStatus: credWithRevStatus?.revStatus,
-                linkNonce: combinedQueryData?.linkNonce ? BigInt(combinedQueryData.linkNonce) : undefined
-            });
-            authResponse.body.scope.push(zkpRes);
-        }
         const msgBytes = utils_1.byteEncoder.encode(JSON.stringify(authResponse));
         const packerOpts = opts.mediaType === constants_1.MediaType.SignedMessage
             ? opts.packerOptions

package/dist/node/cjs/iden3comm/handlers/common.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processZeroKnowledgeProofRequests = void 0;
+const js_crypto_1 = require("@iden3/js-crypto");
+const utils_1 = require("../../utils");
+/**
+ * Groups the ZeroKnowledgeProofRequest objects based on their groupId.
+ * Returns a Map where the key is the groupId and the value is an object containing the query and linkNonce.
+ *
+ * @param requestScope - An array of ZeroKnowledgeProofRequest objects.
+ * @returns A Map<number, { query: JSONObject; linkNonce: number }> representing the grouped queries.
+ */
+const getGroupedQueries = (requestScope) => requestScope.reduce((acc, proofReq) => {
+    const groupId = proofReq.query.groupId;
+    if (!groupId) {
+        return acc;
+    }
+    const existedData = acc.get(groupId);
+    if (!existedData) {
+        const seed = (0, js_crypto_1.getRandomBytes)(12);
+        const dataView = new DataView(seed.buffer);
+        const linkNonce = dataView.getUint32(0);
+        acc.set(groupId, { query: proofReq.query, linkNonce });
+        return acc;
+    }
+    const credentialSubject = (0, utils_1.mergeObjects)(existedData.query.credentialSubject, proofReq.query.credentialSubject);
+    acc.set(groupId, {
+        ...existedData,
+        query: {
+            skipClaimRevocationCheck: existedData.query.skipClaimRevocationCheck || proofReq.query.skipClaimRevocationCheck,
+            ...existedData.query,
+            credentialSubject
+        }
+    });
+    return acc;
+}, new Map());
+/**
+ * Processes zero knowledge proof requests.
+ *
+ * @param senderIdentifier - The identifier of the sender.
+ * @param requests - An array of zero knowledge proof requests.
+ * @param from - The identifier of the sender.
+ * @param proofService - The proof service.
+ * @param opts - Additional options for processing the requests.
+ * @returns A promise that resolves to an array of zero knowledge proof responses.
+ */
+const processZeroKnowledgeProofRequests = async (senderIdentifier, requests, from, proofService, opts) => {
+    const requestScope = requests ?? [];
+    const combinedQueries = getGroupedQueries(requestScope);
+    const groupedCredentialsCache = new Map();
+    const zkpResponses = [];
+    for (const proofReq of requestScope) {
+        if (!opts.supportedCircuits.includes(proofReq.circuitId)) {
+            throw new Error(`Circuit ${proofReq.circuitId} is not allowed`);
+        }
+        const query = proofReq.query;
+        const groupId = query.groupId;
+        const combinedQueryData = combinedQueries.get(groupId);
+        if (groupId) {
+            if (!combinedQueryData) {
+                throw new Error(`Invalid group id ${query.groupId}`);
+            }
+            const combinedQuery = combinedQueryData.query;
+            if (!groupedCredentialsCache.has(groupId)) {
+                const credWithRevStatus = await proofService.findCredentialByProofQuery(senderIdentifier, combinedQueryData.query);
+                if (!credWithRevStatus.cred) {
+                    throw new Error(`Credential not found for query ${JSON.stringify(combinedQuery)}`);
+                }
+                groupedCredentialsCache.set(groupId, credWithRevStatus);
+            }
+        }
+        const credWithRevStatus = groupedCredentialsCache.get(groupId);
+        const zkpRes = await proofService.generateProof(proofReq, senderIdentifier, {
+            verifierDid: from,
+            challenge: opts.challenge,
+            skipRevocation: Boolean(query.skipClaimRevocationCheck),
+            credential: credWithRevStatus?.cred,
+            credentialRevocationStatus: credWithRevStatus?.revStatus,
+            linkNonce: combinedQueryData?.linkNonce ? BigInt(combinedQueryData.linkNonce) : undefined
+        });
+        zkpResponses.push(zkpRes);
+    }
+    return zkpResponses;
+};
+exports.processZeroKnowledgeProofRequests = processZeroKnowledgeProofRequests;

package/dist/node/cjs/iden3comm/handlers/contract-request.js

@@ -4,7 +4,7 @@ exports.ContractRequestHandler = void 0;
 const models_1 = require("../../circuits/models");
 const constants_1 = require("../constants");
 const js_iden3_core_1 = require("@iden3/js-iden3-core");
-const utils_1 = require("../../utils");
+const common_1 = require("./common");
 /**
  *
  * Allows to process ContractInvokeRequest protocol message
@@ -26,7 +26,7 @@ class ContractRequestHandler {
         this._packerMgr = _packerMgr;
         this._proofService = _proofService;
         this._zkpVerifier = _zkpVerifier;
-        this._allowedCircuits = [
+        this._supportedCircuits = [
             models_1.CircuitId.AtomicQueryMTPV2OnChain,
             models_1.CircuitId.AtomicQuerySigV2OnChain,
             models_1.CircuitId.AtomicQueryV3OnChain
@@ -63,33 +63,14 @@ class ContractRequestHandler {
         if (!opts.ethSigner) {
             throw new Error("Can't sign transaction. Provide Signer in options.");
         }
-        const zkRequests = [];
-        const { contract_address, chain_id } = ciRequest.body.transaction_data;
+        const { chain_id } = ciRequest.body.transaction_data;
         const networkFlag = Object.keys(js_iden3_core_1.ChainIds).find((key) => js_iden3_core_1.ChainIds[key] === chain_id);
         if (!networkFlag) {
             throw new Error(`Invalid chain id ${chain_id}`);
         }
-        const [blockchain, networkId] = networkFlag.split(':');
-        const verifierId = (0, utils_1.buildVerifierId)(contract_address, {
-            blockchain,
-            networkId,
-            // DidMethod.Iden3 is used based on discussions: all onchain issuers have iden3 did method by default. This can be changed in the release of v3 circuit.
-            method: js_iden3_core_1.DidMethod.Iden3
-        });
-        const verifierDid = js_iden3_core_1.DID.parseFromId(verifierId);
-        for (const proofReq of ciRequest.body.scope) {
-            if (!this._allowedCircuits.includes(proofReq.circuitId)) {
-                throw new Error(`Can't handle circuit ${proofReq.circuitId}. Only onchain circuits are allowed.`);
-            }
-            const query = proofReq.query;
-            const zkpRes = await this._proofService.generateProof(proofReq, did, {
-                skipRevocation: query.skipClaimRevocationCheck ?? false,
-                challenge: opts.challenge,
-                verifierDid
-            });
-            zkRequests.push(zkpRes);
-        }
-        return this._zkpVerifier.submitZKPResponse(opts.ethSigner, ciRequest.body.transaction_data, zkRequests);
+        const verifierDid = ciRequest.from ? js_iden3_core_1.DID.parse(ciRequest.from) : undefined;
+        const zkpResponses = await (0, common_1.processZeroKnowledgeProofRequests)(did, ciRequest?.body?.scope, verifierDid, this._proofService, { ...opts, supportedCircuits: this._supportedCircuits });
+        return this._zkpVerifier.submitZKPResponse(opts.ethSigner, ciRequest.body.transaction_data, zkpResponses);
     }
 }
 exports.ContractRequestHandler = ContractRequestHandler;

package/dist/node/cjs/iden3comm/handlers/index.js

@@ -18,3 +18,5 @@ __exportStar(require("./auth"), exports);
 __exportStar(require("./fetch"), exports);
 __exportStar(require("./contract-request"), exports);
 __exportStar(require("./refresh"), exports);
+__exportStar(require("./revocation-status"), exports);
+__exportStar(require("./common"), exports);