@0xpolygonid/js-sdk 1.8.3 → 1.9.1

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

@@ -1,5 +1,5 @@
 import { Claim, Id } from '@iden3/js-iden3-core';
-import { BaseConfig, bigIntArrayToStringArray, prepareSiblingsStr, existenceToInt, getNodeAuxValue, prepareCircuitArrayValues } from './common';
+import { BaseConfig, bigIntArrayToStringArray, prepareSiblingsStr, getNodeAuxValue, prepareCircuitArrayValues } from './common';
 import { CircuitError, ValueProof } from './models';
 import { Hash, Proof, ZERO_HASH } from '@iden3/js-merkletree';
 import { byteDecoder, byteEncoder } from '../utils';
@@ -23,13 +23,14 @@ export class AtomicQueryV3OnChainInputs extends BaseConfig {
         if (!this.query.values) {
             throw new Error(CircuitError.EmptyQueryValue);
         }
+        this.query.validateValueArraySize(this.getValueArrSize());
         if (!this.proofType) {
             throw new Error(CircuitError.InvalidProofType);
         }
         if (!this.challenge) {
             throw new Error(CircuitError.EmptyChallenge);
         }
-        if (this.authEnabled === 1) {
+        if (this.isBJJAuthEnabled === 1) {
             if (!this.authClaimIncMtp) {
                 throw new Error(CircuitError.EmptyAuthClaimProof);
             }
@@ -145,7 +146,7 @@ export class AtomicQueryV3OnChainInputs extends 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();
@@ -220,18 +221,18 @@ export class AtomicQueryV3OnChainInputs extends BaseConfig {
         s.issuerClaimNonRevMtpAuxHi = nodeAuxNonRev.key.bigInt().toString();
         s.issuerClaimNonRevMtpAuxHv = nodeAuxNonRev.value.bigInt().toString();
         s.issuerClaimNonRevMtpNoAux = nodeAuxNonRev.noAux;
-        s.claimPathNotExists = existenceToInt(valueProof.mtp.existence);
         const nodAuxJSONLD = 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 = prepareCircuitArrayValues(this.query.values, this.getValueArrSize());
         s.value = 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 byteEncoder.encode(JSON.stringify(s));
     }
 }
@@ -243,7 +244,6 @@ export class AtomicQueryV3OnChainPubSignals extends BaseConfig {
     // PubSignalsUnmarshal unmarshal credentialAtomicQueryV3.circom public signals
     pubSignalsUnmarshal(data) {
         // expected order:
-        // merklized
         // userID
         // circuitQueryHash
         // issuerState
@@ -255,17 +255,11 @@ export class AtomicQueryV3OnChainPubSignals extends BaseConfig {
         // challenge
         // gistRoot
         // issuerID
-        // isRevocationChecked
         // issuerClaimNonRevState
         // timestamp
-        // verifierID
-        // nullifierSessionID
-        // authEnabled
+        // isBJJAuthEnabled
         const sVals = JSON.parse(byteDecoder.decode(data));
         let fieldIdx = 0;
-        // -- merklized
-        this.merklized = parseInt(sVals[fieldIdx]);
-        fieldIdx++;
         //  - userID
         this.userID = Id.fromBigInt(BigInt(sVals[fieldIdx]));
         fieldIdx++;
@@ -299,25 +293,14 @@ export class AtomicQueryV3OnChainPubSignals extends BaseConfig {
         // - issuerID
         this.issuerID = Id.fromBigInt(BigInt(sVals[fieldIdx]));
         fieldIdx++;
-        // - isRevocationChecked
-        this.isRevocationChecked = parseInt(sVals[fieldIdx]);
-        fieldIdx++;
         // - issuerClaimNonRevState
         this.issuerClaimNonRevState = Hash.fromString(sVals[fieldIdx]);
         fieldIdx++;
         //  - timestamp
         this.timestamp = parseInt(sVals[fieldIdx]);
         fieldIdx++;
-        // - verifierID
-        if (sVals[fieldIdx] !== '0') {
-            this.verifierID = 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/esm/circuits/atomic-query-v3.js

@@ -1,5 +1,5 @@
 import { Claim, Id, SchemaHash } from '@iden3/js-iden3-core';
-import { BaseConfig, bigIntArrayToStringArray, prepareSiblingsStr, existenceToInt, getNodeAuxValue, prepareCircuitArrayValues } from './common';
+import { BaseConfig, bigIntArrayToStringArray, prepareSiblingsStr, getNodeAuxValue, prepareCircuitArrayValues } from './common';
 import { CircuitError, ValueProof } from './models';
 import { Hash, Proof, ZERO_HASH } from '@iden3/js-merkletree';
 import { byteDecoder, byteEncoder } from '../utils';
@@ -23,6 +23,7 @@ export class AtomicQueryV3Inputs extends BaseConfig {
         if (!this.query.values) {
             throw new Error(CircuitError.EmptyQueryValue);
         }
+        this.query.validateValueArraySize(this.getValueArrSize());
         if (!this.proofType) {
             throw new Error(CircuitError.InvalidProofType);
         }
@@ -152,12 +153,12 @@ export class AtomicQueryV3Inputs extends BaseConfig {
         s.issuerClaimNonRevMtpAuxHi = nodeAuxNonRev.key.bigInt().toString();
         s.issuerClaimNonRevMtpAuxHv = nodeAuxNonRev.value.bigInt().toString();
         s.issuerClaimNonRevMtpNoAux = nodeAuxNonRev.noAux;
-        s.claimPathNotExists = existenceToInt(valueProof.mtp.existence);
         const nodAuxJSONLD = 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 = prepareCircuitArrayValues(this.query.values, this.getValueArrSize());
         s.value = bigIntArrayToStringArray(values);
         s.linkNonce = this.linkNonce.toString();
@@ -191,11 +192,11 @@ export class AtomicQueryV3PubSignals extends 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
@@ -246,9 +247,6 @@ export class AtomicQueryV3PubSignals extends BaseConfig {
         //  - claimSchema
         this.claimSchema = SchemaHash.newSchemaHashFromInt(BigInt(sVals[fieldIdx]));
         fieldIdx++;
-        // - ClaimPathNotExists
-        this.claimPathNotExists = parseInt(sVals[fieldIdx]);
-        fieldIdx++;
         // - ClaimPathKey
         this.claimPathKey = BigInt(sVals[fieldIdx]);
         fieldIdx++;
@@ -263,6 +261,9 @@ export class AtomicQueryV3PubSignals extends BaseConfig {
             this.value.push(BigInt(sVals[fieldIdx]));
             fieldIdx++;
         }
+        // - valueArraySize
+        this.valueArraySize = parseInt(sVals[fieldIdx]);
+        fieldIdx++;
         // - verifierID
         if (sVals[fieldIdx] !== '0') {
             this.verifierID = Id.fromBigInt(BigInt(sVals[fieldIdx]));

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

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

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

@@ -30,6 +30,8 @@ export 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 || (Operators = {}));
@@ -45,12 +47,17 @@ export const 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(QueryOperators);
 export const availableTypesOperators = new Map([
-    [XSDNS.Boolean, [QueryOperators.$eq, QueryOperators.$ne, QueryOperators.$sd]],
+    [
+        XSDNS.Boolean,
+        [QueryOperators.$eq, QueryOperators.$ne, QueryOperators.$sd, QueryOperators.$exists]
+    ],
     [XSDNS.Integer, allOperations],
     [XSDNS.NonNegativeInteger, allOperations],
     [XSDNS.PositiveInteger, allOperations],
@@ -61,7 +68,8 @@ export const availableTypesOperators = new Map([
             QueryOperators.$ne,
             QueryOperators.$in,
             QueryOperators.$nin,
-            QueryOperators.$sd
+            QueryOperators.$sd,
+            QueryOperators.$exists
         ]
     ],
     [
@@ -71,7 +79,8 @@ export const availableTypesOperators = new Map([
             QueryOperators.$ne,
             QueryOperators.$in,
             QueryOperators.$nin,
-            QueryOperators.$sd
+            QueryOperators.$sd,
+            QueryOperators.$exists
         ]
     ],
     [XSDNS.DateTime, allOperations]
@@ -162,6 +171,16 @@ export 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');
         }
@@ -187,6 +206,8 @@ export 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/esm/circuits/linked-multi-query.js

@@ -1,6 +1,6 @@
 import { Proof } from '@iden3/js-merkletree';
 import { byteDecoder, byteEncoder } from '../utils';
-import { BaseConfig, bigIntArrayToStringArray, existenceToInt, getNodeAuxValue, prepareCircuitArrayValues, prepareSiblingsStr } from './common';
+import { BaseConfig, bigIntArrayToStringArray, getNodeAuxValue, prepareCircuitArrayValues, prepareSiblingsStr } from './common';
 import { ValueProof } from './models';
 /**
  * LinkedMultiQuery circuit representation
@@ -12,8 +12,6 @@ import { ValueProof } from './models';
 export class LinkedMultiQueryInputs extends BaseConfig {
     // InputsMarshal returns Circom private inputs for linkedMultiQueryInputs.circom
     inputsMarshal() {
-        const enabled = [];
-        const claimPathNotExists = [];
         const claimPathMtp = [];
         const claimPathMtpNoAux = [];
         const claimPathMtpAuxHi = [];
@@ -23,10 +21,9 @@ export class LinkedMultiQueryInputs extends 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');
@@ -37,9 +34,9 @@ export class LinkedMultiQueryInputs extends BaseConfig {
                 operator.push(0);
                 const valuesArr = prepareCircuitArrayValues([], this.getValueArrSize());
                 value.push(bigIntArrayToStringArray(valuesArr));
+                valueArraySize.push(0);
                 continue;
             }
-            enabled.push(1);
             let valueProof = this.query[i].valueProof;
             if (!valueProof) {
                 valueProof = new ValueProof();
@@ -47,7 +44,6 @@ export class LinkedMultiQueryInputs extends BaseConfig {
                 valueProof.value = 0n;
                 valueProof.mtp = new Proof();
             }
-            claimPathNotExists.push(existenceToInt(valueProof.mtp.existence));
             claimPathMtp.push(prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaim()));
             const nodAuxJSONLD = getNodeAuxValue(valueProof.mtp);
             claimPathMtpNoAux.push(nodAuxJSONLD.noAux);
@@ -57,15 +53,14 @@ export class LinkedMultiQueryInputs extends 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 = prepareCircuitArrayValues(this.query[i].values, this.getValueArrSize());
             value.push(bigIntArrayToStringArray(valuesArr));
         }
         const s = {
             linkNonce: this.linkNonce.toString(),
             issuerClaim: this.claim.marshalJson(),
-            enabled,
             claimSchema: this.claim.getSchemaHash().bigInt().toString(),
-            claimPathNotExists,
             claimPathMtp,
             claimPathMtpNoAux,
             claimPathMtpAuxHi,
@@ -74,7 +69,8 @@ export class LinkedMultiQueryInputs extends BaseConfig {
             claimPathValue,
             slotIndex,
             operator,
-            value
+            value,
+            valueArraySize
         };
         return byteEncoder.encode(JSON.stringify(s));
     }
@@ -96,7 +92,7 @@ export class LinkedMultiQueryPubSignals {
      * @returns LinkedMultiQueryPubSignals
      */
     pubSignalsUnmarshal(data) {
-        const len = 32;
+        const len = 22;
         const queryLength = LinkedMultiQueryInputs.queryCount;
         const sVals = JSON.parse(byteDecoder.decode(data));
         if (sVals.length !== len) {
@@ -121,13 +117,6 @@ export 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/esm/circuits/models.js

@@ -1,5 +1,5 @@
 import { Proof } from '@iden3/js-merkletree';
-import { QueryOperators } from './comparer';
+import { Operators, QueryOperators } from './comparer';
 /**
  * Query represents basic request to claim slot verification
  *
@@ -17,6 +17,48 @@ export class Query {
             this.values?.some((v) => typeof v !== 'bigint'))
             throw new Error(CircuitError.EmptyQueryValue);
     }
+    validateValueArraySize(maxArrSize) {
+        switch (this.values.length) {
+            case 0: {
+                const zeroArrSizeOps = [Operators.NOOP, Operators.SD, Operators.NULLIFY];
+                if (!zeroArrSizeOps.includes(this.operator)) {
+                    throw new Error(CircuitError.InvalidValuesArrSize);
+                }
+                return;
+            }
+            case 1: {
+                const oneArrSizeOps = [
+                    Operators.EQ,
+                    Operators.LT,
+                    Operators.GT,
+                    Operators.NE,
+                    Operators.LTE,
+                    Operators.GTE,
+                    Operators.EXISTS
+                ];
+                if (!oneArrSizeOps.includes(this.operator)) {
+                    throw new Error(CircuitError.InvalidValuesArrSize);
+                }
+                return;
+            }
+            case 2: {
+                const twoArrSizeOps = [Operators.BETWEEN, Operators.NONBETWEEN];
+                if (!twoArrSizeOps.includes(this.operator)) {
+                    throw new Error(CircuitError.InvalidValuesArrSize);
+                }
+                return;
+            }
+            default: {
+                const maxArrSizeOps = [Operators.IN, 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);
+                }
+            }
+        }
+    }
 }
 /**
  * CircuitID is alias for circuit identifier
@@ -41,17 +83,17 @@ export 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 || (CircuitId = {}));
 /**
  * Claim structure for circuit inputs
@@ -88,6 +130,8 @@ export 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 || (CircuitError = {}));
 /**
  * ValueProof represents a Merkle Proof for a value stored as MT

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

@@ -3,8 +3,9 @@ import { PROTOCOL_MESSAGE_TYPE } from '../constants';
 import { DID } from '@iden3/js-iden3-core';
 import { proving } from '@iden3/js-jwz';
 import * as uuid from 'uuid';
-import { byteDecoder, byteEncoder, mergeObjects } from '../../utils';
-import { getRandomBytes } from '@iden3/js-crypto';
+import { byteDecoder, byteEncoder } from '../../utils';
+import { processZeroKnowledgeProofRequests } from './common';
+import { CircuitId } from '../../circuits';
 /**
  *  createAuthorizationRequest is a function to create protocol authorization request
  * @param {string} reason - reason to request proof
@@ -59,6 +60,12 @@ export class AuthHandler {
     constructor(_packerMgr, _proofService) {
         this._packerMgr = _packerMgr;
         this._proofService = _proofService;
+        this._supportedCircuits = [
+            CircuitId.AtomicQueryV3,
+            CircuitId.AtomicQuerySigV2,
+            CircuitId.AtomicQueryMTPV2,
+            CircuitId.LinkedMultiQuery10
+        ];
     }
     /**
      * @inheritdoc IAuthHandler#parseAuthorizationRequest
@@ -93,6 +100,11 @@ export class AuthHandler {
             did = DID.parse(authRequest.to);
         }
         const guid = uuid.v4();
+        if (!authRequest.from) {
+            throw new Error('auth request should contain from field');
+        }
+        const from = DID.parse(authRequest.from);
+        const responseScope = await processZeroKnowledgeProofRequests(did, authRequest?.body.scope, from, this._proofService, { ...opts, supportedCircuits: this._supportedCircuits });
         const authResponse = {
             id: guid,
             typ: opts.mediaType,
@@ -100,64 +112,11 @@ export 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 = getRandomBytes(12);
-                const dataView = new DataView(seed.buffer);
-                const linkNonce = dataView.getUint32(0);
-                acc.set(groupId, { query: proofReq.query, linkNonce });
-                return acc;
-            }
-            const credentialSubject = 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: 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 = byteEncoder.encode(JSON.stringify(authResponse));
         const packerOpts = opts.mediaType === MediaType.SignedMessage
             ? opts.packerOptions

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

@@ -0,0 +1,81 @@
+import { getRandomBytes } from '@iden3/js-crypto';
+import { mergeObjects } from '../../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 = getRandomBytes(12);
+        const dataView = new DataView(seed.buffer);
+        const linkNonce = dataView.getUint32(0);
+        acc.set(groupId, { query: proofReq.query, linkNonce });
+        return acc;
+    }
+    const credentialSubject = 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.
+ */
+export 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;
+};

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

@@ -1,7 +1,7 @@
 import { CircuitId } from '../../circuits/models';
 import { PROTOCOL_MESSAGE_TYPE } from '../constants';
-import { DID, ChainIds, DidMethod } from '@iden3/js-iden3-core';
-import { buildVerifierId } from '../../utils';
+import { DID, ChainIds } from '@iden3/js-iden3-core';
+import { processZeroKnowledgeProofRequests } from './common';
 /**
  *
  * Allows to process ContractInvokeRequest protocol message
@@ -23,7 +23,7 @@ export class ContractRequestHandler {
         this._packerMgr = _packerMgr;
         this._proofService = _proofService;
         this._zkpVerifier = _zkpVerifier;
-        this._allowedCircuits = [
+        this._supportedCircuits = [
             CircuitId.AtomicQueryMTPV2OnChain,
             CircuitId.AtomicQuerySigV2OnChain,
             CircuitId.AtomicQueryV3OnChain
@@ -60,32 +60,13 @@ export 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(ChainIds).find((key) => ChainIds[key] === chain_id);
         if (!networkFlag) {
             throw new Error(`Invalid chain id ${chain_id}`);
         }
-        const [blockchain, networkId] = networkFlag.split(':');
-        const verifierId = 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: DidMethod.Iden3
-        });
-        const verifierDid = 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 ? DID.parse(ciRequest.from) : undefined;
+        const zkpResponses = await processZeroKnowledgeProofRequests(did, ciRequest?.body?.scope, verifierDid, this._proofService, { ...opts, supportedCircuits: this._supportedCircuits });
+        return this._zkpVerifier.submitZKPResponse(opts.ethSigner, ciRequest.body.transaction_data, zkpResponses);
     }
 }