aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-09-27 04:37:13 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-09-27 04:38:27 +0800
commit2ed8d579daa4d33c38891ac77d1415fcd237a187 (patch)
tree65ad594f6e423ba9f2317cff92516f5d9e221e62
parentb654eb9b1f37cd3757e4614bb048884ab89d2986 (diff)
downloadtangerine-wallet-browser-2ed8d579daa4d33c38891ac77d1415fcd237a187.tar
tangerine-wallet-browser-2ed8d579daa4d33c38891ac77d1415fcd237a187.tar.gz
tangerine-wallet-browser-2ed8d579daa4d33c38891ac77d1415fcd237a187.tar.bz2
tangerine-wallet-browser-2ed8d579daa4d33c38891ac77d1415fcd237a187.tar.lz
tangerine-wallet-browser-2ed8d579daa4d33c38891ac77d1415fcd237a187.tar.xz
tangerine-wallet-browser-2ed8d579daa4d33c38891ac77d1415fcd237a187.tar.zst
tangerine-wallet-browser-2ed8d579daa4d33c38891ac77d1415fcd237a187.zip
listen for the blocke event on the block tracker instead of rawBlock on the provider
-rw-r--r--app/scripts/controllers/network.js1
-rw-r--r--app/scripts/controllers/transactions.js2
2 files changed, 1 insertions, 2 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 6daedbb67..00bdca2c3 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -52,7 +52,6 @@ module.exports = class NetworkController extends EventEmitter {
// apply the listners created by other controllers
const blockTrackerHandlers = this.provider._blockTracker.proxyEventHandlers
this.provider.setTarget(this._provider)
-
this.provider._blockTracker = createEventEmitterProxy(this._provider._blockTracker, blockTrackerHandlers)
this.emit('networkDidChange')
}
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index fb3be6073..4e52a3c14 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -70,7 +70,7 @@ module.exports = class TransactionController extends EventEmitter {
this.pendingTxTracker.on('txFailed', this.setTxStatusFailed.bind(this))
this.pendingTxTracker.on('txConfirmed', this.setTxStatusConfirmed.bind(this))
- this.blockTracker.on('rawBlock', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker))
+ this.blockTracker.on('block', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker))
// this is a little messy but until ethstore has been either
// removed or redone this is to guard against the race condition
// where ethStore hasent been populated by the results yet