Merge branch 'master' into i1567-FixInaccurateError

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))
+    this.blockTracker.on('rawBlock', 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('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

package.json

@@ -123,7 +123,7 @@
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "0.18.2",
-    "web3-provider-engine": "^13.0.1",
+    "web3-provider-engine": "^13.0.3",
     "web3-stream-provider": "^2.0.6",
     "xtend": "^4.0.1"
   },