Merge pull request #464 from terra-money/ST-596-fix-ics20-send-back

ST-596: fix ics20 send back
stationmoney · Jul 10, 2023 · efee91d · efee91d
2 parents c29e7bf + 15644a1
commit efee91d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/data/queries/chains.ts b/src/data/queries/chains.ts
@@ -111,9 +111,9 @@ export function useIBCChannels() {
 
       if (
         icsChannel &&
-        networks[to]?.icsChannels?.[from]?.otherChannel === icsChannel
+        networks[to]?.icsChannels?.[from]?.channel === icsChannel
       ) {
-        return icsChannel
+        return networks[to]?.icsChannels?.[from]?.otherChannel
       }
 
       return networks[from]?.channels?.[to]

diff --git a/src/data/queries/ibc.ts b/src/data/queries/ibc.ts
@@ -5,6 +5,7 @@ import { useInterchainLCDClient } from "./lcdClient"
 import { useNetwork } from "data/wallet"
 import axios from "axios"
 import crypto from "crypto"
+import { AccAddress } from "@terra-money/feather.js"
 
 export const useIBCBaseDenom = (
   denom: Denom,
@@ -111,7 +112,10 @@ export const useIBCBaseDenoms = (data: { denom: Denom; chainID: string }[]) => {
 export function calculateIBCDenom(baseDenom: string, path: string) {
   if (!path) return baseDenom
 
-  const assetString = [path, baseDenom].join("/")
+  const assetString = [
+    path,
+    AccAddress.validate(baseDenom) ? `cw20:${baseDenom}` : baseDenom,
+  ].join("/")
   const hash = crypto.createHash("sha256")
   hash.update(assetString)
   return `ibc/${hash.digest("hex").toUpperCase()}`