Merge branch 'develop' into network-remove-provider-engine

1 files changed, 26 insertions, 6 deletions

diff --git a/package.json b/package.json
index 6489dfe24..d7f126cb4 100644
--- a/package.json
+++ b/package.json
@@ -54,9 +54,19 @@
         "babelify",
         {
           "presets": [
-            "es2015",
+            [
+              "env",
+              {
+                "debug": true
+              }
+            ],
             "stage-0"
           ]
+        },
+        {
+          "plugins": [
+            "transform-class-properties"
+          ]
         }
       ],
       "reactify",
@@ -95,15 +105,18 @@
     "eth-bin-to-ops": "^1.0.1",
     "eth-block-tracker": "^4.0.1",
     "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
-    "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^2.1.1",
-    "eth-json-rpc-infura": "^3.0.0",
     "eth-json-rpc-middleware": "^2.4.0",
     "eth-keyring-controller": "^3.1.4",
+    "eth-ens-namehash": "^2.0.8",
+    "eth-hd-keyring": "^2.0.0",
+    "eth-json-rpc-infura": "^3.0.0",
+    "eth-method-registry": "^1.0.0",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.4.2",
     "eth-token-tracker": "^1.1.4",
+    "eth-trezor-keyring": "^0.1.0",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
@@ -143,6 +156,7 @@
     "metamascara": "^2.0.0",
     "metamask-logo": "^2.1.4",
     "mkdirp": "^0.5.1",
+    "multihashes": "^0.4.12",
     "multiplex": "^6.7.0",
     "number-to-bn": "^1.7.0",
     "obj-multiplex": "^1.0.0",
@@ -182,6 +196,7 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.2.0",
     "request-promise": "^4.2.1",
+    "reselect": "^3.0.1",
     "sandwich-expando": "^1.1.3",
     "semaphore": "^1.0.5",
     "semver": "^5.4.1",
@@ -207,6 +222,7 @@
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.23.0",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-register": "^6.7.2",
@@ -231,11 +247,13 @@
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-mocha": "^5.0.0",
     "eslint-plugin-react": "^7.4.0",
+    "eth-json-rpc-middleware": "^1.6.0",
+    "eth-keyring-controller": "^4.0.0",
     "file-loader": "^1.1.11",
     "fs-extra": "^6.0.1",
     "fs-promise": "^2.0.3",
     "ganache-cli": "^6.1.0",
-    "ganache-core": "^2.1.3",
+    "ganache-core": "^2.1.5",
     "geckodriver": "^1.11.0",
     "gh-pages": "^1.2.0",
     "gifencoder": "^1.1.0",
@@ -271,7 +289,7 @@
     "mocha-jsdom": "^1.1.0",
     "mocha-sinon": "^2.0.0",
     "nock": "^9.0.14",
-    "node-sass": "^4.9.0",
+    "node-sass": "^4.9.2",
     "nsp": "^3.2.1",
     "nyc": "^13.0.0",
     "open": "0.0.5",
@@ -286,6 +304,7 @@
     "react-addons-test-utils": "^15.5.1",
     "react-test-renderer": "^15.6.2",
     "react-testutils-additions": "^15.2.0",
+    "redux-mock-store": "^1.5.3",
     "redux-test-utils": "^0.2.2",
     "resolve-url-loader": "^2.3.0",
     "rimraf": "^2.6.2",
@@ -304,6 +323,7 @@
     "watchify": "^3.11.0"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": "8.11.3",
+    "npm": "^6.1.0"
   }
 }