Merge branch 'master' into selenium-e2e

1 files changed, 54 insertions, 21 deletions

diff --git a/package.json b/package.json
index c811c6bec..36b59a9bc 100644
--- a/package.json
+++ b/package.json
@@ -9,13 +9,13 @@
     "ui": "npm run test:flat:build:states && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
-    "mascara": "METAMASK_DEBUG=true node ./mascara/example/server",
+    "mascara": "gulp build && METAMASK_DEBUG=true node ./mascara/example/server",
     "dist": "npm run dist:clear && npm install && gulp dist",
     "dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect",
-    "test": "npm run lint && npm run test:coverage && npm run test:e2e",
-    "test:unit": "METAMASK_ENV=test mocha --exit --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
+    "test": "npm run lint && npm run test:coverage && npm run test:integration",
+    "test:unit": "METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
     "test:single": "METAMASK_ENV=test mocha --require test/helper.js",
-    "test:integration": "npm run test:flat && npm run test:mascara",
+    "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara",
     "test:e2e": "METAMASK_ENV=test mocha test/e2e/metamask.spec --recursive || true",
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
@@ -33,6 +33,7 @@
     "lint:fix": "gulp lint:fix",
     "disc": "gulp disc --debug",
     "announce": "node development/announcer.js",
+    "version:bump": "node development/run-version-bump.js",
     "generateNotice": "node notices/notice-generator.js",
     "deleteNotice": "node notices/notice-delete.js"
   },
@@ -47,17 +48,25 @@
           ]
         }
       ],
+      "reactify",
       "envify",
       "brfs"
     ]
   },
   "dependencies": {
+    "abi-decoder": "^1.0.9",
+    "asmcrypto.js": "0.22.0",
     "async": "^2.5.0",
     "await-semaphore": "^0.1.1",
     "babel-runtime": "^6.23.0",
+    "bignumber.js": "^4.1.0",
+    "bip39": "^2.2.0",
     "bluebird": "^3.5.0",
     "bn.js": "^4.11.7",
+    "boron": "^0.2.3",
+    "browser-passworder": "^2.0.3",
     "browserify-derequire": "^0.9.4",
+    "browserify-unibabel": "^3.0.0",
     "classnames": "^2.2.5",
     "client-sw-ready-event": "^3.3.0",
     "clone": "^2.1.1",
@@ -71,19 +80,22 @@
     "ensnare": "^1.0.0",
     "eslint-plugin-react": "^7.4.0",
     "eth-bin-to-ops": "^1.0.1",
-    "eth-block-tracker": "^2.2.0",
-    "eth-contract-metadata": "^1.1.4",
+    "eth-block-tracker": "^2.3.0",
+    "eth-contract-metadata": "^1.1.5",
+    "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^1.2.5",
-    "eth-json-rpc-infura": "^2.0.5",
+    "eth-json-rpc-infura": "^3.0.0",
     "eth-keyring-controller": "^2.1.4",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.4.2",
     "eth-token-tracker": "^1.1.4",
+    "ethereumjs-abi": "^0.6.4",
     "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "ethereumjs-wallet": "^0.6.0",
     "etherscan-link": "^1.0.2",
+    "ethjs": "^0.2.8",
     "ethjs-contract": "^0.1.9",
     "ethjs-ens": "^2.0.0",
     "ethjs-query": "^0.3.1",
@@ -92,6 +104,11 @@
     "extensionizer": "^1.0.0",
     "fast-json-patch": "^2.0.4",
     "fast-levenshtein": "^2.0.6",
+    "fuse.js": "^3.2.0",
+    "gulp": "github:gulpjs/gulp#4.0",
+    "gulp-autoprefixer": "^5.0.0",
+    "gulp-eslint": "^4.0.0",
+    "gulp-sass": "^3.1.0",
     "hat": "0.0.3",
     "human-standard-token-abi": "^1.0.2",
     "idb-global": "^2.1.0",
@@ -100,16 +117,15 @@
     "iframe-stream": "^3.0.0",
     "inject-css": "^0.1.1",
     "jazzicon": "^1.2.0",
-    "json-rpc-engine": "3.2.0",
+    "json-rpc-engine": "^3.6.1",
     "json-rpc-middleware-stream": "^1.0.1",
     "lodash.debounce": "^4.0.8",
     "lodash.memoize": "^4.1.2",
     "lodash.shuffle": "^4.2.0",
     "lodash.uniqby": "^4.7.0",
     "loglevel": "^1.4.1",
-    "metamascara": "^1.3.1",
+    "metamascara": "^2.0.0",
     "metamask-logo": "^2.1.2",
-    "mississippi": "^1.2.0",
     "mkdirp": "^0.5.1",
     "multiplex": "^6.7.0",
     "number-to-bn": "^1.7.0",
@@ -123,19 +139,24 @@
     "post-message-stream": "^3.0.0",
     "promise-filter": "^1.1.0",
     "promise-to-callback": "^1.0.0",
-    "pump": "^1.0.2",
+    "pump": "^3.0.0",
     "pumpify": "^1.3.4",
     "qrcode-npm": "0.0.3",
+    "ramda": "^0.24.1",
     "react": "^15.6.2",
     "react-addons-css-transition-group": "^15.6.0",
     "react-dom": "^15.6.2",
     "react-hyperscript": "^3.0.0",
     "react-markdown": "^3.0.0",
     "react-redux": "^5.0.5",
-    "react-select": "^1.0.0-rc.2",
+    "react-select": "^1.0.0",
     "react-simple-file-input": "^2.0.0",
+    "react-tippy": "^1.2.2",
+    "react-toggle-button": "^2.2.0",
     "react-tooltip-component": "^0.3.0",
+    "react-transition-group": "^2.2.1",
     "react-trigger-change": "^1.0.2",
+    "reactify": "^1.1.1",
     "readable-stream": "^2.3.3",
     "recompose": "^0.25.0",
     "redux": "^3.0.5",
@@ -145,13 +166,14 @@
     "sandwich-expando": "^1.1.3",
     "semaphore": "^1.0.5",
     "semver": "^5.4.1",
+    "shallow-copy": "0.0.1",
     "sw-stream": "^2.0.0",
     "textarea-caret": "^3.0.1",
     "through2": "^2.0.3",
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "^0.20.1",
-    "web3-provider-engine": "^13.5.0",
+    "web3-provider-engine": "^13.5.6",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
@@ -167,43 +189,52 @@
     "babelify": "^8.0.0",
     "beefy": "^2.1.5",
     "brfs": "^1.4.3",
-    "browserify": "^14.4.0",
+    "browserify": "^16.1.1",
     "chai": "^4.1.0",
     "chromedriver": "^2.34.1",
+    "compression": "^1.7.1",
     "coveralls": "^3.0.0",
     "deep-freeze-strict": "^1.1.1",
     "del": "^3.0.0",
     "envify": "^4.0.0",
-    "enzyme": "^3.2.0",
+    "enzyme": "^3.3.0",
+    "enzyme-adapter-react-15": "^1.0.5",
     "eslint-plugin-chai": "0.0.1",
     "eslint-plugin-mocha": "^4.9.0",
+    "eslint-plugin-react": "^7.4.0",
     "eth-json-rpc-middleware": "^1.2.7",
     "fs-promise": "^2.0.3",
-    "gulp": "github:gulpjs/gulp#4.0",
+    "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
+    "gulp-babel": "^7.0.0",
     "gulp-eslint": "^4.0.0",
-    "gulp-if": "^2.0.1",
+    "gulp-if": "^2.0.2",
     "gulp-json-editor": "^2.2.1",
     "gulp-livereload": "^3.8.1",
     "gulp-replace": "^0.6.1",
     "gulp-sourcemaps": "^2.6.0",
+    "gulp-stylefmt": "^1.1.0",
+    "gulp-stylelint": "^7.0.0",
+    "gulp-uglify": "^3.0.0",
+    "gulp-uglify-es": "^1.0.1",
     "gulp-util": "^3.0.7",
-    "gulp-watch": "^4.3.5",
+    "gulp-watch": "^5.0.0",
     "gulp-zip": "^4.0.0",
     "isomorphic-fetch": "^2.2.1",
     "jsdom": "^11.2.0",
     "jsdom-global": "^3.0.2",
     "jshint-stylish": "~2.2.1",
-    "karma": "^1.7.1",
+    "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-firefox-launcher": "^1.0.1",
     "karma-qunit": "^1.2.1",
     "lodash.assign": "^4.0.6",
-    "mocha": "^4.0.0",
+    "mocha": "^5.0.0",
     "mocha-eslint": "^4.0.0",
     "mocha-jsdom": "^1.1.0",
     "mocha-sinon": "^2.0.0",
     "nock": "^9.0.14",
+    "node-sass": "^4.7.2",
     "nyc": "^11.0.3",
     "open": "0.0.5",
     "prompt": "^1.0.0",
@@ -213,9 +244,11 @@
     "react-test-renderer": "^15.6.2",
     "react-testutils-additions": "^15.2.0",
     "selenium-webdriver": "^3.5.0",
+    "redux-test-utils": "^0.2.2",
     "sinon": "^4.0.0",
+    "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",
-    "testem": "^1.10.3",
+    "testem": "^2.0.0",
     "uglifyify": "^4.0.2",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",