feat: custom gas in all networks

lavamoat/build-webpack/policy.json

@@ -1156,8 +1156,13 @@
         "define": true
       },
       "packages": {
-        "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true,
-        "webpack>terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true
+        "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true,
+        "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true
+      }
+    },
+    "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/resolve-uri": {
+      "globals": {
+        "define": true
       }
     },
     "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": {

src/core/resources/gas/meteorology.ts

@@ -49,6 +49,11 @@ export type MeteorologyResponse = {
       provider: string;
     };
   };
+  meta: {
+    feeType: 'legacy' | 'eip1559';
+    blockNumber: string;
+    provider: string;
+  };
 };
 
 export type MeteorologyLegacyResponse = {
@@ -58,10 +63,11 @@ export type MeteorologyLegacyResponse = {
       proposeGasPrice: string;
       safeGasPrice: string;
     };
-    meta: {
-      blockNumber: number;
-      provider: string;
-    };
+  };
+  meta: {
+    feeType: 'legacy' | 'eip1559';
+    blockNumber: number;
+    provider: string;
   };
 };
 

src/core/resources/gas/providerGas.ts

@@ -54,10 +54,11 @@ async function providerGasQueryFunction({
         proposeGasPrice: gweiGasPrice,
         safeGasPrice: gweiGasPrice,
       },
-      meta: {
-        blockNumber: 0,
-        provider: 'provider',
-      },
+    },
+    meta: {
+      feeType: 'legacy',
+      blockNumber: 0,
+      provider: 'provider',
     },
   };
 

src/core/state/gas/index.ts

@@ -16,6 +16,7 @@ export interface GasStore {
   gasFeeParamsBySpeed: GasFeeParamsBySpeed | GasFeeLegacyParamsBySpeed;
   customGasModified: boolean;
   setCustomSpeed: (speed: GasFeeParams) => void;
+  setCustomLegacySpeed: (speed: GasFeeLegacyParams) => void;
   setSelectedGas: ({
     selectedGas,
   }: {
@@ -54,6 +55,16 @@ export const gasStore = createStore<GasStore>(
         customGasModified: true,
       });
     },
+    setCustomLegacySpeed: (speed: GasFeeLegacyParams) => {
+      const { gasFeeParamsBySpeed } = get();
+      set({
+        gasFeeParamsBySpeed: {
+          ...gasFeeParamsBySpeed,
+          [GasSpeed.CUSTOM]: speed,
+        } as GasFeeLegacyParamsBySpeed,
+        customGasModified: true,
+      });
+    },
     clearCustomGasModified: () => {
       set({ customGasModified: false });
     },

src/core/utils/gas.ts

@@ -51,6 +51,19 @@ import { getMinimalTimeUnitStringForMs } from './time';
 
 export const FLASHBOTS_MIN_TIP = 6;
 
+const formatDisplayNumber = (number: number | string) => {
+  const n = Number(number);
+  if (n === 0) {
+    return '0';
+  } else if (n < 1) {
+    return n.toFixed(3);
+  } else if (n < 2) {
+    return n.toFixed(2);
+  } else {
+    return n.toFixed(0);
+  }
+};
+
 export const parseGasDataConfirmationTime = ({
   maxBaseFee,
   maxPriorityFee,
@@ -151,11 +164,15 @@ export const parseCustomGasFeeParams = ({
     ? currentBaseFee
     : maxBaseFee.amount;
 
-  const display = `${new BigNumber(
-    weiToGwei(add(baseFee, maxPriorityFeePerGas.amount)),
-  ).toFixed(0)} - ${new BigNumber(
-    weiToGwei(add(baseFeeWei, maxPriorityFeePerGas.amount)),
-  ).toFixed(0)} Gwei`;
+  const display = `${formatDisplayNumber(
+    new BigNumber(
+      weiToGwei(add(baseFee, maxPriorityFeePerGas.amount)),
+    ).toNumber(),
+  )} - ${formatDisplayNumber(
+    new BigNumber(
+      weiToGwei(add(baseFeeWei, maxPriorityFeePerGas.amount)),
+    ).toNumber(),
+  )} Gwei`;
 
   const estimatedTime = parseGasDataConfirmationTime({
     maxBaseFee: maxBaseFee.amount,
@@ -198,6 +215,69 @@ export const parseCustomGasFeeParams = ({
   };
 };
 
+export const parseCustomGasFeeLegacyParams = ({
+  speed,
+  gasPriceWei,
+  gasLimit,
+  nativeAsset,
+  currency,
+  waitTime,
+}: {
+  speed: GasSpeed;
+  gasPriceWei: string;
+  gasLimit: string;
+  nativeAsset?: ParsedAsset;
+  currency: SupportedCurrencyKey;
+  waitTime: number | null;
+}): GasFeeLegacyParams => {
+  const gasPrice = parseGasFeeParam({
+    wei: gasPriceWei || '0',
+  });
+  const display = `${formatDisplayNumber(gasPrice.gwei)} Gwei`;
+
+  const estimatedTime = {
+    amount: waitTime || 0,
+    display: waitTime
+      ? `${waitTime >= 3600 ? '>' : '~'} ${getMinimalTimeUnitStringForMs(
+          Number(multiply(waitTime, 1000)),
+        )}`
+      : '',
+  };
+  const transactionGasParams = {
+    gasPrice: toHex(gasPrice.amount),
+  };
+
+  const amount = gasPrice.amount;
+  const totalWei = multiply(gasLimit, amount);
+
+  const nativeTotalWei = convertRawAmountToBalance(
+    totalWei,
+    supportedCurrencies[nativeAsset?.symbol as SupportedCurrencyKey],
+  ).amount;
+
+  const nativeDisplay = nativeAsset?.price?.value
+    ? convertAmountAndPriceToNativeDisplayWithThreshold(
+        nativeTotalWei,
+        nativeAsset?.price?.value,
+        currency,
+      )
+    : convertRawAmountToBalance(totalWei, {
+        decimals: nativeAsset?.decimals || 18,
+        symbol: nativeAsset?.symbol,
+      });
+
+  const gasFee = { amount: totalWei, display: nativeDisplay.display };
+
+  return {
+    display,
+    estimatedTime,
+    gasFee,
+    gasPrice,
+    option: speed,
+    transactionGasParams,
+  };
+};
+
 export const parseGasFeeParams = ({
   wei,
   currentBaseFee,
@@ -238,11 +318,15 @@ export const parseGasFeeParams = ({
     ? currentBaseFee
     : maxBaseFee.amount;
 
-  const display = `${new BigNumber(
-    weiToGwei(add(baseFee, maxPriorityFeePerGas.amount)),
-  ).toFixed(0)} - ${new BigNumber(
-    weiToGwei(add(maxBaseFee.amount, maxPriorityFeePerGas.amount)),
-  ).toFixed(0)} Gwei`;
+  const display = `${formatDisplayNumber(
+    new BigNumber(
+      weiToGwei(add(baseFee, maxPriorityFeePerGas.amount)),
+    ).toNumber(),
+  )} - ${formatDisplayNumber(
+    new BigNumber(
+      weiToGwei(add(maxBaseFee.amount, maxPriorityFeePerGas.amount)),
+    ).toNumber(),
+  )} Gwei`;
 
   const estimatedTime = parseGasDataConfirmationTime({
     maxBaseFee: maxBaseFee.amount,
@@ -314,7 +398,7 @@ export const parseGasFeeLegacyParams = ({
   const gasPrice = parseGasFeeParam({
     wei: new BigNumber(multiply(wei, getBaseFeeMultiplier(speed))).toFixed(0),
   });
-  const display = parseGasFeeParam({ wei }).display;
+  const display = `${formatDisplayNumber(gasPrice.gwei)} Gwei`;
 
   const estimatedTime = {
     amount: waitTime || 0,