@0xpolygonid/js-sdk 1.9.3 → 1.9.4

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

@@ -132,8 +132,10 @@ class PubSignalsVerifier {
             const queriesMetadata = await (0, common_2.parseQueriesMetadata)(query.type, JSON.stringify(context), query.credentialSubject, {
                 documentLoader: loader
             });
-            await (0, query_1.checkQueryRequest)(query, queriesMetadata, context, outs, models_1.CircuitId.AtomicQueryV3, this._documentLoader, opts);
+            const circuitId = models_1.CircuitId.AtomicQueryV3;
+            await (0, query_1.checkQueryRequest)(query, queriesMetadata, context, outs, circuitId, this._documentLoader, opts);
             const queryMetadata = queriesMetadata[0]; // only one query is supported
+            (0, query_1.checkCircuitOperator)(circuitId, outs.operator);
             // validate selective disclosure
             if (queryMetadata.operator === circuits_1.Operators.SD) {
                 try {
@@ -353,6 +355,7 @@ class PubSignalsVerifier {
         });
         await (0, query_1.checkQueryRequest)(query, queriesMetadata, context, outs, circuitId, this._documentLoader, opts);
         const queryMetadata = queriesMetadata[0]; // only one query is supported
+        (0, query_1.checkCircuitOperator)(circuitId, outs.operator);
         // validate selective disclosure
         if (queryMetadata.operator === circuits_1.Operators.SD) {
             try {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fieldValueFromVerifiablePresentation = exports.validateEmptyCredentialSubjectNoopNativeSupport = exports.validateDisclosureNativeSDSupport = exports.validateDisclosureV2Circuit = exports.validateOperators = exports.validateEmptyCredentialSubjectV2Circuit = exports.verifyFieldValueInclusionNativeExistsSupport = exports.verifyFieldValueInclusionV2 = exports.checkQueryRequest = void 0;
+exports.fieldValueFromVerifiablePresentation = exports.validateEmptyCredentialSubjectNoopNativeSupport = exports.validateDisclosureNativeSDSupport = exports.validateDisclosureV2Circuit = exports.validateOperators = exports.validateEmptyCredentialSubjectV2Circuit = exports.verifyFieldValueInclusionNativeExistsSupport = exports.verifyFieldValueInclusionV2 = exports.checkCircuitOperator = exports.checkCircuitQueriesLength = exports.checkQueryRequest = void 0;
 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");
@@ -29,14 +29,7 @@ async function checkQueryRequest(query, queriesMetadata, ldContext, outputs, cir
     if (!query.skipClaimRevocationCheck && outputs.isRevocationChecked === 0) {
         throw new Error(`check revocation is required`);
     }
-    const circuitValidationData = provers_1.circuitValidator[circuitId];
-    if (queriesMetadata.length > circuitValidationData.maxQueriesCount) {
-        throw new Error(`circuit ${circuitId} supports only ${provers_1.circuitValidator[circuitId].maxQueriesCount} queries`);
-    }
-    const notSupportedOpIndx = queriesMetadata.findIndex((i) => !circuitValidationData.supportedOperations.includes(i.operator));
-    if (notSupportedOpIndx > -1) {
-        throw new Error(`circuit ${circuitId} not support ${queriesMetadata[notSupportedOpIndx].operator} operator`);
-    }
+    checkCircuitQueriesLength(circuitId, queriesMetadata);
     // verify timestamp
     let acceptedProofGenerationDelay = defaultProofGenerationDelayOpts;
     if (opts?.acceptedProofGenerationDelay) {
@@ -49,6 +42,20 @@ async function checkQueryRequest(query, queriesMetadata, ldContext, outputs, cir
     return;
 }
 exports.checkQueryRequest = checkQueryRequest;
+function checkCircuitQueriesLength(circuitId, queriesMetadata) {
+    const circuitValidationData = provers_1.circuitValidator[circuitId];
+    if (queriesMetadata.length > circuitValidationData.maxQueriesCount) {
+        throw new Error(`circuit ${circuitId} supports only ${provers_1.circuitValidator[circuitId].maxQueriesCount} queries`);
+    }
+}
+exports.checkCircuitQueriesLength = checkCircuitQueriesLength;
+function checkCircuitOperator(circuitId, operator) {
+    const circuitValidationData = provers_1.circuitValidator[circuitId];
+    if (!circuitValidationData.supportedOperations.includes(operator)) {
+        throw new Error(`circuit ${circuitId} not support ${(0, comparer_1.getOperatorNameByValue)(operator)} operator`);
+    }
+}
+exports.checkCircuitOperator = checkCircuitOperator;
 function verifyFieldValueInclusionV2(outputs, metadata) {
     if (outputs.operator == comparer_1.QueryOperators.$noop) {
         return;

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

@@ -9,7 +9,7 @@ import { AuthV2PubSignals } from '../../circuits/auth-v2';
 import { BaseConfig } from '../../circuits/common';
 import { LinkedMultiQueryPubSignals, LinkedMultiQueryInputs } from '../../circuits/linked-multi-query';
 import { CircuitId } from '../../circuits/models';
-import { checkQueryRequest, fieldValueFromVerifiablePresentation, validateDisclosureV2Circuit, validateEmptyCredentialSubjectV2Circuit, validateOperators, verifyFieldValueInclusionV2, validateDisclosureNativeSDSupport, validateEmptyCredentialSubjectNoopNativeSupport, verifyFieldValueInclusionNativeExistsSupport } from './query';
+import { checkQueryRequest, fieldValueFromVerifiablePresentation, validateDisclosureV2Circuit, validateEmptyCredentialSubjectV2Circuit, validateOperators, verifyFieldValueInclusionV2, validateDisclosureNativeSDSupport, validateEmptyCredentialSubjectNoopNativeSupport, verifyFieldValueInclusionNativeExistsSupport, checkCircuitOperator } from './query';
 import { parseQueriesMetadata } from '../common';
 import { Operators } from '../../circuits';
 import { calculateQueryHashV3 } from './query-hash';
@@ -129,8 +129,10 @@ export class PubSignalsVerifier {
             const queriesMetadata = await parseQueriesMetadata(query.type, JSON.stringify(context), query.credentialSubject, {
                 documentLoader: loader
             });
-            await checkQueryRequest(query, queriesMetadata, context, outs, CircuitId.AtomicQueryV3, this._documentLoader, opts);
+            const circuitId = CircuitId.AtomicQueryV3;
+            await checkQueryRequest(query, queriesMetadata, context, outs, circuitId, this._documentLoader, opts);
             const queryMetadata = queriesMetadata[0]; // only one query is supported
+            checkCircuitOperator(circuitId, outs.operator);
             // validate selective disclosure
             if (queryMetadata.operator === Operators.SD) {
                 try {
@@ -350,6 +352,7 @@ export class PubSignalsVerifier {
         });
         await checkQueryRequest(query, queriesMetadata, context, outs, circuitId, this._documentLoader, opts);
         const queryMetadata = queriesMetadata[0]; // only one query is supported
+        checkCircuitOperator(circuitId, outs.operator);
         // validate selective disclosure
         if (queryMetadata.operator === Operators.SD) {
             try {

package/dist/node/esm/proof/verifiers/query.js

@@ -1,7 +1,7 @@
 import { DID, getDateFromUnixTimestamp } from '@iden3/js-iden3-core';
 import { Merklizer, Path } from '@iden3/js-jsonld-merklization';
 import { byteEncoder } from '../../utils';
-import { Operators, QueryOperators } from '../../circuits/comparer';
+import { getOperatorNameByValue, Operators, QueryOperators } from '../../circuits/comparer';
 import { calculateCoreSchemaHash, VerifiableConstants } from '../../verifiable';
 import { circuitValidator } from '../provers';
 const defaultProofGenerationDelayOpts = 24 * 60 * 60 * 1000; // 24 hours
@@ -26,14 +26,7 @@ export async function checkQueryRequest(query, queriesMetadata, ldContext, outpu
     if (!query.skipClaimRevocationCheck && outputs.isRevocationChecked === 0) {
         throw new Error(`check revocation is required`);
     }
-    const circuitValidationData = circuitValidator[circuitId];
-    if (queriesMetadata.length > circuitValidationData.maxQueriesCount) {
-        throw new Error(`circuit ${circuitId} supports only ${circuitValidator[circuitId].maxQueriesCount} queries`);
-    }
-    const notSupportedOpIndx = queriesMetadata.findIndex((i) => !circuitValidationData.supportedOperations.includes(i.operator));
-    if (notSupportedOpIndx > -1) {
-        throw new Error(`circuit ${circuitId} not support ${queriesMetadata[notSupportedOpIndx].operator} operator`);
-    }
+    checkCircuitQueriesLength(circuitId, queriesMetadata);
     // verify timestamp
     let acceptedProofGenerationDelay = defaultProofGenerationDelayOpts;
     if (opts?.acceptedProofGenerationDelay) {
@@ -45,6 +38,18 @@ export async function checkQueryRequest(query, queriesMetadata, ldContext, outpu
     }
     return;
 }
+export function checkCircuitQueriesLength(circuitId, queriesMetadata) {
+    const circuitValidationData = circuitValidator[circuitId];
+    if (queriesMetadata.length > circuitValidationData.maxQueriesCount) {
+        throw new Error(`circuit ${circuitId} supports only ${circuitValidator[circuitId].maxQueriesCount} queries`);
+    }
+}
+export function checkCircuitOperator(circuitId, operator) {
+    const circuitValidationData = circuitValidator[circuitId];
+    if (!circuitValidationData.supportedOperations.includes(operator)) {
+        throw new Error(`circuit ${circuitId} not support ${getOperatorNameByValue(operator)} operator`);
+    }
+}
 export function verifyFieldValueInclusionV2(outputs, metadata) {
     if (outputs.operator == QueryOperators.$noop) {
         return;

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

@@ -26,6 +26,8 @@ export interface ClaimOutputs {
     isRevocationChecked: number;
 }
 export declare function checkQueryRequest(query: ProofQuery, queriesMetadata: QueryMetadata[], ldContext: JsonLd, outputs: ClaimOutputs, circuitId: CircuitId, schemaLoader?: DocumentLoader, opts?: VerifyOpts): Promise<void>;
+export declare function checkCircuitQueriesLength(circuitId: CircuitId, queriesMetadata: QueryMetadata[]): void;
+export declare function checkCircuitOperator(circuitId: CircuitId, operator: number): void;
 export declare function verifyFieldValueInclusionV2(outputs: ClaimOutputs, metadata: QueryMetadata): void;
 export declare function verifyFieldValueInclusionNativeExistsSupport(outputs: ClaimOutputs, metadata: QueryMetadata): void;
 export declare function validateEmptyCredentialSubjectV2Circuit(cq: QueryMetadata, outputs: ClaimOutputs): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "description": "SDK to work with Polygon ID",
   "main": "dist/node/cjs/index.js",
   "module": "dist/node/esm/index.js",
@@ -11,10 +11,11 @@
         "require": "./dist/node/cjs/index.js"
       },
       "browser": "./dist/browser/esm/index.js",
-      "umd": "./dist/browser/umd/index.js"
+      "umd": "./dist/browser/umd/index.js",
+      "types": "./dist/types/index.d.ts"
     }
   },
-  "typings": "dist/types/index.d.ts",
+  "types": "dist/types/index.d.ts",
   "source": "./src/index.ts",
   "files": [
     "dist"