diff options
author | kumavis <aaron@kumavis.me> | 2018-06-14 12:11:04 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-06-14 12:11:04 +0800 |
commit | e9cb6508324c166a2d6efe53cf82c39abd4520b4 (patch) | |
tree | da584d964cf84470250f242923967afa7b6a4822 /app/scripts/controllers/transactions/pending-tx-tracker.js | |
parent | 691ac5d288963f376e34c1711e23bbd58432396f (diff) | |
parent | 66c77dc2bd95f40e2d6113e3b932e25c6dc8030c (diff) | |
download | tangerine-wallet-browser-e9cb6508324c166a2d6efe53cf82c39abd4520b4.tar.gz tangerine-wallet-browser-e9cb6508324c166a2d6efe53cf82c39abd4520b4.tar.zst tangerine-wallet-browser-e9cb6508324c166a2d6efe53cf82c39abd4520b4.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into ValidateEmptyKey
Diffstat (limited to 'app/scripts/controllers/transactions/pending-tx-tracker.js')
-rw-r--r-- | app/scripts/controllers/transactions/pending-tx-tracker.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions/pending-tx-tracker.js b/app/scripts/controllers/transactions/pending-tx-tracker.js index 6e2fcb40b..4e41cdaf8 100644 --- a/app/scripts/controllers/transactions/pending-tx-tracker.js +++ b/app/scripts/controllers/transactions/pending-tx-tracker.js @@ -196,14 +196,14 @@ class PendingTransactionTracker extends EventEmitter { async _checkPendingTxs () { const signedTxList = this.getPendingTransactions() // in order to keep the nonceTracker accurate we block it while updating pending transactions - const nonceGlobalLock = await this.nonceTracker.getGlobalLock() + const { releaseLock } = await this.nonceTracker.getGlobalLock() try { await Promise.all(signedTxList.map((txMeta) => this._checkPendingTx(txMeta))) } catch (err) { log.error('PendingTransactionWatcher - Error updating pending transactions') log.error(err) } - nonceGlobalLock.releaseLock() + releaseLock() } /** |