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

nonce-tracker - pass tests

Browse Source
This commit is contained in:
frankiebee 2017-08-21 16:45:10 -07:00
parent e43db262d8
commit 5c74f316a8
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,25 @@ class NonceTracker {
return { nextNonce, nonceDetails, releaseLock } return { nextNonce, nonceDetails, releaseLock }
} }
getPendingTransactionCount (address) {
const pendingTransactions = this.getPendingTransactions(address)
return this.reduceTxListToUniqueNonces(pendingTransactions).length
}
reduceTxListToUniqueNonces (txList) {
const reducedTxList = txList.reduce((reducedList, txMeta, index) => {
if (!index) return [txMeta]
const nonceMatches = txList.filter((txData) => {
return txMeta.txParams.nonce === txData.txParams.nonce
})
if (nonceMatches.length > 1) return reducedList
reducedList.push(txMeta)
return reducedList
}, [])
return reducedTxList
}
async _getCurrentBlock () { async _getCurrentBlock () {
const blockTracker = this._getBlockTracker() const blockTracker = this._getBlockTracker()
const currentBlock = blockTracker.getCurrentBlock() const currentBlock = blockTracker.getCurrentBlock()
@ -82,22 +101,31 @@ class NonceTracker {
// and pending count are from the same block // and pending count are from the same block
const currentBlock = await this._getCurrentBlock() const currentBlock = await this._getCurrentBlock()
const blockNumber = currentBlock.blockNumber const blockNumber = currentBlock.blockNumber
const pendingTransactions = this.getPendingTransactions(address) const pendingNonce = this._getLocalPendingNonce(address)
const pendingCount = pendingTransactions.length const pendingCount = this.getPendingTransactionCount(address)
assert(Number.isInteger(pendingCount), `nonce-tracker - pendingCount is not an integer - got: (${typeof pendingCount}) "${pendingCount}"`) assert(Number.isInteger(pendingCount), `nonce-tracker - pendingCount is not an integer - got: (${typeof pendingCount}) "${pendingCount}"`)
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}"`)
const networkNonce = baseCount + pendingCount let networkNonce = pendingNonce > baseCount ? baseCount + pendingCount : baseCount
return {networkNonce, blockNumber, baseCountHex, baseCount, pendingCount} return {networkNonce, blockNumber, baseCountHex, baseCount, pendingCount, pendingNonce}
}
_getLocalPendingNonce (address) {
const pendingTransactions = this.reduceTxListToUniqueNonces(this.getPendingTransactions(address))
const localNonces = pendingTransactions.map((txMeta) => txMeta.txParams.nonce)
const localNonceHex = localNonces.reduce((highestNonce, nonce) => {
return parseInt(nonce, 16) > parseInt(highestNonce, 16) ? nonce : highestNonce
}, '0x0')
return parseInt(localNonceHex, 16)
} }
_getLocalNextNonce (address) { _getLocalNextNonce (address) {
const confirmedTransactions = this.getConfirmedTransactions(address) const confirmedTransactions = this.reduceTxListToUniqueNonces(this.getConfirmedTransactions(address))
const pendingTransactions = this.getPendingTransactions(address) const pendingTransactions = this.reduceTxListToUniqueNonces(this.getPendingTransactions(address))
const transactions = confirmedTransactions.concat(pendingTransactions) const transactions = this.reduceTxListToUniqueNonces(confirmedTransactions.concat(pendingTransactions))
const localNonces = transactions.map((txMeta) => txMeta.txParams.nonce) const localNonces = transactions.map((txMeta) => txMeta.txParams.nonce)
const localNonceHex = localNonces.reduce((nonce, highestNonce) => { const localNonceHex = localNonces.reduce((highestNonce, nonce) => {
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) let localNonce = parseInt(localNonceHex, 16)
@ -107,7 +135,7 @@ class NonceTracker {
// the local nonce is not 0 // the local nonce is not 0
localNonce || localNonce ||
// or their are pending or confirmed transactions // or their are pending or confirmed transactions
pendingTransactions.length || this.getPendingTransactionCount(address) ||
confirmedTransactions.length confirmedTransactions.length
) ++localNonce ) ++localNonce
return localNonce return localNonce
@ -118,7 +146,6 @@ class NonceTracker {
_getBlockTracker () { _getBlockTracker () {
return this.provider._blockTracker return this.provider._blockTracker
} }
} }
module.exports = NonceTracker module.exports = NonceTracker