From 79117f3d85652dd7e2fbd5b3ad77e73e30f37f58 Mon Sep 17 00:00:00 2001
From: Ilya <officalbatya@gmail.com>
Date: Thu, 2 Mar 2023 11:08:17 +0200
Subject: [PATCH] use mtentry instead of mtvalue (#51)

use mtentry instead of mtvalue
---
 package-lock.json     | 18 +++++++++---------
 package.json          |  4 ++--
 src/circuits/query.ts |  9 +++++----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fecda5f..1f66d73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@iden3/js-iden3-auth",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@iden3/js-iden3-auth",
-      "version": "1.0.0-beta.3",
+      "version": "1.0.0-beta.4",
       "license": "AGPL-3.0",
       "dependencies": {
         "@iden3/js-iden3-core": "1.0.0-beta.0",
-        "@iden3/js-jsonld-merklization": "^1.0.0-beta.3",
+        "@iden3/js-jsonld-merklization": "^1.0.0-beta.4",
         "@iden3/js-jwz": "1.0.0-beta.1",
         "@iden3/js-merkletree": "1.0.0-beta.0",
         "axios": "^0.27.2",
@@ -1439,9 +1439,9 @@
       }
     },
     "node_modules/@iden3/js-jsonld-merklization": {
-      "version": "1.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@iden3/js-jsonld-merklization/-/js-jsonld-merklization-1.0.0-beta.3.tgz",
-      "integrity": "sha512-HGau5bd7L4PbA5zVQp4NROnYVjkg7vs49H5/81WvffMyMHAY8mZj//Y7w5o3s+64Ox7wU6Z/WZRXxP6K0DNeUw==",
+      "version": "1.0.0-beta.4",
+      "resolved": "https://registry.npmjs.org/@iden3/js-jsonld-merklization/-/js-jsonld-merklization-1.0.0-beta.4.tgz",
+      "integrity": "sha512-3kWIAt0YT8YdebVBHJPRUfuJt5IidhQfrE8Brfrja2QadyQNR6IDUVbXV3tgHDIHnQbxVEF+jXqk+o/C8fcgzQ==",
       "dependencies": {
         "@iden3/js-crypto": "v1.0.0-beta.0",
         "@iden3/js-merkletree": "v1.0.0-beta.0",
@@ -9908,9 +9908,9 @@
       }
     },
     "@iden3/js-jsonld-merklization": {
-      "version": "1.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@iden3/js-jsonld-merklization/-/js-jsonld-merklization-1.0.0-beta.3.tgz",
-      "integrity": "sha512-HGau5bd7L4PbA5zVQp4NROnYVjkg7vs49H5/81WvffMyMHAY8mZj//Y7w5o3s+64Ox7wU6Z/WZRXxP6K0DNeUw==",
+      "version": "1.0.0-beta.4",
+      "resolved": "https://registry.npmjs.org/@iden3/js-jsonld-merklization/-/js-jsonld-merklization-1.0.0-beta.4.tgz",
+      "integrity": "sha512-3kWIAt0YT8YdebVBHJPRUfuJt5IidhQfrE8Brfrja2QadyQNR6IDUVbXV3tgHDIHnQbxVEF+jXqk+o/C8fcgzQ==",
       "requires": {
         "@iden3/js-crypto": "v1.0.0-beta.0",
         "@iden3/js-merkletree": "v1.0.0-beta.0",
diff --git a/package.json b/package.json
index 94d14c3..12399c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iden3/js-iden3-auth",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "iden3-auth implementation in JavaScript",
   "main": "dist/cjs/index.js",
   "module": "dist/cjs/index.js",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@iden3/js-iden3-core": "1.0.0-beta.0",
-    "@iden3/js-jsonld-merklization": "^1.0.0-beta.3",
+    "@iden3/js-jsonld-merklization": "^1.0.0-beta.4",
     "@iden3/js-jwz": "1.0.0-beta.1",
     "@iden3/js-merkletree": "1.0.0-beta.0",
     "axios": "^0.27.2",
diff --git a/src/circuits/query.ts b/src/circuits/query.ts
index 6715da3..d1666ab 100644
--- a/src/circuits/query.ts
+++ b/src/circuits/query.ts
@@ -1,7 +1,7 @@
 import { ISchemaLoader, SchemaLoadResult } from '@lib/loaders/schema';
 import nestedProperty from 'nested-property';
 import { Id, SchemaHash, DID } from '@iden3/js-iden3-core';
-import { Merklizer, Path } from '@iden3/js-jsonld-merklization';
+import { Merklizer, Path, Value } from '@iden3/js-jsonld-merklization';
 import keccak256 from 'keccak256';
 
 const operators: Map<string, number> = new Map([
@@ -179,16 +179,17 @@ async function validateDisclosure(
     throw new Error(`can't build path to '${cq.fieldName}' key`);
   }
 
-  let valueByPath: any;
+  let valueByPath: Value;
   try {
     valueByPath = mz.rawValue(merkalizedPath);
   } catch (e) {
     throw new Error(`can't get value by path '${cq.fieldName}'`);
   }
 
-  const mvValue = mz.mkValue(valueByPath);
+  const mtValue = mz.mkValue(valueByPath);
+  const bi = await mtValue.mtEntry();
 
-  if (mvValue.toString() !== outputs.value[0].toString(10)) {
+  if (bi !== outputs.value[0]) {
     throw new Error(`value that was used is not equal to requested in query`);
   }