aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-12-10 09:24:33 +0800
committerGitHub <noreply@github.com>2017-12-10 09:24:33 +0800
commitc12886a3d500d1570bc7328fd6432a3d741a1028 (patch)
tree60c057b2e901347ac20d2b5030bbbbc81b2864bc
parentd39eb370423e2a2cdd41c47b92796c0d4c829b3b (diff)
parent1ebd5140aaa3dfe98668fad3893834653c5f7109 (diff)
downloadtangerine-wallet-browser-c12886a3d500d1570bc7328fd6432a3d741a1028.tar
tangerine-wallet-browser-c12886a3d500d1570bc7328fd6432a3d741a1028.tar.gz
tangerine-wallet-browser-c12886a3d500d1570bc7328fd6432a3d741a1028.tar.bz2
tangerine-wallet-browser-c12886a3d500d1570bc7328fd6432a3d741a1028.tar.lz
tangerine-wallet-browser-c12886a3d500d1570bc7328fd6432a3d741a1028.tar.xz
tangerine-wallet-browser-c12886a3d500d1570bc7328fd6432a3d741a1028.tar.zst
tangerine-wallet-browser-c12886a3d500d1570bc7328fd6432a3d741a1028.zip
Merge pull request #2718 from MetaMask/ReducePollingInterval
Reduce polling interval
-rw-r--r--CHANGELOG.md4
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/controllers/network.js6
-rw-r--r--package.json2
4 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea7e1cc8d..8e35e8775 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
## Current Master
+## 3.13.2 2017-12-9
+
+- Reduce new block polling interval to 8000 ms, to ease server load.
+
## 3.13.1 2017-12-7
- Allow Dapps to specify a transaction nonce, allowing dapps to propose resubmit and force-cancel transactions.
diff --git a/app/manifest.json b/app/manifest.json
index e95e75f6d..a5645bb7c 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "3.13.1",
+ "version": "3.13.2",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 045bfcc5d..cee918796 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -106,7 +106,11 @@ module.exports = class NetworkController extends EventEmitter {
}
_configureStandardProvider (_providerParams) {
- const providerParams = extend(this._baseProviderParams, _providerParams)
+ const providerParams = extend(this._baseProviderParams, _providerParams, {
+ engineParams: {
+ pollingInterval: 8000,
+ },
+ })
const provider = createMetamaskProvider(providerParams)
this._setProvider(provider)
}
diff --git a/package.json b/package.json
index 5129dd3cb..ebe298aea 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
"valid-url": "^1.0.9",
"vreme": "^3.0.2",
"web3": "^0.20.1",
- "web3-provider-engine": "^13.3.2",
+ "web3-provider-engine": "^13.3.4",
"web3-stream-provider": "^3.0.1",
"xtend": "^4.0.1"
},