diff options
author | kumavis <aaron@kumavis.me> | 2018-07-03 04:54:05 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-07-03 04:54:05 +0800 |
commit | a89902c1701f2dcc41effc06d2315e515946b2ca (patch) | |
tree | 922408cf99bcca97c956d5860ac80c2c0c472ecc /app/scripts/controllers/transactions/index.js | |
parent | 055346843bc90a5168151ba2adc9deacedf8afd4 (diff) | |
parent | 4c86f25f5bc4fa18847ca1b77e005afc3f37eddc (diff) | |
download | tangerine-wallet-browser-a89902c1701f2dcc41effc06d2315e515946b2ca.tar.gz tangerine-wallet-browser-a89902c1701f2dcc41effc06d2315e515946b2ca.tar.zst tangerine-wallet-browser-a89902c1701f2dcc41effc06d2315e515946b2ca.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'app/scripts/controllers/transactions/index.js')
-rw-r--r-- | app/scripts/controllers/transactions/index.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index c270be294..6884bbc49 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -170,7 +170,7 @@ class TransactionController extends EventEmitter { // add default tx params txMeta = await this.addTxGasDefaults(txMeta) } catch (error) { - console.log(error) + log.warn(error) this.txStateManager.setTxStatusFailed(txMeta.id, error) throw error } @@ -269,7 +269,12 @@ class TransactionController extends EventEmitter { // must set transaction to submitted/failed before releasing lock nonceLock.releaseLock() } catch (err) { - this.txStateManager.setTxStatusFailed(txId, err) + // this is try-catch wrapped so that we can guarantee that the nonceLock is released + try { + this.txStateManager.setTxStatusFailed(txId, err) + } catch (err) { + log.error(err) + } // must set transaction to submitted/failed before releasing lock if (nonceLock) nonceLock.releaseLock() // continue with error chain |