Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial

1 files changed, 11 insertions, 6 deletions

diff --git a/package.json b/package.json
index 2e66080d6..8cc0e6936 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,14 @@
     "start": "npm run dev",
     "dev": "gulp dev --debug",
     "disc": "gulp disc --debug",
-    "clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/etheraddresslookup",
+    "clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect",
     "dist": "npm run clear && npm install && gulp dist",
     "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\"",
     "single-test": "METAMASK_ENV=test mocha --require test/helper.js",
     "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2",
+    "test-coverage": "nyc npm run test-unit && nyc report --reporter=text-lcov | coveralls",
+    "ci": "npm run lint && npm run test-coverage && npm run test-integration",
     "lint": "gulp lint",
     "buildCiUnits": "node test/integration/index.js",
     "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
@@ -66,19 +68,21 @@
     "eth-bin-to-ops": "^1.0.1",
     "eth-contract-metadata": "^1.1.4",
     "eth-hd-keyring": "^1.1.1",
+    "eth-phishing-detect": "^1.0.2",
     "eth-query": "^2.1.2",
-    "eth-sig-util": "^1.1.1",
+    "eth-sig-util": "^1.2.2",
     "eth-simple-keyring": "^1.1.1",
     "eth-token-tracker": "^1.1.2",
-    "etheraddresslookup": "github:409H/EtherAddressLookup",
     "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "ethereumjs-wallet": "^0.6.0",
     "ethjs-ens": "^2.0.0",
+    "ethjs-query": "^0.2.6",
     "express": "^4.14.0",
     "extension-link-enabler": "^1.0.0",
     "extensionizer": "^1.0.0",
     "gulp-eslint": "^4.0.0",
+    "fast-levenshtein": "^2.0.6",
     "hat": "0.0.3",
     "idb-global": "^2.1.0",
     "identicon.js": "^2.3.1",
@@ -122,12 +126,11 @@
     "semaphore": "^1.0.5",
     "sw-stream": "^2.0.0",
     "textarea-caret": "^3.0.1",
-    "three.js": "^0.77.1",
-    "through2": "^2.0.1",
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "0.20.1",
-    "web3-provider-engine": "^13.2.8",
+    "through2": "^2.0.3",
+    "web3-provider-engine": "^13.2.9",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
@@ -144,6 +147,7 @@
     "brfs": "^1.4.3",
     "browserify": "^14.4.0",
     "chai": "^4.1.0",
+    "coveralls": "^2.13.1",
     "deep-freeze-strict": "^1.1.1",
     "del": "^3.0.0",
     "envify": "^4.0.0",
@@ -170,6 +174,7 @@
     "mocha-jsdom": "^1.1.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",