diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-01-11 16:54:09 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-11 16:54:09 +0800 |
commit | 84445b01c487b53f7e6e6dd2b0ba24d40c7764a6 (patch) | |
tree | 86698d36c4edb29c829c51d570a2608c5ff8204a | |
parent | 766c2f5127b055d208a5fe1ede75c588fbc73935 (diff) | |
parent | a9bdc76e408283b97365809801b31faf6f5b5039 (diff) | |
download | tangerine-wallet-browser-84445b01c487b53f7e6e6dd2b0ba24d40c7764a6.tar tangerine-wallet-browser-84445b01c487b53f7e6e6dd2b0ba24d40c7764a6.tar.gz tangerine-wallet-browser-84445b01c487b53f7e6e6dd2b0ba24d40c7764a6.tar.bz2 tangerine-wallet-browser-84445b01c487b53f7e6e6dd2b0ba24d40c7764a6.tar.lz tangerine-wallet-browser-84445b01c487b53f7e6e6dd2b0ba24d40c7764a6.tar.xz tangerine-wallet-browser-84445b01c487b53f7e6e6dd2b0ba24d40c7764a6.tar.zst tangerine-wallet-browser-84445b01c487b53f7e6e6dd2b0ba24d40c7764a6.zip |
Merge pull request #988 from MetaMask/eth_syncing
web3 provider - override eth_syncing and web3_clientVersion
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | app/scripts/metamask-controller.js | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cd13e102..9f1ec6823 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Fix memory leak in RPC Cache +- Override RPC commands eth_syncing and web3_clientVersion - Remove certain non-essential permissions from certain builds. - Add a check for when a tx is included in a block. - Fix bug where browser-solidity would sometimes warn of a contract creation error when there was none. diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 555460f3d..d79fd3cd3 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -13,6 +13,7 @@ const extension = require('./lib/extension') const autoFaucet = require('./lib/auto-faucet') const nodeify = require('./lib/nodeify') const IdStoreMigrator = require('./lib/idStore-migrator') +const version = require('../manifest.json').version module.exports = class MetamaskController extends EventEmitter { @@ -175,6 +176,10 @@ module.exports = class MetamaskController extends EventEmitter { const keyringController = this.keyringController var providerOpts = { + static: { + eth_syncing: false, + web3_clientVersion: `MetaMask/v${version}`, + }, rpcUrl: this.configManager.getCurrentRpcAddress(), // account mgmt getAccounts: (cb) => { |