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

When checking pending txs, check for successful txs with same nonce.

Browse Source 
If a successful tx with the same nonce exists, transition tx to the failed state.

Fixes #2294
This commit is contained in:
Dan Finlay 2017-10-06 12:51:13 -07:00
parent 94513cae7b
commit a417fab0eb
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/scripts/lib/pending-tx-tracker.js
View File

@ -25,6 +25,7 @@ module.exports = class PendingTransactionTracker extends EventEmitter {
// default is one day // default is one day
this.retryTimePeriod = config.retryTimePeriod || 86400000 this.retryTimePeriod = config.retryTimePeriod || 86400000
this.getPendingTransactions = config.getPendingTransactions this.getPendingTransactions = config.getPendingTransactions
this.getCompletedTransactions = config.getCompletedTransactions
this.publishTransaction = config.publishTransaction this.publishTransaction = config.publishTransaction
} }
@ -120,6 +121,7 @@ module.exports = class PendingTransactionTracker extends EventEmitter {
async _checkPendingTx (txMeta) { async _checkPendingTx (txMeta) {
const txHash = txMeta.hash const txHash = txMeta.hash
const txId = txMeta.id const txId = txMeta.id
// extra check in case there was an uncaught error during the // extra check in case there was an uncaught error during the
// signature and submission process // signature and submission process
if (!txHash) { if (!txHash) {
@ -128,6 +130,15 @@ module.exports = class PendingTransactionTracker extends EventEmitter {
this.emit('tx:failed', txId, noTxHashErr) this.emit('tx:failed', txId, noTxHashErr)
return return
} }
// If another tx with the same nonce is mined, set as failed.
const taken = await this._checkIfNonceIsTaken(txMeta)
if (taken) {
const nonceTakenErr = new Error('Another transaction with this nonce has been mined.')
nonceTakenErr.name = 'NonceTakenErr'
return this.emit('tx:failed', txId, nonceTakenErr)
}
// get latest transaction status // get latest transaction status
let txParams let txParams
try { try {
@ -159,4 +170,13 @@ module.exports = class PendingTransactionTracker extends EventEmitter {
} }
nonceGlobalLock.releaseLock() nonceGlobalLock.releaseLock()
} }
async _checkIfNonceIsTaken (txMeta) {
const completed = this.getCompletedTransactions()
const sameNonce = completed.filter((otherMeta) => {
return otherMeta.txParams.nonce === txMeta.txParams.nonce
})
return sameNonce.length > 0
}
} }