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

Merge branch 'FailLowBalance' into FailingTestForFailingLowBalanceTx

Browse Source
This commit is contained in:
Dan Finlay 2017-07-05 22:43:56 -07:00
commit b2f6ae9ace
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,10 +428,28 @@ module.exports = class TransactionController extends EventEmitter {
const gtBalance = Number.parseInt(txMeta.txParams.value) > Number.parseInt(balance) const gtBalance = Number.parseInt(txMeta.txParams.value) > Number.parseInt(balance)
if (!('retryCount' in txMeta)) txMeta.retryCount = 0 if (!('retryCount' in txMeta)) txMeta.retryCount = 0
// if the value of the transaction is greater then the balance // if the value of the transaction is greater then the balance, fail.
// or the nonce of the transaction is lower then the accounts nonce if (gtBalance) {
// dont resubmit the tx txMeta.err = {
if (gtBalance || txNonce < nonce) return cb() isWarning: true,
message: 'Insufficient balance.',
}
this.updateTx(txMeta)
cb()
return log.error(txMeta.err.message)
}
// if the nonce of the transaction is lower then the accounts nonce, fail.
if (txNonce < nonce) {
txMeta.err = {
isWarning: true,
message: 'Invalid nonce.',
}
this.updateTx(txMeta)
cb()
return log.error(txMeta.err.message)
}
// Only auto-submit already-signed txs: // Only auto-submit already-signed txs:
if (!('rawTx' in txMeta)) return cb() if (!('rawTx' in txMeta)) return cb()