aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-06-17 07:36:32 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-06-17 07:36:32 +0800
commit5f8e74e0aa7eed37fc86a84f1495cc65030e9136 (patch)
tree53d1b4314fcbed9d407533276e9a345d2b94a37c /app/scripts/controllers
parent3e4f2cf3d3c13c876f7ba1d77e8075ae973b1755 (diff)
downloadtangerine-wallet-browser-5f8e74e0aa7eed37fc86a84f1495cc65030e9136.tar
tangerine-wallet-browser-5f8e74e0aa7eed37fc86a84f1495cc65030e9136.tar.gz
tangerine-wallet-browser-5f8e74e0aa7eed37fc86a84f1495cc65030e9136.tar.bz2
tangerine-wallet-browser-5f8e74e0aa7eed37fc86a84f1495cc65030e9136.tar.lz
tangerine-wallet-browser-5f8e74e0aa7eed37fc86a84f1495cc65030e9136.tar.xz
tangerine-wallet-browser-5f8e74e0aa7eed37fc86a84f1495cc65030e9136.tar.zst
tangerine-wallet-browser-5f8e74e0aa7eed37fc86a84f1495cc65030e9136.zip
put the block listeners back on the provider
Diffstat (limited to 'app/scripts/controllers')
-rw-r--r--app/scripts/controllers/transactions.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 9c20a7f1a..d56a81150 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))
+ this.blockTracker.on('rawBlock', this.checkForTxInBlock.bind(this))
this.blockTracker.on('block', this.resubmitPendingTxs.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('sync', this.queryPendingTxs.bind(this))
this.signEthTx = opts.signTransaction
this.nonceLock = Semaphore(1)