diff options
| author | kumavis <aaron@kumavis.me> | 2018-04-03 07:28:33 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-04-03 07:28:33 +0800 |
| commit | 655593ea62b04a47cde18b785d1a88d0d0d0f726 (patch) | |
| tree | 37cdbef5ef0f042c1ce3713e3b11efdec3a315b8 /app/scripts/controllers/transactions.js | |
| parent | bd6f5547667bdae00e8990551f3a0ea39ab8d971 (diff) | |
| parent | c14ec4191741c444dcf5b7c3e177c17a10374c16 (diff) | |
| download | tangerine-wallet-browser-655593ea62b04a47cde18b785d1a88d0d0d0f726.tar.gz tangerine-wallet-browser-655593ea62b04a47cde18b785d1a88d0d0d0f726.tar.zst tangerine-wallet-browser-655593ea62b04a47cde18b785d1a88d0d0d0f726.zip | |
Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf
Diffstat (limited to 'app/scripts/controllers/transactions.js')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index a18a2d2e2..31e53554d 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -187,12 +187,12 @@ module.exports = class TransactionController extends EventEmitter { // validate await this.txGasUtil.validateTxParams(txParams) // construct txMeta - const txMeta = this.txStateManager.generateTxMeta({txParams}) + let txMeta = this.txStateManager.generateTxMeta({txParams}) this.addTx(txMeta) this.emit('newUnapprovedTx', txMeta) // add default tx params try { - await this.addTxDefaults(txMeta) + txMeta = await this.addTxDefaults(txMeta) } catch (error) { console.log(error) this.txStateManager.setTxStatusFailed(txMeta.id, error) @@ -215,6 +215,7 @@ module.exports = class TransactionController extends EventEmitter { } txParams.gasPrice = ethUtil.addHexPrefix(gasPrice.toString(16)) txParams.value = txParams.value || '0x0' + if (txParams.to === null) delete txParams.to // set gasLimit return await this.txGasUtil.analyzeGasUsage(txMeta) } |