fix: displaying housefire nam in mainnet osmosis assets (#2182)

Author: mateuszjasiuk

apps/namadillo/src/atoms/integrations/atoms.ts

@@ -2,7 +2,7 @@ import { AssetList, Chain } from "@chain-registry/types";
 import { DeliverTxResponse, SigningStargateClient } from "@cosmjs/stargate";
 import { ExtensionKey } from "@namada/types";
 import { defaultAccountAtom } from "atoms/accounts";
-import { chainAtom, chainTokensAtom } from "atoms/chain";
+import { chainAtom, chainParametersAtom, chainTokensAtom } from "atoms/chain";
 import { defaultServerConfigAtom, settingsAtom } from "atoms/settings";
 import { queryDependentFn } from "atoms/utils";
 import BigNumber from "bignumber.js";
@@ -79,19 +79,28 @@ export const broadcastIbcTransactionAtom = atomWithMutation(() => {
 
 export const assetBalanceAtomFamily = atomFamily(
   ({ chain, walletAddress, assets }: AssetBalanceAtomParams) => {
-    return atomWithQuery<AddressWithAssetAndAmountMap>(() => ({
-      queryKey: ["assets", walletAddress, chain?.chain_id, assets],
-      ...queryDependentFn(async () => {
-        return await queryAndStoreRpc(chain!, async (rpc: string) => {
-          const assetsBalances = await queryAssetBalances(walletAddress!, rpc);
-          return await mapCoinsToAssets(
-            assetsBalances,
-            chain!.chain_id,
-            ibcAddressToDenomTrace(rpc)
-          );
-        });
-      }, [!!walletAddress, !!chain]),
-    }));
+    return atomWithQuery<AddressWithAssetAndAmountMap>((get) => {
+      const chainParametersQuery = get(chainParametersAtom);
+
+      return {
+        queryKey: ["assets", walletAddress, chain?.chain_id, assets],
+        ...queryDependentFn(async () => {
+          return await queryAndStoreRpc(chain!, async (rpc: string) => {
+            const assetsBalances = await queryAssetBalances(
+              walletAddress!,
+              rpc
+            );
+
+            return await mapCoinsToAssets(
+              assetsBalances,
+              chain!.chain_id,
+              chainParametersQuery.data!.chainId,
+              ibcAddressToDenomTrace(rpc)
+            );
+          });
+        }, [!!walletAddress, !!chain, chainParametersQuery.isSuccess]),
+      };
+    });
   },
   (prev, current) => {
     return Boolean(

apps/namadillo/src/atoms/integrations/functions.ts

@@ -162,7 +162,8 @@ const findCounterpartChainName = (
 const tryDenomToIbcAsset = async (
   denom: string,
   ibcAddressToDenomTrace: (address: string) => Promise<DenomTrace | undefined>,
-  chainName: string
+  chainName: string,
+  namadaChainName: string
 ): Promise<Asset | undefined> => {
   const denomTrace = await ibcAddressToDenomTrace(denom);
   if (typeof denomTrace === "undefined") {
@@ -171,10 +172,14 @@ const tryDenomToIbcAsset = async (
 
   const { path, baseDenom } = denomTrace;
 
-  const assetOnRegistry = tryDenomToRegistryAsset(
-    baseDenom,
-    registry.assets.map((assetListEl) => assetListEl.assets).flat()
-  );
+  // We only check assets for the selected chain i.e. osmosis and current namada chain,
+  // this prevents displaying housefire produced nam on mainnet namada
+  const assets = assetLookup(chainName) || [];
+  const namadaAssets = assetLookup(namadaChainName) || [];
+  const assetOnRegistry = tryDenomToRegistryAsset(baseDenom, [
+    ...assets,
+    ...namadaAssets,
+  ]);
 
   if (assetOnRegistry) {
     return assetOnRegistry;
@@ -220,6 +225,7 @@ const findOriginalAsset = async (
   coin: Coin,
   assets: Asset[],
   ibcAddressToDenomTrace: (address: string) => Promise<DenomTrace | undefined>,
+  namadaChainName: string,
   chainName?: string
 ): Promise<AddressWithAssetAndAmount> => {
   const { minDenomAmount, denom } = coin;
@@ -230,7 +236,12 @@ const findOriginalAsset = async (
   }
 
   if (!asset && chainName) {
-    asset = await tryDenomToIbcAsset(denom, ibcAddressToDenomTrace, chainName);
+    asset = await tryDenomToIbcAsset(
+      denom,
+      ibcAddressToDenomTrace,
+      chainName,
+      namadaChainName
+    );
   }
 
   if (!asset) {
@@ -257,9 +268,12 @@ export const findChainById = (chainId: string): Chain | undefined => {
 export const mapCoinsToAssets = async (
   coins: Coin[],
   chainId: string,
+  namadaChainId: string,
   ibcAddressToDenomTrace: (address: string) => Promise<DenomTrace | undefined>
 ): Promise<AddressWithAssetAndAmountMap> => {
   const chainName = findChainById(chainId)?.chain_name;
+  // Namada chain name should be always available
+  const namadaChainName = findChainById(namadaChainId)?.chain_name as string;
   const assets = mapUndefined(assetLookup, chainName);
   const results = await Promise.allSettled(
     coins.map(
@@ -268,6 +282,7 @@ export const mapCoinsToAssets = async (
           coin,
           assets || [],
           ibcAddressToDenomTrace,
+          namadaChainName,
           chainName
         )
     )