From 8d3fec42d0a49c2e0fe7ef3dc504533deb223d95 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 27 Sep 2017 12:09:32 -0700
Subject: [PATCH 1/3] Fix bug where block gas limit was incorrectly parsed.

---
 CHANGELOG.md                       | 2 ++
 app/scripts/lib/account-tracker.js | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eedfa89c5..4898d27fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- 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/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),

From a453eb132d1aa97923df8900f8290a1b3ca1dee3 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 27 Sep 2017 12:10:25 -0700
Subject: [PATCH 2/3] Version 3.10.5

---
 CHANGELOG.md      | 2 ++
 app/manifest.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4898d27fc..3ad9888fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+## 3.10.5 2017-9-27
+
 - Fix block gas limit estimation.
 
 ## 3.10.4 2017-9-27
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",

From 1983e161c658979872bad66f8dd5e9b2c7a616b5 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 27 Sep 2017 12:29:09 -0700
Subject: [PATCH 3/3] Fix accountTracker store references

---
 app/scripts/controllers/transactions.js | 2 +-
 app/scripts/keyring-controller.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 = []
     }