Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve LUNC/LUNA IBC detection #456

Merged
merged 5 commits into from
Jul 6, 2023
Merged

Improve LUNC/LUNA IBC detection #456

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
159834f
fix ibc lunc
alecande11 Jul 6, 2023
94c89be
fix readNativeDenom()
alecande11 Jul 6, 2023
6f23162
fix undefined chainID
alecande11 Jul 6, 2023
2c19ba8
Use chainID to map unknownIBCDenoms
alecande11 Jul 6, 2023
f586d9f
fix ts error
alecande11 Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 28 additions & 31 deletions src/data/token.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const WithTokenItem = ({ token, chainID, children }: Props) => {
export const getIcon = (path: string) => `${ASSETS}/icon/svg/${path}`

export const useNativeDenoms = () => {
const { whitelist, ibcDenoms, legacyWhitelist } = useWhitelist()
const { whitelist, ibcDenoms } = useWhitelist()
const { list: cw20 } = useCustomTokensCW20()
const networkName = useNetworkName()
const networks = useNetwork()
Expand Down Expand Up @@ -158,46 +158,43 @@ export const useNativeDenoms = () => {

// ibc token
let ibcToken = ibcDenoms[networkName]?.[denom]?.token
const chainOrigin = ibcDenoms[networkName]?.[denom]?.chainID
const ibcLunc =
chainOrigin &&
["phoenix-1:uluna", "pisco-1:uluna"].includes(ibcToken) &&
networkName !== "classic" &&
ibcDenoms["classic"]?.[denom]
if (ibcLunc) {
ibcToken = ibcDenoms["classic"]?.[denom]?.token
return {
...whitelist["classic"][ibcToken],
// @ts-expect-error
chains: [ibcDenoms["classic"]?.[denom]?.chainID],
}
} else if (ibcToken && whitelist[networkName][ibcToken]) {

if (
ibcToken &&
whitelist[networkName][ibcToken] &&
ibcDenoms[networkName][denom].chainID === chainID
) {
return {
...whitelist[networkName][ibcToken],
// @ts-expect-error
chains: [ibcDenoms[networkName][denom].chain],
chains: [ibcDenoms[networkName][denom].chainID],
}
}

// Assuming terra-utils returns "Luna" for LUNC.
if (fixedDenom === "Luna" && networkName !== "classic") {
return {
token: denom,
symbol: "LUNC",
name: "Luna Classic",
icon: "https://assets.terra.money/icon/svg/LUNC.svg",
decimals: 6,
isNonWhitelisted: false,
if (denom === "uluna") {
if (chainID === "columbus-5" || (!chainID && networkName === "classic")) {
return {
token: denom,
symbol: "LUNC",
name: "Luna Classic",
icon: "https://assets.terra.money/icon/svg/LUNC.svg",
decimals: 6,
isNonWhitelisted: false,
}
} else if (chainID === "phoenix-1" || chainID === "pisco-1") {
return {
token: denom,
symbol: "LUNA",
name: "Luna",
icon: "https://assets.terra.money/icon/svg/Luna.svg",
decimals: 6,
isNonWhitelisted: false,
}
}
}

return (
legacyWhitelist[denom] ??
cw20.find(({ token }) => denom === token) ??
// that's needed for axl tokens
Object.values(whitelist[networkName] ?? {}).find(
(t) => t.token === denom
) ?? {
cw20.find(({ token }) => denom === token) ?? {
// default token icon
token: denom,
symbol: fixedDenom,
Expand Down
8 changes: 4 additions & 4 deletions src/pages/wallet/AssetList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ const AssetList = () => {
const unknownIBCDenomsData = useIBCBaseDenoms(
coins
.map(({ denom, chain }) => ({ denom, chainID: chain }))
.filter(({ denom }) => {
const data = readNativeDenom(denom)
.filter(({ denom, chainID }) => {
const data = readNativeDenom(denom, chainID)
return denom.startsWith("ibc/") && data.symbol.endsWith("...")
})
)
Expand Down Expand Up @@ -72,12 +72,12 @@ const AssetList = () => {
coins.reduce((acc, { denom, amount, chain }) => {
const data = readNativeDenom(
unknownIBCDenoms[denom]?.baseDenom ?? denom,
unknownIBCDenoms[denom]?.chainID ?? chain
unknownIBCDenoms[denom]?.chainIDs[0] ?? chain
)

const key = [
// @ts-expect-error
unknownIBCDenoms[denom]?.chainID ?? data?.chainID ?? chain,
unknownIBCDenoms[denom]?.chainIDs[0] ?? data?.chainID ?? chain,
data.token,
].join("*")

Expand Down
8 changes: 4 additions & 4 deletions src/pages/wallet/AssetPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ const AssetPage = () => {
const unknownIBCDenomsData = useIBCBaseDenoms(
balances
.map(({ denom, chain }) => ({ denom, chainID: chain }))
.filter(({ denom }) => {
const data = readNativeDenom(denom)
.filter(({ denom, chainID }) => {
const data = readNativeDenom(denom, chainID)
return denom.startsWith("ibc/") && data.symbol.endsWith("...")
})
)
Expand All @@ -64,8 +64,8 @@ const AssetPage = () => {

const filteredBalances = balances.filter((b) => {
return (
readNativeDenom(b.denom).token === token &&
readNativeDenom(b.denom).symbol === symbol
readNativeDenom(b.denom, b.chain).token === token &&
readNativeDenom(b.denom, b.chain).symbol === symbol
)
})

Expand Down