aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-06-28 05:19:28 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-06-28 05:19:28 +0800
commitdb2836a1ae5bfb2e641ab2b68a9853297e97b64b (patch)
treed55a2ac58747c3742f0ff03922eb2807aa86924f
parent48f7cff8c0e765e85532c860c5f3061ca1d6deb7 (diff)
downloadtangerine-wallet-browser-db2836a1ae5bfb2e641ab2b68a9853297e97b64b.tar
tangerine-wallet-browser-db2836a1ae5bfb2e641ab2b68a9853297e97b64b.tar.gz
tangerine-wallet-browser-db2836a1ae5bfb2e641ab2b68a9853297e97b64b.tar.bz2
tangerine-wallet-browser-db2836a1ae5bfb2e641ab2b68a9853297e97b64b.tar.lz
tangerine-wallet-browser-db2836a1ae5bfb2e641ab2b68a9853297e97b64b.tar.xz
tangerine-wallet-browser-db2836a1ae5bfb2e641ab2b68a9853297e97b64b.tar.zst
tangerine-wallet-browser-db2836a1ae5bfb2e641ab2b68a9853297e97b64b.zip
dont stop retrying brodcasting txs
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/scripts/controllers/transactions.js4
2 files changed, 1 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96dc79d9a..872db1c1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## Current Master
+- No longer stop rebroadcasting transactions
- Add list of popular tokens held to the account detail view.
- Add a warning to JSON file import.
- Fix bug where slowly mined txs would sometimes be incorrectly marked as failed.
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index f6dea34e7..31cf8239a 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -8,8 +8,6 @@ const TxProviderUtil = require('../lib/tx-utils')
const createId = require('../lib/random-id')
const denodeify = require('denodeify')
-const RETRY_LIMIT = 200
-
module.exports = class TransactionController extends EventEmitter {
constructor (opts) {
super()
@@ -435,8 +433,6 @@ module.exports = class TransactionController extends EventEmitter {
// Only auto-submit already-signed txs:
if (!('rawTx' in txMeta)) return cb()
- if (txMeta.retryCount > RETRY_LIMIT) return
-
// Increment a try counter.
txMeta.retryCount++
const rawTx = txMeta.rawTx