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

Only cancel pending txs with non continuously high nonces

Browse Source
This commit is contained in:
Dan Finlay 2017-08-23 23:09:57 -07:00
parent f42687d25f
commit 17a71a9b4c
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/scripts/migrations/019.js
View File

@ -30,6 +30,7 @@ module.exports = {
function transformState (state) { function transformState (state) {
const newState = state const newState = state
const transactions = newState.TransactionController.transactions const transactions = newState.TransactionController.transactions
newState.TransactionController.transactions = transactions.map((txMeta, _, txList) => { newState.TransactionController.transactions = transactions.map((txMeta, _, txList) => {
if (txMeta.status !== 'submitted') return txMeta if (txMeta.status !== 'submitted') return txMeta
@ -38,7 +39,14 @@ function transformState (state) {
.filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from) .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
const highestConfirmedNonce = getHighestNonce(confirmedTxs) const highestConfirmedNonce = getHighestNonce(confirmedTxs)
if (parseInt(txMeta.txParams.nonce, 16) > highestConfirmedNonce + 1) { const pendingTxs = txList.filter((tx) => tx.status === 'submitted')
.filter((tx) => tx.txParams.from === txMeta.txParams.from)
.filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
const highestContinuousNonce = getHighestContinuousFrom(pendingTxs, highestConfirmedNonce)
const maxNonce = Math.max(highestContinuousNonce, highestConfirmedNonce)
if (parseInt(txMeta.txParams.nonce, 16) > maxNonce + 1) {
txMeta.status = 'failed' txMeta.status = 'failed'
txMeta.err = { txMeta.err = {
message: 'nonce too high', message: 'nonce too high',
@ -50,6 +58,20 @@ function transformState (state) {
return newState return newState
} }
function getHighestContinuousFrom (txList, startPoint) {
const nonces = txList.map((txMeta) => {
const nonce = txMeta.txParams.nonce
return parseInt(nonce, 16)
})
let highest = startPoint
while (nonces.includes(highest)) {
highest++
}
return { name: 'local', nonce: highest, details: { startPoint, highest } }
}
function getHighestNonce (txList) { function getHighestNonce (txList) {
const nonces = txList.map((txMeta) => { const nonces = txList.map((txMeta) => {
const nonce = txMeta.txParams.nonce const nonce = txMeta.txParams.nonce
@ -58,3 +80,4 @@ function getHighestNonce (txList) {
const highestNonce = Math.max.apply(null, nonces) const highestNonce = Math.max.apply(null, nonces)
return highestNonce return highestNonce
} }