@0xpolygonid/js-sdk 1.5.1 → 1.6.0

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

@@ -14,6 +14,17 @@ var SearchError;
 const truthyValues = [true, 1, 'true'];
 const falsyValues = [false, 0, 'false'];
 const equalsComparator = (a, b) => {
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return (a.length === b.length && a.every((val, index) => val === b[index]));
+    }
+    if (!Array.isArray(a) && Array.isArray(b)) {
+        return b.includes(a);
+    }
+    if (Array.isArray(a) && !Array.isArray(b)) {
+        return a.includes(b);
+    }
+    a = a;
+    b = b;
     if (truthyValues.includes(a) && truthyValues.includes(b)) {
         return true;
     }
@@ -22,14 +33,65 @@ const equalsComparator = (a, b) => {
     }
     return a === b;
 };
+const greaterThan = (a, b) => {
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return a.every((val, index) => val > b[index]);
+    }
+    if (!Array.isArray(a) && Array.isArray(b)) {
+        return b.every((val) => a > val);
+    }
+    if (Array.isArray(a) && !Array.isArray(b)) {
+        return a.every((val) => val > b);
+    }
+    return a > b;
+};
+const greaterThanOrEqual = (a, b) => {
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return a.every((val, index) => val >= b[index]);
+    }
+    if (!Array.isArray(a) && Array.isArray(b)) {
+        return b.every((val) => a >= val);
+    }
+    if (Array.isArray(a) && !Array.isArray(b)) {
+        return a.every((val) => val >= b);
+    }
+    return a >= b;
+};
+const lessThanOrEqual = (a, b) => {
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return a.every((val, index) => val <= b[index]);
+    }
+    if (!Array.isArray(a) && Array.isArray(b)) {
+        return b.every((val) => a <= val);
+    }
+    if (Array.isArray(a) && !Array.isArray(b)) {
+        return a.every((val) => val <= b);
+    }
+    return a <= b;
+};
+const inOperator = (a, b) => {
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return a.every((val) => b.includes(val));
+    }
+    if (!Array.isArray(a) && Array.isArray(b)) {
+        return b.includes(a);
+    }
+    if (Array.isArray(a) && !Array.isArray(b)) {
+        return a.includes(b);
+    }
+    return false;
+};
 exports.comparatorOptions = {
     $noop: () => true,
+    $sd: () => true,
     $eq: (a, b) => equalsComparator(a, b),
-    $in: (a, b) => b.includes(a),
-    $nin: (a, b) => !b.includes(a),
-    $gt: (a, b) => a > b,
-    $lt: (a, b) => a < b,
-    $ne: (a, b) => !equalsComparator(a, b)
+    $in: (a, b) => inOperator(a, b),
+    $nin: (a, b) => !inOperator(a, b),
+    $gt: (a, b) => greaterThan(a, b),
+    $lt: (a, b) => !greaterThan(a, b),
+    $ne: (a, b) => !equalsComparator(a, b),
+    $gte: (a, b) => greaterThanOrEqual(a, b),
+    $lte: (a, b) => lessThanOrEqual(a, b)
 };
 /**
  * credential search path resolver
@@ -115,8 +177,6 @@ const StandardJSONCredentialsQueryFilter = (query) => {
                 return acc.concat(new FilterQuery('credentialSubject.id', exports.comparatorOptions.$eq, queryValue));
             case 'schema':
                 return acc.concat(new FilterQuery('credentialSchema.id', exports.comparatorOptions.$eq, queryValue));
-            case 'skipClaimRevocationCheck':
-                return acc;
             case 'credentialSubject': {
                 const reqFilters = Object.keys(queryValue).reduce((acc, fieldKey) => {
                     const fieldParams = queryValue[fieldKey];
@@ -134,8 +194,13 @@ const StandardJSONCredentialsQueryFilter = (query) => {
                 }, []);
                 return acc.concat(reqFilters);
             }
+            case 'proofType':
+            case 'groupId':
+            case 'skipClaimRevocationCheck': {
+                return acc;
+            }
             default:
-                throw new Error(SearchError.NotDefinedQueryKey);
+                throw new Error(`${queryKey} : ${SearchError.NotDefinedQueryKey}`);
         }
     }, []);
 };

package/dist/node/cjs/utils/did-helper.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildVerifierId = void 0;
+const js_crypto_1 = require("@iden3/js-crypto");
+const js_iden3_core_1 = require("@iden3/js-iden3-core");
+const buildVerifierId = (address, info) => {
+    address = address.replace('0x', '');
+    const ethAddrBytes = js_crypto_1.Hex.decodeString(address);
+    const ethAddr = ethAddrBytes.slice(0, 20);
+    const genesis = (0, js_iden3_core_1.genesisFromEthAddress)(ethAddr);
+    const tp = (0, js_iden3_core_1.buildDIDType)(info.method, info.blockchain, info.networkId);
+    return new js_iden3_core_1.Id(tp, genesis);
+};
+exports.buildVerifierId = buildVerifierId;

package/dist/node/cjs/utils/index.js

@@ -15,3 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./encoding"), exports);
+__exportStar(require("./object"), exports);
+__exportStar(require("./did-helper"), exports);

package/dist/node/cjs/utils/object.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeObjects = void 0;
+function mergeObjects(credSubject, otherCredSubject) {
+    let result = {};
+    const credSubjectKeys = Object.keys(credSubject);
+    for (const key of credSubjectKeys) {
+        if (typeof otherCredSubject[key] !== 'undefined') {
+            if (typeof credSubject[key] !== 'object' && typeof otherCredSubject[key] !== 'object') {
+                throw new Error('Invalid query');
+            }
+            const subjectProperty = credSubject[key];
+            const otherSubjectProperty = otherCredSubject[key];
+            const propertyOperators = Object.keys(subjectProperty);
+            const subjectPropertyResult = {};
+            for (const operatorKey of propertyOperators) {
+                if (typeof otherSubjectProperty[operatorKey] !== 'undefined') {
+                    const operatorValue1 = subjectProperty[operatorKey];
+                    const operatorValue2 = otherSubjectProperty[operatorKey];
+                    subjectPropertyResult[operatorKey] = [
+                        ...new Set([
+                            ...(subjectPropertyResult[operatorKey] ?? []),
+                            operatorValue1,
+                            ...(Array.isArray(operatorValue2) ? operatorValue2 : [operatorValue2])
+                        ])
+                    ];
+                }
+                else {
+                    subjectPropertyResult[operatorKey] = subjectProperty[operatorKey];
+                }
+            }
+            result[key] = {
+                ...otherCredSubject[key],
+                ...subjectPropertyResult
+            };
+        }
+    }
+    // Add remaining keys from obj2
+    result = { ...credSubject, ...otherCredSubject, ...result };
+    return result;
+}
+exports.mergeObjects = mergeObjects;

package/dist/node/cjs/verifiable/presentation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifiablePresentationFromCred = exports.createVerifiablePresentation = exports.buildQueryPath = exports.stringByPath = void 0;
+exports.createVerifiablePresentation = exports.findValue = exports.buildFieldPath = exports.stringByPath = void 0;
 const constants_1 = require("./constants");
 const js_jsonld_merklization_1 = require("@iden3/js-jsonld-merklization");
 const stringByPath = (obj, path) => {
@@ -19,20 +19,25 @@ const stringByPath = (obj, path) => {
     return value.toString();
 };
 exports.stringByPath = stringByPath;
-const buildQueryPath = async (contextURL, contextType, field, opts) => {
-    let resp;
-    try {
-        resp = await (await fetch(contextURL)).json();
+const buildFieldPath = async (ldSchema, contextType, field, opts) => {
+    let path = new js_jsonld_merklization_1.Path();
+    if (field) {
+        path = await js_jsonld_merklization_1.Path.getContextPathKey(ldSchema, contextType, field, opts);
     }
-    catch (error) {
-        throw new Error(`context not found: ${error.message}`);
-    }
-    const path = await js_jsonld_merklization_1.Path.getContextPathKey(JSON.stringify(resp), contextType, field, opts);
     path.prepend([constants_1.VerifiableConstants.CREDENTIAL_SUBJECT_PATH]);
     return path;
 };
-exports.buildQueryPath = buildQueryPath;
-const createVerifiablePresentation = (context, tp, path, value) => {
+exports.buildFieldPath = buildFieldPath;
+const findValue = (fieldName, credential) => {
+    const [first, ...rest] = fieldName.split('.');
+    let v = credential.credentialSubject[first];
+    for (const part of rest) {
+        v = v[part];
+    }
+    return v;
+};
+exports.findValue = findValue;
+const createVerifiablePresentation = (context, tp, credential, queries) => {
     const baseContext = [constants_1.VerifiableConstants.JSONLD_SCHEMA.W3C_CREDENTIAL_2018];
     const ldContext = baseContext[0] === context ? baseContext : [...baseContext, context];
     const vc = constants_1.VerifiableConstants.CREDENTIAL_TYPE.W3C_VERIFIABLE_CREDENTIAL;
@@ -40,36 +45,32 @@ const createVerifiablePresentation = (context, tp, path, value) => {
     if (tp !== vc) {
         vcTypes.push(tp);
     }
-    const [first, ...rest] = path.split('.');
-    const obj = rest.reduceRight((acc, key) => ({ [key]: acc }), value);
-    return {
+    const skeleton = {
         '@context': baseContext,
         '@type': constants_1.VerifiableConstants.CREDENTIAL_TYPE.W3C_VERIFIABLE_PRESENTATION,
         verifiableCredential: {
             '@context': ldContext,
             '@type': vcTypes,
             credentialSubject: {
-                '@type': tp,
-                [first]: obj
+                '@type': tp
             }
         }
     };
-};
-exports.createVerifiablePresentation = createVerifiablePresentation;
-const verifiablePresentationFromCred = async (w3cCred, requestObj, field, opts) => {
-    const mz = await w3cCred.merklize(opts);
-    const request = requestObj;
-    const contextType = (0, exports.stringByPath)(request, 'type');
-    const hasher = mz.hasher;
-    const contextURL = (0, exports.stringByPath)(request, 'context');
-    const path = await (0, exports.buildQueryPath)(contextURL, contextType, field, opts);
-    const dataType = await mz.jsonLDType(path);
-    const rawValue = mz.rawValue(path);
-    const { value } = await mz.proof(path);
-    const vp = (0, exports.createVerifiablePresentation)(contextURL, contextType, field, rawValue);
-    if (!value) {
-        throw new Error(`can't merklize verifiable presentation`);
+    let result = {};
+    for (const query of queries) {
+        const parts = query.fieldName.split('.');
+        const current = parts.reduceRight((acc, part) => {
+            if (result[part]) {
+                return { [part]: { ...result[part], ...acc } };
+            }
+            return { [part]: acc };
+        }, (0, exports.findValue)(query.fieldName, credential));
+        result = { ...result, ...current };
     }
-    return { vp, mzValue: value, dataType, hasher };
+    skeleton.verifiableCredential.credentialSubject = {
+        ...skeleton.verifiableCredential.credentialSubject,
+        ...result
+    };
+    return skeleton;
 };
-exports.verifiablePresentationFromCred = verifiablePresentationFromCred;
+exports.createVerifiablePresentation = createVerifiablePresentation;

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

@@ -45,6 +45,7 @@ class Iden3SparseMerkleTreeProof {
             mtp: this.mtp.toJSON()
         };
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     static fromJSON(obj) {
         let mtp;
         if (obj?.mtp?.notEmpties && obj?.mtp?.depth && obj?.mtp?.siblings) {
@@ -124,6 +125,7 @@ class BJJSignatureProof2021 {
      * fromJSON is a method to deserialize BJJSignatureProof2021 from json
      * @param obj
      */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     static fromJSON(obj) {
         return new BJJSignatureProof2021({
             issuerData: {

package/dist/node/esm/circuits/atomic-query-mtp-v2-on-chain.js

@@ -67,7 +67,7 @@ export class AtomicQueryMTPV2OnChainInputs extends BaseConfig {
             issuerClaimNonRevRootsTreeRoot: this.claim.nonRevProof?.treeState?.rootOfRoots?.string(),
             issuerClaimNonRevState: this.claim.nonRevProof?.treeState?.state?.string(),
             claimSchema: this.claim.claim?.getSchemaHash().bigInt().toString(),
-            claimPathMtp: prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaimMerklization()),
+            claimPathMtp: prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaim()),
             claimPathValue: valueProof.value.toString(),
             operator: this.query.operator,
             slotIndex: this.query.slotIndex,

package/dist/node/esm/circuits/atomic-query-mtp-v2.js

@@ -58,7 +58,7 @@ export class AtomicQueryMTPV2Inputs extends BaseConfig {
                 .toString(),
             issuerClaimNonRevState: this.claim.nonRevProof?.treeState?.state?.bigInt().toString(),
             claimSchema: this.claim.claim?.getSchemaHash().bigInt().toString(),
-            claimPathMtp: prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaimMerklization()),
+            claimPathMtp: prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaim()),
             claimPathValue: valueProof.value.toString(),
             operator: this.query.operator,
             slotIndex: this.query.slotIndex,

package/dist/node/esm/circuits/atomic-query-sig-v2-on-chain.js

@@ -100,9 +100,9 @@ export class AtomicQuerySigV2OnChainInputs extends BaseConfig {
             issuerAuthClaimNonRevMtp: this.claim.signatureProof?.issuerAuthNonRevProof?.proof &&
                 prepareSiblingsStr(this.claim.signatureProof.issuerAuthNonRevProof.proof, this.getMTLevel()),
             claimSchema: this.claim.claim?.getSchemaHash().bigInt().toString(),
-            claimPathMtp: prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaimMerklization()),
+            claimPathMtp: prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaim()),
             claimPathValue: valueProof.value.toString(),
-            operator: this.query?.operator,
+            operator: this.query.operator,
             timestamp: this.currentTimeStamp,
             // value in this path in merklized json-ld document
             slotIndex: this.query?.slotIndex,

package/dist/node/esm/circuits/atomic-query-sig-v2.js

@@ -49,6 +49,9 @@ export class AtomicQuerySigV2Inputs extends BaseConfig {
             this.query.valueProof.validate();
         }
         const valueProof = this.query.valueProof ?? new ValueProof();
+        const treeState = this.skipClaimRevocationCheck
+            ? this.claim.signatureProof?.issuerAuthNonRevProof.treeState
+            : this.claim.nonRevProof?.treeState;
         const s = {
             requestID: this.requestID.toString(),
             userGenesisID: this.id.bigInt().toString(),
@@ -56,16 +59,10 @@ export class AtomicQuerySigV2Inputs extends BaseConfig {
             claimSubjectProfileNonce: this.claimSubjectProfileNonce?.toString(),
             issuerID: this.claim.issuerID?.bigInt().toString(),
             issuerClaim: this.claim.claim?.marshalJson(),
-            issuerClaimNonRevClaimsTreeRoot: this.claim.nonRevProof?.treeState?.claimsRoot
-                ?.bigInt()
-                .toString(),
-            issuerClaimNonRevRevTreeRoot: this.claim.nonRevProof?.treeState?.revocationRoot
-                ?.bigInt()
-                .toString(),
-            issuerClaimNonRevRootsTreeRoot: this.claim.nonRevProof?.treeState?.rootOfRoots
-                ?.bigInt()
-                .toString(),
-            issuerClaimNonRevState: this.claim.nonRevProof?.treeState?.state?.bigInt().toString(),
+            issuerClaimNonRevClaimsTreeRoot: treeState?.claimsRoot.bigInt().toString(),
+            issuerClaimNonRevRevTreeRoot: treeState?.revocationRoot.bigInt().toString(),
+            issuerClaimNonRevRootsTreeRoot: treeState?.rootOfRoots.bigInt().toString(),
+            issuerClaimNonRevState: treeState?.state.bigInt().toString(),
             issuerClaimNonRevMtp: this.claim.nonRevProof?.proof &&
                 prepareSiblingsStr(this.claim.nonRevProof.proof, this.getMTLevel()),
             issuerClaimSignatureR8x: this.claim.signatureProof?.signature.R8[0].toString(),
@@ -75,18 +72,18 @@ export class AtomicQuerySigV2Inputs extends BaseConfig {
             issuerAuthClaimMtp: this.claim.signatureProof?.issuerAuthIncProof?.proof &&
                 prepareSiblingsStr(this.claim.signatureProof.issuerAuthIncProof.proof, this.getMTLevel()),
             issuerAuthClaimsTreeRoot: this.claim.signatureProof?.issuerAuthIncProof.treeState?.claimsRoot
-                ?.bigInt()
+                .bigInt()
                 .toString(),
             issuerAuthRevTreeRoot: this.claim.signatureProof?.issuerAuthIncProof?.treeState?.revocationRoot
-                ?.bigInt()
+                .bigInt()
                 .toString(),
             issuerAuthRootsTreeRoot: this.claim.signatureProof?.issuerAuthIncProof?.treeState?.rootOfRoots
-                ?.bigInt()
+                .bigInt()
                 .toString(),
             issuerAuthClaimNonRevMtp: this.claim.signatureProof?.issuerAuthNonRevProof?.proof &&
                 prepareSiblingsStr(this.claim.signatureProof.issuerAuthNonRevProof.proof, this.getMTLevel()),
             claimSchema: this.claim.claim?.getSchemaHash().bigInt().toString(),
-            claimPathMtp: prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaimMerklization()),
+            claimPathMtp: prepareSiblingsStr(valueProof.mtp, this.getMTLevelsClaim()),
             claimPathValue: valueProof.value.toString(),
             operator: this.query.operator,
             timestamp: this.currentTimeStamp,