@0xpolygonid/js-sdk 1.8.3 → 1.9.0

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,6 @@ exports.ContractRequestHandler = void 0;
 const models_1 = require("../../circuits/models");
 const constants_1 = require("../constants");
 const js_iden3_core_1 = require("@iden3/js-iden3-core");
-const utils_1 = require("../../utils");
 /**
  *
  * Allows to process ContractInvokeRequest protocol message
@@ -64,19 +63,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(js_iden3_core_1.ChainIds).find((key) => js_iden3_core_1.ChainIds[key] === chain_id);
         if (!networkFlag) {
             throw new Error(`Invalid chain id ${chain_id}`);
         }
-        const [blockchain, networkId] = networkFlag.split(':');
-        const verifierId = (0, utils_1.buildVerifierId)(contract_address, {
-            blockchain,
-            networkId,
-            // DidMethod.Iden3 is used based on discussions: all onchain issuers have iden3 did method by default. This can be changed in the release of v3 circuit.
-            method: js_iden3_core_1.DidMethod.Iden3
-        });
-        const verifierDid = js_iden3_core_1.DID.parseFromId(verifierId);
         for (const proofReq of ciRequest.body.scope) {
             if (!this._allowedCircuits.includes(proofReq.circuitId)) {
                 throw new Error(`Can't handle circuit ${proofReq.circuitId}. Only onchain circuits are allowed.`);
@@ -85,7 +76,7 @@ class ContractRequestHandler {
             const zkpRes = await this._proofService.generateProof(proofReq, did, {
                 skipRevocation: query.skipClaimRevocationCheck ?? false,
                 challenge: opts.challenge,
-                verifierDid
+                verifierDid: ciRequest.from ? js_iden3_core_1.DID.parse(ciRequest.from) : undefined
             });
             zkRequests.push(zkpRes);
         }

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

@@ -90,16 +90,21 @@ const parseCredentialSubject = (credentialSubject) => {
 };
 exports.parseCredentialSubject = parseCredentialSubject;
 const parseQueryMetadata = async (propertyQuery, ldContextJSON, credentialType, options) => {
-    const datatype = await js_jsonld_merklization_1.Path.newTypeFromContext(ldContextJSON, `${credentialType}.${propertyQuery.fieldName}`, options);
     const query = {
         ...propertyQuery,
         slotIndex: 0,
         merklizedSchema: false,
-        datatype: datatype,
+        datatype: '',
         claimPathKey: BigInt(0),
         values: [],
         path: new js_jsonld_merklization_1.Path()
     };
+    if (!propertyQuery.fieldName && propertyQuery.operator !== circuits_1.Operators.NOOP) {
+        throw new Error('query must have a field name if operator is not $noop');
+    }
+    if (propertyQuery.fieldName) {
+        query.datatype = await js_jsonld_merklization_1.Path.newTypeFromContext(ldContextJSON, `${credentialType}.${propertyQuery.fieldName}`, options);
+    }
     const serAttr = await (0, verifiable_1.getSerializationAttrFromContext)(JSON.parse(ldContextJSON), options, credentialType);
     if (!serAttr) {
         query.merklizedSchema = true;
@@ -121,9 +126,10 @@ const parseQueryMetadata = async (propertyQuery, ldContextJSON, credentialType,
         }
     }
     if (propertyQuery.operatorValue) {
-        if (!(0, circuits_1.isValidOperation)(datatype, propertyQuery.operator)) {
-            throw new Error(`operator ${propertyQuery.operator} is not supported for datatype ${datatype}`);
+        if (!(0, circuits_1.isValidOperation)(query.datatype, propertyQuery.operator)) {
+            throw new Error(`operator ${propertyQuery.operator} is not supported for datatype ${query.datatype}`);
         }
+        const datatype = propertyQuery.operator === circuits_1.Operators.EXISTS ? circuits_1.XSDNS.Boolean : query.datatype;
         query.values = await (0, exports.transformQueryValueToBigInts)(propertyQuery.operatorValue, datatype);
     }
     return query;
@@ -135,7 +141,7 @@ const parseQueriesMetadata = async (credentialType, ldContextJSON, credentialSub
 };
 exports.parseQueriesMetadata = parseQueriesMetadata;
 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 js_jsonld_merklization_1.Merklizer.hashValue(ldType, value[index]);

package/dist/node/cjs/proof/provers/inputs-generator.js

@@ -205,10 +205,8 @@ class InputGenerator {
             circuitInputs.profileNonce = BigInt(params.authProfileNonce);
             circuitInputs.skipClaimRevocationCheck = params.skipRevocation;
             const query = circuitQueries[0];
-            query.values =
-                query.operator === circuits_1.Operators.SD || query.operator === circuits_1.Operators.NOOP
-                    ? new Array(circuits_1.defaultValueArraySize).fill(0)
-                    : query.values;
+            query.values = [circuits_1.Operators.SD, circuits_1.Operators.NOOP].includes(query.operator) ? [] : query.values;
+            query.valueProof = query.operator === circuits_1.Operators.NOOP ? new circuits_1.ValueProof() : query.valueProof;
             circuitInputs.query = query;
             circuitInputs.currentTimeStamp = (0, js_iden3_core_1.getUnixTimestamp)(new Date());
             circuitInputs.proofType = proofType;
@@ -256,10 +254,8 @@ class InputGenerator {
             circuitInputs.profileNonce = BigInt(params.authProfileNonce);
             circuitInputs.skipClaimRevocationCheck = params.skipRevocation;
             const query = circuitQueries[0];
-            query.values =
-                query.operator === circuits_1.Operators.SD || query.operator === circuits_1.Operators.NOOP
-                    ? new Array(circuits_1.defaultValueArraySize).fill(0)
-                    : query.values;
+            query.values = [circuits_1.Operators.SD, circuits_1.Operators.NOOP].includes(query.operator) ? [] : query.values;
+            query.valueProof = query.operator === circuits_1.Operators.NOOP ? new circuits_1.ValueProof() : query.valueProof;
             circuitInputs.query = query;
             circuitInputs.currentTimeStamp = (0, js_iden3_core_1.getUnixTimestamp)(new Date());
             circuitInputs.proofType = proofType;
@@ -275,7 +271,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 = js_iden3_core_1.DID.idFromDID(genesisDID);
@@ -283,7 +279,7 @@ class InputGenerator {
             const gistProof = (0, common_1.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,

package/dist/node/cjs/proof/verifiers/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./pub-signals-verifier"), exports);
 __exportStar(require("./query"), exports);
+__exportStar(require("./query-hash"), exports);

package/dist/node/cjs/proof/verifiers/pub-signals-verifier.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PubSignalsVerifier = exports.userStateError = void 0;
-const js_crypto_1 = require("@iden3/js-crypto");
 const js_iden3_core_1 = require("@iden3/js-iden3-core");
 const js_jsonld_merklization_1 = require("@iden3/js-jsonld-merklization");
 const utils_1 = require("../../utils");
@@ -15,6 +14,8 @@ const linked_multi_query_1 = require("../../circuits/linked-multi-query");
 const models_1 = require("../../circuits/models");
 const query_1 = require("./query");
 const common_2 = require("../common");
+const circuits_1 = require("../../circuits");
+const query_hash_1 = require("./query-hash");
 exports.userStateError = new Error(`user state is not valid`);
 const zeroInt = 0n;
 const defaultProofVerifyOpts = 1 * 60 * 60 * 1000; // 1 hour
@@ -112,7 +113,6 @@ class PubSignalsVerifier {
                 timestamp: v3PubSignals.timestamp,
                 merklized: v3PubSignals.merklized,
                 claimPathKey: v3PubSignals.claimPathKey,
-                claimPathNotExists: v3PubSignals.claimPathNotExists,
                 valueArraySize: v3PubSignals.getValueArrSize(),
                 isRevocationChecked: v3PubSignals.isRevocationChecked
             };
@@ -189,7 +189,7 @@ class PubSignalsVerifier {
             this.verifyIdOwnership(sender, challenge);
             return new common_1.BaseConfig();
         };
-        this.linkedMultiQuery10Verify = async ({ query, pubSignals }) => {
+        this.linkedMultiQuery10Verify = async ({ query, verifiablePresentation, pubSignals }) => {
             let multiQueryPubSignals = new linked_multi_query_1.LinkedMultiQueryPubSignals();
             multiQueryPubSignals = multiQueryPubSignals.pubSignalsUnmarshal(utils_1.byteEncoder.encode(JSON.stringify(pubSignals)));
             // verify query
@@ -203,26 +203,41 @@ class PubSignalsVerifier {
             }
             const ldContextJSON = JSON.stringify(schema);
             const credentialSubject = query.credentialSubject;
-            const schemaId = await js_jsonld_merklization_1.Path.getTypeIDFromContext(JSON.stringify(schema), query.type || '', ldOpts);
-            const schemaHash = (0, verifiable_1.caclulateCoreSchemaHash)(utils_1.byteEncoder.encode(schemaId));
+            const schemaId = await js_jsonld_merklization_1.Path.getTypeIDFromContext(ldContextJSON, query.type || '', ldOpts);
+            const schemaHash = (0, verifiable_1.calculateCoreSchemaHash)(utils_1.byteEncoder.encode(schemaId));
             const queriesMetadata = await (0, common_2.parseQueriesMetadata)(query.type || '', ldContextJSON, credentialSubject, ldOpts);
-            const queryHashes = queriesMetadata.map((queryMeta) => {
-                const valueHash = js_crypto_1.poseidon.spongeHashX(queryMeta.values, 6);
-                return js_crypto_1.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(utils_1.bigIntCompare);
-            queryHashes.sort(utils_1.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 < linked_multi_query_1.LinkedMultiQueryInputs.queryCount; i++) {
+                const queryMeta = queriesMetadata[i];
+                const values = queryMeta?.values ?? [];
+                const valArrSize = values.length;
+                const queryHash = (0, query_hash_1.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 < linked_multi_query_1.LinkedMultiQueryInputs.queryCount; i++) {
+                if (request[i].queryHash != pubSignalsMeta[i].queryHash) {
+                    throw new Error('query hashes do not match');
+                }
+                if (request[i].queryMeta?.operator === circuits_1.Operators.SD) {
+                    const disclosedValue = await (0, query_1.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;
         };