Merge pull request #4000 from MetaMask/deps

deps - update keyring controller and other eth-dependinces

package-lock.json

@@ -5751,9 +5751,9 @@
       }
     },
     "eth-keyring-controller": {
-      "version": "2.1.4",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-2.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-2.2.0.tgz",
-      "integrity": "sha1-BRjZ2Jrw2K82Kigh5NVQqL4UqAc=",
+      "integrity": "sha512-f/g1ZrxciWJs2aHgpfvYmZ3ImP48GA+pobTU0EFNF/y5Yylf1zQyDw671W5opGpIt5TgV4F9sYXcvyjlgbL0Pg==",
       "requires": {
         "bip39": "2.4.0",
         "bluebird": "3.5.1",
@@ -5761,7 +5761,7 @@
         "eth-hd-keyring": "1.2.2",
         "eth-sig-util": "1.4.2",
         "eth-simple-keyring": "1.2.1",
-        "ethereumjs-util": "5.1.3",
+        "ethereumjs-util": "5.1.5",
         "loglevel": "1.6.0",
         "obs-store": "2.4.1",
         "promise-filter": "1.1.0"
@@ -5776,35 +5776,10 @@
             "object-assign": "4.1.1"
           }
         },
-        "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=",
-          "requires": {
-            "bip39": "2.4.0",
-            "eth-sig-util": "1.4.2",
-            "ethereumjs-util": "5.1.3",
-            "ethereumjs-wallet": "0.6.0",
-            "events": "1.1.1",
-            "xtend": "4.0.1"
-          }
-        },
-        "eth-simple-keyring": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/eth-simple-keyring/-/eth-simple-keyring-1.2.1.tgz",
-          "integrity": "sha1-bXs1LcWppQINYfafryHvsvY2P0U=",
-          "requires": {
-            "eth-sig-util": "1.4.2",
-            "ethereumjs-util": "5.1.3",
-            "ethereumjs-wallet": "0.6.0",
-            "events": "1.1.1",
-            "xtend": "4.0.1"
-          }
-        },
         "ethereumjs-util": {
-          "version": "5.1.3",
+          "version": "5.1.5",
-          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.5.tgz",
-          "integrity": "sha512-U/wmHagElZVxnpo3bFsvk5beFADegUcEzqtA/NfQbitAPOs6JoYq8M4SY9NfH4HD8236i63UOkkXafd7bqBL9A==",
+          "integrity": "sha512-xPaSEATYJpMTCGowIt0oMZwFP4R1bxd6QsWgkcDvFL0JtXsr39p32WEcD14RscCjfP41YXZPCVWA4yAg0nrJmw==",
           "requires": {
             "bn.js": "4.11.8",
             "create-hash": "1.1.3",
@@ -5878,6 +5853,34 @@
         }
       }
     },
+    "eth-simple-keyring": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/eth-simple-keyring/-/eth-simple-keyring-1.2.1.tgz",
+      "integrity": "sha1-bXs1LcWppQINYfafryHvsvY2P0U=",
+      "requires": {
+        "eth-sig-util": "1.4.2",
+        "ethereumjs-util": "5.1.5",
+        "ethereumjs-wallet": "0.6.0",
+        "events": "1.1.1",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "ethereumjs-util": {
+          "version": "5.1.5",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.5.tgz",
+          "integrity": "sha512-xPaSEATYJpMTCGowIt0oMZwFP4R1bxd6QsWgkcDvFL0JtXsr39p32WEcD14RscCjfP41YXZPCVWA4yAg0nrJmw==",
+          "requires": {
+            "bn.js": "4.11.8",
+            "create-hash": "1.1.3",
+            "ethjs-util": "0.1.4",
+            "keccak": "1.4.0",
+            "rlp": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "secp256k1": "3.4.0"
+          }
+        }
+      }
+    },
     "eth-token-tracker": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/eth-token-tracker/-/eth-token-tracker-1.1.4.tgz",

package.json

@@ -92,7 +92,7 @@
     "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^1.2.5",
     "eth-json-rpc-infura": "^3.0.0",
-    "eth-keyring-controller": "^2.1.4",
+    "eth-keyring-controller": "^2.2.0",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.4.2",