transactions - block nonce-tracker while updating pending transactions

1 files changed, 3 insertions, 0 deletions

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 1fc48aadd..5f3d84ebe 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -484,12 +484,15 @@ module.exports = class TransactionController extends EventEmitter {
   // if confirmed sets the tx status as 'confirmed'
   async _checkPendingTxs () {
     const signedTxList = this.getFilteredTxList({status: 'submitted'})
+    // in order to keep the nonceTracker accurate we block it while updating pending transactions
+    const nonceGlobalLock = await this.nonceTracker.getGlobalLock()
     try {
       await Promise.all(signedTxList.map((txMeta) => this._checkPendingTx(txMeta)))
     } catch (err) {
       console.error('TransactionController - Error updating pending transactions')
       console.error(err)
     }
+    nonceGlobalLock.releaseLock()
   }
 
   async _checkPendingTx (txMeta) {