@0xpolygonid/js-sdk 1.8.2 → 1.9.0

package/dist/browser/umd/index.js

@@ -27439,7 +27439,7 @@ var PolygonIdSdk = (function (exports) {
      * @param {Uint8Array} schemaId
      * @returns {*}  {SchemaHash}
      */
-    const caclulateCoreSchemaHash = (schemaId) => {
+    const calculateCoreSchemaHash = (schemaId) => {
         const sHash = b$5.decodeString(sha3Exports.keccak256(schemaId));
         return new B$3(sHash.slice(sHash.length - 16, sHash.length));
     };
@@ -27554,7 +27554,7 @@ var PolygonIdSdk = (function (exports) {
             if (!nonMerklized && opts.merklizedRootPosition === exports.MerklizedRootPosition.None) {
                 opts.merklizedRootPosition = exports.MerklizedRootPosition.Index;
             }
-            const schemaHash = caclulateCoreSchemaHash(byteEncoder.encode(credentialType));
+            const schemaHash = calculateCoreSchemaHash(byteEncoder.encode(credentialType));
             const claim = v$3.newClaim(schemaHash, C$3.withIndexDataBytes(slots.indexA, slots.indexB), C$3.withValueDataBytes(slots.valueA, slots.valueB), C$3.withRevocationNonce(BigInt(opts.revNonce)), C$3.withVersion(opts.version));
             if (opts.updatable) {
                 claim.setFlagUpdatable(opts.updatable);
@@ -28486,14 +28486,14 @@ var PolygonIdSdk = (function (exports) {
     }
     /**
      *
-     * @deprecated The method should not be used. Use caclulateCoreSchemaHash from verifiable.
+     * @deprecated The method should not be used. Use calculateCoreSchemaHash from verifiable.
      * Calculates schema hash
      *
      * @param {Uint8Array} schemaId
      * @returns {*}  {SchemaHash}
      */
     const createSchemaHash = (schemaId) => {
-        return caclulateCoreSchemaHash(schemaId);
+        return calculateCoreSchemaHash(schemaId);
     };
     /**
      *
@@ -55824,7 +55824,7 @@ var PolygonIdSdk = (function (exports) {
          * @returns number
          */
         getValueArrSize() {
-            return this.valueArraySize ? this.valueArraySize : defaultValueArraySize;
+            return this.maxValueArraySize ? this.maxValueArraySize : defaultValueArraySize;
         }
         /**
          * getMTLevelOnChain return level on chain for given circuit
@@ -55992,6 +55992,8 @@ var PolygonIdSdk = (function (exports) {
         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";
     })(exports.Operators || (exports.Operators = {}));
@@ -56007,12 +56009,17 @@ var PolygonIdSdk = (function (exports) {
         $lte: exports.Operators.LTE,
         $gte: exports.Operators.GTE,
         $between: exports.Operators.BETWEEN,
+        $nonbetween: exports.Operators.NONBETWEEN,
+        $exists: exports.Operators.EXISTS,
         $sd: exports.Operators.SD,
         $nullify: exports.Operators.NULLIFY
     };
     const allOperations$1 = Object.values(QueryOperators);
     const availableTypesOperators = new Map([
-        [exports.XSDNS.Boolean, [QueryOperators.$eq, QueryOperators.$ne, QueryOperators.$sd]],
+        [
+            exports.XSDNS.Boolean,
+            [QueryOperators.$eq, QueryOperators.$ne, QueryOperators.$sd, QueryOperators.$exists]
+        ],
         [exports.XSDNS.Integer, allOperations$1],
         [exports.XSDNS.NonNegativeInteger, allOperations$1],
         [exports.XSDNS.PositiveInteger, allOperations$1],
@@ -56023,7 +56030,8 @@ var PolygonIdSdk = (function (exports) {
                 QueryOperators.$ne,
                 QueryOperators.$in,
                 QueryOperators.$nin,
-                QueryOperators.$sd
+                QueryOperators.$sd,
+                QueryOperators.$exists
             ]
         ],
         [
@@ -56033,7 +56041,8 @@ var PolygonIdSdk = (function (exports) {
                 QueryOperators.$ne,
                 QueryOperators.$in,
                 QueryOperators.$nin,
-                QueryOperators.$sd
+                QueryOperators.$sd,
+                QueryOperators.$exists
             ]
         ],
         [exports.XSDNS.DateTime, allOperations$1]
@@ -56124,6 +56133,16 @@ var PolygonIdSdk = (function (exports) {
                     return this.y.includes(this.x);
                 case exports.Operators.NIN:
                     return !this.y.includes(this.x);
+                case exports.Operators.BETWEEN:
+                    if (this.y.length !== 2) {
+                        return false;
+                    }
+                    return this.x >= this.y[0] && this.x <= this.y[1];
+                case exports.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');
             }
@@ -56149,6 +56168,8 @@ var PolygonIdSdk = (function (exports) {
                 return new Scalar$1(x, y[0]);
             case exports.Operators.IN:
             case exports.Operators.NIN:
+            case exports.Operators.BETWEEN:
+            case exports.Operators.NONBETWEEN:
                 return new Vector(x, y);
             default:
                 throw new Error('unknown compare type');
@@ -56172,6 +56193,48 @@ var PolygonIdSdk = (function (exports) {
                 this.values?.some((v) => typeof v !== 'bigint'))
                 throw new Error(exports.CircuitError.EmptyQueryValue);
         }
+        validateValueArraySize(maxArrSize) {
+            switch (this.values.length) {
+                case 0: {
+                    const zeroArrSizeOps = [exports.Operators.NOOP, exports.Operators.SD, exports.Operators.NULLIFY];
+                    if (!zeroArrSizeOps.includes(this.operator)) {
+                        throw new Error(exports.CircuitError.InvalidValuesArrSize);
+                    }
+                    return;
+                }
+                case 1: {
+                    const oneArrSizeOps = [
+                        exports.Operators.EQ,
+                        exports.Operators.LT,
+                        exports.Operators.GT,
+                        exports.Operators.NE,
+                        exports.Operators.LTE,
+                        exports.Operators.GTE,
+                        exports.Operators.EXISTS
+                    ];
+                    if (!oneArrSizeOps.includes(this.operator)) {
+                        throw new Error(exports.CircuitError.InvalidValuesArrSize);
+                    }
+                    return;
+                }
+                case 2: {
+                    const twoArrSizeOps = [exports.Operators.BETWEEN, exports.Operators.NONBETWEEN];
+                    if (!twoArrSizeOps.includes(this.operator)) {
+                        throw new Error(exports.CircuitError.InvalidValuesArrSize);
+                    }
+                    return;
+                }
+                default: {
+                    const maxArrSizeOps = [exports.Operators.IN, exports.Operators.NIN];
+                    if (!maxArrSizeOps.includes(this.operator)) {
+                        throw new Error(exports.CircuitError.InvalidOperationType);
+                    }
+                    if (!this.values.length || this.values.length > maxArrSize) {
+                        throw new Error(exports.CircuitError.InvalidValuesArrSize);
+                    }
+                }
+            }
+        }
     }
     /**
      * CircuitID is alias for circuit identifier
@@ -56196,17 +56259,17 @@ var PolygonIdSdk = (function (exports) {
          * @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";
     })(exports.CircuitId || (exports.CircuitId = {}));
     /**
      * Claim structure for circuit inputs
@@ -56243,6 +56306,8 @@ var PolygonIdSdk = (function (exports) {
         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";
     })(exports.CircuitError || (exports.CircuitError = {}));
     /**
      * ValueProof represents a Merkle Proof for a value stored as MT
@@ -56852,6 +56917,7 @@ var PolygonIdSdk = (function (exports) {
             if (!this.query.values) {
                 throw new Error(exports.CircuitError.EmptyQueryValue);
             }
+            this.query.validateValueArraySize(this.getValueArrSize());
             if (!this.proofType) {
                 throw new Error(exports.CircuitError.InvalidProofType);
             }
@@ -56981,12 +57047,12 @@ var PolygonIdSdk = (function (exports) {
             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();
@@ -57020,11 +57086,11 @@ var PolygonIdSdk = (function (exports) {
             // 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
@@ -57075,9 +57141,6 @@ var PolygonIdSdk = (function (exports) {
             //  - claimSchema
             this.claimSchema = B$3.newSchemaHashFromInt(BigInt(sVals[fieldIdx]));
             fieldIdx++;
-            // - ClaimPathNotExists
-            this.claimPathNotExists = parseInt(sVals[fieldIdx]);
-            fieldIdx++;
             // - ClaimPathKey
             this.claimPathKey = BigInt(sVals[fieldIdx]);
             fieldIdx++;
@@ -57092,6 +57155,9 @@ var PolygonIdSdk = (function (exports) {
                 this.value.push(BigInt(sVals[fieldIdx]));
                 fieldIdx++;
             }
+            // - valueArraySize
+            this.valueArraySize = parseInt(sVals[fieldIdx]);
+            fieldIdx++;
             // - verifierID
             if (sVals[fieldIdx] !== '0') {
                 this.verifierID = k$2.fromBigInt(BigInt(sVals[fieldIdx]));
@@ -57122,13 +57188,14 @@ var PolygonIdSdk = (function (exports) {
             if (!this.query.values) {
                 throw new Error(exports.CircuitError.EmptyQueryValue);
             }
+            this.query.validateValueArraySize(this.getValueArrSize());
             if (!this.proofType) {
                 throw new Error(exports.CircuitError.InvalidProofType);
             }
             if (!this.challenge) {
                 throw new Error(exports.CircuitError.EmptyChallenge);
             }
-            if (this.authEnabled === 1) {
+            if (this.isBJJAuthEnabled === 1) {
                 if (!this.authClaimIncMtp) {
                     throw new Error(exports.CircuitError.EmptyAuthClaimProof);
                 }
@@ -57244,7 +57311,7 @@ var PolygonIdSdk = (function (exports) {
                 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();
@@ -57319,18 +57386,18 @@ var PolygonIdSdk = (function (exports) {
             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));
         }
     }
@@ -57342,7 +57409,6 @@ var PolygonIdSdk = (function (exports) {
         // PubSignalsUnmarshal unmarshal credentialAtomicQueryV3.circom public signals
         pubSignalsUnmarshal(data) {
             // expected order:
-            // merklized
             // userID
             // circuitQueryHash
             // issuerState
@@ -57354,17 +57420,11 @@ var PolygonIdSdk = (function (exports) {
             // 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 = k$2.fromBigInt(BigInt(sVals[fieldIdx]));
             fieldIdx++;
@@ -57398,25 +57458,14 @@ var PolygonIdSdk = (function (exports) {
             // - issuerID
             this.issuerID = k$2.fromBigInt(BigInt(sVals[fieldIdx]));
             fieldIdx++;
-            // - isRevocationChecked
-            this.isRevocationChecked = parseInt(sVals[fieldIdx]);
-            fieldIdx++;
             // - issuerClaimNonRevState
             this.issuerClaimNonRevState = V$1.fromString(sVals[fieldIdx]);
             fieldIdx++;
             //  - timestamp
             this.timestamp = parseInt(sVals[fieldIdx]);
             fieldIdx++;
-            // - verifierID
-            if (sVals[fieldIdx] !== '0') {
-                this.verifierID = k$2.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;
         }
     }
@@ -57826,8 +57875,6 @@ var PolygonIdSdk = (function (exports) {
     class LinkedMultiQueryInputs extends BaseConfig {
         // InputsMarshal returns Circom private inputs for linkedMultiQueryInputs.circom
         inputsMarshal() {
-            const enabled = [];
-            const claimPathNotExists = [];
             const claimPathMtp = [];
             const claimPathMtpNoAux = [];
             const claimPathMtpAuxHi = [];
@@ -57837,10 +57884,9 @@ var PolygonIdSdk = (function (exports) {
             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');
@@ -57851,9 +57897,9 @@ var PolygonIdSdk = (function (exports) {
                     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();
@@ -57861,7 +57907,6 @@ var PolygonIdSdk = (function (exports) {
                     valueProof.value = 0n;
                     valueProof.mtp = new Kt$1();
                 }
-                claimPathNotExists.push(existenceToInt(valueProof.mtp.existence));
                 claimPathMtp.push(prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaim()));
                 const nodAuxJSONLD = getNodeAuxValue(valueProof.mtp);
                 claimPathMtpNoAux.push(nodAuxJSONLD.noAux);
@@ -57871,15 +57916,14 @@ var PolygonIdSdk = (function (exports) {
                 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,
@@ -57888,7 +57932,8 @@ var PolygonIdSdk = (function (exports) {
                 claimPathValue,
                 slotIndex,
                 operator,
-                value
+                value,
+                valueArraySize
             };
             return byteEncoder.encode(JSON.stringify(s));
         }
@@ -57910,7 +57955,7 @@ var PolygonIdSdk = (function (exports) {
          * @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) {
@@ -57935,13 +57980,6 @@ var PolygonIdSdk = (function (exports) {
                 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;
         }
     }
@@ -59974,6 +60012,19 @@ var PolygonIdSdk = (function (exports) {
         }
         return a <= b;
     };
+    // a - field value
+    // b - true / false (exists operator values)
+    const existsComparator = (a, b) => {
+        if (truthyValues.includes(b) && typeof a !== 'undefined') {
+            // if exists val is true , a field val exists
+            return true;
+        }
+        // if exists val is false , a field val doesn't exist
+        if (falsyValues.includes(b) && (a === undefined || (Array.isArray(a) && !a.length))) {
+            return true;
+        }
+        return false;
+    };
     const inOperator = (a, b) => {
         if (Array.isArray(a) && Array.isArray(b)) {
             return a.every((val) => b.includes(val));
@@ -59986,9 +60037,19 @@ var PolygonIdSdk = (function (exports) {
         }
         return false;
     };
+    const betweenOperator = (a, b) => {
+        if (!Array.isArray(b) || b.length !== 2) {
+            throw new Error('$between/$nonbetween operator value should be 2 elements array');
+        }
+        if (Array.isArray(a)) {
+            return a.every((val) => val >= b[0] && val <= b[1]);
+        }
+        return a >= b[0] && a <= b[1];
+    };
     const comparatorOptions = {
         $noop: () => true,
         $sd: () => true,
+        $exists: (a, b) => existsComparator(a, b),
         $eq: (a, b) => equalsComparator(a, b),
         $in: (a, b) => inOperator(a, b),
         $nin: (a, b) => !inOperator(a, b),
@@ -59996,7 +60057,9 @@ var PolygonIdSdk = (function (exports) {
         $lt: (a, b) => !greaterThan(a, b),
         $ne: (a, b) => !equalsComparator(a, b),
         $gte: (a, b) => greaterThanOrEqual(a, b),
-        $lte: (a, b) => lessThanOrEqual(a, b)
+        $lte: (a, b) => lessThanOrEqual(a, b),
+        $between: (a, b) => betweenOperator(a, b),
+        $nonbetween: (a, b) => !betweenOperator(a, b)
     };
     /**
      * credential search path resolver
@@ -60044,7 +60107,8 @@ var PolygonIdSdk = (function (exports) {
                 throw new Error(exports.SearchError.NotDefinedComparator);
             }
             const credentialPathValue = resolvePath(credential, this.path);
-            if (credentialPathValue === null || credentialPathValue === undefined) {
+            if ((credentialPathValue === null || credentialPathValue === undefined) &&
+                this.operatorFunc !== existsComparator) {
                 return false;
             }
             if (this.isReverseParams) {
@@ -62429,16 +62493,21 @@ var PolygonIdSdk = (function (exports) {
         return queries;
     };
     const parseQueryMetadata = async (propertyQuery, ldContextJSON, credentialType, options) => {
-        const datatype = await lf.newTypeFromContext(ldContextJSON, `${credentialType}.${propertyQuery.fieldName}`, options);
         const query = {
             ...propertyQuery,
             slotIndex: 0,
             merklizedSchema: false,
-            datatype: datatype,
+            datatype: '',
             claimPathKey: BigInt(0),
             values: [],
             path: new lf()
         };
+        if (!propertyQuery.fieldName && propertyQuery.operator !== exports.Operators.NOOP) {
+            throw new Error('query must have a field name if operator is not $noop');
+        }
+        if (propertyQuery.fieldName) {
+            query.datatype = await lf.newTypeFromContext(ldContextJSON, `${credentialType}.${propertyQuery.fieldName}`, options);
+        }
         const serAttr = await getSerializationAttrFromContext(JSON.parse(ldContextJSON), options, credentialType);
         if (!serAttr) {
             query.merklizedSchema = true;
@@ -62460,9 +62529,10 @@ var PolygonIdSdk = (function (exports) {
             }
         }
         if (propertyQuery.operatorValue) {
-            if (!isValidOperation(datatype, propertyQuery.operator)) {
-                throw new Error(`operator ${propertyQuery.operator} is not supported for datatype ${datatype}`);
+            if (!isValidOperation(query.datatype, propertyQuery.operator)) {
+                throw new Error(`operator ${propertyQuery.operator} is not supported for datatype ${query.datatype}`);
             }
+            const datatype = propertyQuery.operator === exports.Operators.EXISTS ? exports.XSDNS.Boolean : query.datatype;
             query.values = await transformQueryValueToBigInts(propertyQuery.operatorValue, datatype);
         }
         return query;
@@ -62472,7 +62542,7 @@ var PolygonIdSdk = (function (exports) {
         return Promise.all(queriesMetadata.map((m) => parseQueryMetadata(m, ldContextJSON, credentialType, options)));
     };
     const transformQueryValueToBigInts = async (value, ldType) => {
-        const values = new Array(64).fill(BigInt(0));
+        const values = [];
         if (Array.isArray(value)) {
             for (let index = 0; index < value.length; index++) {
                 values[index] = await ff.hashValue(ldType, value[index]);
@@ -83791,10 +83861,8 @@ var PolygonIdSdk = (function (exports) {
                 circuitInputs.profileNonce = BigInt(params.authProfileNonce);
                 circuitInputs.skipClaimRevocationCheck = params.skipRevocation;
                 const query = circuitQueries[0];
-                query.values =
-                    query.operator === exports.Operators.SD || query.operator === exports.Operators.NOOP
-                        ? new Array(defaultValueArraySize).fill(0)
-                        : query.values;
+                query.values = [exports.Operators.SD, exports.Operators.NOOP].includes(query.operator) ? [] : query.values;
+                query.valueProof = query.operator === exports.Operators.NOOP ? new ValueProof() : query.valueProof;
                 circuitInputs.query = query;
                 circuitInputs.currentTimeStamp = S$3(new Date());
                 circuitInputs.proofType = proofType;
@@ -83842,10 +83910,8 @@ var PolygonIdSdk = (function (exports) {
                 circuitInputs.profileNonce = BigInt(params.authProfileNonce);
                 circuitInputs.skipClaimRevocationCheck = params.skipRevocation;
                 const query = circuitQueries[0];
-                query.values =
-                    query.operator === exports.Operators.SD || query.operator === exports.Operators.NOOP
-                        ? new Array(defaultValueArraySize).fill(0)
-                        : query.values;
+                query.values = [exports.Operators.SD, exports.Operators.NOOP].includes(query.operator) ? [] : query.values;
+                query.valueProof = query.operator === exports.Operators.NOOP ? new ValueProof() : query.valueProof;
                 circuitInputs.query = query;
                 circuitInputs.currentTimeStamp = S$3(new Date());
                 circuitInputs.proofType = proofType;
@@ -83861,7 +83927,7 @@ var PolygonIdSdk = (function (exports) {
                 catch {
                     isEthIdentity = false;
                 }
-                circuitInputs.authEnabled = isEthIdentity ? 0 : 1;
+                circuitInputs.isBJJAuthEnabled = isEthIdentity ? 0 : 1;
                 circuitInputs.challenge = BigInt(params.challenge ?? 0);
                 const { nonce: authProfileNonce, genesisDID } = await this._identityWallet.getGenesisDIDMetadata(identifier);
                 const id = W$2.idFromDID(genesisDID);
@@ -83869,7 +83935,7 @@ var PolygonIdSdk = (function (exports) {
                 const gistProof = toGISTProof(stateProof);
                 circuitInputs.gistProof = gistProof;
                 // auth inputs
-                if (circuitInputs.authEnabled === 1) {
+                if (circuitInputs.isBJJAuthEnabled === 1) {
                     const authPrepared = await this.prepareAuthBJJCredential(genesisDID);
                     const authClaimData = await this.newCircuitClaimData({
                         credential: authPrepared.credential,
@@ -84002,7 +84068,7 @@ var PolygonIdSdk = (function (exports) {
         const schemaId = await lf.getTypeIDFromContext(JSON.stringify(schema), query.type, {
             documentLoader: schemaLoader
         });
-        const schemaHash = caclulateCoreSchemaHash(byteEncoder.encode(schemaId));
+        const schemaHash = calculateCoreSchemaHash(byteEncoder.encode(schemaId));
         if (schemaHash.bigInt() !== outputs.schemaHash.bigInt()) {
             throw new Error(`schema that was used is not equal to requested in query`);
         }
@@ -84020,7 +84086,8 @@ var PolygonIdSdk = (function (exports) {
         if (notSupportedOpIndx > -1) {
             throw new Error(`circuit ${circuitId} not support ${queriesMetadata[notSupportedOpIndx].operator} operator`);
         }
-        queriesMetadata.forEach(async (metadata) => {
+        for (let i = 0; i < queriesMetadata.length; i++) {
+            const metadata = queriesMetadata[i];
             if (!query.type) {
                 throw new Error(`proof query type is undefined`);
             }
@@ -84073,7 +84140,7 @@ var PolygonIdSdk = (function (exports) {
             if (timeDiff > acceptedProofGenerationDelay) {
                 throw new Error('generated proof is outdated');
             }
-        });
+        }
         return;
     }
     async function validateEmptyCredentialSubject(cq, outputs) {
@@ -84102,14 +84169,14 @@ var PolygonIdSdk = (function (exports) {
         }
         for (let index = 0; index < outputs.value.length; index++) {
             if (outputs.value[index] !== cq.values[index]) {
+                if (outputs.value[index] === 0n && cq.values[index] === undefined) {
+                    continue;
+                }
                 throw new Error(`comparison value that was used is not equal to requested in query`);
             }
         }
     }
     async function validateDisclosure(cq, outputs, verifiablePresentation, ldLoader) {
-        if (!verifiablePresentation) {
-            throw new Error(`verifiablePresentation is required for selective disclosure request`);
-        }
         if (outputs.operator !== exports.Operators.EQ) {
             throw new Error(`operator for selective disclosure must be $eq`);
         }
@@ -84118,6 +84185,15 @@ var PolygonIdSdk = (function (exports) {
                 throw new Error(`selective disclosure not available for array of values`);
             }
         }
+        const bi = await fieldValueFromVerifiablePresentation(cq.fieldName, verifiablePresentation, ldLoader);
+        if (bi !== outputs.value[0]) {
+            throw new Error(`value that was used is not equal to requested in query`);
+        }
+    }
+    const fieldValueFromVerifiablePresentation = async (fieldName, verifiablePresentation, ldLoader) => {
+        if (!verifiablePresentation) {
+            throw new Error(`verifiablePresentation is required for selective disclosure request`);
+        }
         let mz;
         const strVerifiablePresentation = JSON.stringify(verifiablePresentation);
         try {
@@ -84130,13 +84206,13 @@ var PolygonIdSdk = (function (exports) {
         }
         let merklizedPath;
         try {
-            const p = `verifiableCredential.credentialSubject.${cq.fieldName}`;
+            const p = `verifiableCredential.credentialSubject.${fieldName}`;
             merklizedPath = await lf.fromDocument(null, strVerifiablePresentation, p, {
                 documentLoader: ldLoader
             });
         }
         catch (e) {
-            throw new Error(`can't build path to '${cq.fieldName}' key`);
+            throw new Error(`can't build path to '${fieldName}' key`);
         }
         let proof;
         let value;
@@ -84144,18 +84220,49 @@ var PolygonIdSdk = (function (exports) {
             ({ proof, value } = await mz.proof(merklizedPath));
         }
         catch (e) {
-            throw new Error(`can't get value by path '${cq.fieldName}'`);
+            throw new Error(`can't get value by path '${fieldName}'`);
         }
         if (!value) {
-            throw new Error(`can't get merkle value for field '${cq.fieldName}'`);
+            throw new Error(`can't get merkle value for field '${fieldName}'`);
         }
         if (!proof.existence) {
             throw new Error(`path [${merklizedPath.parts}] doesn't exist in verifiablePresentation document`);
         }
-        const bi = await value.mtEntry();
-        if (bi !== outputs.value[0]) {
-            throw new Error(`value that was used is not equal to requested in query`);
-        }
+        return await value.mtEntry();
+    };
+
+    function calculateQueryHashV2(values, schema, slotIndex, operator, claimPathKey, claimPathNotExists) {
+        const expValue = prepareCircuitArrayValues(values, 64);
+        const valueHash = $$2.spongeHashX(expValue, 6);
+        return $$2.hash([
+            schema.bigInt(),
+            BigInt(slotIndex),
+            BigInt(operator),
+            BigInt(claimPathKey),
+            BigInt(claimPathNotExists),
+            valueHash
+        ]);
+    }
+    function calculateQueryHashV3(values, schema, slotIndex, operator, claimPathKey, valueArraySize, merklized, isRevocationChecked, verifierID, nullifierSessionID) {
+        const expValue = prepareCircuitArrayValues(values, defaultValueArraySize);
+        const valueHash = $$2.spongeHashX(expValue, 6);
+        const firstPartQueryHash = $$2.hash([
+            schema.bigInt(),
+            BigInt(slotIndex),
+            BigInt(operator),
+            BigInt(claimPathKey),
+            BigInt(merklized),
+            valueHash
+        ]);
+        const queryHash = $$2.hash([
+            firstPartQueryHash,
+            BigInt(valueArraySize),
+            BigInt(isRevocationChecked),
+            BigInt(verifierID),
+            BigInt(nullifierSessionID),
+            0n
+        ]);
+        return queryHash;
     }
 
     const userStateError = new Error(`user state is not valid`);
@@ -84255,7 +84362,6 @@ var PolygonIdSdk = (function (exports) {
                     timestamp: v3PubSignals.timestamp,
                     merklized: v3PubSignals.merklized,
                     claimPathKey: v3PubSignals.claimPathKey,
-                    claimPathNotExists: v3PubSignals.claimPathNotExists,
                     valueArraySize: v3PubSignals.getValueArrSize(),
                     isRevocationChecked: v3PubSignals.isRevocationChecked
                 };
@@ -84332,7 +84438,7 @@ var PolygonIdSdk = (function (exports) {
                 this.verifyIdOwnership(sender, challenge);
                 return new BaseConfig();
             };
-            this.linkedMultiQuery10Verify = async ({ query, pubSignals }) => {
+            this.linkedMultiQuery10Verify = async ({ query, verifiablePresentation, pubSignals }) => {
                 let multiQueryPubSignals = new LinkedMultiQueryPubSignals();
                 multiQueryPubSignals = multiQueryPubSignals.pubSignalsUnmarshal(byteEncoder.encode(JSON.stringify(pubSignals)));
                 // verify query
@@ -84346,26 +84452,41 @@ var PolygonIdSdk = (function (exports) {
                 }
                 const ldContextJSON = JSON.stringify(schema);
                 const credentialSubject = query.credentialSubject;
-                const schemaId = await lf.getTypeIDFromContext(JSON.stringify(schema), query.type || '', ldOpts);
-                const schemaHash = caclulateCoreSchemaHash(byteEncoder.encode(schemaId));
+                const schemaId = await lf.getTypeIDFromContext(ldContextJSON, query.type || '', ldOpts);
+                const schemaHash = calculateCoreSchemaHash(byteEncoder.encode(schemaId));
                 const queriesMetadata = await parseQueriesMetadata(query.type || '', ldContextJSON, credentialSubject, ldOpts);
-                const queryHashes = queriesMetadata.map((queryMeta) => {
-                    const valueHash = $$2.spongeHashX(queryMeta.values, 6);
-                    return $$2.hash([
-                        schemaHash.bigInt(),
-                        BigInt(queryMeta.slotIndex),
-                        BigInt(queryMeta.operator),
-                        BigInt(queryMeta.claimPathKey),
-                        queryMeta.merklizedSchema ? 0n : 1n,
-                        valueHash
-                    ]);
-                });
-                const circuitQueryHashes = multiQueryPubSignals.circuitQueryHash
-                    .filter((i) => i !== 0n)
-                    .sort(bigIntCompare);
-                queryHashes.sort(bigIntCompare);
-                if (!queryHashes.every((queryHash, i) => queryHash === circuitQueryHashes[i])) {
-                    throw new Error('query hashes do not match');
+                const request = [];
+                const merklized = queriesMetadata[0]?.merklizedSchema ? 1 : 0;
+                for (let i = 0; i < LinkedMultiQueryInputs.queryCount; i++) {
+                    const queryMeta = queriesMetadata[i];
+                    const values = queryMeta?.values ?? [];
+                    const valArrSize = values.length;
+                    const queryHash = calculateQueryHashV3(values, schemaHash, queryMeta?.slotIndex ?? 0, queryMeta?.operator ?? 0, queryMeta?.claimPathKey.toString() ?? 0, valArrSize, merklized, 0, 0, 0);
+                    request.push({ queryHash, queryMeta });
+                }
+                const queryHashCompare = (a, b) => {
+                    if (a.queryHash < b.queryHash)
+                        return -1;
+                    if (a.queryHash > b.queryHash)
+                        return 1;
+                    return 0;
+                };
+                const pubSignalsMeta = multiQueryPubSignals.circuitQueryHash.map((queryHash, index) => ({
+                    queryHash,
+                    operatorOutput: multiQueryPubSignals.operatorOutput[index]
+                }));
+                pubSignalsMeta.sort(queryHashCompare);
+                request.sort(queryHashCompare);
+                for (let i = 0; i < LinkedMultiQueryInputs.queryCount; i++) {
+                    if (request[i].queryHash != pubSignalsMeta[i].queryHash) {
+                        throw new Error('query hashes do not match');
+                    }
+                    if (request[i].queryMeta?.operator === exports.Operators.SD) {
+                        const disclosedValue = await fieldValueFromVerifiablePresentation(request[i].queryMeta.fieldName, verifiablePresentation, this._documentLoader);
+                        if (disclosedValue != pubSignalsMeta[i].operatorOutput) {
+                            throw new Error('disclosed value is not in the proof outputs');
+                        }
+                    }
                 }
                 return multiQueryPubSignals;
             };
@@ -85400,6 +85521,7 @@ var PolygonIdSdk = (function (exports) {
             if (message.type !== PROTOCOL_MESSAGE_TYPE.AUTHORIZATION_REQUEST_MESSAGE_TYPE) {
                 throw new Error('Invalid media type');
             }
+            authRequest.body.scope = authRequest.body.scope || [];
             return authRequest;
         }
         /**
@@ -85511,7 +85633,8 @@ var PolygonIdSdk = (function (exports) {
                 throw new Error(`sender of the request is not a target of response - expected ${request.from}, given ${response.to}`);
             }
             this.verifyAuthRequest(request);
-            const requestScope = request.body.scope;
+            const requestScope = request.body.scope || [];
+            const responseScope = response.body.scope || [];
             if (!response.from) {
                 throw new Error(`proof response doesn't contain from field`);
             }
@@ -85519,7 +85642,7 @@ var PolygonIdSdk = (function (exports) {
             // group requests by query group id
             for (const proofRequest of requestScope) {
                 const groupId = proofRequest.query.groupId;
-                const proofResp = response.body.scope.find((resp) => resp.id === proofRequest.id);
+                const proofResp = responseScope.find((resp) => resp.id === proofRequest.id);
                 if (!proofResp) {
                     throw new Error(`proof is not given for requestId ${proofRequest.id}`);
                 }
@@ -85555,7 +85678,7 @@ var PolygonIdSdk = (function (exports) {
         }
         verifyAuthRequest(request) {
             const groupIdValidationMap = {};
-            const requestScope = request.body.scope;
+            const requestScope = request.body.scope || [];
             for (const proofRequest of requestScope) {
                 const groupId = proofRequest.query.groupId;
                 if (groupId) {
@@ -85773,6 +85896,7 @@ var PolygonIdSdk = (function (exports) {
             if (message.type !== PROTOCOL_MESSAGE_TYPE.CONTRACT_INVOKE_REQUEST_MESSAGE_TYPE) {
                 throw new Error('Invalid media type');
             }
+            ciRequest.body.scope = ciRequest.body.scope || [];
             return ciRequest;
         }
         /**
@@ -85792,19 +85916,11 @@ var PolygonIdSdk = (function (exports) {
                 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(u$2).find((key) => u$2[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: h$3.Iden3
-            });
-            const verifierDid = W$2.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.`);
@@ -85813,7 +85929,7 @@ var PolygonIdSdk = (function (exports) {
                 const zkpRes = await this._proofService.generateProof(proofReq, did, {
                     skipRevocation: query.skipClaimRevocationCheck ?? false,
                     challenge: opts.challenge,
-                    verifierDid
+                    verifierDid: ciRequest.from ? W$2.parse(ciRequest.from) : undefined
                 });
                 zkRequests.push(zkpRes);
             }
@@ -85996,7 +86112,9 @@ var PolygonIdSdk = (function (exports) {
     exports.bytesToBase64url = bytesToBase64url;
     exports.bytesToHex = bytesToHex$1;
     exports.cacheLoader = cacheLoader;
-    exports.caclulateCoreSchemaHash = caclulateCoreSchemaHash;
+    exports.calculateCoreSchemaHash = calculateCoreSchemaHash;
+    exports.calculateQueryHashV2 = calculateQueryHashV2;
+    exports.calculateQueryHashV3 = calculateQueryHashV3;
     exports.checkDataInField = checkDataInField;
     exports.checkQueryRequest = checkQueryRequest;
     exports.circuitValidator = circuitValidator;
@@ -86021,6 +86139,7 @@ var PolygonIdSdk = (function (exports) {
     exports.extractPublicKeyBytes = extractPublicKeyBytes;
     exports.factoryComparer = factoryComparer;
     exports.fieldToByteArray = fieldToByteArray;
+    exports.fieldValueFromVerifiablePresentation = fieldValueFromVerifiablePresentation;
     exports.fillCoreClaimSlot = fillCoreClaimSlot;
     exports.fillSlot = fillSlot;
     exports.findCredentialType = findCredentialType;