Merge branch 'master' into UpdateMetadata

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- Now detects and blocks known phishing sites.
 - No longer validate nonce client-side in retry loop.
 - Fix bug where insufficient balance error was sometimes shown on successful transactions.
 

app/manifest.json

@@ -52,6 +52,12 @@
       ],
       "run_at": "document_start",
       "all_frames": true
+    },
+    {
+      "run_at": "document_end",
+      "matches": ["http://*/*", "https://*/*"],
+      "js": ["scripts/blacklister.js"],
+      "css": ["css/blacklister.css"]
     }
   ],
   "permissions": [

app/scripts/blacklister.js

@@ -0,0 +1,13 @@
+const blacklistedDomains = require('etheraddresslookup/blacklists/domains.json')
+
+function detectBlacklistedDomain() {
+  var strCurrentTab = window.location.hostname
+  if (blacklistedDomains && blacklistedDomains.includes(strCurrentTab)) {
+    window.location.href = 'https://metamask.io/phishing.html'
+  }
+}
+
+window.addEventListener('load', function() {
+  detectBlacklistedDomain()
+})
+

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 8.0.0
+    version: 8.1.4
 dependencies:
   pre:
     - "npm i -g testem"

gulpfile.js

@@ -172,6 +172,7 @@ gulp.task('default', ['lint'], function () {
 const jsFiles = [
   'inpage',
   'contentscript',
+  'blacklister',
   'background',
   'popup',
 ]

package.json

@@ -7,7 +7,7 @@
     "start": "npm run dev",
     "dev": "gulp dev --debug",
     "disc": "gulp disc --debug",
-    "clear": "rm -rf node_modules/eth-contract-metadata",
+    "clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/etheraddresslookup",
     "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\"",
@@ -69,6 +69,7 @@
     "eth-sig-util": "^1.1.1",
     "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",