|
|
|
@ -201,11 +201,8 @@ module.exports = class TransactionController extends EventEmitter { |
|
|
|
|
// wait for a nonce
|
|
|
|
|
nonceLock = await this.nonceTracker.getNonceLock(fromAddress) |
|
|
|
|
// add nonce to txParams
|
|
|
|
|
if (txMeta.nonceSpecified) { |
|
|
|
|
txMeta.txParams.nonce = ethUtil.addHexPrefix(txMeta.txParams.nonce.toString(16)) |
|
|
|
|
} else { |
|
|
|
|
txMeta.txParams.nonce = ethUtil.addHexPrefix(nonceLock.nextNonce.toString(16)) |
|
|
|
|
} |
|
|
|
|
const nonce = txMeta.nonceSpecified ? txMeta.txParams.nonce : nonceLock.nextNonce |
|
|
|
|
txMeta.txParams.nonce = ethUtil.addHexPrefix(nonce.toString(16)) |
|
|
|
|
// add nonce debugging information to txMeta
|
|
|
|
|
txMeta.nonceDetails = nonceLock.nonceDetails |
|
|
|
|
this.txStateManager.updateTx(txMeta, 'transactions#approveTransaction') |
|
|
|
|