From 0e54c5aecd94c825383bfa5d95a12649d10f3e41 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Wed, 29 Apr 2020 16:01:22 -0230 Subject: [PATCH] Don't updatePendingTxs outside of block updates (#8445) * Don't updatePendingTxs outside of block updates Refs #8377 Reverts 507397f6c (#5431) * Check for new block data on unlock --- app/scripts/controllers/transactions/index.js | 1 - app/scripts/metamask-controller.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index 852f0dcc6..204b11f62 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -757,7 +757,6 @@ export default class TransactionController extends EventEmitter { Updates the memStore in transaction controller */ _updateMemstore () { - this.pendingTxTracker.updatePendingTxs() const unapprovedTxs = this.txStateManager.getUnapprovedTxList() const currentNetworkTxList = this.txStateManager.getFilteredTxList({ metamaskNetworkId: this.getNetwork(), diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 42464a9d9..b2a25b81d 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -779,7 +779,7 @@ export default class MetamaskController extends EventEmitter { await this.diagnostics.reportMultipleKeyrings(nonSimpleKeyrings) } - await this.txController.pendingTxTracker.updatePendingTxs() + await this.blockTracker.checkForLatestBlock() try { const threeBoxSyncingAllowed = this.threeBoxController.getThreeBoxSyncingState()