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

fix 0x0 nonce calc.

Browse Source
This commit is contained in:
frankiebee 2017-08-18 15:44:32 -07:00
parent f8eca95ca5
commit 37f86e874f
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/scripts/lib/nonce-tracker.js
View File

@ -29,10 +29,8 @@ class NonceTracker {
// calculate next nonce // calculate next nonce
// we need to make sure our base count // we need to make sure our base count
// and pending count are from the same block // and pending count are from the same block
const localNonceHex = this._getHighestLocalNonce(address) const localNextNonce = this._getLocalNextNonce(address)
let localNonce = parseInt(localNonceHex, 16)
// throw out localNonce if not a number // throw out localNonce if not a number
if (!Number.isInteger(localNonce)) localNonce = 0
const currentBlock = await this._getCurrentBlock() const currentBlock = await this._getCurrentBlock()
const pendingTransactions = this.getPendingTransactions(address) const pendingTransactions = this.getPendingTransactions(address)
const pendingCount = pendingTransactions.length const pendingCount = pendingTransactions.length
@ -40,12 +38,11 @@ class NonceTracker {
const baseCountHex = await this._getTxCount(address, currentBlock) const baseCountHex = await this._getTxCount(address, currentBlock)
const baseCount = parseInt(baseCountHex, 16) const baseCount = parseInt(baseCountHex, 16)
assert(Number.isInteger(baseCount), `nonce-tracker - baseCount is not an integer - got: (${typeof baseCount}) "${baseCount}"`) assert(Number.isInteger(baseCount), `nonce-tracker - baseCount is not an integer - got: (${typeof baseCount}) "${baseCount}"`)
if (localNonce) ++localNonce const nextNonce = Math.max(baseCount + pendingCount, localNextNonce)
const nextNonce = Math.max(baseCount + pendingCount, localNonce)
assert(Number.isInteger(nextNonce), `nonce-tracker - nextNonce is not an integer - got: (${typeof nextNonce}) "${nextNonce}"`) assert(Number.isInteger(nextNonce), `nonce-tracker - nextNonce is not an integer - got: (${typeof nextNonce}) "${nextNonce}"`)
// collect the numbers used to calculate the nonce for debugging // collect the numbers used to calculate the nonce for debugging
const blockNumber = currentBlock.number const blockNumber = currentBlock.number
const nonceDetails = { blockNumber, baseCount, baseCountHex, pendingCount, localNonceHex, localNonce } const nonceDetails = { blockNumber, baseCount, baseCountHex, pendingCount, localNextNonce }
// return nonce and release cb // return nonce and release cb
return { nextNonce, nonceDetails, releaseLock } return { nextNonce, nonceDetails, releaseLock }
} }
@ -89,14 +86,27 @@ class NonceTracker {
return mutex return mutex
} }
_getHighestLocalNonce (address) { // _getNetworkNonce (address) {
// }
_getLocalNextNonce (address) {
const confirmedTransactions = this.getConfirmedTransactions(address) const confirmedTransactions = this.getConfirmedTransactions(address)
const pendingTransactions = this.getPendingTransactions(address) const pendingTransactions = this.getPendingTransactions(address)
const transactions = confirmedTransactions.concat(pendingTransactions) const transactions = confirmedTransactions.concat(pendingTransactions)
const localNonces = transactions.map((txMeta) => txMeta.txParams.nonce) const localNonces = transactions.map((txMeta) => txMeta.txParams.nonce)
return localNonces.reduce((nonce, highestNonce) => { const localNonceHex = localNonces.reduce((nonce, highestNonce) => {
return parseInt(nonce, 16) > parseInt(highestNonce, 16) ? nonce : highestNonce return parseInt(nonce, 16) > parseInt(highestNonce, 16) ? nonce : highestNonce
}, '0x0') }, '0x0')
let localNonce = parseInt(localNonceHex, 16)
if (
// the local nonce is not 0
localNonce ||
// or their are pending or confirmed transactions
pendingTransactions.length ||
confirmedTransactions.length
) ++localNonce
return localNonce
} }
// this is a hotfix for the fact that the blockTracker will // this is a hotfix for the fact that the blockTracker will