Fix resubmit bug

feature/default_network_editable
Dan Finlay 5 years ago
parent ac8f3cb310
commit a6deccd810
  1. 12
      app/scripts/controllers/transactions/index.js

@ -68,6 +68,7 @@ class TransactionController extends EventEmitter {
this.blockTracker = opts.blockTracker this.blockTracker = opts.blockTracker
this.signEthTx = opts.signTransaction this.signEthTx = opts.signTransaction
this.getGasPrice = opts.getGasPrice this.getGasPrice = opts.getGasPrice
this.inProcessOfSigning = new Set()
this.memStore = new ObservableStore({}) this.memStore = new ObservableStore({})
this.query = new EthQuery(this.provider) this.query = new EthQuery(this.provider)
@ -354,6 +355,15 @@ class TransactionController extends EventEmitter {
@param txId {number} - the tx's Id @param txId {number} - the tx's Id
*/ */
async approveTransaction (txId) { async approveTransaction (txId) {
// TODO: Move this safety out of this function.
// Since this transaction is async,
// we need to keep track of what is currently being signed,
// So that we do not increment nonce + resubmit something
// that is already being incrmented & signed.
if (this.inProcessOfSigning.has(txId)) {
return
}
this.inProcessOfSigning.add(txId)
let nonceLock let nonceLock
try { try {
// approve // approve
@ -387,6 +397,8 @@ class TransactionController extends EventEmitter {
if (nonceLock) nonceLock.releaseLock() if (nonceLock) nonceLock.releaseLock()
// continue with error chain // continue with error chain
throw err throw err
} finally {
this.inProcessOfSigning.delete(txId)
} }
} }
/** /**

Loading…
Cancel
Save