mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Ensures that transactions cannot be confirmed if gas limit is below 21000. (#6625)
This commit is contained in:
parent
2b5c7b82a9
commit
5e2fd8ae86
@ -201,7 +201,20 @@ const mapDispatchToProps = dispatch => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const mergeProps = (stateProps, dispatchProps, ownProps) => {
|
const mergeProps = (stateProps, dispatchProps, ownProps) => {
|
||||||
const { gasPriceButtonGroupProps, isConfirm, txId, isSpeedUp, insufficientBalance, maxModeOn, customGasPrice, customGasTotal, balance, selectedToken, tokenBalance} = stateProps
|
const {
|
||||||
|
gasPriceButtonGroupProps,
|
||||||
|
isConfirm,
|
||||||
|
txId,
|
||||||
|
isSpeedUp,
|
||||||
|
insufficientBalance,
|
||||||
|
maxModeOn,
|
||||||
|
customGasPrice,
|
||||||
|
customGasTotal,
|
||||||
|
balance,
|
||||||
|
selectedToken,
|
||||||
|
tokenBalance,
|
||||||
|
customGasLimit,
|
||||||
|
} = stateProps
|
||||||
const {
|
const {
|
||||||
updateCustomGasPrice: dispatchUpdateCustomGasPrice,
|
updateCustomGasPrice: dispatchUpdateCustomGasPrice,
|
||||||
hideGasButtonGroup: dispatchHideGasButtonGroup,
|
hideGasButtonGroup: dispatchHideGasButtonGroup,
|
||||||
@ -251,7 +264,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
|
|||||||
dispatchHideSidebar()
|
dispatchHideSidebar()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
disableSave: insufficientBalance || (isSpeedUp && customGasPrice === 0),
|
disableSave: insufficientBalance || (isSpeedUp && customGasPrice === 0) || customGasLimit < 21000,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,6 +9,7 @@ import { DEFAULT_ROUTE, CONFIRM_TRANSACTION_ROUTE } from '../../helpers/constant
|
|||||||
import {
|
import {
|
||||||
INSUFFICIENT_FUNDS_ERROR_KEY,
|
INSUFFICIENT_FUNDS_ERROR_KEY,
|
||||||
TRANSACTION_ERROR_KEY,
|
TRANSACTION_ERROR_KEY,
|
||||||
|
GAS_LIMIT_TOO_LOW_ERROR_KEY,
|
||||||
} from '../../helpers/constants/error-keys'
|
} from '../../helpers/constants/error-keys'
|
||||||
import { CONFIRMED_STATUS, DROPPED_STATUS } from '../../helpers/constants/transactions'
|
import { CONFIRMED_STATUS, DROPPED_STATUS } from '../../helpers/constants/transactions'
|
||||||
import UserPreferencedCurrencyDisplay from '../../components/app/user-preferenced-currency-display'
|
import UserPreferencedCurrencyDisplay from '../../components/app/user-preferenced-currency-display'
|
||||||
@ -134,6 +135,7 @@ export default class ConfirmTransactionBase extends Component {
|
|||||||
value: amount,
|
value: amount,
|
||||||
} = {},
|
} = {},
|
||||||
} = {},
|
} = {},
|
||||||
|
customGas,
|
||||||
} = this.props
|
} = this.props
|
||||||
|
|
||||||
const insufficientBalance = balance && !isBalanceSufficient({
|
const insufficientBalance = balance && !isBalanceSufficient({
|
||||||
@ -150,6 +152,13 @@ export default class ConfirmTransactionBase extends Component {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (customGas.gasLimit < 21000) {
|
||||||
|
return {
|
||||||
|
valid: false,
|
||||||
|
errorKey: GAS_LIMIT_TOO_LOW_ERROR_KEY,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (simulationFails) {
|
if (simulationFails) {
|
||||||
return {
|
return {
|
||||||
valid: true,
|
valid: true,
|
||||||
|
Loading…
Reference in New Issue
Block a user