Merge branch 'master' into i#1203MainNetSwitch

1 files changed, 8 insertions, 2 deletions

diff --git a/app/scripts/lib/eth-store.js b/app/scripts/lib/eth-store.js
index 8812a507b..ebba98f5c 100644
--- a/app/scripts/lib/eth-store.js
+++ b/app/scripts/lib/eth-store.js
@@ -10,7 +10,7 @@
 const async = require('async')
 const EthQuery = require('eth-query')
 const ObservableStore = require('obs-store')
-function noop() {}
+function noop () {}
 
 
 class EthereumStore extends ObservableStore {
@@ -19,6 +19,9 @@ class EthereumStore extends ObservableStore {
     super({
       accounts: {},
       transactions: {},
+      currentBlockNumber: '0',
+      currentBlockHash: '',
+      currentBlockGasLimit: '',
     })
     this._provider = opts.provider
     this._query = new EthQuery(this._provider)
@@ -69,6 +72,9 @@ class EthereumStore extends ObservableStore {
   _updateForBlock (block) {
     const blockNumber = '0x' + block.number.toString('hex')
     this._currentBlockNumber = blockNumber
+    this.updateState({ currentBlockNumber: parseInt(blockNumber) })
+    this.updateState({ currentBlockHash: `0x${block.hash.toString('hex')}`})
+    this.updateState({ currentBlockGasLimit: `0x${block.gasLimit.toString('hex')}` })
     async.parallel([
       this._updateAccounts.bind(this),
       this._updateTransactions.bind(this, blockNumber),
@@ -129,4 +135,4 @@ class EthereumStore extends ObservableStore {
 
 }
 
-module.exports = EthereumStore
\ No newline at end of file
+module.exports = EthereumStore