tx controller + nonce tracker - record nonce components on txMeta

feature/default_network_editable
kumavis 7 years ago
parent 39d28922de
commit 0ef90fb1f0
  1. 4
      app/scripts/controllers/transactions.js
  2. 7
      app/scripts/lib/nonce-tracker.js

@ -200,8 +200,12 @@ module.exports = class TransactionController extends EventEmitter {
// get next nonce // get next nonce
const txMeta = this.getTx(txId) const txMeta = this.getTx(txId)
const fromAddress = txMeta.txParams.from const fromAddress = txMeta.txParams.from
// wait for a nonce
nonceLock = await this.nonceTracker.getNonceLock(fromAddress) nonceLock = await this.nonceTracker.getNonceLock(fromAddress)
// add nonce to txParams
txMeta.txParams.nonce = nonceLock.nextNonce txMeta.txParams.nonce = nonceLock.nextNonce
// add nonce debugging information to txMeta
txMeta.nonceDetails = nonceLock.nonceDetails
this.updateTx(txMeta) this.updateTx(txMeta)
// sign transaction // sign transaction
const rawTx = await this.signTransaction(txId) const rawTx = await this.signTransaction(txId)

@ -37,8 +37,11 @@ class NonceTracker {
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 nextNonce = baseCount + pendingCount const nextNonce = baseCount + pendingCount
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}"`)
// return next nonce and release cb // collect the numbers used to calculate the nonce for debugging
return { nextNonce, releaseLock } const blockNumber = currentBlock.number
const nonceDetails = { blockNumber, baseCount, pendingCount }
// return nonce and release cb
return { nextNonce, nonceDetails, releaseLock }
} }
async _getCurrentBlock () { async _getCurrentBlock () {

Loading…
Cancel
Save