Merge branch 'master' into NewUI-flat

1 files changed, 37 insertions, 34 deletions

diff --git a/package.json b/package.json
index 7dc1222d7..25dbc1ee9 100644
--- a/package.json
+++ b/package.json
@@ -49,19 +49,20 @@
     ]
   },
   "dependencies": {
-    "async": "^1.5.2",
+    "async": "^2.5.0",
     "await-semaphore": "^0.1.1",
     "babel-runtime": "^6.23.0",
     "bip39": "^2.2.0",
     "bluebird": "^3.5.0",
     "boron": "^0.2.3",
+    "bn.js": "^4.11.7",
     "browser-passworder": "^2.0.3",
     "browserify-derequire": "^0.9.4",
     "client-sw-ready-event": "^3.3.0",
-    "clone": "^1.0.2",
-    "copy-to-clipboard": "^2.0.0",
+    "clone": "^2.1.1",
+    "copy-to-clipboard": "^3.0.8",
     "debounce": "^1.0.0",
-    "deep-extend": "^0.4.1",
+    "deep-extend": "^0.5.0",
     "detect-node": "^2.0.3",
     "disc": "^1.3.2",
     "dnode": "^1.2.2",
@@ -76,7 +77,7 @@
     "eth-simple-keyring": "^1.1.1",
     "eth-token-tracker": "^1.1.2",
     "ethereumjs-tx": "^1.3.0",
-    "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+    "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "ethereumjs-wallet": "^0.6.0",
     "ethjs-ens": "^2.0.0",
     "ethjs-query": "^0.2.6",
@@ -85,13 +86,14 @@
     "extensionizer": "^1.0.0",
     "fast-levenshtein": "^2.0.6",
     "gulp-autoprefixer": "^4.0.0",
-    "gulp-eslint": "^2.0.0",
     "gulp-sass": "^3.1.0",
+    "gulp": "github:gulpjs/gulp#4.0",
+    "gulp-eslint": "^4.0.0",
     "hat": "0.0.3",
-    "idb-global": "^1.0.0",
-    "identicon.js": "^1.2.1",
+    "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",
     "loglevel": "^1.4.1",
@@ -105,7 +107,7 @@
     "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",
@@ -114,9 +116,9 @@
     "react": "^15.0.2",
     "react-addons-css-transition-group": "^15.6.0",
     "react-dom": "^15.5.4",
-    "react-hyperscript": "^2.2.2",
+    "react-hyperscript": "^3.0.0",
     "react-markdown": "^2.3.0",
-    "react-redux": "^4.4.5",
+    "react-redux": "^5.0.5",
     "react-select": "^1.0.0-rc.2",
     "react-simple-file-input": "^1.0.0",
     "react-tooltip-component": "^0.3.0",
@@ -124,25 +126,24 @@
     "reactify": "^1.1.1",
     "readable-stream": "^2.1.2",
     "redux": "^3.0.5",
-    "redux-logger": "^2.10.2",
-    "redux-thunk": "^1.0.2",
+    "redux-logger": "^3.0.6",
+    "redux-thunk": "^2.2.0",
     "request-promise": "^4.1.1",
     "sandwich-expando": "^1.0.5",
     "semaphore": "^1.0.5",
     "sw-stream": "^2.0.0",
     "textarea-caret": "^3.0.1",
-    "three.js": "^0.73.2",
     "through2": "^2.0.3",
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
-    "web3": "0.19.1",
+    "web3": "^0.20.1",
     "web3-provider-engine": "^13.2.9",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
   "devDependencies": {
     "babel-core": "^6.24.1",
-    "babel-eslint": "^6.0.5",
+    "babel-eslint": "^7.2.3",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.23.0",
@@ -151,50 +152,52 @@
     "babelify": "^7.2.0",
     "beefy": "^2.1.5",
     "brfs": "^1.4.3",
-    "browserify": "^13.0.0",
-    "chai": "^3.5.0",
+    "browserify": "^14.4.0",
+    "chai": "^4.1.0",
     "coveralls": "^2.13.1",
     "deep-freeze-strict": "^1.1.1",
-    "del": "^2.2.0",
+    "del": "^3.0.0",
     "envify": "^4.0.0",
     "enzyme": "^2.8.2",
     "eslint-plugin-chai": "0.0.1",
     "eslint-plugin-mocha": "^4.9.0",
-    "fs-promise": "^1.0.0",
+    "eth-json-rpc-middleware": "^1.2.7",
+    "fs-promise": "^2.0.3",
     "gulp": "github:gulpjs/gulp#4.0",
     "gulp-if": "^2.0.1",
     "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-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
-    "gulp-zip": "^3.2.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",
+    "json-rpc-engine": "^3.0.1",
     "lodash.assign": "^4.0.6",
-    "mocha": "^2.4.5",
-    "mocha-eslint": "^2.1.1",
+    "mocha": "^3.4.2",
+    "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",
     "nyc": "^11.0.3",
     "open": "0.0.5",
     "prompt": "^1.0.0",
     "qs": "^6.2.0",
-    "qunit": "^0.9.1",
+    "qunit": "^1.0.0",
     "react-addons-test-utils": "^15.5.1",
     "react-test-renderer": "^15.5.4",
     "react-testutils-additions": "^15.2.0",
     "sinon": "^2.3.8",
     "tape": "^4.5.1",
     "testem": "^1.10.3",
-    "uglifyify": "^3.0.1",
+    "uglifyify": "^4.0.2",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.7.0"
+    "watchify": "^3.9.0"
   },
   "engines": {
     "node": ">=0.8.0"