Merge branch 'develop' into contextTypes

# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

1 files changed, 15 insertions, 14 deletions

diff --git a/package.json b/package.json
index 10a9f3a75..6a5e63992 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
     "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
     "ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'",
     "sentry:publish": "node ./development/sentry-publish.js",
-    "lint": "gulp lint",
-    "lint:fix": "gulp lint:fix",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
@@ -93,7 +93,7 @@
     "ensnare": "^1.0.0",
     "eslint-plugin-react": "^7.4.0",
     "eth-bin-to-ops": "^1.0.1",
-    "eth-contract-metadata": "^1.1.5",
+    "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
     "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^1.2.6",
     "eth-json-rpc-infura": "^3.0.0",
@@ -107,7 +107,7 @@
     "ethereumjs-wallet": "^0.6.0",
     "etherscan-link": "^1.0.2",
     "ethjs": "^0.4.0",
-    "ethjs-contract": "^0.2.0",
+    "ethjs-contract": "^0.2.3",
     "ethjs-ens": "^2.0.0",
     "ethjs-query": "^0.3.4",
     "express": "^4.15.5",
@@ -192,7 +192,9 @@
     "web3": "^0.20.1",
     "web3-provider-engine": "^14.0.5",
     "web3-stream-provider": "^3.0.1",
-    "xtend": "^4.0.1"
+    "xtend": "^4.0.1",
+    "multihashes": "^0.4.12",
+    "eth-ens-namehash": "^2.0.8"
   },
   "devDependencies": {
     "@sentry/cli": "^1.30.3",
@@ -209,7 +211,7 @@
     "babel-register": "^6.7.2",
     "babelify": "^8.0.0",
     "beefy": "^2.1.5",
-    "brfs": "^1.4.3",
+    "brfs": "^1.6.1",
     "browserify": "^16.1.1",
     "chai": "^4.1.0",
     "chromedriver": "2.36.0",
@@ -233,13 +235,12 @@
     "file-loader": "^1.1.11",
     "fs-promise": "^2.0.3",
     "ganache-cli": "^6.1.0",
-    "ganache-core": "^2.1.0",
+    "ganache-core": "^2.1.3",
     "geckodriver": "^1.11.0",
-    "gh-pages": "^1.1.0",
+    "gh-pages": "^1.2.0",
     "gifencoder": "^1.1.0",
     "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
     "gulp-babel": "^7.0.0",
-    "gulp-eslint": "^4.0.0",
     "gulp-json-editor": "^2.2.1",
     "gulp-livereload": "^3.8.1",
     "gulp-multi-process": "^1.3.1",
@@ -259,7 +260,7 @@
     "jsdom": "^11.2.0",
     "jsdom-global": "^3.0.2",
     "jshint-stylish": "~2.2.1",
-    "karma": "^2.0.0",
+    "karma": "^2.0.4",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-firefox-launcher": "^1.0.1",
@@ -270,9 +271,9 @@
     "mocha-jsdom": "^1.1.0",
     "mocha-sinon": "^2.0.0",
     "nock": "^9.0.14",
-    "node-sass": "^4.7.2",
+    "node-sass": "^4.9.0",
     "nsp": "^3.2.1",
-    "nyc": "^11.0.3",
+    "nyc": "^13.0.0",
     "open": "0.0.5",
     "path": "^0.12.7",
     "png-file-stream": "^1.0.0",
@@ -295,11 +296,11 @@
     "style-loader": "^0.21.0",
     "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",
-    "testem": "^2.0.0",
+    "testem": "^2.8.0",
     "through2": "^2.0.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
-    "watchify": "^3.9.0"
+    "watchify": "^3.11.0"
   },
   "engines": {
     "node": ">=8.0.0"