@0xpolygonid/js-sdk 1.21.0 → 1.21.3

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

@@ -10,6 +10,15 @@ const utils_1 = require("../../utils");
 const allOperations = Object.values(circuits_1.QueryOperators);
 const v2Operations = [
     circuits_1.Operators.NOOP,
+    circuits_1.Operators.EQ,
+    circuits_1.Operators.LT,
+    circuits_1.Operators.GT,
+    circuits_1.Operators.IN,
+    circuits_1.Operators.NIN,
+    circuits_1.Operators.NE,
+    circuits_1.Operators.SD
+];
+const v2OnChainOperations = [
     circuits_1.Operators.EQ,
     circuits_1.Operators.LT,
     circuits_1.Operators.GT,
@@ -19,9 +28,15 @@ const v2Operations = [
 ];
 exports.circuitValidator = {
     [circuits_1.CircuitId.AtomicQueryMTPV2]: { maxQueriesCount: 1, supportedOperations: v2Operations },
-    [circuits_1.CircuitId.AtomicQueryMTPV2OnChain]: { maxQueriesCount: 1, supportedOperations: v2Operations },
+    [circuits_1.CircuitId.AtomicQueryMTPV2OnChain]: {
+        maxQueriesCount: 1,
+        supportedOperations: v2OnChainOperations
+    },
     [circuits_1.CircuitId.AtomicQuerySigV2]: { maxQueriesCount: 1, supportedOperations: v2Operations },
-    [circuits_1.CircuitId.AtomicQuerySigV2OnChain]: { maxQueriesCount: 1, supportedOperations: v2Operations },
+    [circuits_1.CircuitId.AtomicQuerySigV2OnChain]: {
+        maxQueriesCount: 1,
+        supportedOperations: v2OnChainOperations
+    },
     [circuits_1.CircuitId.AtomicQueryV3]: { maxQueriesCount: 1, supportedOperations: allOperations },
     [circuits_1.CircuitId.AtomicQueryV3OnChain]: { maxQueriesCount: 1, supportedOperations: allOperations },
     [circuits_1.CircuitId.AuthV2]: { maxQueriesCount: 0, supportedOperations: [] },
@@ -88,7 +103,6 @@ class InputGenerator {
             circuitInputs.signature = signature;
             circuitInputs.challenge = params.challenge;
             const query = circuitQueries[0];
-            query.operator = this.transformV2QueryOperator(query.operator);
             circuitInputs.query = query;
             circuitInputs.claim = {
                 issuerID: circuitClaimData.issuerId,
@@ -147,7 +161,6 @@ class InputGenerator {
             circuitInputs.profileNonce = BigInt(params.authProfileNonce);
             circuitInputs.skipClaimRevocationCheck = params.skipRevocation;
             const query = circuitQueries[0];
-            query.operator = this.transformV2QueryOperator(query.operator);
             circuitInputs.query = query;
             circuitInputs.currentTimeStamp = (0, js_iden3_core_1.getUnixTimestamp)(new Date());
             if (authClaimData.treeState) {

package/dist/node/cjs/storage/filters/jsonQuery.js

@@ -98,10 +98,12 @@ const betweenOperator = (a, b) => {
     if (!Array.isArray(b) || b.length !== 2) {
         throw new Error('$between/$nonbetween operator value should be 2 elements array');
     }
+    const [min, max] = b.map(BigInt);
+    const predicate = (val) => val >= min && val <= max;
     if (Array.isArray(a)) {
-        return a.every((val) => val >= b[0] && val <= b[1]);
+        return a.map(BigInt).every(predicate);
     }
-    return a >= b[0] && a <= b[1];
+    return predicate(BigInt(a));
 };
 exports.comparatorOptions = {
     $noop: () => true,
@@ -111,7 +113,7 @@ exports.comparatorOptions = {
     $in: (a, b) => inOperator(a, b),
     $nin: (a, b) => !inOperator(a, b),
     $gt: (a, b) => greaterThan(a, b),
-    $lt: (a, b) => !greaterThan(a, b),
+    $lt: (a, b) => !greaterThanOrEqual(a, b),
     $ne: (a, b) => !equalsComparator(a, b),
     $gte: (a, b) => greaterThanOrEqual(a, b),
     $lte: (a, b) => lessThanOrEqual(a, b),

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

@@ -7,6 +7,15 @@ import { isEthereumIdentity } from '../../utils';
 const allOperations = Object.values(QueryOperators);
 const v2Operations = [
     Operators.NOOP,
+    Operators.EQ,
+    Operators.LT,
+    Operators.GT,
+    Operators.IN,
+    Operators.NIN,
+    Operators.NE,
+    Operators.SD
+];
+const v2OnChainOperations = [
     Operators.EQ,
     Operators.LT,
     Operators.GT,
@@ -16,9 +25,15 @@ const v2Operations = [
 ];
 export const circuitValidator = {
     [CircuitId.AtomicQueryMTPV2]: { maxQueriesCount: 1, supportedOperations: v2Operations },
-    [CircuitId.AtomicQueryMTPV2OnChain]: { maxQueriesCount: 1, supportedOperations: v2Operations },
+    [CircuitId.AtomicQueryMTPV2OnChain]: {
+        maxQueriesCount: 1,
+        supportedOperations: v2OnChainOperations
+    },
     [CircuitId.AtomicQuerySigV2]: { maxQueriesCount: 1, supportedOperations: v2Operations },
-    [CircuitId.AtomicQuerySigV2OnChain]: { maxQueriesCount: 1, supportedOperations: v2Operations },
+    [CircuitId.AtomicQuerySigV2OnChain]: {
+        maxQueriesCount: 1,
+        supportedOperations: v2OnChainOperations
+    },
     [CircuitId.AtomicQueryV3]: { maxQueriesCount: 1, supportedOperations: allOperations },
     [CircuitId.AtomicQueryV3OnChain]: { maxQueriesCount: 1, supportedOperations: allOperations },
     [CircuitId.AuthV2]: { maxQueriesCount: 0, supportedOperations: [] },
@@ -85,7 +100,6 @@ export class InputGenerator {
             circuitInputs.signature = signature;
             circuitInputs.challenge = params.challenge;
             const query = circuitQueries[0];
-            query.operator = this.transformV2QueryOperator(query.operator);
             circuitInputs.query = query;
             circuitInputs.claim = {
                 issuerID: circuitClaimData.issuerId,
@@ -144,7 +158,6 @@ export class InputGenerator {
             circuitInputs.profileNonce = BigInt(params.authProfileNonce);
             circuitInputs.skipClaimRevocationCheck = params.skipRevocation;
             const query = circuitQueries[0];
-            query.operator = this.transformV2QueryOperator(query.operator);
             circuitInputs.query = query;
             circuitInputs.currentTimeStamp = getUnixTimestamp(new Date());
             if (authClaimData.treeState) {

package/dist/node/esm/storage/filters/jsonQuery.js

@@ -95,10 +95,12 @@ const betweenOperator = (a, b) => {
     if (!Array.isArray(b) || b.length !== 2) {
         throw new Error('$between/$nonbetween operator value should be 2 elements array');
     }
+    const [min, max] = b.map(BigInt);
+    const predicate = (val) => val >= min && val <= max;
     if (Array.isArray(a)) {
-        return a.every((val) => val >= b[0] && val <= b[1]);
+        return a.map(BigInt).every(predicate);
     }
-    return a >= b[0] && a <= b[1];
+    return predicate(BigInt(a));
 };
 export const comparatorOptions = {
     $noop: () => true,
@@ -108,7 +110,7 @@ export const comparatorOptions = {
     $in: (a, b) => inOperator(a, b),
     $nin: (a, b) => !inOperator(a, b),
     $gt: (a, b) => greaterThan(a, b),
-    $lt: (a, b) => !greaterThan(a, b),
+    $lt: (a, b) => !greaterThanOrEqual(a, b),
     $ne: (a, b) => !equalsComparator(a, b),
     $gte: (a, b) => greaterThanOrEqual(a, b),
     $lte: (a, b) => lessThanOrEqual(a, b),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.21.0",
+  "version": "1.21.3",
   "description": "SDK to work with Polygon ID",
   "main": "dist/node/cjs/index.js",
   "module": "dist/node/esm/index.js",