refactor: Refactor sdk

bnb-chain · Nov 13, 2024 · 030d8c3 · 030d8c3
1 parent 778fb75
commit 030d8c3
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 83 deletions.
diff --git a/packages/canonical-bridge-sdk/src/aggregator/index.ts b/packages/canonical-bridge-sdk/src/aggregator/index.ts
@@ -99,11 +99,13 @@ export class CanonicalBridgeSDK {
           const adapter = this.options.adapters.find(
             (e) => e.bridgeType === bridgeType
           );
-          if (adapter) return adapter;
-
-          throw Error(
-            `${bridgeType} adapter is not found, you should initialize an adapter before using`
-          );
+          if (adapter) {
+            return adapter;
+          } else {
+            console.warn(
+              `${bridgeType} adapter is not found, you should initialize an adapter before using`
+            );
+          }
         },
       });
     });
@@ -559,4 +561,8 @@ export class CanonicalBridgeSDK {
 
     return Array.from(tokenMap.values());
   }
+
+  public getChainDetail() {}
+
+  public getTokenDetail() {}
 }
diff --git a/...nical-bridge-widget/src/modules/aggregator/adapters/stargate/hooks/useStargateWaitTime.ts b/...nical-bridge-widget/src/modules/aggregator/adapters/stargate/hooks/useStargateWaitTime.ts
@@ -22,7 +22,7 @@ export const useStargateWaitTime = () => {
         toEndpointId: String(toEndpointId),
       });
     },
-    enabled: !!fromEndpointId && !!toEndpointId && isMainnet,
+    enabled: !!fromEndpointId && !!toEndpointId && isMainnet && !!bridgeSDK.stargate,
     staleTime: 1000 * 30,
   });
 };
diff --git a/...l-bridge-widget/src/modules/aggregator/components/SelectModal/DestinationNetworkModal.tsx b/...l-bridge-widget/src/modules/aggregator/components/SelectModal/DestinationNetworkModal.tsx
@@ -10,6 +10,7 @@ import { reportEvent } from '@/core/utils/gtm';
 import { useSearch } from '@/modules/aggregator/components/SelectModal/hooks/useSearch';
 import { BaseModal } from '@/modules/aggregator/components/SelectModal/components/BaseModal';
 import { ListItem } from '@/modules/aggregator/components/SelectModal/components/ListItem';
+import { useChainList } from '@/modules/aggregator/components/SelectModal/hooks/useChainList';
 
 interface DestinationNetworkModalProps {
   isOpen: boolean;
@@ -33,9 +34,9 @@ export function DestinationNetworkModal(props: DestinationNetworkModalProps) {
 
   const { isNoResult, result, onSearch } = useSearch({
     filter: (item, keyword) => item.name.toLowerCase().includes(keyword),
-    sorter: (a) => (toChain?.id === a.id ? -1 : 0),
     data: toChains,
   });
+  const { data } = useChainList('to', result);
 
   return (
     <BaseModal
@@ -46,7 +47,7 @@ export function DestinationNetworkModal(props: DestinationNetworkModalProps) {
       placeholder={formatMessage({ id: 'select-modal.destination.placeholder' })}
       isNoResult={isNoResult}
     >
-      <VirtualList data={result} itemHeight={64}>
+      <VirtualList data={data} itemHeight={64}>
         {(item) => (
           <ListItem
             key={item.id}

diff --git a/...onical-bridge-widget/src/modules/aggregator/components/SelectModal/SourceNetworkModal.tsx b/...onical-bridge-widget/src/modules/aggregator/components/SelectModal/SourceNetworkModal.tsx
@@ -11,6 +11,7 @@ import { useSearch } from '@/modules/aggregator/components/SelectModal/hooks/use
 import { ListItem } from '@/modules/aggregator/components/SelectModal/components/ListItem';
 import { reportEvent } from '@/core/utils/gtm';
 import { setToAccount } from '@/modules/transfer/action';
+import { useChainList } from '@/modules/aggregator/components/SelectModal/hooks/useChainList';
 
 interface SourceNetworkModalProps {
   isOpen: boolean;
@@ -32,9 +33,9 @@ export function SourceNetworkModal(props: SourceNetworkModalProps) {
 
   const { isNoResult, result, onSearch } = useSearch({
     filter: (item, keyword) => item.name.toLowerCase().includes(keyword),
-    sorter: (a) => (fromChain?.id === a.id ? -1 : 0),
     data: fromChains,
   });
+  const { data } = useChainList('from', result);
 
   return (
     <BaseModal
@@ -45,7 +46,7 @@ export function SourceNetworkModal(props: SourceNetworkModalProps) {
       placeholder={formatMessage({ id: 'select-modal.source.placeholder' })}
       isNoResult={isNoResult}
     >
-      <VirtualList data={result} itemHeight={64}>
+      <VirtualList data={data} itemHeight={64}>
         {(item) => (
           <ListItem
             key={item.id}

diff --git a/...nonical-bridge-widget/src/modules/aggregator/components/SelectModal/hooks/useChainList.ts b/...nonical-bridge-widget/src/modules/aggregator/components/SelectModal/hooks/useChainList.ts
@@ -0,0 +1,59 @@
+import { useMemo } from 'react';
+import { IBridgeChain } from '@bnb-chain/canonical-bridge-sdk';
+
+import { useAggregator } from '@/modules/aggregator/components/AggregatorProvider';
+import { useAppSelector } from '@/modules/store/StoreProvider';
+
+export function useChainList(direction: 'from' | 'to', chains: IBridgeChain[] = []) {
+  const { transferConfig } = useAggregator();
+
+  const fromChain = useAppSelector((state) => state.transfer.fromChain);
+  const toChain = useAppSelector((state) => state.transfer.toChain);
+
+  const sortedChains = useMemo(() => {
+    const chainOrder = transferConfig.order?.chains ?? [];
+
+    const sortedChains = chains
+      .sort((a, b) => {
+        if (direction === 'to') {
+          const isA = a.isCompatible;
+          const isB = b.isCompatible;
+
+          if (isA && !isB) {
+            return -1;
+          }
+          if (!isA && isB) {
+            return 1;
+          }
+        }
+
+        const indexA = chainOrder.indexOf(a.id);
+        const indexB = chainOrder.indexOf(b.id);
+
+        if (indexA > -1 && indexB === -1) {
+          return -1;
+        }
+        if (indexA === -1 && indexB > -1) {
+          return 1;
+        }
+        if (indexA > -1 && indexB > -1) {
+          return indexA - indexB;
+        }
+
+        return a.name < b.name ? -1 : 1;
+      })
+      .sort((a) => {
+        if (direction === 'from' && a.id === fromChain?.id) {
+          return -1;
+        }
+        if (direction === 'to' && a.id === toChain?.id) {
+          return -1;
+        }
+        return 0;
+      });
+
+    return sortedChains;
+  }, [transferConfig.order?.chains, chains, direction, fromChain?.id, toChain?.id]);
+
+  return { data: sortedChains };
+}
diff --git a/...nonical-bridge-widget/src/modules/aggregator/components/SelectModal/hooks/useTokenList.ts b/...nonical-bridge-widget/src/modules/aggregator/components/SelectModal/hooks/useTokenList.ts
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { IBridgeToken } from '@bnb-chain/canonical-bridge-sdk';
+import { IBridgeToken, isSameAddress } from '@bnb-chain/canonical-bridge-sdk';
 
 import { IBridgeTokenWithBalance } from '@/modules/aggregator/types';
 import { useTokenPrice } from '@/modules/aggregator/hooks/useTokenPrice';
@@ -37,7 +37,8 @@ export function useTokenList(tokens: IBridgeToken[] = []) {
     const sortedTokens = sortTokens({
       tokens: tmpTokens,
       orders: transferConfig.order?.tokens,
-      selectedTokenAddress: selectedToken?.address,
+    }).sort((a) => {
+      return isSameAddress(a.address, selectedToken?.address) && a.isCompatible ? -1 : 0;
     });
 
     return sortedTokens;

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts b/packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts
@@ -1,7 +1,7 @@
 import { useChains } from 'wagmi';
 import { useCallback } from 'react';
 import { useConnection } from '@solana/wallet-adapter-react';
-import { IBridgeChain, IBridgeToken } from '@bnb-chain/canonical-bridge-sdk';
+import { ChainType, IBridgeChain, IBridgeToken } from '@bnb-chain/canonical-bridge-sdk';
 
 import { useAggregator } from '@/modules/aggregator/components/AggregatorProvider';
 import { IBridgeTokenWithBalance } from '@/modules/aggregator/types';
@@ -35,13 +35,12 @@ export function useSelection() {
     toChainId?: number;
     token?: IBridgeToken;
   }) => {
-    const newToToken = getToToken({
-      fromChainId: fromChainId!,
-      toChainId: toChainId!,
-      token: token!,
-    });
-
-    dispatch(setToToken(newToToken));
+    // const newToToken = getToToken({
+    //   fromChainId: fromChainId!,
+    //   toChainId: toChainId!,
+    //   token: token!,
+    // });
+    // dispatch(setToToken(newToToken));
   };
 
   const updateSelectedInfo = ({
@@ -53,58 +52,58 @@ export function useSelection() {
     tmpToChain?: IBridgeChain;
     tmpToken?: IBridgeToken;
   }) => {
-    const newToken = bridgeSDK
-      .getTokens({
-        fromChainId: tmpFromChain?.id,
-        toChainId: tmpToChain?.id,
-      })
-      .find((t) => t.displaySymbol?.toUpperCase() === tmpToken?.displaySymbol?.toUpperCase());
-
-    const newFromChain = getFromChains({
-      toChainId: tmpToChain?.id,
-      token: newToken,
-    }).find((c) => c.id === tmpFromChain?.id);
-
-    const newToChain = getToChains({
-      fromChainId: tmpFromChain?.id,
-      token: newToken,
-    }).find((c) => c.id === tmpToChain?.id);
-
-    dispatch(setFromChain(newFromChain));
-    dispatch(setToChain(newToChain));
-    dispatch(setSelectedToken(newToken));
-
-    updateToToken({
-      fromChainId: newFromChain?.id,
-      toChainId: newToChain?.id,
-      token: newToken,
-    });
+    // const newToken = bridgeSDK
+    //   .getTokens({
+    //     fromChainId: tmpFromChain?.id,
+    //     toChainId: tmpToChain?.id,
+    //   })
+    //   .find((t) => t.displaySymbol?.toUpperCase() === tmpToken?.displaySymbol?.toUpperCase());
+    // const newFromChain = bridgeSDK
+    //   .getFromChains({
+    //     toChainId: tmpToChain?.id,
+    //     token: newToken,
+    //   })
+    //   .find((c) => c.id === tmpFromChain?.id);
+    // const newToChain = bridgeSDK
+    //   .getToChains({
+    //     fromChainId: tmpFromChain?.id,
+    //     token: newToken,
+    //   })
+    //   .find((c) => c.id === tmpToChain?.id);
+    // dispatch(setFromChain(newFromChain));
+    // dispatch(setToChain(newToChain));
+    // dispatch(setSelectedToken(newToken));
+    // updateToToken({
+    //   fromChainId: newFromChain?.id,
+    //   toChainId: newToChain?.id,
+    //   token: newToken,
+    // });
   };
 
   const selectFromChain = async (tmpFromChain: IBridgeChain) => {
     // After selecting fromChain, if toChain becomes incompatible, reselect the first compatible network in toChain list.
-    const toChains = getToChains({
+    const toChains = bridgeSDK.getToChains({
       fromChainId: tmpFromChain.id,
     });
     const tmpToChain =
-      toChains.find((c) => isChainOrTokenCompatible(c) && c.id === toChain?.id) ??
-      toChains.find((c) => isChainOrTokenCompatible(c) && c.chainType !== 'link');
+      toChains.find((c) => c.isCompatible && c.id === toChain?.id) ??
+      toChains.find((c) => c.isCompatible && c.chainType !== 'link');
 
     const tmpTokens = await getSortedTokens({
       chainType: tmpFromChain.chainType,
       fromChainId: tmpFromChain.id,
-      tokens: getTokens({
+      tokens: bridgeSDK.getTokens({
         fromChainId: tmpFromChain.id,
-        toChainId: tmpToChain?.id,
+        toChainId: tmpToChain!.id,
       }),
     });
 
     const newToken =
       tmpTokens.find(
         (t) =>
-          isChainOrTokenCompatible(t) &&
+          t.isCompatible &&
           t.displaySymbol.toUpperCase() === selectedToken?.displaySymbol.toUpperCase(),
-      ) ?? tmpTokens.find((t) => isChainOrTokenCompatible(t));
+      ) ?? tmpTokens.find((t) => t.isCompatible);
 
     updateSelectedInfo({
       tmpToken: newToken,
@@ -123,13 +122,6 @@ export function useSelection() {
       toChainId: number;
       tokenSymbol: string;
     }) {
-      const { adapters } = bridgeSDK.getSDKOptions();
-      const bridgeTypes = adapters.map((item) => item.bridgeType);
-
-      const token = Object.fromEntries(
-        bridgeTypes.map((item) => [item, { symbol: tokenSymbol }]),
-      ) as any as IBridgeToken;
-
       if (chainId) {
         const fromChains = bridgeSDK.getFromChains();
         const chain = fromChains.find((chain) => chain.id === chainId);
@@ -140,15 +132,11 @@ export function useSelection() {
         if (fromChain?.id) return;
       }
 
-      const fromChains = getFromChains({
-        toChainId,
-        token,
-      });
-      const toChains = getToChains({
+      const fromChains = bridgeSDK.getFromChains();
+      const toChains = bridgeSDK.getToChains({
         fromChainId,
-        token,
       });
-      const tokens = getTokens({
+      const tokens = bridgeSDK.getTokens({
         fromChainId,
         toChainId,
       });
@@ -163,19 +151,19 @@ export function useSelection() {
       dispatch(setToChain(newToChain));
       dispatch(setSelectedToken(newToken));
 
-      updateToToken({
-        fromChainId: newFromChain?.id,
-        toChainId: newToChain?.id,
-        token: newToken,
-      });
+      // updateToToken({
+      //   fromChainId: newFromChain?.id,
+      //   toChainId: newToChain?.id,
+      //   token: newToken,
+      // });
     },
     selectFromChain,
     async selectToChain(tmpToChain: IBridgeChain) {
       const fromChainId = fromChain!.id;
 
       const tmpTokens = await getSortedTokens({
         fromChainId,
-        tokens: getTokens({
+        tokens: bridgeSDK.getTokens({
           fromChainId,
           toChainId: tmpToChain?.id,
         }),
@@ -184,9 +172,9 @@ export function useSelection() {
       const newToken =
         tmpTokens.find(
           (t) =>
-            isChainOrTokenCompatible(t) &&
+            t.isCompatible &&
             t.displaySymbol.toUpperCase() === selectedToken?.displaySymbol.toUpperCase(),
-        ) ?? tmpTokens.find((t) => isChainOrTokenCompatible(t));
+        ) ?? tmpTokens.find((t) => t.isCompatible);
 
       updateSelectedInfo({
         tmpToken: newToken,

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/shared/sortTokens.ts b/packages/canonical-bridge-widget/src/modules/aggregator/shared/sortTokens.ts
@@ -1,23 +1,15 @@
-import { isSameAddress } from '@bnb-chain/canonical-bridge-sdk';
-
 import { IBridgeTokenWithBalance } from '@/modules/aggregator/types';
 
 export function sortTokens({
   tokens = [],
   orders = [],
-  selectedTokenAddress,
 }: {
   tokens?: IBridgeTokenWithBalance[];
   orders?: string[];
-  selectedTokenAddress?: string;
 }) {
   const tokenOrders = orders.map((item) => item.toUpperCase());
 
   const sortedTokens = [...tokens].sort((a, b) => {
-    if (isSameAddress(a.address, selectedTokenAddress) && a.isCompatible) {
-      return -1;
-    }
-
     const aSymbol = a.displaySymbol.toUpperCase();
     const bSymbol = b.displaySymbol.toUpperCase();