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

Simplify nonce calculation

Browse Source
This commit is contained in:
Dan Finlay 2017-08-23 19:34:20 -07:00
parent ebe8ceeba4
commit 1f0223d0a0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@ class NonceTracker {
const releaseLock = await this._takeMutex(address) const releaseLock = await this._takeMutex(address)
// evaluate multiple nextNonce strategies // evaluate multiple nextNonce strategies
const nonceDetails = {} const nonceDetails = {}
const localNonceResult = await this._getlocalNextNonce(address)
nonceDetails.local = localNonceResult.details
const networkNonceResult = await this._getNetworkNextNonce(address) const networkNonceResult = await this._getNetworkNextNonce(address)
const localNonceResult = await this._getLocalNextNonce(address, networkNonceResult)
nonceDetails.local = localNonceResult.details
nonceDetails.network = networkNonceResult.details nonceDetails.network = networkNonceResult.details
const nextNonce = Math.max(networkNonceResult.nonce, localNonceResult.nonce) const nextNonce = Math.max(networkNonceResult.nonce, localNonceResult.nonce)
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}"`)
@ -81,15 +81,16 @@ class NonceTracker {
return { name: 'network', nonce: baseCount, details: nonceDetails } return { name: 'network', nonce: baseCount, details: nonceDetails }
} }
async _getlocalNextNonce (address) { async _getLocalNextNonce (address, networkNonce) {
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 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 highestConfirmedNonce = this._getHighestNonce(confirmedTransactions) const highestConfirmedNonce = this._getHighestNonce(confirmedTransactions)
const highestPendingNonce = this._getHighestNonce(pendingTransactions) const highestPendingNonce = this._getHighestNonce(pendingTransactions)
const highestNonce = this._getHighestNonce(transactions) const highestNonce = Math.max(highestConfirmedNonce, highestPendingNonce)
const haveHighestNonce = Number.isInteger(highestNonce) const haveHighestNonce = Number.isInteger(highestNonce)
if (haveHighestNonce) { if (haveHighestNonce) {