@0xpolygonid/js-sdk 1.8.2 → 1.9.0

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

@@ -66,6 +66,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));
@@ -78,9 +91,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];
+};
 export 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),
@@ -88,7 +111,9 @@ export 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
@@ -136,7 +161,8 @@ export 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) {

package/dist/node/esm/verifiable/core-utils.js

@@ -194,7 +194,7 @@ export const parseCoreClaimSlots = async (ldCtx, mz, credentialType) => {
  * @param {Uint8Array} schemaId
  * @returns {*}  {SchemaHash}
  */
-export const caclulateCoreSchemaHash = (schemaId) => {
+export const calculateCoreSchemaHash = (schemaId) => {
     const sHash = Hex.decodeString(keccak256(schemaId));
     return new SchemaHash(sHash.slice(sHash.length - 16, sHash.length));
 };

package/dist/node/esm/verifiable/credential.js

@@ -7,7 +7,7 @@ import { PublicKey, poseidon } from '@iden3/js-crypto';
 import { getUserDIDFromCredential } from '../credentials/utils';
 import { byteEncoder, validateDIDDocumentAuth } from '../utils';
 import { MerklizedRootPosition, ProofType, SubjectPosition } from './constants';
-import { caclulateCoreSchemaHash, findCredentialType, parseCoreClaimSlots } from './core-utils';
+import { calculateCoreSchemaHash, findCredentialType, parseCoreClaimSlots } from './core-utils';
 import * as jsonld from 'jsonld/lib';
 import * as ldcontext from 'jsonld/lib/context';
 /**
@@ -119,7 +119,7 @@ export 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);

package/dist/types/circuits/atomic-query-v3-on-chain.d.ts

@@ -32,7 +32,7 @@ export declare class AtomicQueryV3OnChainInputs extends BaseConfig {
     linkNonce: bigint;
     verifierID?: Id;
     nullifierSessionID: bigint;
-    authEnabled: number;
+    isBJJAuthEnabled: number;
     validate(): void;
     fillMTPProofsWithZero(s: Partial<AtomicQueryV3OnChainCircuitInputs>): void;
     fillSigProofWithZero(s: Partial<AtomicQueryV3OnChainCircuitInputs>): void;
@@ -73,7 +73,6 @@ interface AtomicQueryV3OnChainCircuitInputs {
     issuerAuthRootsTreeRoot: string;
     issuerAuthState: string;
     isRevocationChecked: number;
-    claimPathNotExists: number;
     claimPathMtp: string[];
     claimPathMtpNoAux: string;
     claimPathMtpAuxHi: string;
@@ -84,6 +83,7 @@ interface AtomicQueryV3OnChainCircuitInputs {
     slotIndex: number;
     timestamp: number;
     value: string[];
+    valueArraySize: number;
     issuerClaimMtp: string[];
     issuerClaimClaimsTreeRoot: string;
     issuerClaimRevTreeRoot: string;
@@ -112,7 +112,7 @@ interface AtomicQueryV3OnChainCircuitInputs {
     linkNonce: string;
     verifierID: string;
     nullifierSessionID: string;
-    authEnabled: string;
+    isBJJAuthEnabled: string;
 }
 /**
  * @beta
@@ -125,8 +125,6 @@ export declare class AtomicQueryV3OnChainPubSignals extends BaseConfig {
     issuerState: Hash;
     issuerClaimNonRevState: Hash;
     timestamp: number;
-    merklized: number;
-    isRevocationChecked: number;
     circuitQueryHash: bigint;
     challenge: bigint;
     gistRoot: Hash;
@@ -134,9 +132,7 @@ export declare class AtomicQueryV3OnChainPubSignals extends BaseConfig {
     linkID: bigint;
     nullifier: bigint;
     operatorOutput: bigint;
-    verifierID: Id;
-    nullifierSessionID: bigint;
-    authEnabled: number;
+    isBJJAuthEnabled: number;
     pubSignalsUnmarshal(data: Uint8Array): AtomicQueryV3OnChainPubSignals;
 }
 export {};

package/dist/types/circuits/atomic-query-v3.d.ts

@@ -69,7 +69,6 @@ interface AtomicQueryV3CircuitInputs {
     issuerAuthRootsTreeRoot: string;
     issuerAuthState: string;
     isRevocationChecked: number;
-    claimPathNotExists: number;
     claimPathMtp: string[];
     claimPathMtpNoAux: string;
     claimPathMtpAuxHi: string;
@@ -80,6 +79,7 @@ interface AtomicQueryV3CircuitInputs {
     slotIndex: number;
     timestamp: number;
     value: string[];
+    valueArraySize: number;
     issuerClaimMtp: string[];
     issuerClaimClaimsTreeRoot: string;
     issuerClaimRevTreeRoot: string;
@@ -104,10 +104,10 @@ export declare class AtomicQueryV3PubSignals extends BaseConfig {
     slotIndex: number;
     operator: number;
     value: bigint[];
+    valueArraySize: number;
     timestamp: number;
     merklized: number;
     claimPathKey: bigint;
-    claimPathNotExists: number;
     isRevocationChecked: number;
     proofType: number;
     linkID: bigint;

package/dist/types/circuits/common.d.ts

@@ -21,7 +21,7 @@ export declare const ErrorEmptyIssuerAuthClaimNonRevProof = "empty issuer auth c
  */
 export declare class BaseConfig {
     mtLevel: number;
-    valueArraySize: number;
+    maxValueArraySize: number;
     mtLevelOnChain: number;
     mtLevelClaim: number;
     /**

package/dist/types/circuits/comparer.d.ts

@@ -28,6 +28,8 @@ export declare enum Operators {
     LTE = 7,
     GTE = 8,
     BETWEEN = 9,
+    NONBETWEEN = 10,
+    EXISTS = 11,
     SD = 16,
     NULLIFY = 17
 }
@@ -43,6 +45,8 @@ export declare const QueryOperators: {
     $lte: Operators;
     $gte: Operators;
     $between: Operators;
+    $nonbetween: Operators;
+    $exists: Operators;
     $sd: Operators;
     $nullify: Operators;
 };

package/dist/types/circuits/linked-multi-query.d.ts

@@ -26,7 +26,6 @@ export declare class LinkedMultiQueryPubSignals {
     merklized: number;
     operatorOutput: bigint[];
     circuitQueryHash: bigint[];
-    enabled: boolean[];
     /**
      * PubSignalsUnmarshal unmarshal linkedMultiQuery10.circom public inputs to LinkedMultiQueryPubSignals
      *

package/dist/types/circuits/models.d.ts

@@ -40,6 +40,7 @@ export declare class Query {
      *
      */
     validate(): void;
+    validateValueArraySize(maxArrSize: number): void;
 }
 /**
  * CircuitID is alias for circuit identifier
@@ -56,15 +57,15 @@ export declare enum CircuitId {
     /**
      * @beta
      */
-    AtomicQueryV3 = "credentialAtomicQueryV3-beta.0",
+    AtomicQueryV3 = "credentialAtomicQueryV3-beta.1",
     /**
      * @beta
      */
-    AtomicQueryV3OnChain = "credentialAtomicQueryV3OnChain-beta.0",
+    AtomicQueryV3OnChain = "credentialAtomicQueryV3OnChain-beta.1",
     /**
      * @beta
      */
-    LinkedMultiQuery10 = "linkedMultiQuery10-beta.0"
+    LinkedMultiQuery10 = "linkedMultiQuery10-beta.1"
 }
 /**
  * Claim structure for circuit inputs
@@ -161,7 +162,9 @@ export declare enum CircuitError {
     EmptyGISTProof = "empty GIST merkle tree proof",
     EmptyTreeState = "empty tree state",
     EmptyRequestID = "empty request ID",
-    InvalidProofType = "invalid proof type"
+    InvalidProofType = "invalid proof type",
+    InvalidValuesArrSize = "invalid query Values array size",
+    InvalidOperationType = "invalid operation type"
 }
 /**
  * ValueProof represents a Merkle Proof for a value stored as MT

package/dist/types/iden3comm/types/protocol/contract-request.d.ts

@@ -6,6 +6,7 @@ export type ContractInvokeRequest = {
     type: string;
     thid: string;
     body: ContractInvokeRequestBody;
+    from?: string;
 };
 /** ContractInvokeRequestBody represents structure of contract invoke request body object */
 export type ContractInvokeRequestBody = {

package/dist/types/proof/verifiers/index.d.ts

@@ -1,2 +1,3 @@
 export * from './pub-signals-verifier';
 export * from './query';
+export * from './query-hash';

package/dist/types/proof/verifiers/query-hash.d.ts

@@ -0,0 +1,3 @@
+import { SchemaHash } from '@iden3/js-iden3-core';
+export declare function calculateQueryHashV2(values: bigint[], schema: SchemaHash, slotIndex: string | number, operator: string | number, claimPathKey: string | number, claimPathNotExists: string | number): bigint;
+export declare function calculateQueryHashV3(values: bigint[], schema: SchemaHash, slotIndex: string | number, operator: string | number, claimPathKey: string | number, valueArraySize: string | number, merklized: string | number, isRevocationChecked: string | number, verifierID: string | number, nullifierSessionID: string | number): bigint;

package/dist/types/proof/verifiers/query.d.ts

@@ -23,3 +23,4 @@ export interface ClaimOutputs {
     isRevocationChecked: number;
 }
 export declare function checkQueryRequest(query: ProofQuery, outputs: ClaimOutputs, circuitId: CircuitId, schemaLoader?: DocumentLoader, verifiablePresentation?: JSON, opts?: VerifyOpts): Promise<void>;
+export declare const fieldValueFromVerifiablePresentation: (fieldName: string, verifiablePresentation?: JSON, ldLoader?: DocumentLoader) => Promise<bigint>;

package/dist/types/schema-processor/utils.d.ts

@@ -32,7 +32,7 @@ export declare function dataFillsSlot(slot: Uint8Array, newData: Uint8Array): bo
 export declare function checkDataInField(data: Uint8Array): boolean;
 /**
  *
- * @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

package/dist/types/storage/filters/jsonQuery.d.ts

@@ -9,7 +9,7 @@ export declare enum SearchError {
     NotDefinedComparator = "not defined comparator"
 }
 /** allowed operators to search */
-export type FilterOperatorMethod = '$noop' | '$eq' | '$in' | '$nin' | '$gt' | '$lt' | '$ne' | '$gte' | '$lte' | '$sd';
+export type FilterOperatorMethod = '$noop' | '$eq' | '$in' | '$nin' | '$gt' | '$lt' | '$ne' | '$gte' | '$lte' | '$sd' | '$exists' | '$between' | '$nonbetween';
 /** filter function type */
 export type FilterOperatorFunction = (a: any, b: any) => boolean;
 /**

package/dist/types/verifiable/core-utils.d.ts

@@ -81,4 +81,4 @@ export declare const parseCoreClaimSlots: (ldCtx: {
  * @param {Uint8Array} schemaId
  * @returns {*}  {SchemaHash}
  */
-export declare const caclulateCoreSchemaHash: (schemaId: Uint8Array) => SchemaHash;
+export declare const calculateCoreSchemaHash: (schemaId: Uint8Array) => SchemaHash;

package/package.json

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