m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #2190 from MetaMask/Version-3.10.5

Browse Source 
Version 3.10.5
This commit is contained in:
kumavis 2017-09-27 13:55:39 -07:00 committed by GitHub
commit 496fd2a5ba
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@
## Current Master ## Current Master
## 3.10.5 2017-9-27
- Fix block gas limit estimation.
## 3.10.4 2017-9-27 ## 3.10.4 2017-9-27
- Fix bug that could mis-render token balances when very small. (Not actually included in 3.9.9) - Fix bug that could mis-render token balances when very small. (Not actually included in 3.9.9)

2
app/manifest.json
View File

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

2
app/scripts/controllers/transactions.js
View File

@ -52,7 +52,7 @@ module.exports = class TransactionController extends EventEmitter {
provider: this.provider, provider: this.provider,
nonceTracker: this.nonceTracker, nonceTracker: this.nonceTracker,
getBalance: (address) => { getBalance: (address) => {
const account = this.accountTracker.getState().accounts[address] const account = this.accountTracker.store.getState().accounts[address]
if (!account) return if (!account) return
return account.balance return account.balance
}, },

2
app/scripts/keyring-controller.js
View File

@ -568,7 +568,7 @@ class KeyringController extends EventEmitter {
clearKeyrings () { clearKeyrings () {
let accounts let accounts
try { try {
accounts = Object.keys(this.accountTracker.getState()) accounts = Object.keys(this.accountTracker.store.getState())
} catch (e) { } catch (e) {
accounts = [] accounts = []
} }

4
app/scripts/lib/account-tracker.js
View File

@ -11,6 +11,7 @@ const async = require('async')
const EthQuery = require('eth-query') const EthQuery = require('eth-query')
const ObservableStore = require('obs-store') const ObservableStore = require('obs-store')
const EventEmitter = require('events').EventEmitter const EventEmitter = require('events').EventEmitter
const ethUtil = require('ethereumjs-util')
function noop () {} function noop () {}
@ -59,8 +60,9 @@ class AccountTracker extends EventEmitter {
_updateForBlock (block) { _updateForBlock (block) {
const blockNumber = '0x' + block.number.toString('hex') const blockNumber = '0x' + block.number.toString('hex')
this._currentBlockNumber = blockNumber 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([ async.parallel([
this._updateAccounts.bind(this), this._updateAccounts.bind(this),