Merge pull request #2191 from MetaMask/direct-block-trackerv3.10.5

Fix for direct use of eth-block-tracker

2 files changed, 3 insertions, 5 deletions

diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js
index 07fc32b10..cdc21282d 100644
--- a/app/scripts/lib/account-tracker.js
+++ b/app/scripts/lib/account-tracker.js
@@ -11,7 +11,6 @@ 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 () {}
 
 
@@ -58,9 +57,8 @@ class AccountTracker extends EventEmitter {
   //
 
   _updateForBlock (block) {
-    const blockNumber = '0x' + block.number.toString('hex')
-    this._currentBlockNumber = blockNumber
-    const currentBlockGasLimit = ethUtil.addHexPrefix(block.gasLimit.toString())
+    this._currentBlockNumber = block.number
+    const currentBlockGasLimit = block.gasLimit
 
     this.store.updateState({ currentBlockGasLimit })
 
diff --git a/app/scripts/lib/pending-tx-tracker.js b/app/scripts/lib/pending-tx-tracker.js
index b07a6bd39..b97cec9ce 100644
--- a/app/scripts/lib/pending-tx-tracker.js
+++ b/app/scripts/lib/pending-tx-tracker.js
@@ -53,7 +53,7 @@ module.exports = class PendingTransactionTracker extends EventEmitter {
     })
   }
 
-  queryPendingTxs ({oldBlock, newBlock}) {
+  queryPendingTxs ({ oldBlock, newBlock }) {
     // check pending transactions on start
     if (!oldBlock) {
       this._checkPendingTxs()