Merge branch 'master' into mascara-deploy

1 files changed, 167 insertions, 79 deletions

diff --git a/package.json b/package.json
index b892653fa..826d06c32 100644
--- a/package.json
+++ b/package.json
@@ -6,19 +6,31 @@
   "scripts": {
     "start": "npm run dev",
     "dev": "gulp dev --debug",
-    "disc": "gulp disc --debug",
-    "dist": "gulp dist --disableLiveReload",
-    "test": "npm run lint && npm run test-unit && npm run test-integration",
-    "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"",
-    "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2",
-    "lint": "gulp lint",
-    "buildCiUnits": "node test/integration/index.js",
-    "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
-    "genStates": "node development/genStates.js",
-    "ui": "npm run genStates && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
+    "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 ./",
-    "buildMock": "npm run genStates && browserify ./mock-dev.js -o ./development/bundle.js",
-    "testem": "npm run buildMock && testem",
+    "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
+    "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:integration",
+    "test:unit": "METAMASK_ENV=test mocha --exit --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
+    "test:single": "METAMASK_ENV=test mocha --require test/helper.js",
+    "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara",
+    "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",
+    "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",
+    "test:flat:build": "npm run test:flat:build:ui && npm run test:flat:build:tests",
+    "test:flat:build:tests": "node test/integration/index.js",
+    "test:flat:build:states": "node development/genStates.js",
+    "test:flat:build:ui": "npm run test:flat:build:states && browserify ./mock-dev.js -o ./development/bundle.js",
+    "test:mascara": "npm run test:mascara:build && karma start test/mascara.conf.js",
+    "test:mascara:build": "mkdir -p dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests",
+    "test:mascara:build:ui": "browserify mascara/test/test-ui.js -o dist/mascara/ui.js",
+    "test:mascara:build:background": "browserify mascara/src/background.js -o dist/mascara/background.js",
+    "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
+    "lint": "gulp lint",
+    "lint:fix": "gulp lint:fix",
+    "disc": "gulp disc --debug",
     "announce": "node development/announcer.js",
     "generateNotice": "node notices/notice-generator.js",
     "deleteNotice": "node notices/notice-delete.js"
@@ -29,137 +41,213 @@
         "babelify",
         {
           "presets": [
-            "es2015"
+            "es2015",
+            "stage-0"
           ]
         }
       ],
+      "reactify",
       "envify",
       "brfs"
     ]
   },
   "dependencies": {
-    "async": "^1.5.2",
-    "async-q": "^0.3.1",
+    "abi-decoder": "^1.0.9",
+    "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",
-    "client-sw-ready-event": "^3.0.1",
-    "clone": "^1.0.2",
-    "copy-to-clipboard": "^2.0.0",
+    "classnames": "^2.2.5",
+    "client-sw-ready-event": "^3.3.0",
+    "clone": "^2.1.1",
+    "copy-to-clipboard": "^3.0.8",
     "debounce": "^1.0.0",
-    "deep-extend": "^0.4.1",
-    "denodeify": "^1.2.1",
+    "deep-extend": "^0.5.0",
+    "detect-node": "^2.0.3",
     "disc": "^1.3.2",
     "dnode": "^1.2.2",
     "end-of-stream": "^1.1.0",
     "ensnare": "^1.0.0",
+    "eslint-plugin-react": "^7.4.0",
     "eth-bin-to-ops": "^1.0.1",
-    "eth-hd-keyring": "^1.1.1",
-    "eth-query": "^1.0.3",
-    "eth-sig-util": "^1.1.1",
-    "eth-simple-keyring": "^1.1.1",
-    "ethereumjs-tx": "^1.2.5",
-    "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+    "eth-block-tracker": "^2.3.0",
+    "eth-json-rpc-filters": "^1.2.5",
+    "eth-json-rpc-infura": "^3.0.0",
+    "eth-keyring-controller": "^2.1.4",
+    "eth-contract-metadata": "^1.1.5",
+    "eth-hd-keyring": "^1.2.1",
+    "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",
-    "ethjs-ens": "^1.0.2",
-    "express": "^4.14.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",
+    "express": "^4.15.5",
     "extension-link-enabler": "^1.0.0",
     "extensionizer": "^1.0.0",
-    "gulp-eslint": "^2.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": "^4.0.0",
+    "gulp-eslint": "^4.0.0",
+    "gulp-sass": "^3.1.0",
     "hat": "0.0.3",
-    "identicon.js": "^1.2.1",
+    "human-standard-token-abi": "^1.0.2",
+    "idb-global": "^2.1.0",
+    "identicon.js": "^2.3.1",
     "iframe": "^1.0.0",
-    "iframe-stream": "^1.0.2",
+    "iframe-stream": "^3.0.0",
     "inject-css": "^0.1.1",
     "jazzicon": "^1.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",
-    "menu-droppo": "^1.1.0",
+    "metamascara": "^1.3.1",
     "metamask-logo": "^2.1.2",
     "mississippi": "^1.2.0",
     "mkdirp": "^0.5.1",
     "multiplex": "^6.7.0",
-    "obs-store": "^2.3.1",
+    "number-to-bn": "^1.7.0",
+    "obj-multiplex": "^1.0.0",
+    "obs-store": "^3.0.0",
     "once": "^1.3.3",
+    "percentile": "^1.2.0",
     "ping-pong-stream": "^1.0.0",
     "pojo-migrator": "^2.1.0",
     "polyfill-crypto.getrandomvalues": "^1.0.0",
-    "post-message-stream": "^1.0.0",
+    "post-message-stream": "^3.0.0",
     "promise-filter": "^1.1.0",
     "promise-to-callback": "^1.0.0",
     "pump": "^1.0.2",
     "pumpify": "^1.3.4",
     "qrcode-npm": "0.0.3",
-    "react": "^15.0.2",
-    "react-addons-css-transition-group": "^15.0.2",
-    "react-dom": "^15.0.2",
-    "react-hyperscript": "^2.2.2",
-    "react-markdown": "^2.3.0",
-    "react-redux": "^4.4.5",
-    "react-select": "^1.0.0-rc.2",
-    "react-simple-file-input": "^1.0.0",
+    "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",
+    "react-simple-file-input": "^2.0.0",
+    "react-tippy": "^1.2.2",
+    "react-toggle-button": "^2.2.0",
     "react-tooltip-component": "^0.3.0",
-    "readable-stream": "^2.1.2",
+    "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",
-    "redux-logger": "^2.10.2",
-    "redux-thunk": "^1.0.2",
-    "request-promise": "^4.1.1",
-    "sandwich-expando": "^1.0.5",
+    "redux-logger": "^3.0.6",
+    "redux-thunk": "^2.2.0",
+    "request-promise": "^4.2.1",
+    "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",
-    "three.js": "^0.73.2",
-    "through2": "^2.0.1",
+    "through2": "^2.0.3",
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
-    "web3": "0.18.2",
-    "web3-provider-engine": "^11.0.2",
-    "web3-stream-provider": "^2.0.6",
+    "web3": "^0.20.1",
+    "web3-provider-engine": "^13.5.6",
+    "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
   "devDependencies": {
-    "babel-eslint": "^6.0.5",
+    "babel-core": "^6.24.1",
+    "babel-eslint": "^8.0.0",
+    "babel-plugin-transform-async-to-generator": "^6.24.1",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-polyfill": "^6.23.0",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-0": "^6.24.1",
     "babel-register": "^6.7.2",
-    "babelify": "^7.2.0",
+    "babelify": "^8.0.0",
     "beefy": "^2.1.5",
     "brfs": "^1.4.3",
-    "browserify": "^13.0.0",
-    "chai": "^3.5.0",
-    "clone": "^1.0.2",
+    "browserify": "^14.4.0",
+    "chai": "^4.1.0",
+    "compression": "^1.7.1",
+    "coveralls": "^3.0.0",
     "deep-freeze-strict": "^1.1.1",
-    "del": "^2.2.0",
+    "del": "^3.0.0",
     "envify": "^4.0.0",
-    "fs-promise": "^1.0.0",
-    "gulp": "github:gulpjs/gulp#4.0",
-    "gulp-if": "^2.0.1",
+    "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#6d71a658c61edb3090221579d8f97dbe086ba2ed",
+    "gulp-babel": "^7.0.0",
+    "gulp-eslint": "^4.0.0",
+    "gulp-if": "^2.0.2",
     "gulp-json-editor": "^2.2.1",
     "gulp-livereload": "^3.8.1",
-    "gulp-replace": "^0.5.4",
-    "gulp-sourcemaps": "^1.6.0",
+    "gulp-replace": "^0.6.1",
+    "gulp-sourcemaps": "^2.6.0",
+    "gulp-stylefmt": "^1.1.0",
+    "gulp-stylelint": "^4.0.0",
+    "gulp-uglify": "^3.0.0",
+    "gulp-uglify-es": "^1.0.0",
     "gulp-util": "^3.0.7",
-    "gulp-watch": "^4.3.5",
-    "gulp-zip": "^3.2.0",
+    "gulp-watch": "^5.0.0",
+    "gulp-zip": "^4.0.0",
     "isomorphic-fetch": "^2.2.1",
-    "jsdom": "^8.1.0",
-    "jsdom-global": "^1.7.0",
-    "jshint-stylish": "~0.1.5",
+    "jsdom": "^11.1.0",
+    "jsdom-global": "^3.0.2",
+    "jshint-stylish": "~2.2.1",
+    "karma": "^1.7.1",
+    "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": "^2.4.5",
-    "mocha-eslint": "^2.1.1",
+    "mocha": "^5.0.0",
+    "mocha-eslint": "^4.0.0",
     "mocha-jsdom": "^1.1.0",
-    "mocha-sinon": "^1.1.5",
-    "nock": "^8.0.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",
     "qs": "^6.2.0",
-    "qunit": "^0.9.1",
-    "sinon": "^1.17.3",
+    "qunitjs": "^2.4.1",
+    "react-addons-test-utils": "^15.5.1",
+    "react-test-renderer": "^15.6.2",
+    "react-testutils-additions": "^15.2.0",
+    "redux-test-utils": "^0.2.2",
+    "sinon": "^4.0.0",
+    "stylelint-config-standard": "^17.0.0",
     "tape": "^4.5.1",
-    "testem": "^1.10.3",
-    "uglifyify": "^3.0.1",
-    "vinyl-buffer": "^1.0.0",
-    "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.7.0"
+    "testem": "^2.0.0",
+    "uglifyify": "^4.0.2",
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0",
+    "watchify": "^3.9.0"
   },
   "engines": {
     "node": ">=0.8.0"