aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-06-17 07:44:59 +0800
committerGitHub <noreply@github.com>2017-06-17 07:44:59 +0800
commit42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172 (patch)
tree084921687dc603c197774274bbcd5669274e74a2
parentfc3f83ac7480af43e0f91f36a6c64f61c2981f3c (diff)
parent5f8e74e0aa7eed37fc86a84f1495cc65030e9136 (diff)
downloadtangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.tar.gz
tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.tar.zst
tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.zip
Merge pull request #1623 from MetaMask/checkTxs
Check txs
-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 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)
diff --git a/package.json b/package.json
index 7ee5dc5be..3cace3250 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"
},