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

Clear unapprovedTxs on createNewVaultAndRestore (#9026)

Browse Source 
Clear unapproved transactions from txStateManager.transactions on createNewVaultAndRestore
This commit is contained in:
Thomas Huang 2020-07-16 18:37:56 -07:00 committed by GitHub
parent fd2e02274a
commit 7b2218ac6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,4 +793,5 @@ export default class TransactionController extends EventEmitter {
const currentNetworkTxList = this.txStateManager.getTxList(MAX_MEMSTORE_TX_LIST_SIZE) const currentNetworkTxList = this.txStateManager.getTxList(MAX_MEMSTORE_TX_LIST_SIZE)
this.memStore.updateState({ unapprovedTxs, currentNetworkTxList }) this.memStore.updateState({ unapprovedTxs, currentNetworkTxList })
} }
} }

10
app/scripts/controllers/transactions/tx-state-manager.js
View File

@ -508,4 +508,14 @@ export default class TransactionStateManager extends EventEmitter {
const transactionList = this.getFullTxList() const transactionList = this.getFullTxList()
this._saveTxList(transactionList.filter((txMeta) => txMeta.id !== txId)) this._saveTxList(transactionList.filter((txMeta) => txMeta.id !== txId))
} }
/**
* Filters out the unapproved transactions
*/
clearUnapprovedTxs () {
const transactions = this.getFullTxList()
const nonUnapprovedTxs = transactions.filter((tx) => tx.status !== 'unapproved')
this._saveTxList(nonUnapprovedTxs)
}
} }

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

@ -631,6 +631,9 @@ export default class MetamaskController extends EventEmitter {
// clear permissions // clear permissions
this.permissionsController.clearPermissions() this.permissionsController.clearPermissions()
// clear unapproved transactions
this.txController.txStateManager.clearUnapprovedTxs()
// create new vault // create new vault
const vault = await keyringController.createNewVaultAndRestore(password, seed) const vault = await keyringController.createNewVaultAndRestore(password, seed)

19
test/unit/app/controllers/transactions/tx-state-manager-test.js
View File

@ -598,4 +598,23 @@ describe('TransactionStateManager', function () {
assert.equal(txStateManager.getFullTxList()[0].id, 2, 'txList should have a id of 2') assert.equal(txStateManager.getFullTxList()[0].id, 2, 'txList should have a id of 2')
}) })
}) })
describe('#clearUnapprovedTxs', function () {
it('removes unapproved transactions', function () {
const txMetas = [
{ id: 0, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
{ id: 1, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
{ id: 2, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: otherNetworkId },
{ id: 3, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: otherNetworkId },
]
txMetas.forEach((txMeta) => txStateManager.addTx(txMeta, noop))
txStateManager.clearUnapprovedTxs()
const unapprovedTxList = txStateManager.getFullTxList().filter((tx) => tx.status === 'unapproved')
assert.equal(unapprovedTxList.length, 0)
})
})
}) })