m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

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

Browse Source 
* Don't updatePendingTxs outside of block updates

Refs #8377

Reverts 507397f6c (#5431)

* Check for new block data on unlock
This commit is contained in:
Whymarrh Whitby 2020-04-29 16:01:22 -02:30 committed by GitHub
parent 53feb20803
commit 0e54c5aecd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/controllers/transactions/index.js
View File

@ -757,7 +757,6 @@ export default class TransactionController extends EventEmitter {
Updates the memStore in transaction controller Updates the memStore in transaction controller
*/ */
_updateMemstore () { _updateMemstore () {
this.pendingTxTracker.updatePendingTxs()
const unapprovedTxs = this.txStateManager.getUnapprovedTxList() const unapprovedTxs = this.txStateManager.getUnapprovedTxList()
const currentNetworkTxList = this.txStateManager.getFilteredTxList({ const currentNetworkTxList = this.txStateManager.getFilteredTxList({
metamaskNetworkId: this.getNetwork(), metamaskNetworkId: this.getNetwork(),

2
app/scripts/metamask-controller.js
View File

@ -779,7 +779,7 @@ export default class MetamaskController extends EventEmitter {
await this.diagnostics.reportMultipleKeyrings(nonSimpleKeyrings) await this.diagnostics.reportMultipleKeyrings(nonSimpleKeyrings)
} }
await this.txController.pendingTxTracker.updatePendingTxs() await this.blockTracker.checkForLatestBlock()
try { try {
const threeBoxSyncingAllowed = this.threeBoxController.getThreeBoxSyncingState() const threeBoxSyncingAllowed = this.threeBoxController.getThreeBoxSyncingState()