feat(suite): allow lower gas prices for eth networks

packages/connect/src/api/ethereum/api/ethereumGetAddress.ts

@@ -10,7 +10,7 @@ import { getEthereumNetwork, getUniqueNetworks } from '../../../data/coinInfo';
 import { stripHexPrefix } from '../../../utils/formatUtils';
 import { PROTO, ERRORS } from '../../../constants';
 import { UI, createUiMessage } from '../../../events';
-import type { EthereumNetworkInfo } from '../../../types';
+import type { EthereumNetworkInfoDefinitionValues } from '../../../types';
 import {
     getEthereumDefinitions,
     decodeEthereumDefinition,
@@ -21,7 +21,7 @@ import { GetAddress as GetAddressSchema } from '../../../types/api/getAddress';
 
 type Params = PROTO.EthereumGetAddress & {
     address?: string;
-    network?: EthereumNetworkInfo;
+    network?: EthereumNetworkInfoDefinitionValues;
     encoded_network?: ArrayBuffer;
 };
 

packages/connect/src/api/ethereum/api/ethereumSignTransaction.ts

@@ -17,13 +17,13 @@ import {
 } from '../ethereumDefinitions';
 import type { EthereumTransaction, EthereumTransactionEIP1559 } from '../../../types/api/ethereum';
 import {
-    EthereumNetworkInfo,
+    EthereumNetworkInfoDefinitionValues,
     EthereumSignTransaction as EthereumSignTransactionSchema,
 } from '../../../types';
 
 type Params = {
     path: number[];
-    network?: EthereumNetworkInfo;
+    network?: EthereumNetworkInfoDefinitionValues;
     definitions?: MessagesSchema.EthereumDefinitions;
     chunkify: boolean;
 } & (

packages/connect/src/api/ethereum/ethereumDefinitions.ts

@@ -5,7 +5,7 @@ import { trzd } from '@trezor/protocol';
 import { Type, Static, Assert } from '@trezor/schema-utils';
 
 import { DataManager } from '../../data/DataManager';
-import { EthereumNetworkInfo } from '../../types';
+import { EthereumNetworkInfoDefinitionValues } from '../../types';
 import { ethereumNetworkInfoBase } from '../../data/coinInfo';
 
 interface GetEthereumDefinitions {
@@ -135,14 +135,10 @@ export const decodeEthereumDefinition = (
     return decoded;
 };
 
-/**
- * Converts protobuf decoded eth definitions to EthereumNetworkInfo type
- */
 export const ethereumNetworkInfoFromDefinition = (
     definition: EthereumNetworkDefinitionDecoded,
-): EthereumNetworkInfo => ({
+): EthereumNetworkInfoDefinitionValues => ({
     ...ethereumNetworkInfoBase,
-
     chainId: definition.chain_id,
     label: definition.name,
     name: definition.name,

packages/connect/src/data/__tests__/defaultFeeLevels.test.ts

@@ -0,0 +1,90 @@
+import { getEthereumFeeLevels } from '../defaultFeeLevels';
+
+describe('getEthereumFeeLevels', () => {
+    const fixtures = {
+        eth: {
+            defaultGas: 15,
+            minFee: 1,
+            maxFee: 10000,
+            expected: {
+                blockTime: -1,
+                defaultFees: [
+                    {
+                        label: 'normal',
+                        feePerUnit: '15000000000', // 15 Gwei * 1e9 = 15000000000 Wei
+                        feeLimit: '21000',
+                        blocks: -1,
+                    },
+                ],
+                minFee: 1,
+                maxFee: 10000,
+                dustLimit: -1,
+            },
+        },
+        pol: {
+            defaultGas: 200,
+            minFee: 1,
+            maxFee: 10000000,
+            expected: {
+                blockTime: -1,
+                defaultFees: [
+                    {
+                        label: 'normal',
+                        feePerUnit: '200000000000', // 200 Gwei * 1e9 = 200000000000 Wei
+                        feeLimit: '21000',
+                        blocks: -1,
+                    },
+                ],
+                minFee: 1,
+                maxFee: 10000000,
+                dustLimit: -1,
+            },
+        },
+        base: {
+            defaultGas: 0.01,
+            minFee: 0.000000001,
+            maxFee: 100,
+            expected: {
+                blockTime: -1,
+                defaultFees: [
+                    {
+                        label: 'normal',
+                        feePerUnit: '10000000', // 0.01 Gwei * 1e9 = 10000000 Wei
+                        feeLimit: '21000',
+                        blocks: -1,
+                    },
+                ],
+                minFee: 0.0000001,
+                maxFee: 1000,
+                dustLimit: -1,
+            },
+        },
+        unknown: {
+            defaultGas: 5,
+            minFee: 0.000000001,
+            maxFee: 10000,
+            expected: {
+                blockTime: -1,
+                defaultFees: [
+                    {
+                        label: 'normal',
+                        feePerUnit: '5000000000', // 5 Gwei * 1e9 = 5000000000 Wei
+                        feeLimit: '21000',
+                        blocks: -1,
+                    },
+                ],
+                minFee: 0.000000001,
+                maxFee: 10000,
+                dustLimit: -1,
+            },
+        },
+    };
+
+    Object.entries(fixtures).forEach(([chain, { expected }]) => {
+        it(`should return correct fee levels for ${chain}`, () => {
+            const result = getEthereumFeeLevels(chain);
+
+            expect(result).toEqual(expected);
+        });
+    });
+});

packages/connect/src/data/coinInfo.ts

@@ -5,7 +5,6 @@ import { getBitcoinFeeLevels, getEthereumFeeLevels, getMiscFeeLevels } from './d
 import { ERRORS } from '../constants';
 import { toHardened, fromHardened } from '../utils/pathUtils';
 import type {
-    CoinInfo,
     BitcoinNetworkInfo,
     EthereumNetworkInfo,
     MiscNetworkInfo,
@@ -249,8 +248,7 @@ const parseBitcoinNetworksJson = (json: any) => {
 
 export const ethereumNetworkInfoBase = {
     type: 'ethereum' as const,
-    decimals: 16,
-    ...getEthereumFeeLevels(),
+    decimals: 18,
 };
 
 const parseEthereumNetworksJson = (json: any) => {
@@ -259,6 +257,7 @@ const parseEthereumNetworksJson = (json: any) => {
 
         ethereumNetworks.push({
             ...ethereumNetworkInfoBase,
+            ...getEthereumFeeLevels(network.chain),
             blockchainLink: network.blockchain_link,
             chainId: network.chain_id,
             label: network.label,
@@ -304,8 +303,8 @@ export const parseCoinsJson = (json: any) => {
     });
 };
 
-export const getUniqueNetworks = (networks: (CoinInfo | undefined)[]) =>
-    networks.reduce((result: CoinInfo[], info?: CoinInfo) => {
+export const getUniqueNetworks = <T extends { shortcut: string }>(networks: (T | undefined)[]) =>
+    networks.reduce((result: T[], info?: T) => {
         if (!info || result.find(i => i.shortcut === info.shortcut)) return result;
 
         return result.concat(info);

packages/connect/src/data/defaultFeeLevels.ts

@@ -1,3 +1,5 @@
+import { BigNumber } from '@trezor/utils';
+
 import { FeeLevel, FeeInfo } from '../types';
 
 // this is workaround for the lack of information from 'trezor-common'
@@ -18,6 +20,25 @@ const getDefaultBlocksForFeeLevel = (shortcut: string, label: string) =>
         ? BLOCKS_FOR_FEE_LEVEL[shortcut][label]
         : -1; // -1 for unknown
 
+const EVM_GAS_PRICE_PER_CHAIN_IN_GWEI: Record<
+    string,
+    { min: number; max: number; defaultGas: number }
+> = {
+    eth: { min: 1, max: 10000, defaultGas: 15 },
+    pol: { min: 1, max: 10000000, defaultGas: 200 },
+    bsc: { min: 1, max: 100000, defaultGas: 3 },
+    base: { min: 0.0000001, max: 1000, defaultGas: 0.01 },
+    arb: { min: 0.001, max: 1000, defaultGas: 0.01 },
+    op: { min: 0.000000001, max: 1000, defaultGas: 0.01 },
+};
+
+const getEvmChainGweiGasPrice = (chain: string) =>
+    EVM_GAS_PRICE_PER_CHAIN_IN_GWEI[chain] ?? {
+        min: 0.000000001,
+        max: 10000,
+        defaultGas: 5,
+    };
+
 // partial data from coins.jon
 interface CoinsJsonData {
     shortcut: string; // uppercase shortcut
@@ -58,20 +79,24 @@ export const getBitcoinFeeLevels = (coin: CoinsJsonData): FeeInfoWithLevels => {
     };
 };
 
-export const getEthereumFeeLevels = (): FeeInfoWithLevels => ({
-    blockTime: -1, // unknown
-    defaultFees: [
-        {
-            label: 'normal' as const,
-            feePerUnit: '5000000000',
-            feeLimit: '21000', // unlike the other networks ethereum have additional value "feeLimit" (Gas limit)
-            blocks: -1, // unknown
-        },
-    ],
-    minFee: 1,
-    maxFee: 10000,
-    dustLimit: -1, // unknown/unused
-});
+export const getEthereumFeeLevels = (chain: string): FeeInfoWithLevels => {
+    const { min, max, defaultGas } = getEvmChainGweiGasPrice(chain);
+
+    return {
+        blockTime: -1, // unknown
+        defaultFees: [
+            {
+                label: 'normal' as const,
+                feePerUnit: new BigNumber(defaultGas).multipliedBy('1e+9').toString(), // defined in wei 1 Gwei = 10^9 Wei
+                feeLimit: '21000', // default transfer gas limit
+                blocks: -1, // unknown
+            },
+        ],
+        minFee: min,
+        maxFee: max,
+        dustLimit: -1, // unknown/unused
+    };
+};
 
 const RIPPLE_FEE_INFO: FeeInfoWithLevels = {
     blockTime: -1, // unknown

packages/connect/src/types/coinInfo.ts

@@ -94,6 +94,16 @@ export const EthereumNetworkInfo = Type.Intersect([
     }),
 ]);
 
+export type EthereumNetworkInfoDefinitionValues = Static<
+    typeof EthereumNetworkInfoDefinitionValues
+>;
+export const EthereumNetworkInfoDefinitionValues = Type.Omit(EthereumNetworkInfo, [
+    'minFee',
+    'maxFee',
+    'defaultFees',
+    'blockTime',
+]);
+
 export type MiscNetworkInfo = Static<typeof MiscNetworkInfo>;
 export const MiscNetworkInfo = Type.Intersect([
     Common,

packages/connect/src/utils/ethereumUtils.ts

@@ -1,8 +1,11 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/utils/ethereumUtils.js
 
-import type { CoinInfo } from '../types';
-
-export const getNetworkLabel = (label: string, network?: CoinInfo) => {
+export const getNetworkLabel = (
+    label: string,
+    network?: {
+        name: string;
+    },
+) => {
     if (network) {
         const name = network.name.toLowerCase().indexOf('testnet') >= 0 ? 'Testnet' : network.name;
 

packages/suite/src/components/wallet/Fees/CustomFee.tsx

@@ -119,9 +119,13 @@ export const CustomFee = <TFieldValues extends FormState>({
                 except: networkType !== 'ethereum',
             }),
             range: (value: string) => {
-                const feeBig = new BigNumber(value);
-                if (feeBig.isGreaterThan(maxFee) || feeBig.isLessThan(minFee)) {
-                    return translationString('CUSTOM_FEE_NOT_IN_RANGE', { minFee, maxFee });
+                const customFee = new BigNumber(value);
+
+                if (customFee.isGreaterThan(maxFee) || customFee.isLessThan(minFee)) {
+                    return translationString('CUSTOM_FEE_NOT_IN_RANGE', {
+                        minFee: new BigNumber(minFee).toString(),
+                        maxFee: new BigNumber(maxFee).toString(),
+                    });
                 }
             },
         },

packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketComposeTransaction.ts

@@ -4,7 +4,7 @@ import { UseFormReturn } from 'react-hook-form';
 import { COMPOSE_ERROR_TYPES } from '@suite-common/wallet-constants';
 import { selectAccounts, selectSelectedDevice } from '@suite-common/wallet-core';
 import { AddressDisplayOptions } from '@suite-common/wallet-types';
-import { getFeeLevels } from '@suite-common/wallet-utils';
+import { getFeeInfo } from '@suite-common/wallet-utils';
 
 import { saveComposedTransactionInfo } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 import { FORM_OUTPUT_ADDRESS, FORM_OUTPUT_AMOUNT } from 'src/constants/wallet/coinmarket/form';
@@ -41,9 +41,14 @@ export const useCoinmarketComposeTransaction = <T extends CoinmarketSellExchange
     >;
     const chunkify = addressDisplayType === AddressDisplayOptions.CHUNKED;
     const { symbol, networkType } = account;
-    const coinFees = fees[symbol];
-    const levels = getFeeLevels(networkType, coinFees);
-    const feeInfo = useMemo(() => ({ ...coinFees, levels }), [coinFees, levels]);
+    const feeInfo = useMemo(
+        () =>
+            getFeeInfo({
+                networkType,
+                feeInfo: fees[symbol],
+            }),
+        [networkType, symbol, fees],
+    );
     const initState = useMemo(() => ({ account, network, feeInfo }), [account, network, feeInfo]);
     const outputAddress = values?.outputs?.[0].address;
     const [state, setState] = useState<CoinmarketUseComposeTransactionStateProps>(initState);

packages/suite/src/hooks/wallet/useClaimEthForm.ts

@@ -1,7 +1,7 @@
 import { createContext, useCallback, useContext, useEffect, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
 
-import { getFeeLevels } from '@suite-common/wallet-utils';
+import { getFeeInfo } from '@suite-common/wallet-utils';
 import { PrecomposedTransactionFinal } from '@suite-common/wallet-types';
 
 import { useDispatch, useSelector } from 'src/hooks/suite';
@@ -40,8 +40,10 @@ export const useClaimEthForm = ({ selectedAccount }: UseStakeFormsProps): ClaimC
     }, [account.symbol]);
 
     const state = useMemo(() => {
-        const levels = getFeeLevels(account.networkType, symbolFees);
-        const feeInfo = { ...symbolFees, levels };
+        const feeInfo = getFeeInfo({
+            networkType: account.networkType,
+            feeInfo: symbolFees,
+        });
 
         return {
             account,
@@ -101,9 +103,10 @@ export const useClaimEthForm = ({ selectedAccount }: UseStakeFormsProps): ClaimC
 
     // sub-hook, FeeLevels handler
     const fees = useSelector(state => state.wallet.fees);
-    const coinFees = fees[account.symbol];
-    const levels = getFeeLevels(account.networkType, coinFees);
-    const feeInfo = { ...coinFees, levels };
+    const feeInfo = getFeeInfo({
+        networkType: account.networkType,
+        feeInfo: fees[account.symbol],
+    });
     const { changeFeeLevel, selectedFee: _selectedFee } = useFees({
         defaultValue: 'normal',
         feeInfo,

packages/suite/src/hooks/wallet/useCoinmarketRecomposeAndSign.ts

@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { DEFAULT_VALUES, DEFAULT_PAYMENT } from '@suite-common/wallet-constants';
 import { FormState } from '@suite-common/wallet-types';
-import { getFeeLevels } from '@suite-common/wallet-utils';
+import { getFeeInfo } from '@suite-common/wallet-utils';
 import { networks } from '@suite-common/wallet-config';
 import type { Account, FormOptions } from '@suite-common/wallet-types';
 import { composeSendFormTransactionFeeLevelsThunk } from '@suite-common/wallet-core';
@@ -80,9 +80,10 @@ export const useCoinmarketRecomposeAndSign = () => {
             };
 
             // prepare form state for composeAction
-            const coinFees = fees[account.symbol];
-            const levels = getFeeLevels(account.networkType, coinFees);
-            const feeInfo = { ...coinFees, levels };
+            const feeInfo = getFeeInfo({
+                networkType: account.networkType,
+                feeInfo: fees[account.symbol],
+            });
             const composeContext = { account, network, feeInfo };
 
             // recalcCustomLimit is used in case of custom fee level, when we want to keep the feePerUnit defined by the user