Support multiple ICS channels

stationmoney · Aug 31, 2023 · e7b2eb1 · e7b2eb1
1 parent ed27d74
commit e7b2eb1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/src/data/queries/chains.ts b/src/data/queries/chains.ts
@@ -106,14 +106,26 @@ export function useIBCChannels() {
       const isCW20 = AccAddress.validate(tokenAddress)
 
       if (isCW20) {
-        return networks[from]?.icsChannels?.[to]?.channel
+        const availableChannels = networks[from]?.ics20Channels?.[to]
+
+        if (!availableChannels) return
+
+        return (
+          availableChannels.find(
+            ({ tokens }) => !!tokens && tokens.includes(tokenAddress)
+          ) || availableChannels.find(({ tokens }) => !tokens)
+        )?.channel
       }
 
       if (
         icsChannel &&
-        networks[to]?.icsChannels?.[from]?.channel === icsChannel
+        !!networks[to]?.ics20Channels?.[from]?.find(
+          ({ channel }) => channel === icsChannel
+        )
       ) {
-        return networks[to]?.icsChannels?.[from]?.otherChannel
+        return networks[to]?.ics20Channels?.[from]?.find(
+          ({ channel }) => channel === icsChannel
+        )?.otherChannel
       }
 
       return networks[from]?.channels?.[to]
@@ -122,11 +134,17 @@ export function useIBCChannels() {
     getICSContract: ({
       from,
       to,
+      tokenAddress,
     }: {
       from: string
       to: string
+      tokenAddress: AccAddress
     }): string | undefined => {
-      return networks[from]?.icsChannels?.[to]?.contract
+      const channels = networks[from]?.ics20Channels?.[to]
+      return (
+        channels?.find(({ tokens }) => tokens?.includes(tokenAddress))
+          ?.contract || channels?.find(({ tokens }) => !tokens)?.contract
+      )
     },
   }
 }
diff --git a/src/pages/wallet/SendPage.tsx b/src/pages/wallet/SendPage.tsx
@@ -267,6 +267,7 @@ const SendPage = () => {
                     contract: getICSContract({
                       from: chain,
                       to: destinationChain,
+                      tokenAddress: token.denom,
                     }),
                     amount: amount,
                     msg: Buffer.from(

diff --git a/src/pages/wallet/TransferPage.tsx b/src/pages/wallet/TransferPage.tsx
@@ -269,6 +269,7 @@ const TransferPage = () => {
                     contract: getICSContract({
                       from: chain,
                       to: destinationChain,
+                      tokenAddress: token.denom,
                     }),
                     amount: amount,
                     msg: Buffer.from(

diff --git a/src/types/network.d.ts b/src/types/network.d.ts
@@ -31,13 +31,14 @@ interface InterchainNetwork {
     }
   }
   channels?: Record<ChainID, IBCChannel>
-  icsChannels?: Record<
+  ics20Channels?: Record<
     ChainID,
     {
       contract: AccAddress
       channel: IBCChannel
       otherChannel: IBCChannel
-    }
+      tokens?: AccAddress[]
+    }[]
   >
   version?: string
   isClassic?: boolean