Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm

2 files changed, 9 insertions, 1 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 6868637e5..e31cb45ed 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -5,6 +5,7 @@ const normalize = require('eth-sig-util').normalize
 const TESTNET_RPC = MetamaskConfig.network.testnet
 const MAINNET_RPC = MetamaskConfig.network.mainnet
 const MORDEN_RPC = MetamaskConfig.network.morden
+const KOVAN_RPC = MetamaskConfig.network.kovan
 
 /* The config-manager is a convenience object
  * wrapping a pojo-migrator.
@@ -150,6 +151,9 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
     case 'morden':
       return MORDEN_RPC
 
+    case 'kovan':
+      return KOVAN_RPC
+
     default:
       return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC
   }
diff --git a/app/scripts/lib/eth-store.js b/app/scripts/lib/eth-store.js
index 8812a507b..243253df2 100644
--- a/app/scripts/lib/eth-store.js
+++ b/app/scripts/lib/eth-store.js
@@ -19,6 +19,8 @@ class EthereumStore extends ObservableStore {
     super({
       accounts: {},
       transactions: {},
+      currentBlockNumber: '0',
+      currentBlockHash: '',
     })
     this._provider = opts.provider
     this._query = new EthQuery(this._provider)
@@ -69,6 +71,8 @@ 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')}`})
     async.parallel([
       this._updateAccounts.bind(this),
       this._updateTransactions.bind(this, blockNumber),
@@ -129,4 +133,4 @@ class EthereumStore extends ObservableStore {
 
 }
 
-module.exports = EthereumStore
\ No newline at end of file
+module.exports = EthereumStore