@0xpolygonid/js-sdk 1.8.3 → 1.9.0

package/dist/browser/esm/index.js

@@ -27300,7 +27300,7 @@ const parseCoreClaimSlots = async (ldCtx, mz, credentialType) => {
  * @param {Uint8Array} schemaId
  * @returns {*}  {SchemaHash}
  */
-const caclulateCoreSchemaHash = (schemaId) => {
+const calculateCoreSchemaHash = (schemaId) => {
     const sHash = Hex.decodeString(sha3Exports.keccak256(schemaId));
     return new SchemaHash(sHash.slice(sHash.length - 16, sHash.length));
 };
@@ -27415,7 +27415,7 @@ class W3CCredential {
         if (!nonMerklized && opts.merklizedRootPosition === MerklizedRootPosition.None) {
             opts.merklizedRootPosition = MerklizedRootPosition.Index;
         }
-        const schemaHash = caclulateCoreSchemaHash(byteEncoder.encode(credentialType));
+        const schemaHash = calculateCoreSchemaHash(byteEncoder.encode(credentialType));
         const claim = Claim.newClaim(schemaHash, ClaimOptions.withIndexDataBytes(slots.indexA, slots.indexB), ClaimOptions.withValueDataBytes(slots.valueA, slots.valueB), ClaimOptions.withRevocationNonce(BigInt(opts.revNonce)), ClaimOptions.withVersion(opts.version));
         if (opts.updatable) {
             claim.setFlagUpdatable(opts.updatable);
@@ -28347,14 +28347,14 @@ function checkDataInField(data) {
 }
 /**
  *
- * @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);
 };
 /**
  *
@@ -55685,7 +55685,7 @@ 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
@@ -55853,6 +55853,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 || (Operators = {}));
@@ -55868,12 +55870,17 @@ 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$1 = Object.values(QueryOperators);
 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$1],
     [XSDNS.NonNegativeInteger, allOperations$1],
     [XSDNS.PositiveInteger, allOperations$1],
@@ -55884,7 +55891,8 @@ const availableTypesOperators = new Map([
             QueryOperators.$ne,
             QueryOperators.$in,
             QueryOperators.$nin,
-            QueryOperators.$sd
+            QueryOperators.$sd,
+            QueryOperators.$exists
         ]
     ],
     [
@@ -55894,7 +55902,8 @@ const availableTypesOperators = new Map([
             QueryOperators.$ne,
             QueryOperators.$in,
             QueryOperators.$nin,
-            QueryOperators.$sd
+            QueryOperators.$sd,
+            QueryOperators.$exists
         ]
     ],
     [XSDNS.DateTime, allOperations$1]
@@ -55985,6 +55994,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');
         }
@@ -56010,6 +56029,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');
@@ -56033,6 +56054,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 = [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
@@ -56057,17 +56120,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 || (CircuitId = {}));
 /**
  * Claim structure for circuit inputs
@@ -56104,6 +56167,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 || (CircuitError = {}));
 /**
  * ValueProof represents a Merkle Proof for a value stored as MT
@@ -56713,6 +56778,7 @@ 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);
         }
@@ -56842,12 +56908,12 @@ 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();
@@ -56881,11 +56947,11 @@ 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
@@ -56936,9 +57002,6 @@ 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++;
@@ -56953,6 +57016,9 @@ 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]));
@@ -56983,13 +57049,14 @@ 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);
             }
@@ -57105,7 +57172,7 @@ 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();
@@ -57180,18 +57247,18 @@ 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));
     }
 }
@@ -57203,7 +57270,6 @@ class AtomicQueryV3OnChainPubSignals extends BaseConfig {
     // PubSignalsUnmarshal unmarshal credentialAtomicQueryV3.circom public signals
     pubSignalsUnmarshal(data) {
         // expected order:
-        // merklized
         // userID
         // circuitQueryHash
         // issuerState
@@ -57215,17 +57281,11 @@ 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++;
@@ -57259,25 +57319,14 @@ class AtomicQueryV3OnChainPubSignals extends BaseConfig {
         // - issuerID
         this.issuerID = Id.fromBigInt(BigInt(sVals[fieldIdx]));
         fieldIdx++;
-        // - isRevocationChecked
-        this.isRevocationChecked = parseInt(sVals[fieldIdx]);
-        fieldIdx++;
         // - issuerClaimNonRevState
         this.issuerClaimNonRevState = Hash$1.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;
     }
 }
@@ -57687,8 +57736,6 @@ class StateTransitionPubSignals {
 class LinkedMultiQueryInputs extends BaseConfig {
     // InputsMarshal returns Circom private inputs for linkedMultiQueryInputs.circom
     inputsMarshal() {
-        const enabled = [];
-        const claimPathNotExists = [];
         const claimPathMtp = [];
         const claimPathMtpNoAux = [];
         const claimPathMtpAuxHi = [];
@@ -57698,10 +57745,9 @@ 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');
@@ -57712,9 +57758,9 @@ 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();
@@ -57722,7 +57768,6 @@ 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);
@@ -57732,15 +57777,14 @@ 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,
@@ -57749,7 +57793,8 @@ class LinkedMultiQueryInputs extends BaseConfig {
             claimPathValue,
             slotIndex,
             operator,
-            value
+            value,
+            valueArraySize
         };
         return byteEncoder.encode(JSON.stringify(s));
     }
@@ -57771,7 +57816,7 @@ 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) {
@@ -57796,13 +57841,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;
     }
 }
@@ -59835,6 +59873,19 @@ const lessThanOrEqual = (a, b) => {
     }
     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));
@@ -59847,9 +59898,19 @@ const inOperator = (a, b) => {
     }
     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),
@@ -59857,7 +59918,9 @@ const comparatorOptions = {
     $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
@@ -59905,7 +59968,8 @@ class FilterQuery {
             throw new Error(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) {
@@ -62290,16 +62354,21 @@ const parseCredentialSubject = (credentialSubject) => {
     return queries;
 };
 const parseQueryMetadata = async (propertyQuery, ldContextJSON, credentialType, options) => {
-    const datatype = await Path.newTypeFromContext(ldContextJSON, `${credentialType}.${propertyQuery.fieldName}`, options);
     const query = {
         ...propertyQuery,
         slotIndex: 0,
         merklizedSchema: false,
-        datatype: datatype,
+        datatype: '',
         claimPathKey: BigInt(0),
         values: [],
         path: new Path()
     };
+    if (!propertyQuery.fieldName && propertyQuery.operator !== Operators.NOOP) {
+        throw new Error('query must have a field name if operator is not $noop');
+    }
+    if (propertyQuery.fieldName) {
+        query.datatype = await Path.newTypeFromContext(ldContextJSON, `${credentialType}.${propertyQuery.fieldName}`, options);
+    }
     const serAttr = await getSerializationAttrFromContext(JSON.parse(ldContextJSON), options, credentialType);
     if (!serAttr) {
         query.merklizedSchema = true;
@@ -62321,9 +62390,10 @@ const parseQueryMetadata = async (propertyQuery, ldContextJSON, credentialType,
         }
     }
     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 === Operators.EXISTS ? XSDNS.Boolean : query.datatype;
         query.values = await transformQueryValueToBigInts(propertyQuery.operatorValue, datatype);
     }
     return query;
@@ -62333,7 +62403,7 @@ const parseQueriesMetadata = async (credentialType, ldContextJSON, credentialSub
     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 Merklizer.hashValue(ldType, value[index]);
@@ -62889,10 +62959,8 @@ class InputGenerator {
             circuitInputs.profileNonce = BigInt(params.authProfileNonce);
             circuitInputs.skipClaimRevocationCheck = params.skipRevocation;
             const query = circuitQueries[0];
-            query.values =
-                query.operator === Operators.SD || query.operator === Operators.NOOP
-                    ? new Array(defaultValueArraySize).fill(0)
-                    : query.values;
+            query.values = [Operators.SD, Operators.NOOP].includes(query.operator) ? [] : query.values;
+            query.valueProof = query.operator === Operators.NOOP ? new ValueProof() : query.valueProof;
             circuitInputs.query = query;
             circuitInputs.currentTimeStamp = getUnixTimestamp(new Date());
             circuitInputs.proofType = proofType;
@@ -62940,10 +63008,8 @@ class InputGenerator {
             circuitInputs.profileNonce = BigInt(params.authProfileNonce);
             circuitInputs.skipClaimRevocationCheck = params.skipRevocation;
             const query = circuitQueries[0];
-            query.values =
-                query.operator === Operators.SD || query.operator === Operators.NOOP
-                    ? new Array(defaultValueArraySize).fill(0)
-                    : query.values;
+            query.values = [Operators.SD, Operators.NOOP].includes(query.operator) ? [] : query.values;
+            query.valueProof = query.operator === Operators.NOOP ? new ValueProof() : query.valueProof;
             circuitInputs.query = query;
             circuitInputs.currentTimeStamp = getUnixTimestamp(new Date());
             circuitInputs.proofType = proofType;
@@ -62959,7 +63025,7 @@ class InputGenerator {
             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 = DID.idFromDID(genesisDID);
@@ -62967,7 +63033,7 @@ class InputGenerator {
             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,
@@ -63100,7 +63166,7 @@ async function checkQueryRequest(query, outputs, circuitId, schemaLoader, verifi
     const schemaId = await Path.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`);
     }
@@ -63118,7 +63184,8 @@ async function checkQueryRequest(query, outputs, circuitId, schemaLoader, verifi
     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`);
         }
@@ -63171,7 +63238,7 @@ async function checkQueryRequest(query, outputs, circuitId, schemaLoader, verifi
         if (timeDiff > acceptedProofGenerationDelay) {
             throw new Error('generated proof is outdated');
         }
-    });
+    }
     return;
 }
 async function validateEmptyCredentialSubject(cq, outputs) {
@@ -63200,14 +63267,14 @@ async function validateOperators(cq, outputs) {
     }
     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 !== Operators.EQ) {
         throw new Error(`operator for selective disclosure must be $eq`);
     }
@@ -63216,6 +63283,15 @@ async function validateDisclosure(cq, outputs, verifiablePresentation, ldLoader)
             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 {
@@ -63228,13 +63304,13 @@ async function validateDisclosure(cq, outputs, verifiablePresentation, ldLoader)
     }
     let merklizedPath;
     try {
-        const p = `verifiableCredential.credentialSubject.${cq.fieldName}`;
+        const p = `verifiableCredential.credentialSubject.${fieldName}`;
         merklizedPath = await Path.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;
@@ -63242,18 +63318,49 @@ async function validateDisclosure(cq, outputs, verifiablePresentation, ldLoader)
         ({ 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 = poseidon.spongeHashX(expValue, 6);
+    return poseidon.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 = poseidon.spongeHashX(expValue, 6);
+    const firstPartQueryHash = poseidon.hash([
+        schema.bigInt(),
+        BigInt(slotIndex),
+        BigInt(operator),
+        BigInt(claimPathKey),
+        BigInt(merklized),
+        valueHash
+    ]);
+    const queryHash = poseidon.hash([
+        firstPartQueryHash,
+        BigInt(valueArraySize),
+        BigInt(isRevocationChecked),
+        BigInt(verifierID),
+        BigInt(nullifierSessionID),
+        0n
+    ]);
+    return queryHash;
 }
 
 const userStateError = new Error(`user state is not valid`);
@@ -63353,7 +63460,6 @@ class PubSignalsVerifier {
                 timestamp: v3PubSignals.timestamp,
                 merklized: v3PubSignals.merklized,
                 claimPathKey: v3PubSignals.claimPathKey,
-                claimPathNotExists: v3PubSignals.claimPathNotExists,
                 valueArraySize: v3PubSignals.getValueArrSize(),
                 isRevocationChecked: v3PubSignals.isRevocationChecked
             };
@@ -63430,7 +63536,7 @@ class PubSignalsVerifier {
             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
@@ -63444,26 +63550,41 @@ class PubSignalsVerifier {
             }
             const ldContextJSON = JSON.stringify(schema);
             const credentialSubject = query.credentialSubject;
-            const schemaId = await Path.getTypeIDFromContext(JSON.stringify(schema), query.type || '', ldOpts);
-            const schemaHash = caclulateCoreSchemaHash(byteEncoder.encode(schemaId));
+            const schemaId = await Path.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 = poseidon.spongeHashX(queryMeta.values, 6);
-                return poseidon.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 === 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;
         };
@@ -64891,19 +65012,11 @@ class ContractRequestHandler {
             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.`);
@@ -64912,7 +65025,7 @@ class ContractRequestHandler {
             const zkpRes = await this._proofService.generateProof(proofReq, did, {
                 skipRevocation: query.skipClaimRevocationCheck ?? false,
                 challenge: opts.challenge,
-                verifierDid
+                verifierDid: ciRequest.from ? DID.parse(ciRequest.from) : undefined
             });
             zkRequests.push(zkpRes);
         }
@@ -64985,5 +65098,5 @@ class RefreshHandler {
     }
 }
 
-export { AbstractPrivateKeyStore, AgentResolver, AtomicQueryMTPV2Inputs, AtomicQueryMTPV2OnChainInputs, AtomicQueryMTPV2OnChainPubSignals, AtomicQueryMTPV2PubSignals, AtomicQuerySigV2Inputs, AtomicQuerySigV2OnChainCircuitInputs, AtomicQuerySigV2OnChainInputs, AtomicQuerySigV2OnChainPubSignals, AtomicQuerySigV2PubSignals, AtomicQueryV3Inputs, AtomicQueryV3OnChainInputs, AtomicQueryV3OnChainPubSignals, AtomicQueryV3PubSignals, AuthHandler, AuthV2Inputs, AuthV2PubSignals, BJJSignatureProof2021, BaseConfig, BjjProvider, BrowserDataSource, CircuitClaim, CircuitError, CircuitId, CircuitStorage, ContractRequestHandler, CredentialStatusPublisherRegistry, CredentialStatusResolverRegistry, CredentialStatusType, CredentialStorage, CredentialWallet, DIDDocumentJSONSchema, DataPrepareHandlerFunc, ErrorEmptyAuthClaimNonRevProof, ErrorEmptyAuthClaimProof, ErrorEmptyChallengeSignature, ErrorEmptyClaimNonRevProof, ErrorEmptyClaimProof, ErrorEmptyClaimSignature, ErrorEmptyIssuerAuthClaimNonRevProof, ErrorEmptyIssuerAuthClaimProof, ErrorUserStateInRelayClaimProof, EthStateStorage, FSCircuitStorage, FetchHandler, FilterQuery, Iden3OnchainSmtCredentialStatusPublisher, Iden3SmtRhsCredentialStatusPublisher, Iden3SparseMerkleTreeProof, IdentityStorage, IdentityWallet, InMemoryDataSource, InMemoryMerkleTreeStorage, InMemoryPrivateKeyStore, IndexedDBDataSource, IndexedDBPrivateKeyStore, InputGenerator, IssuerResolver, JSON_SCHEMA_VALIDATORS_REGISTRY, JWSPacker, JsonSchemaValidator, KMS, KmsKeyType, LDParser, LinkedMultiQueryInputs, LinkedMultiQueryPubSignals, LocalStoragePrivateKeyStore, MerkleTreeIndexedDBStorage, MerkleTreeLocalStorage, MerkleTreeType, MerklizedRootPosition, MessageBus, NativeProver, OnChainResolver, OnChainRevocationStorage, OnChainZKPVerifier, Operators, constants as PROTOCOL_CONSTANTS, PackageManager, Parser, PlainPacker, ProofNode, ProofPurpose, ProofService, ProofType, PubSignalsVerifier, Query, QueryOperators, RHSResolver, RefreshHandler, RefreshServiceType, SDK_EVENTS, Scalar, SearchError, Sec256k1Provider, StandardJSONCredentialsQueryFilter, StateTransitionInputs, StateTransitionPubSignals, SubjectPosition, ValueProof, Vector, VerifiableConstants, VerificationHandlerFunc, W3CCredential, XSDNS, ZKPPacker, availableTypesOperators, base58ToBytes, base64ToBytes, base64UrlToBytes, bigIntArrayToStringArray, bigIntCompare, buildFieldPath, buildTreeState, buildVerifierId, byteDecoder, byteEncoder, bytesToBase58, bytesToBase64, bytesToBase64url, bytesToHex$1 as bytesToHex, cacheLoader, caclulateCoreSchemaHash, checkDataInField, checkQueryRequest, circuitValidator, comparatorOptions, createAuthorizationRequest, createAuthorizationRequestWithMessage, createSchemaHash, createVerifiablePresentation, credentialSubjectKey, dataFillsSlot, decodeBase64url, defaultEthConnectionConfig, defaultMTLevels, defaultMTLevelsClaim, defaultMTLevelsOnChain, defaultValueArraySize, defineMerklizedRootPosition, encodeBase64url, existenceToInt, extractProof, extractPublicKeyBytes, factoryComparer, fieldToByteArray, fillCoreClaimSlot, fillSlot, findCredentialType, findValue, generateProfileDID, getFieldSlotIndex, getKMSIdByAuthCredential, getNodeAuxValue, getNodesRepresentation, getProperties, getSerializationAttrFromContext, getSerializationAttrFromParsedContext, getUserDIDFromCredential, hexToBytes$1 as hexToBytes, isGenesisState, isGenesisStateId, isIssuerGenesis, isValidOperation, keyPath, mergeObjects, parseCoreClaimSlots, parseCredentialSubject, parseQueriesMetadata, parseQueryMetadata, parseSerializationAttr, prepareCircuitArrayValues, prepareSiblingsStr, pushHashesToRHS, resolveDIDDocumentAuth, resolvePath, resolveVerificationMethods, strMTHex, stringByPath, subjectPositionIndex, swapEndianness, toClaimNonRevStatus, toGISTProof, toRevocationStatus, transformQueryValueToBigInts, userStateError, validateDIDDocumentAuth, validateTreeState, witnessBuilder };
+export { AbstractPrivateKeyStore, AgentResolver, AtomicQueryMTPV2Inputs, AtomicQueryMTPV2OnChainInputs, AtomicQueryMTPV2OnChainPubSignals, AtomicQueryMTPV2PubSignals, AtomicQuerySigV2Inputs, AtomicQuerySigV2OnChainCircuitInputs, AtomicQuerySigV2OnChainInputs, AtomicQuerySigV2OnChainPubSignals, AtomicQuerySigV2PubSignals, AtomicQueryV3Inputs, AtomicQueryV3OnChainInputs, AtomicQueryV3OnChainPubSignals, AtomicQueryV3PubSignals, AuthHandler, AuthV2Inputs, AuthV2PubSignals, BJJSignatureProof2021, BaseConfig, BjjProvider, BrowserDataSource, CircuitClaim, CircuitError, CircuitId, CircuitStorage, ContractRequestHandler, CredentialStatusPublisherRegistry, CredentialStatusResolverRegistry, CredentialStatusType, CredentialStorage, CredentialWallet, DIDDocumentJSONSchema, DataPrepareHandlerFunc, ErrorEmptyAuthClaimNonRevProof, ErrorEmptyAuthClaimProof, ErrorEmptyChallengeSignature, ErrorEmptyClaimNonRevProof, ErrorEmptyClaimProof, ErrorEmptyClaimSignature, ErrorEmptyIssuerAuthClaimNonRevProof, ErrorEmptyIssuerAuthClaimProof, ErrorUserStateInRelayClaimProof, EthStateStorage, FSCircuitStorage, FetchHandler, FilterQuery, Iden3OnchainSmtCredentialStatusPublisher, Iden3SmtRhsCredentialStatusPublisher, Iden3SparseMerkleTreeProof, IdentityStorage, IdentityWallet, InMemoryDataSource, InMemoryMerkleTreeStorage, InMemoryPrivateKeyStore, IndexedDBDataSource, IndexedDBPrivateKeyStore, InputGenerator, IssuerResolver, JSON_SCHEMA_VALIDATORS_REGISTRY, JWSPacker, JsonSchemaValidator, KMS, KmsKeyType, LDParser, LinkedMultiQueryInputs, LinkedMultiQueryPubSignals, LocalStoragePrivateKeyStore, MerkleTreeIndexedDBStorage, MerkleTreeLocalStorage, MerkleTreeType, MerklizedRootPosition, MessageBus, NativeProver, OnChainResolver, OnChainRevocationStorage, OnChainZKPVerifier, Operators, constants as PROTOCOL_CONSTANTS, PackageManager, Parser, PlainPacker, ProofNode, ProofPurpose, ProofService, ProofType, PubSignalsVerifier, Query, QueryOperators, RHSResolver, RefreshHandler, RefreshServiceType, SDK_EVENTS, Scalar, SearchError, Sec256k1Provider, StandardJSONCredentialsQueryFilter, StateTransitionInputs, StateTransitionPubSignals, SubjectPosition, ValueProof, Vector, VerifiableConstants, VerificationHandlerFunc, W3CCredential, XSDNS, ZKPPacker, availableTypesOperators, base58ToBytes, base64ToBytes, base64UrlToBytes, bigIntArrayToStringArray, bigIntCompare, buildFieldPath, buildTreeState, buildVerifierId, byteDecoder, byteEncoder, bytesToBase58, bytesToBase64, bytesToBase64url, bytesToHex$1 as bytesToHex, cacheLoader, calculateCoreSchemaHash, calculateQueryHashV2, calculateQueryHashV3, checkDataInField, checkQueryRequest, circuitValidator, comparatorOptions, createAuthorizationRequest, createAuthorizationRequestWithMessage, createSchemaHash, createVerifiablePresentation, credentialSubjectKey, dataFillsSlot, decodeBase64url, defaultEthConnectionConfig, defaultMTLevels, defaultMTLevelsClaim, defaultMTLevelsOnChain, defaultValueArraySize, defineMerklizedRootPosition, encodeBase64url, existenceToInt, extractProof, extractPublicKeyBytes, factoryComparer, fieldToByteArray, fieldValueFromVerifiablePresentation, fillCoreClaimSlot, fillSlot, findCredentialType, findValue, generateProfileDID, getFieldSlotIndex, getKMSIdByAuthCredential, getNodeAuxValue, getNodesRepresentation, getProperties, getSerializationAttrFromContext, getSerializationAttrFromParsedContext, getUserDIDFromCredential, hexToBytes$1 as hexToBytes, isGenesisState, isGenesisStateId, isIssuerGenesis, isValidOperation, keyPath, mergeObjects, parseCoreClaimSlots, parseCredentialSubject, parseQueriesMetadata, parseQueryMetadata, parseSerializationAttr, prepareCircuitArrayValues, prepareSiblingsStr, pushHashesToRHS, resolveDIDDocumentAuth, resolvePath, resolveVerificationMethods, strMTHex, stringByPath, subjectPositionIndex, swapEndianness, toClaimNonRevStatus, toGISTProof, toRevocationStatus, transformQueryValueToBigInts, userStateError, validateDIDDocumentAuth, validateTreeState, witnessBuilder };
 //# sourceMappingURL=index.js.map