aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/scripts/controllers/transactions.js5
-rw-r--r--package.json2
2 files changed, 3 insertions, 4 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
diff --git a/package.json b/package.json
index d2fce188a..9ed2e7ae0 100644
--- a/package.json
+++ b/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"
},