Merge branch 'master' into i1567-FixInaccurateError

1 files changed, 2 insertions, 3 deletions

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 042d8e66d..d9d9849b1 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -24,10 +24,9 @@ module.exports = class TransactionController extends EventEmitter {
     this.blockTracker = opts.blockTracker
     this.query = opts.ethQuery
     this.txProviderUtils = new TxProviderUtil(this.query)
-    this.blockTracker.on('block', this.checkForTxInBlock.bind(this))
-    // provider-engine only exploses the 'block' event, not 'latest' for 'sync'
-    this.provider._blockTracker.on('sync', this.queryPendingTxs.bind(this))
+    this.blockTracker.on('rawBlock', this.checkForTxInBlock.bind(this))
     this.blockTracker.on('latest', this.resubmitPendingTxs.bind(this))
+    this.blockTracker.on('sync', this.queryPendingTxs.bind(this))
     this.signEthTx = opts.signTransaction
     this.nonceLock = Semaphore(1)
     this.ethStore = opts.ethStore