m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #2896 from MetaMask/kumavis-patch-2

Browse Source 
bugfix - transaction controller - fix order of operations
This commit is contained in:
Dan Finlay 2018-01-08 13:34:52 -08:00 committed by GitHub
commit f441bb7248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/controllers/transactions.js
View File

@ -180,8 +180,10 @@ module.exports = class TransactionController extends EventEmitter {
// ensure value // ensure value
txMeta.gasPriceSpecified = Boolean(txParams.gasPrice) txMeta.gasPriceSpecified = Boolean(txParams.gasPrice)
txMeta.nonceSpecified = Boolean(txParams.nonce) txMeta.nonceSpecified = Boolean(txParams.nonce)
const gasPrice = txParams.gasPrice || this.getGasPrice ? this.getGasPrice() let gasPrice = txParams.gasPrice
: await this.query.gasPrice() if (!gasPrice) {
gasPrice = this.getGasPrice ? this.getGasPrice() : await this.query.gasPrice()
}
txParams.gasPrice = ethUtil.addHexPrefix(gasPrice.toString(16)) txParams.gasPrice = ethUtil.addHexPrefix(gasPrice.toString(16))
txParams.value = txParams.value || '0x0' txParams.value = txParams.value || '0x0'
// set gasLimit // set gasLimit