diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-12-29 08:34:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-29 08:34:24 +0800 |
commit | b2e4f913bae41b62df7d4893ab10c426d3f72aca (patch) | |
tree | 8bad35bda1e84865618ab597f0cc75e4ec2683db /app | |
parent | a22e98910d31ab1f79c0b23cb9b4c375ee0c84c3 (diff) | |
parent | 0c54efdfc74079ff539606cbd0fc0a08fa922a0e (diff) | |
download | tangerine-wallet-browser-b2e4f913bae41b62df7d4893ab10c426d3f72aca.tar tangerine-wallet-browser-b2e4f913bae41b62df7d4893ab10c426d3f72aca.tar.gz tangerine-wallet-browser-b2e4f913bae41b62df7d4893ab10c426d3f72aca.tar.bz2 tangerine-wallet-browser-b2e4f913bae41b62df7d4893ab10c426d3f72aca.tar.lz tangerine-wallet-browser-b2e4f913bae41b62df7d4893ab10c426d3f72aca.tar.xz tangerine-wallet-browser-b2e4f913bae41b62df7d4893ab10c426d3f72aca.tar.zst tangerine-wallet-browser-b2e4f913bae41b62df7d4893ab10c426d3f72aca.zip |
Merge pull request #2817 from MetaMask/i#2810
only check nonces of transactions who's from address match the txMeta
Diffstat (limited to 'app')
-rw-r--r-- | app/scripts/lib/pending-tx-tracker.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/lib/pending-tx-tracker.js b/app/scripts/lib/pending-tx-tracker.js index 7956a3329..e8869e6b8 100644 --- a/app/scripts/lib/pending-tx-tracker.js +++ b/app/scripts/lib/pending-tx-tracker.js @@ -178,7 +178,8 @@ module.exports = class PendingTransactionTracker extends EventEmitter { } async _checkIfNonceIsTaken (txMeta) { - const completed = this.getCompletedTransactions() + const address = txMeta.txParams.from + const completed = this.getCompletedTransactions(address) const sameNonce = completed.filter((otherMeta) => { return otherMeta.txParams.nonce === txMeta.txParams.nonce }) |