use latest keyring packages

1 files changed, 95 insertions, 30 deletions

diff --git a/package-lock.json b/package-lock.json
index d9912c285..fcbed7788 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8372,22 +8372,42 @@
             }
         },
         "eth-hd-keyring": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/eth-hd-keyring/-/eth-hd-keyring-1.2.2.tgz",
-            "integrity": "sha1-rV9HkHRDapO0ObC5XHkJXCh5GII=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/eth-hd-keyring/-/eth-hd-keyring-2.0.0.tgz",
+            "integrity": "sha512-lTeANNPNj/j08sWU7LUQZTsx9NUJaUsiOdVxeP0UI5kke7L+Sd7zJWBmCShudEVG8PkqKLE1KJo08o430sl6rw==",
             "requires": {
                 "bip39": "^2.2.0",
-                "eth-sig-util": "^1.4.2",
+                "eth-sig-util": "^2.0.1",
+                "ethereumjs-abi": "^0.6.5",
                 "ethereumjs-util": "^5.1.1",
                 "ethereumjs-wallet": "^0.6.0",
                 "events": "^1.1.1",
                 "xtend": "^4.0.1"
             },
             "dependencies": {
+                "eth-sig-util": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.0.1.tgz",
+                    "integrity": "sha512-lxHZOQspexk3DaGj4RBbWy4C/qNOWRnxpaJzNnYD3WEmC8shcJ4tHs7Xv878rzvILfJnSFSCCiKQhng1m80oBQ==",
+                    "requires": {
+                        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                        "ethereumjs-util": "^5.1.1"
+                    },
+                    "dependencies": {
+                        "ethereumjs-abi": {
+                            "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                            "requires": {
+                                "bn.js": "^4.10.0",
+                                "ethereumjs-util": "^5.0.0"
+                            }
+                        }
+                    }
+                },
                 "ethereumjs-util": {
-                    "version": "5.1.4",
-                    "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.4.tgz",
-                    "integrity": "sha512-wbeTc5prEzIWFSQUcEsCAZbqubtJKy6yS+oZMY1cGG6GLYzLjm4YhC2RNrWIg8hRYnclWpnZmx2zkiufQkmd3w==",
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
+                    "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
                     "requires": {
                         "bn.js": "^4.11.0",
                         "create-hash": "^1.1.2",
@@ -8458,17 +8478,17 @@
             }
         },
         "eth-keyring-controller": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-3.3.0.tgz",
-            "integrity": "sha512-ZQtWxg0mNSAeQ9JcOaeTKaN5vfr+MbjRhSfeaF1VIWZsQgULpHrbjT6m94qiAFdh7ZngoR7OEpK9PATBH7JNYw==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-4.0.0.tgz",
+            "integrity": "sha512-D3Uj0b97vzEl/zXvrwYjFUYsz5gB4tnl/iMWqOm8jsvaREuHHbxRkm3iU/LG4fT8NGwS+fG8sLRPNBPu2/wRsA==",
             "dev": true,
             "requires": {
                 "bip39": "^2.4.0",
                 "bluebird": "^3.5.0",
                 "browser-passworder": "^2.0.3",
-                "eth-hd-keyring": "^1.2.2",
+                "eth-hd-keyring": "^2.0.0",
                 "eth-sig-util": "^1.4.0",
-                "eth-simple-keyring": "^1.3.0",
+                "eth-simple-keyring": "^2.0.0",
                 "ethereumjs-util": "^5.1.2",
                 "loglevel": "^1.5.0",
                 "obs-store": "^2.4.1",
@@ -8485,19 +8505,6 @@
                         "object-assign": "^4.0.0"
                     }
                 },
-                "eth-simple-keyring": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eth-simple-keyring/-/eth-simple-keyring-1.3.0.tgz",
-                    "integrity": "sha512-KNB3WXHyY/NfUiVTllsGScJ8AFTR6OGcrjKn4oSYG+HIvhkOoBqMAJ94BR3zGTvzyg5rHywHwT4L2K4+ZPFp5Q==",
-                    "dev": true,
-                    "requires": {
-                        "eth-sig-util": "^1.4.2",
-                        "ethereumjs-util": "^5.1.1",
-                        "ethereumjs-wallet": "^0.6.0",
-                        "events": "^1.1.1",
-                        "xtend": "^4.0.1"
-                    }
-                },
                 "ethereumjs-util": {
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
@@ -8667,12 +8674,13 @@
             "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
             "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
             "requires": {
+                "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                 "ethereumjs-util": "^5.1.1"
             },
             "dependencies": {
                 "ethereumjs-abi": {
                     "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
-                    "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                    "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
                     "requires": {
                         "bn.js": "^4.10.0",
                         "ethereumjs-util": "^5.0.0"
@@ -8694,6 +8702,58 @@
                 }
             }
         },
+        "eth-simple-keyring": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/eth-simple-keyring/-/eth-simple-keyring-2.0.0.tgz",
+            "integrity": "sha512-4dMbkIy2k1qotDTjWINvXG+7tBmofp0YUhlXgcG0+I3w684V46+MAHEkBtD2Y09iEeIB07RDXrezKP9WxOpynA==",
+            "dev": true,
+            "requires": {
+                "eth-sig-util": "^2.0.1",
+                "ethereumjs-abi": "^0.6.5",
+                "ethereumjs-util": "^5.1.1",
+                "ethereumjs-wallet": "^0.6.0",
+                "events": "^1.1.1",
+                "xtend": "^4.0.1"
+            },
+            "dependencies": {
+                "eth-sig-util": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.0.1.tgz",
+                    "integrity": "sha512-lxHZOQspexk3DaGj4RBbWy4C/qNOWRnxpaJzNnYD3WEmC8shcJ4tHs7Xv878rzvILfJnSFSCCiKQhng1m80oBQ==",
+                    "dev": true,
+                    "requires": {
+                        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                        "ethereumjs-util": "^5.1.1"
+                    },
+                    "dependencies": {
+                        "ethereumjs-abi": {
+                            "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                            "dev": true,
+                            "requires": {
+                                "bn.js": "^4.10.0",
+                                "ethereumjs-util": "^5.0.0"
+                            }
+                        }
+                    }
+                },
+                "ethereumjs-util": {
+                    "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",
+                        "ethjs-util": "^0.1.3",
+                        "keccak": "^1.0.2",
+                        "rlp": "^2.0.0",
+                        "safe-buffer": "^5.1.1",
+                        "secp256k1": "^3.0.1"
+                    }
+                }
+            }
+        },
         "eth-token-tracker": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/eth-token-tracker/-/eth-token-tracker-1.1.4.tgz",
@@ -30629,6 +30689,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"
             }
@@ -31652,6 +31713,7 @@
             "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.3.tgz",
             "integrity": "sha1-yqRDc9yIFayHZ73ba6cwc5ZMqos=",
             "requires": {
+                "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
                 "crypto-js": "^3.1.4",
                 "utf8": "^2.1.1",
                 "xhr2": "*",
@@ -31660,7 +31722,7 @@
             "dependencies": {
                 "bignumber.js": {
                     "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
-                    "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934"
+                    "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
                 }
             }
         },
@@ -32159,7 +32221,8 @@
             "dev": true,
             "requires": {
                 "underscore": "1.8.3",
-                "web3-core-helpers": "1.0.0-beta.34"
+                "web3-core-helpers": "1.0.0-beta.34",
+                "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
             },
             "dependencies": {
                 "underscore": {
@@ -32170,7 +32233,8 @@
                 },
                 "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",
@@ -33526,7 +33590,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
         },
         "yallist": {
             "version": "2.1.2",