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

tx controller - clean code

Browse Source
This commit is contained in:
kumavis 2017-07-07 01:50:48 -07:00 committed by GitHub
parent 8661989f51
commit 34e2f6650d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/scripts/controllers/transactions.js
View File

@ -241,23 +241,24 @@ module.exports = class TransactionController extends EventEmitter {
this.txProviderUtils.publishTransaction(rawTx, (err, txHash) => { this.txProviderUtils.publishTransaction(rawTx, (err, txHash) => {
if (err) { if (err) {
const errorMessage = err.message.toLowerCase()
/* /*
Dont marked as failed if the error is because Dont marked as failed if the error is a "known" transaction warning
it's a "known" transaction
"there is already a transaction with the same sender-nonce "there is already a transaction with the same sender-nonce
but higher/same gas price" but higher/same gas price"
*/ */
const errorMessage = err.message.toLowerCase()
// geth const isKnownTx = (
if (errorMessage !== 'replacement transaction underpriced' // geth
// geth errorMessage === 'replacement transaction underpriced'
&& !errorMessage.startsWith('known transaction') || errorMessage.startsWith('known transaction')
// parity // parity
&& errorMessage !== 'gas price too low to replace' || errorMessage === 'gas price too low to replace'
) { )
this.setTxStatusFailed(txId) // ignore resubmit warnings, return early
} if (isKnownTx) return cb()
// encountered unknown error, set status to failed
this.setTxStatusFailed(txId, err.message)
return cb(err) return cb(err)
} }
this.setTxHash(txId, txHash) this.setTxHash(txId, txHash)