diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-08-05 15:29:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 15:29:10 +0800 |
| commit | a456baea8be1843f1f2a39af3f2b88820d0b8249 (patch) | |
| tree | d30c5603bbca3e045e39c00f08749dc27a7e1fb9 | |
| parent | 3f5b82f7efa713d4927856187108a0e61f5cfb75 (diff) | |
| parent | 2ba5737728d2539fc3bc9015e440f37341219cdc (diff) | |
| download | tangerine-wallet-browser-a456baea8be1843f1f2a39af3f2b88820d0b8249.tar tangerine-wallet-browser-a456baea8be1843f1f2a39af3f2b88820d0b8249.tar.gz tangerine-wallet-browser-a456baea8be1843f1f2a39af3f2b88820d0b8249.tar.bz2 tangerine-wallet-browser-a456baea8be1843f1f2a39af3f2b88820d0b8249.tar.lz tangerine-wallet-browser-a456baea8be1843f1f2a39af3f2b88820d0b8249.tar.xz tangerine-wallet-browser-a456baea8be1843f1f2a39af3f2b88820d0b8249.tar.zst tangerine-wallet-browser-a456baea8be1843f1f2a39af3f2b88820d0b8249.zip | |
Merge branch 'master' into NewUI
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/controllers/blacklist.js | 5 | ||||
| -rw-r--r-- | package.json | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b34878df8..b3e069352 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/app/manifest.json b/app/manifest.json index d5e1937fa..3b9194eb9 100644 --- a/app/manifest.json +++ b/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", diff --git a/app/scripts/controllers/blacklist.js b/app/scripts/controllers/blacklist.js index 7e01fa386..dd671943f 100644 --- a/app/scripts/controllers/blacklist.js +++ b/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 -const POLLING_INTERVAL = 10 * 60 * 1000 +// every four minutes +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) diff --git a/package.json b/package.json index 60987559e..ce8545fc4 100644 --- a/package.json +++ b/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", |