diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-06-17 07:44:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-17 07:44:59 +0800 |
| commit | 42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172 (patch) | |
| tree | 084921687dc603c197774274bbcd5669274e74a2 /app/scripts | |
| parent | fc3f83ac7480af43e0f91f36a6c64f61c2981f3c (diff) | |
| parent | 5f8e74e0aa7eed37fc86a84f1495cc65030e9136 (diff) | |
| download | tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.tar tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.tar.gz tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.tar.bz2 tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.tar.lz tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.tar.xz tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.tar.zst tangerine-wallet-browser-42f3ccd9dc91dde7c82aecaf2eb22625a9ef2172.zip | |
Merge pull request #1623 from MetaMask/checkTxs
Check txs
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 5 |
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) |