diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-09-20 01:45:51 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-09-20 01:45:51 +0800 |
| commit | 90482934f105deeaa32271dac06271f4d6a0bf52 (patch) | |
| tree | bf281edb54e920e008c3f28f57efac4d3324c6c7 /app | |
| parent | bfd75107f11995e0636def0e1efa6dd14b3ee8a6 (diff) | |
| parent | 166bd55a43125796521f7caf97c2e2baf3519b36 (diff) | |
| download | tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.tar.gz tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.tar.zst tangerine-wallet-browser-90482934f105deeaa32271dac06271f4d6a0bf52.zip | |
Merge branch 'master' into breakout-mascara
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/lib/pending-tx-tracker.js | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/manifest.json b/app/manifest.json index 8febf91aa..67fb543b9 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.10.1", + "version": "3.10.2", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/lib/pending-tx-tracker.js b/app/scripts/lib/pending-tx-tracker.js index b90851b58..44e9d50fa 100644 --- a/app/scripts/lib/pending-tx-tracker.js +++ b/app/scripts/lib/pending-tx-tracker.js @@ -76,6 +76,9 @@ module.exports = class PendingTransactionTracker extends EventEmitter { Dont marked as failed if the error is a "known" transaction warning "there is already a transaction with the same sender-nonce but higher/same gas price" + + Also don't mark as failed if it has ever been broadcast successfully. + A successful broadcast means it may still be mined. */ const errorMessage = err.message.toLowerCase() const isKnownTx = ( @@ -88,6 +91,7 @@ module.exports = class PendingTransactionTracker extends EventEmitter { // other || errorMessage.includes('gateway timeout') || errorMessage.includes('nonce too low') + || txMeta.retryCount > 1 ) // ignore resubmit warnings, return early if (isKnownTx) return @@ -117,10 +121,12 @@ module.exports = class PendingTransactionTracker extends EventEmitter { // Only auto-submit already-signed txs: if (!('rawTx' in txMeta)) return - // Increment a try counter. - txMeta.retryCount++ const rawTx = txMeta.rawTx - return await this.publishTransaction(rawTx) + const txHash = await this.publishTransaction(rawTx) + + // Increment successful tries: + txMeta.retryCount++ + return txHash } async _checkPendingTx (txMeta) { |