Merge branch 'master' into NewUI

CHANGELOG.md

@@ -5,6 +5,10 @@
 - Replace account scren with an account drop-down menu.
 - Replace confusing buttons with an new account-specific drop-down menu.
 
+## 3.9.5 2017-8-04
+
+- Improved phishing detection configuration update rate 
+
 ## 3.9.4 2017-8-03
 
 - Fixed bug that prevented transactions from being rejected.

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "3.9.4",
+  "version": "3.9.5",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",

app/scripts/controllers/blacklist.js

@@ -4,8 +4,8 @@ const PhishingDetector = require('eth-phishing-detect/src/detector')
 
 // compute phishing lists
 const PHISHING_DETECTION_CONFIG = require('eth-phishing-detect/src/config.json')
-// every ten minutes
+// every four minutes
-const POLLING_INTERVAL = 10 * 60 * 1000
+const POLLING_INTERVAL = 4 * 60 * 1000
 
 class BlacklistController {
 
@@ -41,6 +41,7 @@ class BlacklistController {
 
   scheduleUpdates () {
     if (this._phishingUpdateIntervalRef) return
+    this.updatePhishingList()
     this._phishingUpdateIntervalRef = setInterval(() => {
       this.updatePhishingList()
     }, POLLING_INTERVAL)

package.json

@@ -68,7 +68,7 @@
     "eth-bin-to-ops": "^1.0.1",
     "eth-contract-metadata": "^1.1.4",
     "eth-hd-keyring": "^1.1.1",
-    "eth-phishing-detect": "^1.1.0",
+    "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.2.2",
     "eth-simple-keyring": "^1.1.1",