Backport "Don't updatePendingTxs outside of block updates (#8445)" (#…

…8474) Backport #8445 to v7.7.9. Original commit description: * Don't updatePendingTxs outside of block updates Refs #8377 Reverts 507397f (#5431) * Check for new block data on unlock Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
MetaMask · Apr 30, 2020 · 14d4c10 · 14d4c10
1 parent 2d36d42
commit 14d4c10
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
@@ -724,7 +724,6 @@ class TransactionController extends EventEmitter {
     Updates the memStore in transaction controller
   */
   _updateMemstore () {
-    this.pendingTxTracker.updatePendingTxs()
     const unapprovedTxs = this.txStateManager.getUnapprovedTxList()
     const selectedAddressTxList = this.txStateManager.getFilteredTxList({
       from: this.getSelectedAddress(),

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -767,7 +767,7 @@ module.exports = class MetamaskController extends EventEmitter {
     }
 
     await this.preferencesController.syncAddresses(accounts)
-    await this.txController.pendingTxTracker.updatePendingTxs()
+    await this.blockTracker.checkForLatestBlock()
 
     try {
       const threeBoxSyncingAllowed = this.threeBoxController.getThreeBoxSyncingState()