+ {gasIsExcessive && this.renderError(true)}
{error && this.renderError()}
{warning && this.renderWarning()}
{this.maybeRenderAddContact()}
@@ -77,13 +79,13 @@ export default class SendContent extends Component {
);
}
- renderError() {
+ renderError(gasError = false) {
const { t } = this.context;
const { error } = this.props;
return (
);
}
diff --git a/ui/app/pages/send/send.component.js b/ui/app/pages/send/send.component.js
index 9a366d3da..23696807a 100644
--- a/ui/app/pages/send/send.component.js
+++ b/ui/app/pages/send/send.component.js
@@ -58,6 +58,7 @@ export default class SendTransactionScreen extends Component {
qrCodeDetected: PropTypes.func.isRequired,
qrCodeData: PropTypes.object,
sendTokenAddress: PropTypes.string,
+ gasIsExcessive: PropTypes.bool.isRequired,
};
static contextTypes = {
@@ -382,7 +383,7 @@ export default class SendTransactionScreen extends Component {
}
renderSendContent() {
- const { history, showHexData } = this.props;
+ const { history, showHexData, gasIsExcessive } = this.props;
const { toWarning, toError } = this.state;
return [
@@ -394,6 +395,7 @@ export default class SendTransactionScreen extends Component {
showHexData={showHexData}
warning={toWarning}
error={toError}
+ gasIsExcessive={gasIsExcessive}
/>,
,
];
diff --git a/ui/app/pages/send/send.container.js b/ui/app/pages/send/send.container.js
index 3f0ddb0a0..898546a81 100644
--- a/ui/app/pages/send/send.container.js
+++ b/ui/app/pages/send/send.container.js
@@ -23,6 +23,7 @@ import {
getSelectedAddress,
getAddressBook,
getSendTokenAddress,
+ isCustomPriceExcessive,
} from '../../selectors';
import {
@@ -67,6 +68,7 @@ function mapStateToProps(state) {
tokenBalance: getTokenBalance(state),
tokenContract: getSendTokenContract(state),
sendTokenAddress: getSendTokenAddress(state),
+ gasIsExcessive: isCustomPriceExcessive(state, true),
};
}
diff --git a/ui/app/selectors/custom-gas.js b/ui/app/selectors/custom-gas.js
index 2cb40f5a6..2ac6b4767 100644
--- a/ui/app/selectors/custom-gas.js
+++ b/ui/app/selectors/custom-gas.js
@@ -9,7 +9,12 @@ import { formatETHFee } from '../helpers/utils/formatters';
import { calcGasTotal } from '../pages/send/send.utils';
import { GAS_ESTIMATE_TYPES } from '../helpers/constants/common';
-import { getCurrentCurrency, getIsMainnet, getPreferences } from '.';
+import {
+ getCurrentCurrency,
+ getIsMainnet,
+ getPreferences,
+ getGasPrice,
+} from '.';
const NUMBER_OF_DECIMALS_SM_BTNS = 5;
@@ -31,7 +36,7 @@ export function getAveragePriceEstimateInHexWEI(state) {
}
export function getFastPriceEstimateInHexWEI(state) {
- const fastPriceEstimate = state.gas.basicEstimates.fast;
+ const fastPriceEstimate = getFastPriceEstimate(state);
return getGasPriceInHexWei(fastPriceEstimate || '0x0');
}
@@ -55,6 +60,16 @@ export function getSafeLowEstimate(state) {
return safeLow;
}
+export function getFastPriceEstimate(state) {
+ const {
+ gas: {
+ basicEstimates: { fast },
+ },
+ } = state;
+
+ return fast;
+}
+
export function isCustomPriceSafe(state) {
const safeLow = getSafeLowEstimate(state);
@@ -81,6 +96,31 @@ export function isCustomPriceSafe(state) {
return customPriceSafe;
}
+export function isCustomPriceExcessive(state, checkSend = false) {
+ const customPrice = checkSend ? getGasPrice(state) : getCustomGasPrice(state);
+ const fastPrice = getFastPriceEstimate(state);
+
+ if (!customPrice || !fastPrice) {
+ return false;
+ }
+
+ // Custom gas should be considered excessive when it is 1.5 times greater than the fastest estimate.
+ const customPriceExcessive = conversionGreaterThan(
+ {
+ value: customPrice,
+ fromNumericBase: 'hex',
+ fromDenomination: 'WEI',
+ toDenomination: 'GWEI',
+ },
+ {
+ fromNumericBase: 'dec',
+ value: Math.floor(fastPrice * 1.5),
+ },
+ );
+
+ return customPriceExcessive;
+}
+
export function basicPriceEstimateToETHTotal(
estimate,
gasLimit,
diff --git a/ui/app/selectors/tests/custom-gas.test.js b/ui/app/selectors/tests/custom-gas.test.js
index 3afb1afdd..ddfd6b136 100644
--- a/ui/app/selectors/tests/custom-gas.test.js
+++ b/ui/app/selectors/tests/custom-gas.test.js
@@ -7,6 +7,7 @@ const {
getRenderableBasicEstimateData,
getRenderableEstimateDataForSmallButtonsFromGWEI,
isCustomPriceSafe,
+ isCustomPriceExcessive,
} = proxyquire('../custom-gas', {});
describe('custom-gas selectors', function () {
@@ -55,6 +56,91 @@ describe('custom-gas selectors', function () {
});
});
+ describe('isCustomPriceExcessive()', function () {
+ it('should return false for gas.customData.price null', function () {
+ const mockState = {
+ gas: {
+ customData: { price: null },
+ basicEstimates: { fast: 150 },
+ },
+ };
+ assert.strictEqual(isCustomPriceExcessive(mockState), false);
+ });
+ it('should return false gas.basicEstimates.fast undefined', function () {
+ const mockState = {
+ gas: {
+ customData: { price: '0x77359400' },
+ basicEstimates: { fast: undefined },
+ },
+ };
+ assert.strictEqual(isCustomPriceExcessive(mockState), false);
+ });
+ it('should return false gas.basicEstimates.price 0x205d0bae00 (139)', function () {
+ const mockState = {
+ gas: {
+ customData: { price: '0x205d0bae00' },
+ basicEstimates: { fast: 139 },
+ },
+ };
+ assert.strictEqual(isCustomPriceExcessive(mockState), false);
+ });
+ it('should return false gas.basicEstimates.price 0x1bf08eb000 (120)', function () {
+ const mockState = {
+ gas: {
+ customData: { price: '0x1bf08eb000' },
+ basicEstimates: { fast: 139 },
+ },
+ };
+ assert.strictEqual(isCustomPriceExcessive(mockState), false);
+ });
+ it('should return false gas.basicEstimates.price 0x28bed01600 (175)', function () {
+ const mockState = {
+ gas: {
+ customData: { price: '0x28bed01600' },
+ basicEstimates: { fast: 139 },
+ },
+ };
+ assert.strictEqual(isCustomPriceExcessive(mockState), false);
+ });
+ it('should return true gas.basicEstimates.price 0x30e4f9b400 (210)', function () {
+ const mockState = {
+ gas: {
+ customData: { price: '0x30e4f9b400' },
+ basicEstimates: { fast: 139 },
+ },
+ };
+ assert.strictEqual(isCustomPriceExcessive(mockState), true);
+ });
+ it('should return false gas.basicEstimates.price 0x28bed01600 (175) (checkSend=true)', function () {
+ const mockState = {
+ metamask: {
+ send: {
+ gasPrice: '0x28bed0160',
+ },
+ },
+ gas: {
+ customData: { price: null },
+ basicEstimates: { fast: 139 },
+ },
+ };
+ assert.strictEqual(isCustomPriceExcessive(mockState, true), false);
+ });
+ it('should return true gas.basicEstimates.price 0x30e4f9b400 (210) (checkSend=true)', function () {
+ const mockState = {
+ metamask: {
+ send: {
+ gasPrice: '0x30e4f9b400',
+ },
+ },
+ gas: {
+ customData: { price: null },
+ basicEstimates: { fast: 139 },
+ },
+ };
+ assert.strictEqual(isCustomPriceExcessive(mockState, true), true);
+ });
+ });
+
describe('getCustomGasLimit()', function () {
it('should return gas.customData.limit', function () {
const mockState = { gas: { customData: { limit: 'mockLimit' } } };