m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Refactor gas limit estimation when gas limit specified (#8485)

Browse Source 
The `analyzeGasUsage` function is skipped entirely now when the gas
limit is specified. This is functionally equivalent to how it worked
before.
This commit is contained in:
Mark Stacey 2020-04-30 20:53:35 -03:00 committed by GitHub
parent afa2ff65b7
commit 157cc98c3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/scripts/controllers/transactions/index.js
View File

@ -274,10 +274,13 @@ export default class TransactionController extends EventEmitter {
// set gasLimit
if (
if (txParams.gas) {
txMeta.estimatedGas = txParams.gas
txMeta.gasLimitSpecified = Boolean(txParams.gas)
return txMeta
} else if (
txParams.to &&
txMeta.transactionCategory === SEND_ETHER_ACTION_KEY &&
!txParams.gas
txMeta.transactionCategory === SEND_ETHER_ACTION_KEY
) {
// if there's data in the params, but there's no contract code, it's not a valid transaction
if (txParams.data) {

14
app/scripts/controllers/transactions/tx-gas-utils.js
View File

@ -48,14 +48,6 @@ export default class TxGasUtil {
async estimateTxGas (txMeta, blockGasLimitHex) {
const txParams = txMeta.txParams
// check if gasLimit is already specified
txMeta.gasLimitSpecified = Boolean(txParams.gas)
// if it is, use that value
if (txMeta.gasLimitSpecified) {
return txParams.gas
}
// fallback to block gasLimit
const blockGasLimitBN = hexToBn(blockGasLimitHex)
const saferGasLimitBN = BnMultiplyByFraction(blockGasLimitBN, 19, 20)
@ -75,12 +67,6 @@ export default class TxGasUtil {
txMeta.estimatedGas = addHexPrefix(estimatedGasHex)
const txParams = txMeta.txParams
// if gasLimit was specified and doesnt OOG,
// use original specified amount
if (txMeta.gasLimitSpecified) {
txMeta.estimatedGas = txParams.gas
return
}
// if gasLimit not originally specified,
// try adding an additional gas buffer to our estimation for safety
const recommendedGasHex = this.addGasBuffer(txMeta.estimatedGas, blockGasLimitHex)