poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nonce-tracker: only check transactions that are not supposed to be ignored

This commit is contained in:
frankiebee 2017-06-27 16:46:14 -07:00
parent 0ee4502d71
commit 690685d20d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/scripts/controllers/transactions.js
View File

@ -26,7 +26,14 @@ module.exports = class TransactionController extends EventEmitter {
this.nonceTracker = new NonceTracker({
provider: this.provider,
blockTracker: this.provider._blockTracker,
getPendingTransactions: (address) => this.getFilteredTxList({ from: address, status: 'submitted', err: undefined }),
getPendingTransactions: (address) => {
return this.getFilteredTxList({
from: address,
status: 'submitted',
err: undefined,
ignore: undefined,
})
},
})
this.query = opts.ethQuery
this.txProviderUtils = new TxProviderUtil(this.query)

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

@ -12,15 +12,14 @@ class NonceTracker {
// releaseLock must be called
// releaseLock must be called after adding signed tx to pending transactions (or discarding)
async getNonceLock (address) {
const pendingTransactions = this.getPendingTransactions(address)
// await lock free
await this.lockMap[address]
if (pendingTransactions.length) await this.lockMap[address]
else if (this.lockMap[address]) await this.lockMap[address]()
// take lock
const releaseLock = this._takeLock(address)
// calculate next nonce
const currentBlock = await this._getCurrentBlock()
const blockNumber = currentBlock.number
const pendingTransactions = this.getPendingTransactions(address)
const baseCount = await this._getTxCount(address, blockNumber)
const baseCount = await this._getTxCount(address)
const nextNonce = parseInt(baseCount) + pendingTransactions.length
// return next nonce and release cb
return { nextNonce: nextNonce.toString(16), releaseLock }
@ -44,7 +43,9 @@ class NonceTracker {
return releaseLock
}
_getTxCount (address, blockNumber) {
async _getTxCount (address) {
const currentBlock = await this._getCurrentBlock()
const blockNumber = currentBlock.number
return new Promise((resolve, reject) => {
this.ethQuery.getTransactionCount(address, blockNumber, (err, result) => {
err ? reject(err) : resolve(result)