aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-07-12 06:52:19 +0800
committerGitHub <noreply@github.com>2017-07-12 06:52:19 +0800
commit6811fb26793ca71989df2f0c0604e72cbf03ca23 (patch)
treede84f20d9ac31151c27be26af0670c09dc5ae192 /app
parentde967d2dfd2119d2468263ecb9646fd0a92df195 (diff)
parent91ef01be4c2c0a39107e1200c5f94fa5fc7defb7 (diff)
downloadtangerine-wallet-browser-6811fb26793ca71989df2f0c0604e72cbf03ca23.tar
tangerine-wallet-browser-6811fb26793ca71989df2f0c0604e72cbf03ca23.tar.gz
tangerine-wallet-browser-6811fb26793ca71989df2f0c0604e72cbf03ca23.tar.bz2
tangerine-wallet-browser-6811fb26793ca71989df2f0c0604e72cbf03ca23.tar.lz
tangerine-wallet-browser-6811fb26793ca71989df2f0c0604e72cbf03ca23.tar.xz
tangerine-wallet-browser-6811fb26793ca71989df2f0c0604e72cbf03ca23.tar.zst
tangerine-wallet-browser-6811fb26793ca71989df2f0c0604e72cbf03ca23.zip
Merge branch 'master' into 3.8.5
Diffstat (limited to 'app')
-rw-r--r--app/scripts/controllers/transactions.js36
-rw-r--r--app/scripts/lib/tx-utils.js9
-rw-r--r--app/scripts/metamask-controller.js2
-rw-r--r--app/scripts/migrations/016.js41
-rw-r--r--app/scripts/migrations/index.js1
5 files changed, 68 insertions, 21 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 41d70194e..43735a691 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -417,46 +417,42 @@ module.exports = class TransactionController extends EventEmitter {
// only try resubmitting if their are transactions to resubmit
if (!pending.length) return
const resubmit = denodeify(this._resubmitTx.bind(this))
- pending.forEach((txMeta) => resubmit(txMeta)
- .catch((reason) => {
+ pending.forEach((txMeta) => resubmit(txMeta).catch((err) => {
/*
Dont marked as failed if the error is a "known" transaction warning
"there is already a transaction with the same sender-nonce
but higher/same gas price"
*/
- const errorMessage = reason.message.toLowerCase()
+ const errorMessage = err.message.toLowerCase()
const isKnownTx = (
// geth
- errorMessage === 'replacement transaction underpriced'
- || errorMessage.startsWith('known transaction')
+ errorMessage.includes('replacement transaction underpriced')
+ || errorMessage.includes('known transaction')
// parity
- || errorMessage === 'gas price too low to replace'
+ || errorMessage.includes('gas price too low to replace')
+ || errorMessage.includes('transaction with the same hash was already imported')
+ // other
+ || errorMessage.includes('gateway timeout')
)
// ignore resubmit warnings, return early
- if (!isKnownTx) this.setTxStatusFailed(txMeta.id, reason.message)
+ if (isKnownTx) return
+ // encountered real error - transition to error state
+ this.setTxStatusFailed(txMeta.id, {
+ errCode: err.errCode || err,
+ message: err.message,
+ })
}))
}
_resubmitTx (txMeta, cb) {
const address = txMeta.txParams.from
const balance = this.ethStore.getState().accounts[address].balance
- const nonce = Number.parseInt(this.ethStore.getState().accounts[address].nonce)
- const txNonce = Number.parseInt(txMeta.txParams.nonce)
- const gtBalance = Number.parseInt(txMeta.txParams.value) > Number.parseInt(balance)
if (!('retryCount' in txMeta)) txMeta.retryCount = 0
// if the value of the transaction is greater then the balance, fail.
- if (gtBalance) {
+ if (!this.txProviderUtils.sufficientBalance(txMeta.txParams, balance)) {
const message = 'Insufficient balance.'
- this.setTxStatusFailed(txMeta.id, message)
- cb()
- return log.error(message)
- }
-
- // if the nonce of the transaction is lower then the accounts nonce, fail.
- if (txNonce < nonce) {
- const message = 'Invalid nonce.'
- this.setTxStatusFailed(txMeta.id, message)
+ this.setTxStatusFailed(txMeta.id, { message })
cb()
return log.error(message)
}
diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index 149d93102..4e780fcc0 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -118,6 +118,15 @@ module.exports = class txProviderUtils {
}
}
+ sufficientBalance (tx, hexBalance) {
+ const balance = hexToBn(hexBalance)
+ const value = hexToBn(tx.value)
+ const gasLimit = hexToBn(tx.gas)
+ const gasPrice = hexToBn(tx.gasPrice)
+
+ const maxCost = value.add(gasLimit.mul(gasPrice))
+ return balance.gte(maxCost)
+ }
}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 73093dfad..0e7ccbd66 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -367,7 +367,7 @@ module.exports = class MetamaskController extends EventEmitter {
function onResponse (err, request, response) {
if (err) return console.error(err)
if (response.error) {
- console.error('Error in RPC response:\n', response.error)
+ console.error('Error in RPC response:\n', response)
}
if (request.isMetamaskInternal) return
log.info(`RPC (${originDomain}):`, request, '->', response)
diff --git a/app/scripts/migrations/016.js b/app/scripts/migrations/016.js
new file mode 100644
index 000000000..4fc534f1c
--- /dev/null
+++ b/app/scripts/migrations/016.js
@@ -0,0 +1,41 @@
+const version = 16
+
+/*
+
+This migration sets transactions with the 'Gave up submitting tx.' err message
+to a 'failed' stated
+
+*/
+
+const clone = require('clone')
+
+module.exports = {
+ version,
+
+ migrate: function (originalVersionedData) {
+ const versionedData = clone(originalVersionedData)
+ versionedData.meta.version = version
+ try {
+ const state = versionedData.data
+ const newState = transformState(state)
+ versionedData.data = newState
+ } catch (err) {
+ console.warn(`MetaMask Migration #${version}` + err.stack)
+ }
+ return Promise.resolve(versionedData)
+ },
+}
+
+function transformState (state) {
+ const newState = state
+ const transactions = newState.TransactionController.transactions
+ newState.TransactionController.transactions = transactions.map((txMeta) => {
+ if (!txMeta.err) return txMeta
+ if (txMeta.err === 'transaction with the same hash was already imported.') {
+ txMeta.status = 'submitted'
+ delete txMeta.err
+ }
+ return txMeta
+ })
+ return newState
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 651ee6a9c..a4f9c7c4d 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -26,4 +26,5 @@ module.exports = [
require('./013'),
require('./014'),
require('./015'),
+ require('./016'),
]