cleanup raps + network specific gas logic

src/entities/index.ts

@@ -1,16 +1,16 @@
 export { default as AssetTypes, AssetType } from './assetTypes';
-export type {
-  BlocksToConfirmation,
-  BlocksToConfirmationByBaseFee,
-  BlocksToConfirmationByPriorityFee,
-  GasFeeParam,
-  GasFeeParams,
-  GasFeeParamsBySpeed,
-  TransactionGasParams,
-  GasFeeLegacyParams,
-  GasFeeLegacyParamsBySpeed,
+export {
+  type BlocksToConfirmation,
+  type BlocksToConfirmationByBaseFee,
+  type BlocksToConfirmationByPriorityFee,
+  type GasFeeParam,
+  type GasFeeParams,
+  type GasFeeParamsBySpeed,
+  type TransactionGasParams,
+  type GasFeeLegacyParams,
+  type GasFeeLegacyParamsBySpeed,
   GasSpeed,
-  TransactionLegacyGasParams,
+  type TransactionLegacyGasParams,
 } from './gas';
 export { NativeCurrencyKeys } from './nativeCurrencyTypes';
 export type { NativeCurrencyKey } from './nativeCurrencyTypes';

src/hooks/useHasEnoughGas.ts

@@ -0,0 +1,13 @@
+import { useGasStore } from '@/state/gas/gasStore';
+import { ChainId } from '@/entities/chains';
+import { gweiToWei } from '@/parsers';
+import { lessThan } from '@/__swaps__/utils/numbers';
+import { ethereumUtils } from '@/utils';
+
+export const useHasEnoughGas = async ({ chainId }: { chainId: ChainId }) => {
+  const nativeAsset = await ethereumUtils.getNativeAssetForNetwork(ethereumUtils.getNetworkFromChainId(chainId));
+
+  const { selectedGas } = useGasStore();
+
+  return lessThan(selectedGas?.gasFee?.amount || '0', gweiToWei(nativeAsset?.balance?.amount || '0'));
+};

src/networks/arbitrum.ts

@@ -1,10 +1,9 @@
 import { getProviderForNetwork, proxyRpcEndpoint } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
 import { arbitrum } from '@wagmi/chains';
 import { ARBITRUM_ETH_ADDRESS } from '@/references';
-import { getArbitrumGasPrices } from '@/redux/gas';
 import { getRemoteConfig } from '@/model/remoteConfig';
+import { getGasSpeeds } from '.';
 
 export const getArbitrumNetworkObject = (): NetworkProperties => {
   const { arbitrum_enabled, arbitrum_tx_enabled } = getRemoteConfig();
@@ -42,17 +41,10 @@ export const getArbitrumNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL, gasUtils.FAST, gasUtils.URGENT, gasUtils.CUSTOM],
-
+      speeds: getGasSpeeds(),
       // ?
       gasType: 'eip1559',
       roundGasDisplay: true,
-
-      // this prob can just be blockTime
-      pollingIntervalInMs: 3_000,
-
-      // needs more research
-      getGasPrices: getArbitrumGasPrices,
     },
 
     swaps: {

src/networks/avalanche.ts

@@ -1,10 +1,9 @@
 import { getProviderForNetwork, proxyRpcEndpoint } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
 import { avalanche } from '@wagmi/chains';
 import { AVAX_AVALANCHE_ADDRESS } from '@/references';
-import { getAvalancheGasPrices } from '@/redux/gas';
 import { getRemoteConfig } from '@/model/remoteConfig';
+import { getGasSpeeds } from '.';
 
 export const getAvalancheNetworkObject = (): NetworkProperties => {
   const { avalanche_enabled, avalanche_tx_enabled } = getRemoteConfig();
@@ -42,15 +41,10 @@ export const getAvalancheNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL, gasUtils.FAST, gasUtils.URGENT, gasUtils.CUSTOM],
+      speeds: getGasSpeeds(),
       // ?
       gasType: 'eip1559',
       roundGasDisplay: true,
-
-      // this prob can just be blockTime,
-      pollingIntervalInMs: 5_000,
-
-      getGasPrices: getAvalancheGasPrices,
     },
 
     swaps: {

src/networks/base.ts

@@ -1,10 +1,9 @@
 import { getProviderForNetwork, proxyRpcEndpoint } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
 import { base } from '@wagmi/chains';
 import { BASE_ETH_ADDRESS } from '@/references';
-import { getBaseGasPrices } from '@/redux/gas';
 import { getRemoteConfig } from '@/model/remoteConfig';
+import { getGasSpeeds } from '.';
 
 export const getBaseNetworkObject = (): NetworkProperties => {
   const { base_enabled, base_tx_enabled, op_chains_enabled, op_chains_tx_enabled } = getRemoteConfig();
@@ -41,16 +40,11 @@ export const getBaseNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL, gasUtils.FAST, gasUtils.URGENT, gasUtils.CUSTOM],
+      speeds: getGasSpeeds(),
       // ?
       gasType: 'eip1559',
       roundGasDisplay: true,
       OptimismTxFee: true,
-
-      // this prob can just be blockTime,
-      pollingIntervalInMs: 5_000,
-
-      getGasPrices: getBaseGasPrices,
     },
 
     swaps: {

src/networks/blast.ts

@@ -1,13 +1,10 @@
+import { blast } from 'viem/chains';
 import { getProviderForNetwork, proxyRpcEndpoint } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
-import { blast } from 'viem/chains';
-import { getBlastGasPrices } from '@/redux/gas';
 import { getRemoteConfig } from '@/model/remoteConfig';
 import { BLAST_MAINNET_RPC } from 'react-native-dotenv';
 import { BLAST_ETH_ADDRESS } from '@/references';
-
-const BLAST_CHAIN_ID = 81457;
+import { getGasSpeeds } from '.';
 
 export const getBlastNetworkObject = (): NetworkProperties => {
   const { blast_enabled, blast_tx_enabled } = getRemoteConfig();
@@ -30,7 +27,7 @@ export const getBlastNetworkObject = (): NetworkProperties => {
     },
 
     balanceCheckerAddress: '',
-    rpc: proxyRpcEndpoint(BLAST_CHAIN_ID),
+    rpc: proxyRpcEndpoint(blast.id),
     getProvider: getProviderForNetwork(Network.blast),
 
     // features
@@ -45,15 +42,10 @@ export const getBlastNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL, gasUtils.FAST, gasUtils.URGENT, gasUtils.CUSTOM],
+      speeds: getGasSpeeds(),
       // ?
       gasType: 'eip1559',
       roundGasDisplay: true,
-
-      // this prob can just be blockTime,
-      pollingIntervalInMs: 5_000,
-
-      getGasPrices: getBlastGasPrices,
     },
 
     swaps: {

src/networks/bsc.ts

@@ -1,10 +1,10 @@
 import { getProviderForNetwork, proxyRpcEndpoint } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
 import { bsc } from '@wagmi/chains';
 import { BNB_BSC_ADDRESS, BNB_MAINNET_ADDRESS } from '@/references';
-import { getBscGasPrices } from '@/redux/gas';
 import { getRemoteConfig } from '@/model/remoteConfig';
+import { getGasSpeeds } from '.';
+import { GasSpeed } from '@/entities';
 
 export const getBSCNetworkObject = (): NetworkProperties => {
   const { bsc_enabled, bsc_tx_enabled } = getRemoteConfig();
@@ -43,17 +43,11 @@ export const getBSCNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL, gasUtils.FAST, gasUtils.URGENT],
+      speeds: getGasSpeeds([GasSpeed.NORMAL, GasSpeed.FAST, GasSpeed.URGENT]),
 
       // ?
       gasType: 'legacy',
       roundGasDisplay: false,
-
-      // this prob can just be blockTime
-      pollingIntervalInMs: 3_000,
-
-      // needs more research
-      getGasPrices: getBscGasPrices,
     },
 
     swaps: {

src/networks/degen.ts

@@ -1,11 +1,10 @@
 import { getProviderForNetwork, proxyRpcEndpoint } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
 import { degen } from 'viem/chains';
 import { DEGEN_CHAIN_DEGEN_ADDRESS } from '@/references';
-import { getDegenGasPrices } from '@/redux/gas';
 import { getRemoteConfig } from '@/model/remoteConfig';
 import { DEGEN_MAINNET_RPC } from 'react-native-dotenv';
+import { getGasSpeeds } from '.';
 
 export const getDegenNetworkObject = (): NetworkProperties => {
   const { degen_enabled, degen_tx_enabled } = getRemoteConfig();
@@ -44,15 +43,10 @@ export const getDegenNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL, gasUtils.FAST, gasUtils.URGENT, gasUtils.CUSTOM],
+      speeds: getGasSpeeds(),
       // ?
       gasType: 'eip1559',
       roundGasDisplay: true,
-
-      // this prob can just be blockTime,
-      pollingIntervalInMs: 5_000,
-
-      getGasPrices: getDegenGasPrices,
     },
 
     swaps: {

src/networks/gnosis.ts

@@ -1,9 +1,9 @@
 import { getProviderForNetwork } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
 import { gnosis } from '@wagmi/chains';
 import { ETH_ADDRESS } from '@/references';
-import { getOptimismGasPrices } from '@/redux/gas';
+import { getGasSpeeds } from '.';
+import { GasSpeed } from '@/entities';
 
 export const getGnosisNetworkObject = (): NetworkProperties => {
   return {
@@ -39,17 +39,12 @@ export const getGnosisNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL],
+      speeds: getGasSpeeds([GasSpeed.NORMAL]),
 
       // ?
       gasType: 'legacy',
       roundGasDisplay: true,
       OptimismTxFee: true,
-
-      // this prob can just be blockTime,
-      pollingIntervalInMs: 5_000,
-
-      getGasPrices: getOptimismGasPrices,
     },
 
     swaps: {

src/networks/goerli.ts

@@ -1,9 +1,10 @@
 import { getProviderForNetwork, proxyRpcEndpoint } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
 import { goerli } from '@wagmi/chains';
 import { ETH_ADDRESS } from '@/references';
 import { getRemoteConfig } from '@/model/remoteConfig';
+import { GasSpeed } from '@/entities';
+import { getGasSpeeds } from '.';
 
 export const getGoerliNetworkObject = (): NetworkProperties => {
   const { goerli_enabled, goerli_tx_enabled } = getRemoteConfig();
@@ -43,15 +44,9 @@ export const getGoerliNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL, gasUtils.FAST, gasUtils.CUSTOM],
+      speeds: getGasSpeeds([GasSpeed.NORMAL, GasSpeed.FAST, GasSpeed.URGENT]),
       gasType: 'eip1559',
       roundGasDisplay: true,
-
-      // this prob can just be blockTime
-      pollingIntervalInMs: 5_000,
-
-      // needs more research
-      getGasPrices: async () => null,
     },
 
     swaps: {

src/networks/index.ts

@@ -13,6 +13,13 @@ import { getBlastNetworkObject } from './blast';
 import { getDegenNetworkObject } from './degen';
 import store from '@/redux/store';
 import * as ls from '@/storage';
+import { GasSpeed } from '@/entities';
+
+export const DEFAULT_GAS_SPEEDS = Object.values(GasSpeed);
+
+export const getGasSpeeds = (speeds?: GasSpeed[]) => {
+  return speeds || DEFAULT_GAS_SPEEDS;
+};
 
 /**
  * Array of all Rainbow Networks

src/networks/mainnet.ts

@@ -1,9 +1,9 @@
 import { getProviderForNetwork, proxyRpcEndpoint } from '@/handlers/web3';
 import { Network, NetworkProperties } from './types';
-import { gasUtils } from '@/utils';
 import { mainnet } from '@wagmi/chains';
 import { ETH_ADDRESS } from '@/references';
 import { getRemoteConfig } from '@/model/remoteConfig';
+import { getGasSpeeds } from '.';
 
 export const getMainnetNetworkObject = (): NetworkProperties => {
   const { mainnet_enabled, mainnet_tx_enabled } = getRemoteConfig();
@@ -43,15 +43,9 @@ export const getMainnetNetworkObject = (): NetworkProperties => {
     },
 
     gas: {
-      speeds: [gasUtils.NORMAL, gasUtils.FAST, gasUtils.URGENT, gasUtils.CUSTOM],
+      speeds: getGasSpeeds(),
       gasType: 'eip1559',
       roundGasDisplay: true,
-
-      // this prob can just be blockTime
-      pollingIntervalInMs: 5_000,
-
-      // needs more research
-      getGasPrices: async () => null,
     },
 
     swaps: {