diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2017-06-28 05:30:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 05:30:39 +0800 |
| commit | 215948dc38c62166d30432de484b250e208cf350 (patch) | |
| tree | d55a2ac58747c3742f0ff03922eb2807aa86924f | |
| parent | 48f7cff8c0e765e85532c860c5f3061ca1d6deb7 (diff) | |
| parent | db2836a1ae5bfb2e641ab2b68a9853297e97b64b (diff) | |
| download | tangerine-wallet-browser-215948dc38c62166d30432de484b250e208cf350.tar tangerine-wallet-browser-215948dc38c62166d30432de484b250e208cf350.tar.gz tangerine-wallet-browser-215948dc38c62166d30432de484b250e208cf350.tar.bz2 tangerine-wallet-browser-215948dc38c62166d30432de484b250e208cf350.tar.lz tangerine-wallet-browser-215948dc38c62166d30432de484b250e208cf350.tar.xz tangerine-wallet-browser-215948dc38c62166d30432de484b250e208cf350.tar.zst tangerine-wallet-browser-215948dc38c62166d30432de484b250e208cf350.zip | |
Merge pull request #1684 from MetaMask/neverGiveUp
dont stop retrying brodcasting txs
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/scripts/controllers/transactions.js | 4 |
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 |