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 - more debugging numbers for nonceDetails

Browse Source
This commit is contained in:
kumavis 2017-08-22 15:34:30 -07:00
parent 0a93b65a3d
commit 247965ebbe
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,13 @@ class NonceTracker {
async _getlocalNextNonce (address) { async _getlocalNextNonce (address) {
let nextNonce let nextNonce
// check our local tx history for the highest nonce (if any) // check our local tx history for the highest nonce (if any)
const highestNonce = this._getLocalHighestNonce(address) const confirmedTransactions = this.getConfirmedTransactions(address)
const pendingTransactions = this.getPendingTransactions(address)
const transactions = confirmedTransactions.concat(pendingTransactions)
const highestConfirmedNonce = this._getHighestNonce(confirmedTransactions)
const highestPendingNonce = this._getHighestNonce(pendingTransactions)
const highestNonce = this._getHighestNonce(transactions)
const haveHighestNonce = Number.isInteger(highestNonce) const haveHighestNonce = Number.isInteger(highestNonce)
if (haveHighestNonce) { if (haveHighestNonce) {
// next nonce is the nonce after our last // next nonce is the nonce after our last
@ -93,18 +99,10 @@ class NonceTracker {
// no local tx history so next must be first (zero) // no local tx history so next must be first (zero)
nextNonce = 0 nextNonce = 0
} }
const nonceDetails = { highestNonce, haveHighestNonce } const nonceDetails = { highestNonce, haveHighestNonce, highestConfirmedNonce, highestPendingNonce }
return { name: 'local', nonce: nextNonce, details: nonceDetails } return { name: 'local', nonce: nextNonce, details: nonceDetails }
} }
_getLocalHighestNonce (address) {
const confirmedTransactions = this.getConfirmedTransactions(address)
const pendingTransactions = this.getPendingTransactions(address)
const transactions = confirmedTransactions.concat(pendingTransactions)
const highestNonce = this._getHighestNonce(transactions)
return highestNonce
}
_getPendingTransactionCount (address) { _getPendingTransactionCount (address) {
const pendingTransactions = this.getPendingTransactions(address) const pendingTransactions = this.getPendingTransactions(address)
return this._reduceTxListToUniqueNonces(pendingTransactions).length return this._reduceTxListToUniqueNonces(pendingTransactions).length