refactor: delete getTokenBalance and getNativeBalance from routes

wormhole-foundation · Sep 8, 2023 · e7a3f50 · e7a3f50
1 parent a02850c
commit e7a3f50
Show file tree

Hide file tree

Showing 18 changed files with 157 additions and 222 deletions.
diff --git a/wormhole-connect/public/index.html b/wormhole-connect/public/index.html
@@ -16,9 +16,6 @@
   <body style="margin: 0">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <!-- <div id="wormhole-connect" config='{"networks": ["goerli", "mumbai"], "tokens": ["ETH", "WETH", "MATIC", "WMATIC"], "theme": "light"}'></div> -->
-    <div
-      id="wormhole-connect"
-      config='{"routes": ["bridge", "cctpManual"]}'
-    ></div>
+    <div id="wormhole-connect"></div>
   </body>
 </html>
diff --git a/wormhole-connect/src/components/ChainsModal.tsx b/wormhole-connect/src/components/ChainsModal.tsx
@@ -5,7 +5,7 @@ import {
   ChainConfig,
   ChainName,
 } from '@wormhole-foundation/wormhole-connect-sdk';
-import { CHAINS_ARR, CHAINS, ROUTES } from '../config';
+import { CHAINS_ARR, CHAINS } from '../config';
 import { CENTER, joinClass } from '../utils/style';
 
 import Header from './Header';
@@ -85,7 +85,7 @@ function ChainsModal(props: Props) {
     return chains.filter((chain) => {
       return supported.includes(chain.key);
     });
-  }, [ROUTES, chains]);
+  }, [chains]);
 
   const searchChains = (
     e:

diff --git a/wormhole-connect/src/components/TokensModal.tsx b/wormhole-connect/src/components/TokensModal.tsx
@@ -17,9 +17,9 @@ import { CHAINS, TOKENS_ARR } from 'config';
 import { TokenConfig } from 'config/types';
 import { setBalance, formatBalance, clearBalances } from 'store/transferInput';
 import { displayAddress } from 'utils';
+import { wh } from 'utils/sdk';
 import { CENTER, NO_INPUT } from 'utils/style';
 import { isCosmWasmChain } from 'utils/cosmos';
-import RouteOperator from 'utils/routes/operator';
 
 import Header from './Header';
 import Modal from './Modal';
@@ -29,6 +29,7 @@ import Scroll from './Scroll';
 import TokenIcon from '../icons/TokenIcons';
 import CircularProgress from '@mui/material/CircularProgress';
 import Tabs from './Tabs';
+import { CosmosGatewayRoute } from 'utils/routes';
 
 const useStyles = makeStyles()((theme: any) => ({
   tokensContainer: {
@@ -337,20 +338,36 @@ function TokensModal(props: Props) {
   }, [chain, walletAddress]);
 
   const getBalances = useCallback(async () => {
-    if (!walletAddress || !chain || !route) return;
+    if (!walletAddress || !chain) return;
     // fetch all N tokens and trigger a single update action
     const balancesArr = await Promise.all(
       allTokens.map(async (t) => {
         let balance: BigNumber | null = null;
         try {
-          balance = t.tokenId
-            ? await RouteOperator.getTokenBalance(
-                route,
+          if (t.tokenId) {
+            // TODO: going to do some refactoring of gateway/cosmos contexts
+            if (isCosmWasmChain(wh.toChainId(chain))) {
+              const denom = await new CosmosGatewayRoute().getForeignAsset(
+                t.tokenId,
+                chain,
+              );
+              if (denom) {
+                balance = await wh.getNativeBalance(
+                  walletAddress,
+                  chain,
+                  denom,
+                );
+              }
+            } else {
+              balance = await wh.getTokenBalance(
                 walletAddress,
                 t.tokenId,
                 chain,
-              )
-            : await RouteOperator.getNativeBalance(route, walletAddress, chain);
+              );
+            }
+          } else {
+            balance = await wh.getNativeBalance(walletAddress, chain);
+          }
         } catch (e) {
           console.warn('Failed to fetch balance', e);
         }

diff --git a/wormhole-connect/src/store/transferInput.ts b/wormhole-connect/src/store/transferInput.ts
@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { ChainName } from '@wormhole-foundation/wormhole-connect-sdk';
 import { BigNumber } from 'ethers';
-import { ROUTES, TOKENS, config } from 'config';
+import { TOKENS, config } from 'config';
 import { Route, TokenConfig } from 'config/types';
 import { getTokenDecimals } from 'utils';
 import { toDecimals } from 'utils/balance';
@@ -48,7 +48,7 @@ export interface TransferInputState {
   destToken: string;
   amount: string;
   receiveAmount: string;
-  route: Route;
+  route: Route | undefined;
   sourceBalances: Balances;
   destBalances: Balances;
   foreignAsset: string;
@@ -78,14 +78,14 @@ const initialState: TransferInputState = {
     foreignAsset: '',
     associatedTokenAccount: '',
   },
-  availableRoutes: ROUTES,
+  availableRoutes: [],
   fromChain: config?.bridgeDefaults?.fromNetwork || undefined,
   toChain: config?.bridgeDefaults?.toNetwork || undefined,
   token: config?.bridgeDefaults?.token || '',
   destToken: '',
   amount: '',
   receiveAmount: '',
-  route: ROUTES[0] as Route,
+  route: undefined,
   sourceBalances: {},
   destBalances: {},
   foreignAsset: '',
@@ -218,9 +218,17 @@ export const transferInputSlice = createSlice({
     },
     setTransferRoute: (
       state: TransferInputState,
-      { payload }: PayloadAction<Route>,
+      { payload }: PayloadAction<Route | undefined>,
     ) => {
-      state.route = payload;
+      if (!payload) {
+        state.route = undefined;
+        return;
+      }
+      if (state.availableRoutes.includes(payload)) {
+        state.route = payload;
+      } else {
+        state.route = undefined;
+      }
     },
     // gas estimates
     setSendingGasEst: (

diff --git a/wormhole-connect/src/utils/routes/bridge.ts b/wormhole-connect/src/utils/routes/bridge.ts
@@ -245,21 +245,6 @@ export class BridgeRoute extends BaseRoute {
     ];
   }
 
-  getNativeBalance(
-    address: string,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    return wh.getNativeBalance(address, chain);
-  }
-
-  getTokenBalance(
-    address: string,
-    tokenId: TokenId,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    return wh.getTokenBalance(address, tokenId, chain);
-  }
-
   async getRelayerFee(
     sourceChain: ChainName | ChainId,
     destChain: ChainName | ChainId,

diff --git a/wormhole-connect/src/utils/routes/cctpManual.ts b/wormhole-connect/src/utils/routes/cctpManual.ts
@@ -468,21 +468,6 @@ export class CCTPManualRoute extends BaseRoute {
     ];
   }
 
-  getNativeBalance(
-    address: string,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    return wh.getNativeBalance(address, chain);
-  }
-
-  getTokenBalance(
-    address: string,
-    tokenId: TokenId,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    return wh.getTokenBalance(address, tokenId, chain);
-  }
-
   async getRelayerFee(
     sourceChain: ChainName | ChainId,
     destChain: ChainName | ChainId,

diff --git a/wormhole-connect/src/utils/routes/cosmosGateway.ts b/wormhole-connect/src/utils/routes/cosmosGateway.ts
@@ -415,27 +415,6 @@ export class CosmosGatewayRoute extends BaseRoute {
     ];
   }
 
-  async getNativeBalance(
-    address: string,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    return wh.getNativeBalance(address, chain);
-  }
-
-  async getTokenBalance(
-    address: string,
-    tokenId: TokenId,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    if (isCosmWasmChain(wh.toChainId(chain))) {
-      const denom = await this.getForeignAsset(tokenId, chain);
-      if (!denom) return null;
-      return wh.getNativeBalance(address, chain, denom);
-    }
-
-    return wh.getTokenBalance(address, tokenId, chain);
-  }
-
   private isNativeDenom(denom: string, chain: ChainName | ChainId): boolean {
     const chainId = wh.toChainId(chain);
     switch (chainId) {

diff --git a/wormhole-connect/src/utils/routes/hashflow.ts b/wormhole-connect/src/utils/routes/hashflow.ts
@@ -108,20 +108,7 @@ export class HashflowRoute extends RouteAbstract {
   ): Promise<string> {
     throw new Error('Method not implemented.');
   }
-  public getPreview<P>(params: P): Promise<TransferDisplayData> {
-    throw new Error('Method not implemented.');
-  }
-  getNativeBalance(
-    address: string,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    throw new Error('Method not implemented.');
-  }
-  getTokenBalance(
-    address: string,
-    tokenId: TokenId,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
+  getPreview<P>(params: P): Promise<TransferDisplayData> {
     throw new Error('Method not implemented.');
   }
   async getRelayerFee(

diff --git a/wormhole-connect/src/utils/routes/operator.ts b/wormhole-connect/src/utils/routes/operator.ts
@@ -417,25 +417,6 @@ export class Operator {
     );
   }
 
-  async getNativeBalance(
-    route: Route,
-    address: string,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    const r = this.getRoute(route);
-    return r.getNativeBalance(address, chain);
-  }
-
-  async getTokenBalance(
-    route: Route,
-    address: string,
-    tokenId: TokenId,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null> {
-    const r = this.getRoute(route);
-    return r.getTokenBalance(address, tokenId, chain);
-  }
-
   async getRelayerFee(
     route: Route,
     sourceChain: ChainName | ChainId,

diff --git a/wormhole-connect/src/utils/routes/routeAbstract.ts b/wormhole-connect/src/utils/routes/routeAbstract.ts
@@ -134,17 +134,6 @@ export default abstract class RouteAbstract {
   ): Promise<TransferDisplayData>;
 
   // send, validate, estimate gas, isRouteAvailable, parse data from VAA/fetch data, claim
-
-  abstract getNativeBalance(
-    address: string,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null>;
-  abstract getTokenBalance(
-    address: string,
-    tokenId: TokenId,
-    chain: ChainName | ChainId,
-  ): Promise<BigNumber | null>;
-
   abstract getRelayerFee(
     sourceChain: ChainName | ChainId,
     destChain: ChainName | ChainId,

diff --git a/wormhole-connect/src/utils/transferValidation.ts b/wormhole-connect/src/utils/transferValidation.ts
@@ -89,7 +89,6 @@ export const validateDestToken = (
 export const validateAmount = (
   amount: string,
   balance: string | null,
-  route: Route,
   minAmt: number | undefined,
 ): ValidationErr => {
   const numAmount = Number.parseFloat(amount);
@@ -138,10 +137,10 @@ export const validateToNativeAmt = (
 };
 
 export const validateRoute = (
-  route: Route,
+  route: Route | undefined,
   availableRoutes: string[],
 ): ValidationErr => {
-  if (!availableRoutes || !availableRoutes.includes(route)) {
+  if (!route || !availableRoutes || !availableRoutes.includes(route)) {
     return 'No bridge or swap route available for selected tokens';
   }
   return '';
@@ -169,6 +168,18 @@ export const validateSolanaTokenAccount = (
   return '';
 };
 
+export const getMinAmt = (route: Route | undefined, relayData: any): number => {
+  if (!route) return 0;
+  const r = RouteOperator.getRoute(route);
+  return r.getMinSendAmount(relayData);
+};
+
+export const getIsAutomatic = (route: Route | undefined): boolean => {
+  if (!route) return false;
+  const r = RouteOperator.getRoute(route);
+  return r.AUTOMATIC_DEPOSIT;
+};
+
 export const validateAll = async (
   transferData: TransferInputState,
   relayData: RelayState,
@@ -188,18 +199,17 @@ export const validateAll = async (
   } = transferData;
   const { maxSwapAmt, toNativeToken } = relayData;
   const { sending, receiving } = walletData;
-  if (!route) throw new Error('no route selected');
-  const r = RouteOperator.getRoute(route);
-  const isAutomatic = r.AUTOMATIC_DEPOSIT;
-  const minAmt = r.getMinSendAmount(relayData);
+  const isAutomatic = getIsAutomatic(route);
+  const minAmt = getMinAmt(route, relayData);
+
   const baseValidations = {
     sendingWallet: await validateWallet(sending, fromChain),
     receivingWallet: await validateWallet(receiving, toChain),
     fromChain: validateFromChain(fromChain),
     toChain: validateToChain(toChain, fromChain),
     token: validateToken(token, fromChain),
     destToken: validateDestToken(destToken, toChain),
-    amount: validateAmount(amount, balances[token], route, minAmt),
+    amount: validateAmount(amount, balances[token], minAmt),
     route: validateRoute(route, availableRoutes),
     toNativeToken: '',
     foreignAsset: validateForeignAsset(foreignAsset),
@@ -212,7 +222,7 @@ export const validateAll = async (
   if (!isAutomatic) return baseValidations;
   return {
     ...baseValidations,
-    amount: validateAmount(amount, balances[token], route, minAmt),
+    amount: validateAmount(amount, balances[token], minAmt),
     toNativeToken: validateToNativeAmt(toNativeToken, maxSwapAmt),
   };
 };