aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-07-27 01:48:08 +0800
committerGitHub <noreply@github.com>2017-07-27 01:48:08 +0800
commitbbeecbbb2892b2bc5a7e675b03a5fc5736d34287 (patch)
tree968b070a4b023af29063e823f1ee9c218c991f49 /app/scripts/controllers/transactions.js
parent5af753a597d565e4654899ea37349ba7e839bb00 (diff)
parentde2cf4e9cd00ec947e265b0bff3f676c02d5a4f7 (diff)
downloadtangerine-wallet-browser-bbeecbbb2892b2bc5a7e675b03a5fc5736d34287.tar
tangerine-wallet-browser-bbeecbbb2892b2bc5a7e675b03a5fc5736d34287.tar.gz
tangerine-wallet-browser-bbeecbbb2892b2bc5a7e675b03a5fc5736d34287.tar.bz2
tangerine-wallet-browser-bbeecbbb2892b2bc5a7e675b03a5fc5736d34287.tar.lz
tangerine-wallet-browser-bbeecbbb2892b2bc5a7e675b03a5fc5736d34287.tar.xz
tangerine-wallet-browser-bbeecbbb2892b2bc5a7e675b03a5fc5736d34287.tar.zst
tangerine-wallet-browser-bbeecbbb2892b2bc5a7e675b03a5fc5736d34287.zip
Merge pull request #1828 from MetaMask/betterErrorsOnTx
Nonce Tracker - better error messages, more debug info in tx history data
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r--app/scripts/controllers/transactions.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 5f2d75b47..d6b2b555e 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -200,8 +200,12 @@ module.exports = class TransactionController extends EventEmitter {
// get next nonce
const txMeta = this.getTx(txId)
const fromAddress = txMeta.txParams.from
+ // wait for a nonce
nonceLock = await this.nonceTracker.getNonceLock(fromAddress)
+ // add nonce to txParams
txMeta.txParams.nonce = nonceLock.nextNonce
+ // add nonce debugging information to txMeta
+ txMeta.nonceDetails = nonceLock.nonceDetails
this.updateTx(txMeta)
// sign transaction
const rawTx = await this.signTransaction(txId)