diff --git a/vapp/package-lock.json b/vapp/package-lock.json
index 4951c6c..e9c3175 100644
--- a/vapp/package-lock.json
+++ b/vapp/package-lock.json
@@ -2722,6 +2722,22 @@
         "babel-plugin-jest-hoist": "^24.9.0"
       }
     },
+    "babyjubjub": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/babyjubjub/-/babyjubjub-1.0.4.tgz",
+      "integrity": "sha512-R+EcKjxMSoctFCUtRUBKf3oDrnBrbbHUnt7u4LMGaERCx6/8+qfHZlqpBdsgAar9IvoPbDk0BLIj9lL9gfKCkw==",
+      "requires": {
+        "bignumber.js": "^9.0.0",
+        "buffer-reverse": "^1.0.1"
+      },
+      "dependencies": {
+        "bignumber.js": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
+          "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
+        }
+      }
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -2783,6 +2799,14 @@
         }
       }
     },
+    "base-x": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.7.tgz",
+      "integrity": "sha512-zAKJGuQPihXW22fkrfOclUUZXM2g92z5GzlSMHxhO6r6Qj+Nm0ccaGNBzDZojzwOMkpjAv4J0fOv1U4go+a4iw==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
@@ -3100,6 +3124,14 @@
         "node-releases": "^1.1.25"
       }
     },
+    "bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
+      "requires": {
+        "base-x": "^3.0.2"
+      }
+    },
     "bser": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz",
@@ -3164,6 +3196,11 @@
       "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
       "dev": true
     },
+    "buffer-reverse": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-reverse/-/buffer-reverse-1.0.1.tgz",
+      "integrity": "sha1-SSg8jvpvkBvAH6MwTQYCeXGuL2A="
+    },
     "buffer-to-arraybuffer": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz",
@@ -5092,21 +5129,12 @@
       }
     },
     "es5-ext": {
-<<<<<<< HEAD
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-=======
       "version": "0.10.52",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.52.tgz",
       "integrity": "sha512-bWCbE9fbpYQY4CU6hJbJ1vSz70EClMlDgJ7BmwI+zEJhxrwjesZRPglGJlsZhu0334U3hI+gaspwksH9IGD6ag==",
       "requires": {
         "es6-iterator": "~2.0.3",
         "es6-symbol": "~3.1.2",
->>>>>>> vapp: renew vapp
         "next-tick": "~1.0.0"
       }
     },
@@ -5879,15 +5907,9 @@
       }
     },
     "ext": {
-<<<<<<< HEAD
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-=======
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.2.0.tgz",
       "integrity": "sha512-0ccUQK/9e3NreLFg6K6np8aPyRgwycx+oFGtfx1dSp7Wj00Ozw9r05FgBRlzjf2XBM7LAzwgLyDscRrtSU91hA==",
->>>>>>> vapp: renew vapp
       "requires": {
         "type": "^2.0.0"
       },
@@ -16807,6 +16829,29 @@
           "dev": true
         }
       }
+    },
+    "zk-dex-keystore": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/zk-dex-keystore/-/zk-dex-keystore-0.0.3.tgz",
+      "integrity": "sha512-zGSfbLFKQTb0e/xV2Bs2mRqJnAnSCv2kAXkgoZidpEkZlXxIgdcRt7DCIA7NjsArH3BMP4X4WyWLhoztz0q1yg==",
+      "requires": {
+        "babyjubjub": "^1.0.2",
+        "bs58": "^4.0.1",
+        "crypto-browserify": "3.12.0",
+        "keccak": "1.4.0",
+        "scrypt": "6.0.3",
+        "secp256k1": "3.5.0",
+        "sjcl": "1.0.6",
+        "uuid": "3.0.0",
+        "web3-utils": "^1.2.1"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz",
+          "integrity": "sha1-Zyj8BFnEUNeWqZwxg3VpvfZy1yg="
+        }
+      }
     }
   }
 }
diff --git a/vapp/package.json b/vapp/package.json
index e6cd9e8..6f47a21 100644
--- a/vapp/package.json
+++ b/vapp/package.json
@@ -32,7 +32,8 @@
     "vue-router": "^3.0.7",
     "vue-template-compiler": "^2.6.10",
     "vuex": "^3.1.1",
-    "web3": "^1.2.1"
+    "web3": "^1.2.1",
+    "zk-dex-keystore": "0.0.3"
   },
   "devDependencies": {
     "@vue/babel-preset-app": "^3.9.2",