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

fix addTxDefaults

Browse Source
This commit is contained in:
frankiebee 2017-08-02 11:35:35 -04:00
parent 21e76484d6
commit 3a4726018e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,7 @@ module.exports = class TransactionController extends EventEmitter {
// ensure value // ensure value
txParams.value = txParams.value || '0x0' txParams.value = txParams.value || '0x0'
if (!txParams.gasPrice) { if (!txParams.gasPrice) {
gassPrice = await this.query.gasPrice() const gasPrice = await this.query.gasPrice()
txParams.gasPrice = gasPrice txParams.gasPrice = gasPrice
} }
// set gasLimit // set gasLimit

3
app/scripts/lib/tx-utils.js
View File

@ -19,6 +19,7 @@ module.exports = class txProvideUtils {
const block = await this.query.getBlockByNumber('latest', true) const block = await this.query.getBlockByNumber('latest', true)
const estimatedGasHex = await this.estimateTxGas(txMeta, block.gasLimit) const estimatedGasHex = await this.estimateTxGas(txMeta, block.gasLimit)
this.setTxGas(txMeta, block.gasLimit, estimatedGasHex) this.setTxGas(txMeta, block.gasLimit, estimatedGasHex)
return txMeta
} }
async estimateTxGas (txMeta, blockGasLimitHex) { async estimateTxGas (txMeta, blockGasLimitHex) {
@ -32,7 +33,7 @@ module.exports = class txProvideUtils {
txParams.gas = bnToHex(saferGasLimitBN) txParams.gas = bnToHex(saferGasLimitBN)
} }
// run tx, see if it will OOG // run tx, see if it will OOG
return await this.query.estimateGas(txParams) return this.query.estimateGas(txParams)
} }
setTxGas (txMeta, blockGasLimitHex, estimatedGasHex) { setTxGas (txMeta, blockGasLimitHex, estimatedGasHex) {