Merge branch 'main' into feature/onchain-non-merklized-credential-con…

…verter

package.json

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

rollup.config.mjs

@@ -1,8 +1,8 @@
 import commonJS from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import typescript from '@rollup/plugin-typescript';
-import packageJson from './package.json' assert { type: 'json' };
-import tsConfig from './tsconfig.json' assert { type: 'json' };
+import packageJson from './package.json' with { type: 'json' };
+import tsConfig from './tsconfig.json' with { type: 'json' };
 import virtual from '@rollup/plugin-virtual';
 import json from '@rollup/plugin-json';
 const empty = 'export default {}';

src/storage/filters/jsonQuery.ts

@@ -163,11 +163,14 @@ const betweenOperator = (
     throw new Error('$between/$nonbetween operator value should be 2 elements array');
   }
 
+  const [min, max] = b.map(BigInt);
+  const predicate = (val: bigint) => 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: { [v in FilterOperatorMethod]: FilterOperatorFunction } = {
@@ -182,7 +185,7 @@ export const comparatorOptions: { [v in FilterOperatorMethod]: FilterOperatorFun
   $gt: (a: ComparableType | ComparableType[], b: ComparableType | ComparableType[]) =>
     greaterThan(a, b),
   $lt: (a: ComparableType | ComparableType[], b: ComparableType | ComparableType[]) =>
-    !greaterThan(a, b),
+    !greaterThanOrEqual(a, b),
   $ne: (a, b) => !equalsComparator(a, b),
   $gte: (a: ComparableType | ComparableType[], b: ComparableType | ComparableType[]) =>
     greaterThanOrEqual(a, b),

tests/handlers/auth.test.ts

@@ -118,46 +118,51 @@ describe('auth', () => {
 
   it('request-response flow identity (not profile)', async () => {
     const claimReq: CredentialRequest = {
-      credentialSchema:
-        'https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json/kyc-nonmerklized.json',
-      type: 'KYCAgeCredential',
+      credentialSchema: 'ipfs://QmWDmZQrtvidcNK7d6rJwq7ZSi8SUygJaKepN7NhKtGryc',
+      type: 'operators',
       credentialSubject: {
         id: userDID.string(),
-        birthday: 19960424,
-        documentType: 99
+        boolean1: true,
+        'date-time1': '2024-11-04T12:39:00Z',
+        integer1: 4321,
+        'non-negative-integer1': '654321',
+        number1: 1234,
+        'positive-integer1': '123456789',
+        string1: 'abcd'
       },
       expiration: 2793526400,
       revocationOpts: {
         type: CredentialStatusType.Iden3ReverseSparseMerkleTreeProof,
         id: RHS_URL
       }
     };
-    const issuerCred = await idWallet.issueCredential(issuerDID, claimReq);
+    const issuerCred = await idWallet.issueCredential(issuerDID, claimReq, {
+      ipfsNodeURL: IPFS_URL
+    });
 
     await credWallet.save(issuerCred);
 
     const proofReq: ZeroKnowledgeProofRequest = {
-      id: 1,
-      circuitId: CircuitId.AtomicQuerySigV2,
+      id: 1730736196,
+      circuitId: CircuitId.AtomicQueryV3,
       optional: false,
       query: {
         allowedIssuers: ['*'],
-        type: claimReq.type,
-        context:
-          'https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-nonmerklized.jsonld',
+        context: 'ipfs://Qmb48rJ5SiQMLXjVkaLQB6fWbT7C8LK75MHsCoHv8GAc15',
         credentialSubject: {
-          documentType: {
-            $eq: 99
+          'positive-integer1': {
+            $between: ['123456789', '1123456789']
           }
-        }
+        },
+        type: 'operators'
       }
     };
 
     const authReqBody: AuthorizationRequestMessageBody = {
       callbackUrl: 'http://localhost:8080/callback?id=1234442-123123-123123',
       reason: 'reason',
       message: 'message',
-      scope: [proofReq as ZeroKnowledgeProofRequest]
+      scope: [proofReq]
     };
 
     const id = uuid.v4();