added pvk->pbk circuit

fix missing deps
2026-02-07 11:16:45 +01:00 · 2019-03-17 10:38:36 +01:00 · 2019-03-17 10:36:14 +01:00
15 changed files with 366 additions and 446 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -60,9 +60,6 @@ typings/
 # next.js build output
 .next

-# Visual code configuration
-.vscode
-
 tmp

 .DS_Store
--- a/circuits/babyjub.circom
+++ b/circuits/babyjub.circom
@@ -17,6 +17,9 @@
    along with circom. If not, see <https://www.gnu.org/licenses/>.
 */

+include "bitify.circom";
+include "escalarmulfix.circom";
+
 template BabyAdd() {
    signal input x1;
    signal input y1;
@@ -77,3 +80,27 @@ template BabyCheck() {

    a*x2 + y2 === 1 + d*x2*y2;
 }
+
+// Extracts the public key from private key
+template BabyPbk() {
+    signal private input  in;
+    signal         output Ax;
+    signal         output Ay;
+
+    var BASE8 = [
+        17777552123799933955779906779655732241715742912184938656739573121738514868268,
+        2626589144620713026669568689430873010625803728049924121243784502389097019475
+    ];
+
+    component pvkBits = Num2Bits(253);
+    pvkBits.in <== in;
+
+    component mulFix = EscalarMulFix(253, BASE8);
+
+    var i;
+    for (i=0; i<253; i++) {
+        mulFix.e[i] <== pvkBits.out[i];
+    }
+    Ax  <== mulFix.out[0];
+    Ay  <== mulFix.out[1];
+}
--- a/circuits/eddsamimc.circom
+++ b/circuits/eddsamimc.circom
@@ -58,7 +58,6 @@ template EdDSAMiMCVerifier() {
    hash.in[2] <== Ax;
    hash.in[3] <== Ay;
    hash.in[4] <== M;
-    hash.k <== 0;

    component h2bits = Num2Bits_strict();
    h2bits.in <== hash.out;
--- a/circuits/mimc.circom
+++ b/circuits/mimc.circom
@@ -137,19 +137,18 @@ template MiMC7(nrounds) {

 template MultiMiMC7(nInputs, nRounds) {
    signal input in[nInputs];
-    signal input k;
    signal output out;
-    signal r[nInputs +1];

    component mims[nInputs];
-
-    r[0] <== k;
    for (var i=0; i<nInputs; i++) {
        mims[i] = MiMC7(nRounds);
-        mims[i].x_in <== in[i];
-        mims[i].k <== r[i];
-        r[i+1] <== r[i] + in[i] + mims[i].out;
+        if (i==0) {
+            mims[i].x_in <== 15021630795539610737508582392395901278341266317943626182700664337106830745361;
+        } else {
+            mims[i].x_in <== mims[i-1].out;
+        }
+        mims[i].k <== in[i];
    }

-    out <== r[nInputs];
+    out <== mims[nInputs-1].out;
 }
--- a/circuits/smt/smthash.circom
+++ b/circuits/smt/smthash.circom
@@ -29,12 +29,19 @@ template SMTHash1() {
    signal input value;
    signal output out;

-    component h = MultiMiMC7(2, 91);   // Constant
-    h.in[0] <== key;
-    h.in[1] <== value;
-    h.k <== 1;
+    component h1 = MiMC7(91);   // Constant
+    h1.x_in <== 15021630795539610737508582392395901278341266317943626182700664337106830745361;
+    h1.k <== 1;

-    out <== h.out;
+    component h2 = MiMC7(91);
+    h2.x_in <== h1.out;
+    h2.k <== key;
+
+    component h3 = MiMC7(91);
+    h3.x_in <== h2.out;
+    h3.k <== value;
+
+    out <== h3.out;
 }

 /*
@@ -48,10 +55,13 @@ template SMTHash2() {
    signal input R;
    signal output out;

-    component h = MultiMiMC7(2, 91);   // Constant
-    h.in[0] <== L;
-    h.in[1] <== R;
-    h.k <== 0;
+    component h1 = MiMC7(91);
+    h1.x_in <== 15021630795539610737508582392395901278341266317943626182700664337106830745361;
+    h1.k <== L;

-    out <== h.out;
+    component h2 = MiMC7(91);
+    h2.x_in <== h1.out;
+    h2.k <== R;
+
+    out <== h2.out;
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,9 +37,9 @@
      }
    },
    "acorn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.5.tgz",
-      "integrity": "sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg=="
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+      "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="
    },
    "acorn-jsx": {
      "version": "5.0.1",
@@ -63,9 +63,9 @@
      }
    },
    "ansi-escapes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
-      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
    },
    "ansi-regex": {
      "version": "3.0.0",
@@ -457,11 +457,6 @@
        "yargs": "^12.0.2"
      }
    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
-    },
    "cli-cursor": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -793,9 +788,9 @@
      }
    },
    "doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
      "requires": {
        "esutils": "^2.0.2"
      }
@@ -838,6 +833,11 @@
        "minimalistic-crypto-utils": "^1.0.0"
      }
    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    },
    "encodeurl": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -862,47 +862,59 @@
      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
    },
    "eslint": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.12.0.tgz",
-      "integrity": "sha512-LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g==",
+      "version": "5.15.2",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.2.tgz",
+      "integrity": "sha512-I8VM4SILpMwUvsRt83bQVwIRQAJ2iPMXun1FVZ/lV1OHklH2tJaXqoDnNzdiFc6bnCtGKXvQIQNP3kj1eMskSw==",
      "requires": {
        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.5.3",
+        "ajv": "^6.9.1",
        "chalk": "^2.1.0",
        "cross-spawn": "^6.0.5",
        "debug": "^4.0.1",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^4.0.0",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
        "eslint-utils": "^1.3.1",
        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^5.0.0",
+        "espree": "^5.0.1",
        "esquery": "^1.0.1",
        "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
+        "file-entry-cache": "^5.0.1",
        "functional-red-black-tree": "^1.0.1",
        "glob": "^7.1.2",
        "globals": "^11.7.0",
        "ignore": "^4.0.6",
        "import-fresh": "^3.0.0",
        "imurmurhash": "^0.1.4",
-        "inquirer": "^6.1.0",
+        "inquirer": "^6.2.2",
        "js-yaml": "^3.12.0",
        "json-stable-stringify-without-jsonify": "^1.0.1",
        "levn": "^0.3.0",
-        "lodash": "^4.17.5",
+        "lodash": "^4.17.11",
        "minimatch": "^3.0.4",
        "mkdirp": "^0.5.1",
        "natural-compare": "^1.4.0",
        "optionator": "^0.8.2",
        "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
        "progress": "^2.0.0",
        "regexpp": "^2.0.1",
        "semver": "^5.5.1",
        "strip-ansi": "^4.0.0",
        "strip-json-comments": "^2.0.1",
-        "table": "^5.0.2",
+        "table": "^5.2.3",
        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        }
      }
    },
    "eslint-plugin-mocha": {
@@ -915,9 +927,9 @@
      }
    },
    "eslint-scope": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
      "requires": {
        "esrecurse": "^4.1.0",
        "estraverse": "^4.1.1"
@@ -934,11 +946,11 @@
      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
    },
    "espree": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz",
-      "integrity": "sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
      "requires": {
-        "acorn": "^6.0.2",
+        "acorn": "^6.0.7",
        "acorn-jsx": "^5.0.0",
        "eslint-visitor-keys": "^1.0.0"
      }
@@ -1094,27 +1106,17 @@
      }
    },
    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+      "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
      "requires": {
        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
+        "get-stream": "^3.0.0",
        "is-stream": "^1.1.0",
        "npm-run-path": "^2.0.0",
        "p-finally": "^1.0.0",
        "signal-exit": "^3.0.0",
        "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
      }
    },
    "express": {
@@ -1226,12 +1228,11 @@
      }
    },
    "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
      "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "^2.0.1"
      }
    },
    "file-type": {
@@ -1282,15 +1283,29 @@
      }
    },
    "flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
      "requires": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "requires": {
+            "glob": "^7.1.3"
          }
+        }
+      }
+    },
+    "flatted": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
+      "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg=="
    },
    "for-each": {
      "version": "0.3.3",
@@ -2336,7 +2351,8 @@
            "bindings": {
              "version": "1.3.0",
              "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
-              "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="
+              "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==",
+              "dev": true
            },
            "bip39": {
              "version": "2.5.0",
@@ -2355,6 +2371,7 @@
              "version": "1.1.5",
              "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
              "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=",
+              "dev": true,
              "requires": {
                "safe-buffer": "^5.0.1"
              }
@@ -2389,7 +2406,8 @@
            "bn.js": {
              "version": "4.11.8",
              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-              "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+              "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+              "dev": true
            },
            "body-parser": {
              "version": "1.18.3",
@@ -2432,12 +2450,14 @@
            "brorand": {
              "version": "1.1.0",
              "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-              "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+              "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+              "dev": true
            },
            "browserify-aes": {
              "version": "1.2.0",
              "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
              "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+              "dev": true,
              "requires": {
                "buffer-xor": "^1.0.3",
                "cipher-base": "^1.0.0",
@@ -2594,7 +2614,8 @@
            "buffer-xor": {
              "version": "1.0.3",
              "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-              "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+              "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+              "dev": true
            },
            "builtin-modules": {
              "version": "1.1.1",
@@ -2692,6 +2713,7 @@
              "version": "1.0.4",
              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
              "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+              "dev": true,
              "requires": {
                "inherits": "^2.0.1",
                "safe-buffer": "^5.0.1"
@@ -2851,6 +2873,7 @@
              "version": "1.2.0",
              "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
              "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+              "dev": true,
              "requires": {
                "cipher-base": "^1.0.1",
                "inherits": "^2.0.1",
@@ -2863,6 +2886,7 @@
              "version": "1.1.7",
              "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
              "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+              "dev": true,
              "requires": {
                "cipher-base": "^1.0.3",
                "create-hash": "^1.1.0",
@@ -3162,6 +3186,7 @@
              "version": "1.0.1",
              "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
              "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=",
+              "dev": true,
              "requires": {
                "browserify-aes": "^1.0.6",
                "create-hash": "^1.1.2",
@@ -3200,6 +3225,7 @@
              "version": "6.4.1",
              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
              "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+              "dev": true,
              "requires": {
                "bn.js": "^4.4.0",
                "brorand": "^1.0.1",
@@ -3490,17 +3516,8 @@
                  "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
                  "dev": true,
                  "requires": {
+                    "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d8d7fc9cc1fd781186c25676af100d1ec727013e",
                    "ethereumjs-util": "^5.1.1"
-                  },
-                  "dependencies": {
-                    "ethereumjs-abi": {
-                      "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
-                      "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
-                      "requires": {
-                        "bn.js": "^4.10.0",
-                        "ethereumjs-util": "^5.0.0"
-                      }
-                    }
                  }
                },
                "ethereum-common": {
@@ -3510,11 +3527,29 @@
                  "dev": true
                },
                "ethereumjs-abi": {
-                  "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
+                  "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d8d7fc9cc1fd781186c25676af100d1ec727013e",
                  "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                  "dev": true,
                  "requires": {
-                    "bn.js": "^4.10.0",
-                    "ethereumjs-util": "^5.0.0"
+                    "bn.js": "^4.11.8",
+                    "ethereumjs-util": "^6.0.0"
+                  },
+                  "dependencies": {
+                    "ethereumjs-util": {
+                      "version": "6.1.0",
+                      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
+                      "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
+                      "dev": true,
+                      "requires": {
+                        "bn.js": "^4.11.0",
+                        "create-hash": "^1.1.2",
+                        "ethjs-util": "0.1.6",
+                        "keccak": "^1.0.2",
+                        "rlp": "^2.0.0",
+                        "safe-buffer": "^5.1.1",
+                        "secp256k1": "^3.0.1"
+                      }
+                    }
                  }
                },
                "ethereumjs-block": {
@@ -3706,6 +3741,7 @@
              "version": "5.2.0",
              "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
              "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
+              "dev": true,
              "requires": {
                "bn.js": "^4.11.0",
                "create-hash": "^1.1.2",
@@ -3795,6 +3831,7 @@
              "version": "0.1.6",
              "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
              "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+              "dev": true,
              "requires": {
                "is-hex-prefixed": "1.0.0",
                "strip-hex-prefix": "1.0.0"
@@ -3816,6 +3853,7 @@
              "version": "1.0.3",
              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
              "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+              "dev": true,
              "requires": {
                "md5.js": "^1.3.4",
                "safe-buffer": "^5.1.1"
@@ -4226,6 +4264,7 @@
              "version": "3.0.4",
              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
              "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+              "dev": true,
              "requires": {
                "inherits": "^2.0.1",
                "safe-buffer": "^5.0.1"
@@ -4235,6 +4274,7 @@
              "version": "1.1.5",
              "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
              "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
+              "dev": true,
              "requires": {
                "inherits": "^2.0.3",
                "minimalistic-assert": "^1.0.1"
@@ -4262,6 +4302,7 @@
              "version": "1.0.1",
              "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
              "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+              "dev": true,
              "requires": {
                "hash.js": "^1.0.3",
                "minimalistic-assert": "^1.0.0",
@@ -4429,7 +4470,8 @@
            "is-hex-prefixed": {
              "version": "1.0.0",
              "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
-              "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ="
+              "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=",
+              "dev": true
            },
            "is-natural-number": {
              "version": "4.0.1",
@@ -4483,7 +4525,8 @@
            "is-typedarray": {
              "version": "1.0.0",
              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+              "dev": true
            },
            "is-utf8": {
              "version": "0.2.1",
@@ -4629,6 +4672,7 @@
              "version": "1.4.0",
              "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz",
              "integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==",
+              "dev": true,
              "requires": {
                "bindings": "^1.2.1",
                "inherits": "^2.0.3",
@@ -4928,6 +4972,7 @@
              "version": "1.3.5",
              "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
              "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+              "dev": true,
              "requires": {
                "hash-base": "^3.0.0",
                "inherits": "^2.0.1",
@@ -5087,12 +5132,14 @@
            "minimalistic-assert": {
              "version": "1.0.1",
              "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-              "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+              "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+              "dev": true
            },
            "minimalistic-crypto-utils": {
              "version": "1.0.1",
              "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-              "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+              "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+              "dev": true
            },
            "minimatch": {
              "version": "3.0.4",
@@ -5144,7 +5191,8 @@
            "ms": {
              "version": "2.0.0",
              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
            },
            "mz": {
              "version": "2.7.0",
@@ -5161,7 +5209,8 @@
            "nan": {
              "version": "2.10.0",
              "resolved": "http://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-              "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+              "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+              "dev": true
            },
            "nano-json-stream-parser": {
              "version": "0.1.2",
@@ -5828,6 +5877,7 @@
              "version": "2.0.2",
              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
              "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+              "dev": true,
              "requires": {
                "hash-base": "^3.0.0",
                "inherits": "^2.0.1"
@@ -5837,6 +5887,7 @@
              "version": "2.1.0",
              "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.1.0.tgz",
              "integrity": "sha512-93U7IKH5j7nmXFVg19MeNBGzQW5uXW1pmCuKY8veeKIhYTE32C2d0mOegfiIAfXcHOKJjjPlJisn8iHDF5AezA==",
+              "dev": true,
              "requires": {
                "safe-buffer": "^5.1.1"
              }
@@ -5850,7 +5901,8 @@
            "safe-buffer": {
              "version": "5.1.2",
              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+              "dev": true
            },
            "safe-event-emitter": {
              "version": "1.0.1",
@@ -5902,6 +5954,7 @@
              "version": "3.5.2",
              "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.5.2.tgz",
              "integrity": "sha512-iin3kojdybY6NArd+UFsoTuapOF7bnJNf2UbcWXaY3z+E1sJDipl60vtzB5hbO/uquBu7z0fd4VC4Irp+xoFVQ==",
+              "dev": true,
              "requires": {
                "bindings": "^1.2.1",
                "bip66": "^1.1.3",
@@ -6033,6 +6086,7 @@
              "version": "2.4.11",
              "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
              "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+              "dev": true,
              "requires": {
                "inherits": "^2.0.1",
                "safe-buffer": "^5.0.1"
@@ -6243,6 +6297,7 @@
              "version": "1.0.0",
              "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
              "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
+              "dev": true,
              "requires": {
                "is-hex-prefixed": "1.0.0"
              }
@@ -6486,6 +6541,7 @@
              "version": "3.1.5",
              "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
              "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+              "dev": true,
              "requires": {
                "is-typedarray": "^1.0.0"
              }
@@ -6928,27 +6984,36 @@
                  "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
                  "dev": true,
                  "requires": {
+                    "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d8d7fc9cc1fd781186c25676af100d1ec727013e",
                    "ethereumjs-util": "^5.1.1"
+                  }
+                },
+                "ethereumjs-abi": {
+                  "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d8d7fc9cc1fd781186c25676af100d1ec727013e",
+                  "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                  "dev": true,
+                  "requires": {
+                    "bn.js": "^4.11.8",
+                    "ethereumjs-util": "^6.0.0"
                  },
                  "dependencies": {
-                    "ethereumjs-abi": {
-                      "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
-                      "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
+                    "ethereumjs-util": {
+                      "version": "6.1.0",
+                      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
+                      "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
+                      "dev": true,
                      "requires": {
-                        "bn.js": "^4.10.0",
-                        "ethereumjs-util": "^5.0.0"
+                        "bn.js": "^4.11.0",
+                        "create-hash": "^1.1.2",
+                        "ethjs-util": "0.1.6",
+                        "keccak": "^1.0.2",
+                        "rlp": "^2.0.0",
+                        "safe-buffer": "^5.1.1",
+                        "secp256k1": "^3.0.1"
                      }
                    }
                  }
                },
-                "ethereumjs-abi": {
-                  "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799",
-                  "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
-                  "requires": {
-                    "bn.js": "^4.10.0",
-                    "ethereumjs-util": "^5.0.0"
-                  }
-                },
                "ws": {
                  "version": "5.2.2",
                  "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
@@ -6988,20 +7053,23 @@
              "dev": true,
              "requires": {
                "underscore": "1.8.3",
-                "web3-core-helpers": "1.0.0-beta.35"
+                "web3-core-helpers": "1.0.0-beta.35",
+                "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
              },
              "dependencies": {
                "debug": {
                  "version": "2.6.9",
                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                  "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                  "dev": true,
                  "requires": {
                    "ms": "2.0.0"
                  }
                },
                "websocket": {
                  "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
-                  "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
+                  "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
+                  "dev": true,
                  "requires": {
                    "debug": "^2.2.0",
                    "nan": "^2.3.3",
@@ -7180,7 +7248,8 @@
            "yaeti": {
              "version": "0.0.6",
              "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
-              "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
+              "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
+              "dev": true
            },
            "yargs": {
              "version": "4.8.1",
@@ -7612,9 +7681,9 @@
      }
    },
    "globals": {
-      "version": "11.10.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz",
-      "integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ=="
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+      "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw=="
    },
    "got": {
      "version": "7.1.0",
@@ -7807,36 +7876,36 @@
      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
    },
    "inquirer": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz",
-      "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz",
+      "integrity": "sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==",
      "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
        "cli-cursor": "^2.1.0",
        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.0",
+        "external-editor": "^3.0.3",
        "figures": "^2.0.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.11",
        "mute-stream": "0.0.7",
        "run-async": "^2.2.0",
-        "rxjs": "^6.1.0",
+        "rxjs": "^6.4.0",
        "string-width": "^2.1.0",
        "strip-ansi": "^5.0.0",
        "through": "^2.3.6"
      },
      "dependencies": {
        "ansi-regex": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-          "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w=="
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
        },
        "strip-ansi": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz",
+          "integrity": "sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==",
          "requires": {
-            "ansi-regex": "^4.0.0"
+            "ansi-regex": "^4.1.0"
          }
        }
      }
@@ -7941,9 +8010,9 @@
      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
    },
    "js-yaml": {
-      "version": "3.12.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-      "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz",
+      "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==",
      "requires": {
        "argparse": "^1.0.7",
        "esprima": "^4.0.0"
@@ -8161,7 +8230,7 @@
    },
    "minimist": {
      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
      "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
      "dev": true
    },
@@ -8404,11 +8473,11 @@
      }
    },
    "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz",
+      "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
      "requires": {
-        "execa": "^1.0.0",
+        "execa": "^0.10.0",
        "lcid": "^2.0.0",
        "mem": "^4.0.0"
      }
@@ -8435,13 +8504,13 @@
    },
    "p-is-promise": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4="
    },
    "p-limit": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
-      "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
+      "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
      "requires": {
        "p-try": "^2.0.0"
      }
@@ -8571,11 +8640,6 @@
        "pinkie": "^2.0.0"
      }
    },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
-    },
    "prelude-ls": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -8628,15 +8692,6 @@
        "safe-buffer": "^5.1.2"
      }
    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
    "punycode": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -8807,9 +8862,9 @@
      }
    },
    "rxjs": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-      "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+      "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
      "requires": {
        "tslib": "^1.9.0"
      }
@@ -9013,9 +9068,9 @@
      }
    },
    "slice-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz",
-      "integrity": "sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
      "requires": {
        "ansi-styles": "^3.2.0",
        "astral-regex": "^1.0.0",
@@ -9023,19 +9078,20 @@
      }
    },
    "snarkjs": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/snarkjs/-/snarkjs-0.1.9.tgz",
-      "integrity": "sha512-UMiONT6f86bTB0AyT7bC+QsMgv2wwMk4qz7CYvTK6assojA4poEocJuEc5wl/awHsibQTbX2zNqqnO+IAYMfTA==",
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/snarkjs/-/snarkjs-0.1.11.tgz",
+      "integrity": "sha512-NoMNn03Uwbt18V340ZlHSZscyfIu8F6fMOL7LT9Xr1zQY/nmzScM8442ATyJfzSI5bDTAz1QQGbCerP2BCKljA==",
      "requires": {
        "big-integer": "^1.6.35",
        "chai": "^4.1.2",
+        "escape-string-regexp": "^1.0.5",
        "eslint": "^5.3.0",
        "yargs": "^12.0.2"
      }
    },
    "sprintf-js": {
      "version": "1.0.3",
-      "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
    },
    "sshpk": {
@@ -9099,7 +9155,7 @@
    },
    "strip-eof": {
      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
    },
    "strip-hex-prefix": {
@@ -9144,14 +9200,50 @@
      }
    },
    "table": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.2.1.tgz",
-      "integrity": "sha512-qmhNs2GEHNqY5fd2Mo+8N1r2sw/rvTAAvBZTaTx+Y7PHLypqyrxr1MdIu0pLw6Xvl/Gi4ONu/sdceP8vvUjkyA==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.2.3.tgz",
+      "integrity": "sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==",
      "requires": {
-        "ajv": "^6.6.1",
+        "ajv": "^6.9.1",
        "lodash": "^4.17.11",
-        "slice-ansi": "2.0.0",
-        "string-width": "^2.1.1"
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz",
+          "integrity": "sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
      }
    },
    "tar": {
@@ -9657,32 +9749,8 @@
      "integrity": "sha512-wAnENuZx75T5ZSrT2De2LOaUuPf2yRjq1VfcbD7+Zd79F3DZZLBJcPyCNVQ1U0fAXt0wfgCKl7sVw5pffqR9Bw==",
      "requires": {
        "underscore": "1.8.3",
-        "web3-core-helpers": "1.0.0-beta.36"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "websocket": {
-          "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
-          "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
-          "requires": {
-            "debug": "^2.2.0",
-            "nan": "^2.3.3",
-            "typedarray-to-buffer": "^3.1.2",
-            "yaeti": "^0.0.6"
-          }
-        }
+        "web3-core-helpers": "1.0.0-beta.36",
+        "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
      }
    },
    "web3-shh": {
@@ -9763,7 +9831,7 @@
    },
    "wrap-ansi": {
      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
      "requires": {
        "string-width": "^1.0.1",
@@ -9795,7 +9863,7 @@
        },
        "strip-ansi": {
          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
          "requires": {
            "ansi-regex": "^2.0.0"
@@ -9809,9 +9877,9 @@
      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
    },
    "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
      "requires": {
        "mkdirp": "^0.5.1"
      }
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
  "dependencies": {
    "blake-hash": "^1.1.0",
    "snarkjs": "0.1.11",
+    "typedarray-to-buffer": "^3.1.5",
    "web3": "^1.0.0-beta.36"
  },
  "devDependencies": {
--- a/src/mimc7.js
+++ b/src/mimc7.js
@@ -44,21 +44,10 @@ exports.hash =  (_x_in, _k) =>{
    return F.affine(F.add(r, k));
 };

-exports.multiHash = (arr, key) => {
-    let r;
-    if (typeof(key) === "undefined") {
-        r = F.zero;
-    } else {
-        r = key;
-    }
+exports.multiHash = (arr) => {
+    let r = exports.getIV();
    for (let i=0; i<arr.length; i++) {
-        r = F.add(
-            F.add(
-                r,
-                arr[i]
-            ),
-            exports.hash(bigInt(arr[i]), r)
-        );
+        r = exports.hash(r, bigInt(arr[i]));
    }
-    return F.affine(r);
+    return r;
 };
--- a/src/smt.js
+++ b/src/smt.js
@@ -46,8 +46,8 @@ class SMT {
        const ins = [];
        const dels = [];

-        let rtOld = mimc7.multiHash([key, resFind.foundValue], bigInt.one);
-        let rtNew = mimc7.multiHash([key, newValue], bigInt.one);
+        let rtOld = mimc7.multiHash([1, key, resFind.foundValue]);
+        let rtNew = mimc7.multiHash([1, key, newValue]);
        ins.push([rtNew, [1, key, newValue ]]);
        dels.push(rtOld);

@@ -59,11 +59,11 @@ class SMT {
                oldNode = [sibling, rtOld];
                newNode = [sibling, rtNew];
            } else {
-                oldNode = [rtOld, sibling];
-                newNode = [rtNew, sibling];
+                oldNode = [rtOld, sibling, ];
+                newNode = [rtNew, sibling, ];
            }
-            rtOld = mimc7.multiHash(oldNode, bigInt.zero);
-            rtNew = mimc7.multiHash(newNode, bigInt.zero);
+            rtOld = mimc7.multiHash(oldNode);
+            rtNew = mimc7.multiHash(newNode);
            dels.push(rtOld);
            ins.push([rtNew, newNode]);
        }
@@ -92,7 +92,7 @@ class SMT {

        const dels = [];
        const ins = [];
-        let rtOld = mimc7.multiHash([key, resFind.foundValue], bigInt.one);
+        let rtOld = mimc7.multiHash([1, key, resFind.foundValue]);
        let rtNew;
        dels.push(rtOld);

@@ -130,9 +130,9 @@ class SMT {
            }
            const oldSibling = resFind.siblings[level];
            if (keyBits[level]) {
-                rtOld = mimc7.multiHash([oldSibling, rtOld], bigInt.zero);
+                rtOld = mimc7.multiHash([oldSibling, rtOld]);
            } else {
-                rtOld = mimc7.multiHash([rtOld, oldSibling], bigInt.zero);
+                rtOld = mimc7.multiHash([rtOld, oldSibling]);
            }
            dels.push(rtOld);
            if (!newSibling.isZero()) {
@@ -147,7 +147,7 @@ class SMT {
                } else {
                    newNode = [rtNew, newSibling];
                }
-                rtNew = mimc7.multiHash(newNode, bigInt.zero);
+                rtNew = mimc7.multiHash(newNode);
                ins.push([rtNew, newNode]);
            }
        }
@@ -185,7 +185,7 @@ class SMT {
            for (let i= res.siblings.length; oldKeyits[i] == newKeyBits[i]; i++) {
                res.siblings.push(bigInt.zero);
            }
-            rtOld = mimc7.multiHash([resFind.notFoundKey, resFind.notFoundValue], bigInt.one);
+            rtOld = mimc7.multiHash([1, resFind.notFoundKey, resFind.notFoundValue]);
            res.siblings.push(rtOld);
            addedOne = true;
            mixed = false;
@@ -197,7 +197,7 @@ class SMT {
        const inserts = [];
        const dels = [];

-        let rt = mimc7.multiHash([key, value], bigInt.one);
+        let rt = mimc7.multiHash([1, key, value]);
        inserts.push([rt,[1, key, value]] );

        for (let i=res.siblings.length-1; i>=0; i--) {
@@ -207,9 +207,9 @@ class SMT {
            if (mixed) {
                const oldSibling = resFind.siblings[i];
                if (newKeyBits[i]) {
-                    rtOld = mimc7.multiHash([oldSibling, rtOld], bigInt.zero);
+                    rtOld = mimc7.multiHash([oldSibling, rtOld]);
                } else {
-                    rtOld = mimc7.multiHash([rtOld, oldSibling], bigInt.zero);
+                    rtOld = mimc7.multiHash([rtOld, oldSibling]);
                }
                dels.push(rtOld);
            }
@@ -217,10 +217,10 @@ class SMT {

            let newRt;
            if (newKeyBits[i]) {
-                newRt = mimc7.multiHash([res.siblings[i], rt], bigInt.zero);
+                newRt = mimc7.multiHash([res.siblings[i], rt]);
                inserts.push([newRt,[res.siblings[i], rt]] );
            } else {
-                newRt = mimc7.multiHash([rt, res.siblings[i]],  bigInt.zero);
+                newRt = mimc7.multiHash([rt, res.siblings[i]]);
                inserts.push([newRt,[rt, res.siblings[i]]] );
            }
            rt = newRt;
--- a/test/babyjub.js
+++ b/test/babyjub.js
@@ -3,10 +3,12 @@ const path = require("path");
 const snarkjs = require("snarkjs");
 const compiler = require("circom");

+const createBlakeHash = require("blake-hash");
+const eddsa = require("../src/eddsa.js");
+
 const assert = chai.assert;

-const bigInt = require("big-integer");
-
+const bigInt = require("snarkjs").bigInt;

 describe("Baby Jub test", function () {
    let circuitAdd;
@@ -22,6 +24,11 @@ describe("Baby Jub test", function () {
        const cirDefTest = await compiler(path.join(__dirname, "circuits", "babycheck_test.circom"));
        circuitTest = new snarkjs.Circuit(cirDefTest);
        console.log("NConstrains BabyTest: " + circuitTest.nConstraints);
+
+        const cirDefPbk = await compiler(path.join(__dirname, "circuits", "babypbk_test.circom"));
+        circuitPbk = new snarkjs.Circuit(cirDefPbk);
+        console.log("NConstrains BabyPbk: " + circuitPbk.nConstraints);
+
    });

    it("Should add point (0,1) and (0,1)", async () => {
@@ -97,4 +104,22 @@ describe("Baby Jub test", function () {
        }
    });

+    it("Should extract the public key from the private one", async () => {    
+
+        const rawpvk = Buffer.from("0001020304050607080900010203040506070809000102030405060708090021", "hex");
+        const pvk    = eddsa.pruneBuffer(createBlakeHash("blake512").update(rawpvk).digest().slice(0,32));
+        const S      = bigInt.leBuff2int(pvk).shr(3);
+
+        const A      = eddsa.prv2pub(rawpvk);
+
+        const input = {
+            in : S,
+            Ax : A[0],
+            Ay : A[1]
+        }
+
+        const w = circuitPbk.calculateWitness(input);
+        assert(circuitPbk.checkWitness(w));
+    });
+
 });
--- a/test/circuits/babypbk_test.circom
+++ b/test/circuits/babypbk_test.circom
@@ -0,0 +1,3 @@
+include "../../circuits/babyjub.circom";
+
+component main = BabyPbk();
--- a/test/eddsamimc.js
+++ b/test/eddsamimc.js
@@ -9,7 +9,7 @@ const assert = chai.assert;

 const bigInt = snarkjs.bigInt;

-describe("EdDSA MiMC test", function () {
+describe("EdDSA test", function () {
    let circuit;

    this.timeout(100000);
--- a/test/mimctestvectors.js
+++ b/test/mimctestvectors.js
@@ -1,51 +0,0 @@
-const chai = require("chai");
-const snarkjs = require("snarkjs");
-const mimcjs = require("../src/mimc7.js");
-const expect = chai.expect;
-const bigInt = snarkjs.bigInt;
-
-function bytesToHex(buff) {
-    return `0x${buff.toString("hex")}`;
-}
-
-function bigIntToBuffer(number) {
-    const buff = Buffer.alloc(32);
-    let pos = buff.length - 1;
-    while (!number.isZero()) {
-        buff[pos] = number.and(255);
-        number = number.shiftRight(8);
-        pos -= 1;
-    }
-    return buff;
-}
-
-describe("[mimc hash] Javascript test", function () {
-  
-    this.timeout(100000);
-    before( async () => {
-    });
-
-    it("Mimc7 hash with 1 entry", () => {
-        const entries = [bigInt(12)];
-        const hash = mimcjs.multiHash(entries);
-        const hashHex = bytesToHex(bigIntToBuffer(hash));
-        expect(hashHex).to.be.equal("0x237c92644dbddb86d8a259e0e923aaab65a93f1ec5758b8799988894ac0958fd");
-    });
-
-    it("Mimc7 hash with 2 entries", () => {
-        const entries = [bigInt(12), bigInt(45), bigInt(78), bigInt(41)];
-        const hi = mimcjs.multiHash(entries.slice(2));
-        const hiHex = bytesToHex(bigIntToBuffer(hi));
-        expect(hiHex).to.be.equal("0x067f3202335ea256ae6e6aadcd2d5f7f4b06a00b2d1e0de903980d5ab552dc70");
-        const hv = mimcjs.multiHash(entries.slice(0, 2));
-        const hvHex = bytesToHex(bigIntToBuffer(hv));
-        expect(hvHex).to.be.equal("0x15ff7fe9793346a17c3150804bcb36d161c8662b110c50f55ccb7113948d8879");
-    });
-
-    it("Mimc7 hash with 4 entries", () => {
-        const entries = [bigInt(12), bigInt(45), bigInt(78), bigInt(41)];
-        const hash = mimcjs.multiHash(entries);
-        const hashHex = bytesToHex(bigIntToBuffer(hash));
-        expect(hashHex).to.be.equal("0x284bc1f34f335933a23a433b6ff3ee179d682cd5e5e2fcdd2d964afa85104beb");
-    });
-});
--- a/test/smttestvectors.js
+++ b/test/smttestvectors.js
@@ -1,147 +0,0 @@
-const chai = require("chai");
-const snarkjs = require("snarkjs");
-
-const smt = require("../src/smt.js");
-const mimcjs = require("../src/mimc7.js");
-
-const expect = chai.expect;
-
-const bigInt = snarkjs.bigInt;
-
-function bytesToHex(buff) {
-    return `0x${buff.toString("hex")}`;
-}
-
-function bigIntToBuffer(number) {
-    const buff = Buffer.alloc(32);
-    let pos = buff.length - 1;
-    while (!number.isZero()) {
-        buff[pos] = number.and(255);
-        number = number.shiftRight(8);
-        pos -= 1;
-    }
-    return buff;
-}
-
-function newEntry(arr) {
-    return {
-        hi: mimcjs.multiHash(arr.slice(2)),
-        hv: mimcjs.multiHash(arr.slice(0, 2)),
-    };
-}
-
-describe("[sparse-merkle-tree] Javascript test", function () {
-  
-    this.timeout(100000);
-    before( async () => {
-    });
-
-    it("Add one claim", async () => {
-        const claim = [bigInt(12), bigInt(45), bigInt(78), bigInt(41)]; 
-        const entries = newEntry(claim);
-        const tree = await smt.newMemEmptyTrie();
-        const key1 = entries.hi;
-        const value1 = entries.hv;
-
-        await tree.insert(key1,value1);
-        const root = tree.root;
-        const rootBuff = bigIntToBuffer(root);
-        expect(bytesToHex(rootBuff)).to.be.equal("0x2bf39430aa2482fc1e2f170179c8cab126b0f55f71edc8d333f4c80cb4e798f5");
-    });
-    /*
-    it("Add two claims", async () => {
-        const firstClaim = [bigInt(12), bigInt(45), bigInt(78), bigInt(41)]; 
-        const firstEntries = newEntry(firstClaim);
-        const secondClaim = [bigInt(33), bigInt(44), bigInt(55), bigInt(66)]; 
-        const secondEntries = newEntry(secondClaim);
-        const tree = await smt.newMemEmptyTrie();
-        const key1 = firstEntries.hi;
-        const value1 = firstEntries.hv;
-        const key2 = secondEntries.hi;
-        const value2 = secondEntries.hv;
-
-        await tree.insert(key1,value1);
-        await tree.insert(key2,value2);
-        const root = tree.root;
-        const rootBuff = bigIntToBuffer(root);
-        expect(bytesToHex(rootBuff)).to.be.equal("0x1fb755a3677f8fd6c47b5462b69778ef6383c31d2d498b765e953f8cacaa6744");
-    });
-
-    it("Add claims in different orders", async () => {
-        const tree1 = await smt.newMemEmptyTrie();
-        for (let i = 0; i < 16; i++) {
-            const claim = [bigInt(0), bigInt(i), bigInt(0), bigInt(i)];
-            const entries = newEntry(claim);
-            await tree1.insert(entries.hi, entries.hv);
-        }
-        const tree2 = await smt.newMemEmptyTrie();
-        for (let i = 0; i < 16; i++) {
-            const claim = [bigInt(0), bigInt(i), bigInt(0), bigInt(i)];
-            const entries = newEntry(claim);
-            await tree2.insert(entries.hi, entries.hv);
-        }
-        const root1 = bigIntToBuffer(tree1.root);
-        const root2 = bigIntToBuffer(tree2.root);
-        expect(bytesToHex(root1)).to.be.equal(bytesToHex(root2));
-        expect(bytesToHex(root1)).to.be.equal("0x173fd27f6622526dfb21c4d8d83e3c95adba5d8f46a397113e4e80e629c6de76");
-    });
-
-    it("Insert 3 elements in different order into different trees", async () => {
-        const claim1 = [bigInt(33), bigInt(44), bigInt(55), bigInt(66)];
-        const entries1 = newEntry(claim1);
-        const claim2 = [bigInt(1111), bigInt(2222), bigInt(3333), bigInt(4444)];
-        const entries2 = newEntry(claim2);
-        const claim3 = [bigInt(5555), bigInt(6666), bigInt(7777), bigInt(8888)];
-        const entries3 = newEntry(claim3);
-      
-        const tree1 = await smt.newMemEmptyTrie();
-        const tree2 = await smt.newMemEmptyTrie();
-        const tree3 = await smt.newMemEmptyTrie();
-        const tree4 = await smt.newMemEmptyTrie();
-        const tree5 = await smt.newMemEmptyTrie();
-        const tree6 = await smt.newMemEmptyTrie();
-
-        await tree1.insert(entries1.hi,entries1.hv);
-        await tree1.insert(entries2.hi,entries2.hv);
-        await tree1.insert(entries3.hi,entries3.hv);
-
-        await tree2.insert(entries1.hi,entries1.hv);
-        await tree2.insert(entries3.hi,entries3.hv);
-        await tree2.insert(entries2.hi,entries2.hv);
-
-        await tree3.insert(entries2.hi,entries2.hv);
-        await tree3.insert(entries1.hi,entries1.hv);
-        await tree3.insert(entries3.hi,entries3.hv);
-
-        await tree4.insert(entries2.hi,entries2.hv);
-        await tree4.insert(entries3.hi,entries3.hv);
-        await tree4.insert(entries1.hi,entries1.hv);
-
-        await tree5.insert(entries3.hi,entries3.hv);
-        await tree5.insert(entries1.hi,entries1.hv);
-        await tree5.insert(entries2.hi,entries2.hv);
-
-        await tree6.insert(entries3.hi,entries3.hv);
-        await tree6.insert(entries2.hi,entries2.hv);
-        await tree6.insert(entries1.hi,entries1.hv);
-        
-        const root1 = bigIntToBuffer(tree1.root);
-        const root2 = bigIntToBuffer(tree2.root);
-        const root3 = bigIntToBuffer(tree3.root);
-        const root4 = bigIntToBuffer(tree4.root);
-        const root5 = bigIntToBuffer(tree5.root);
-        const root6 = bigIntToBuffer(tree6.root);
-
-        expect(bytesToHex(root1)).to.be.equal(bytesToHex(root2));
-        expect(bytesToHex(root2)).to.be.equal(bytesToHex(root3));
-        expect(bytesToHex(root3)).to.be.equal(bytesToHex(root4));
-        expect(bytesToHex(root4)).to.be.equal(bytesToHex(root5));
-        expect(bytesToHex(root5)).to.be.equal(bytesToHex(root6));
-        
-        expect(bytesToHex(root1)).to.be.equal("0x27990ef22656f49f010b2b48b2418c46f2bc93e4afb2e3377a1eb09f129e9802");
-    });
-<<<<<<< HEAD
-    */
-=======
->>>>>>> 5b7abbc4ec56447e5e2baa31e3b4ce3a0c0617a8
-});
Author	SHA1	Message	Date
adriamb	d9d6e43143	added pvk->pbk circuit	2019-03-17 10:38:36 +01:00
adriamb	8cb7b46603	fix missing deps	2019-03-17 10:36:14 +01:00