diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-09-28 04:55:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 04:55:39 +0800 |
| commit | 496fd2a5ba165f37442146e79bb9d4cfb6ba785e (patch) | |
| tree | 8364e8db5da18c5c71fb37b47e877805dbbbfbb8 | |
| parent | 52976d6edc4b69add7c08b1eab77dd18a5a9fdd4 (diff) | |
| parent | 1983e161c658979872bad66f8dd5e9b2c7a616b5 (diff) | |
| download | tangerine-wallet-browser-496fd2a5ba165f37442146e79bb9d4cfb6ba785e.tar.gz tangerine-wallet-browser-496fd2a5ba165f37442146e79bb9d4cfb6ba785e.tar.zst tangerine-wallet-browser-496fd2a5ba165f37442146e79bb9d4cfb6ba785e.zip | |
Merge pull request #2190 from MetaMask/Version-3.10.5
Version 3.10.5
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/controllers/transactions.js | 2 | ||||
| -rw-r--r-- | app/scripts/keyring-controller.js | 2 | ||||
| -rw-r--r-- | app/scripts/lib/account-tracker.js | 4 |
5 files changed, 10 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index eedfa89c5..3ad9888fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Current Master +## 3.10.5 2017-9-27 + +- Fix block gas limit estimation. + ## 3.10.4 2017-9-27 - Fix bug that could mis-render token balances when very small. (Not actually included in 3.9.9) diff --git a/app/manifest.json b/app/manifest.json index 8812f4eea..4d02cd334 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.10.4", + "version": "3.10.5", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 4cd307b07..87521c76b 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -52,7 +52,7 @@ module.exports = class TransactionController extends EventEmitter { provider: this.provider, nonceTracker: this.nonceTracker, getBalance: (address) => { - const account = this.accountTracker.getState().accounts[address] + const account = this.accountTracker.store.getState().accounts[address] if (!account) return return account.balance }, diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 34e008ec4..1a1904621 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -568,7 +568,7 @@ class KeyringController extends EventEmitter { clearKeyrings () { let accounts try { - accounts = Object.keys(this.accountTracker.getState()) + accounts = Object.keys(this.accountTracker.store.getState()) } catch (e) { accounts = [] } diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js index e2892b1ce..07fc32b10 100644 --- a/app/scripts/lib/account-tracker.js +++ b/app/scripts/lib/account-tracker.js @@ -11,6 +11,7 @@ const async = require('async') const EthQuery = require('eth-query') const ObservableStore = require('obs-store') const EventEmitter = require('events').EventEmitter +const ethUtil = require('ethereumjs-util') function noop () {} @@ -59,8 +60,9 @@ class AccountTracker extends EventEmitter { _updateForBlock (block) { const blockNumber = '0x' + block.number.toString('hex') this._currentBlockNumber = blockNumber + const currentBlockGasLimit = ethUtil.addHexPrefix(block.gasLimit.toString()) - this.store.updateState({ currentBlockGasLimit: `0x${block.gasLimit.toString('hex')}` }) + this.store.updateState({ currentBlockGasLimit }) async.parallel([ this._updateAccounts.bind(this), |