ModularChainInfo: branch for merge

apps/extension/src/analytics-amplitude.ts

@@ -249,8 +249,10 @@ export const logNobleClaimAnalytics = async (
   eventName: string
 ) => {
   const chainId = NOBLE_CHAIN_ID;
-  const chainInfo = chainStore.getChain(chainId);
-  const currency = await chainInfo.findCurrencyAsync("uusdn");
+  const chainInfo = chainStore.getModularChain(chainId);
+  const currency = await chainStore
+    .getModularChainInfoImpl(chainId)
+    .findCurrencyAsync("uusdn");
   const bech32Address = accountStore.getAccount(chainId).bech32Address;
 
   if (!bech32Address) return;

apps/extension/src/components/address-book-modal/index.tsx

@@ -122,7 +122,9 @@ export const AddressBookModal: FunctionComponent<{
       debounceTrimmedSearchText,
     ]);
 
-    const chainInfo = chainStore.getChain(recipientConfig.chainId);
+    const chainInfo = chainStore.getModularChainInfoImpl(
+      recipientConfig.chainId
+    );
     const isEVMChain = chainStore.isEvmChain(chainInfo.chainId);
     const isEVMOnlyChain = chainStore.isEvmOnlyChain(chainInfo.chainId);
     const isERC20 = new DenomHelper(currency.coinMinimalDenom).type === "erc20";

apps/extension/src/components/image/index.tsx

@@ -158,8 +158,8 @@ export const CurrencyImageFallback: FunctionComponent<
               currency.originCurrency
             ) {
               if (
-                chainStore.hasChain(currency.originChainId) &&
-                chainStore.getChain(currency.originChainId).chainIdentifier ===
+                chainStore.hasModularChain(currency.originChainId) &&
+                ChainIdHelper.parse(currency.originChainId).identifier ===
                   axelarChainIdentifier &&
                 currency.originCurrency.coinMinimalDenom !== "uaxl"
               ) {
@@ -176,9 +176,12 @@ export const CurrencyImageFallback: FunctionComponent<
             }
           }
 
-          if (isAxelarBridged && chainStore.hasChain(axelarChainIdentifier)) {
+          if (
+            isAxelarBridged &&
+            chainStore.hasModularChain(axelarChainIdentifier)
+          ) {
             const axlCurrency = chainStore
-              .getChain(axelarChainIdentifier)
+              .getModularChainInfoImpl(axelarChainIdentifier)
               .findCurrency("uaxl");
 
             if (axlCurrency && axlCurrency.coinImageUrl) {

apps/extension/src/components/input/amount-input/input.tsx

@@ -185,9 +185,9 @@ export const AmountInput: FunctionComponent<{
           // However, in this case, the tax itself changes the fee,
           // so if you use the max function, it will fall into infinite repetition.
           // We currently disable if chain is terra classic because we can't handle it properly.
-          chainStore.hasChain(amountConfig.chainId) &&
+          chainStore.hasModularChain(amountConfig.chainId) &&
           chainStore
-            .getChain(amountConfig.chainId)
+            .getModularChainInfoImpl(amountConfig.chainId)
             .hasFeature("terra-classic-fee")
         ) {
           return undefined;

apps/extension/src/components/input/fee-control/index.tsx

@@ -102,7 +102,7 @@ export const useAutoFeeCurrencySelectionOnInit = (
         feeConfig.fees.length > 0
       ) {
         const queryBalances =
-          chainStore.getChain(feeConfig.chainId).evm != null &&
+          "evm" in chainStore.getModularChain(feeConfig.chainId) &&
           EthereumAccountBase.isEthereumHexAddressWithChecksum(
             senderConfig.sender
           )
@@ -122,9 +122,12 @@ export const useAutoFeeCurrencySelectionOnInit = (
           feeConfig.type
         );
         if (currentFeeCurrencyBal.toDec().lt(currentFee.toDec())) {
+          const modularChainInfoImpl = chainStore.getModularChainInfoImpl(
+            feeConfig.chainId
+          );
           const isOsmosis =
-            chainStore.hasChain(feeConfig.chainId) &&
-            chainStore.getChain(feeConfig.chainId).hasFeature("osmosis-txfees");
+            modularChainInfoImpl.matchModule("cosmos") &&
+            modularChainInfoImpl.hasFeature("osmosis-txfees");
 
           // Not enough balances for fee.
           // Try to find other fee currency to send.
@@ -291,12 +294,14 @@ export const FeeControl: FunctionComponent<{
                         if (feeConfig.fees.length > 0) {
                           return feeConfig.fees;
                         }
-                        const chainInfo = chainStore.getChain(
+                        const chainInfo = chainStore.getModularChainInfoImpl(
                           feeConfig.chainId
                         );
                         return [
                           new CoinPretty(
-                            chainInfo.stakeCurrency || chainInfo.currencies[0],
+                            ("cosmos" in chainInfo.embedded &&
+                              chainInfo.embedded.cosmos.stakeCurrency) ||
+                              chainInfo.getCurrencies()[0],
                             new Dec(0)
                           ),
                         ];

apps/extension/src/components/input/reciepient-input/input.tsx

@@ -69,10 +69,13 @@ export const RecipientInput = observer<RecipientInputProps, HTMLInputElement>(
               if ("getNameService" in recipientConfig) {
                 const icns = recipientConfig.getNameService("icns");
                 const ens = recipientConfig.getNameService("ens");
+                const modularChainInfo = chainStore.getModularChain(
+                  recipientConfig.chainId
+                );
                 if (
                   icns?.isEnabled &&
-                  chainStore.getChain(recipientConfig.chainId).bech32Config !=
-                    null &&
+                  "cosmos" in modularChainInfo &&
+                  modularChainInfo.cosmos.bech32Config != null &&
                   ens?.isEnabled &&
                   chainStore.isEvmChain(recipientConfig.chainId)
                 ) {

apps/extension/src/hooks/analytics/use-insufficient-fee-analytics.ts

@@ -59,8 +59,8 @@ export const useInsufficientFeeAnalytics = (
         analyticsAmplitudeStore.logEvent("view_insufficient_fee_error", {
           pathname,
           chainIdentifier: ChainIdHelper.parse(chainId).identifier,
-          chainName: chainStore.hasChain(chainId)
-            ? chainStore.getChain(chainId).chainName
+          chainName: chainStore.hasModularChain(chainId)
+            ? chainStore.getModularChain(chainId).chainName
             : undefined,
           feeCurrencyDenom: feeConfig.fees[0].currency.coinMinimalDenom,
         });

apps/extension/src/hooks/claim/use-cosmos-claim-rewards.ts

@@ -26,6 +26,7 @@ import {
 } from "../../config.ui";
 import { MakeTxResponse } from "@keplr-wallet/stores";
 import { logNobleClaimAnalytics } from "../../analytics-amplitude";
+import { ChainIdHelper } from "@keplr-wallet/cosmos";
 
 const zeroDec = new Dec(0);
 // TODO: Add below property to config.ui.ts
@@ -49,7 +50,7 @@ export const useCosmosClaimRewards = () => {
     rewardToken: CoinPretty,
     state: ClaimAllEachState
   ) => {
-    const chainInfo = chainStore.getChain(chainId);
+    const chainInfo = chainStore.getModularChain(chainId);
     const account = accountStore.getAccount(chainId);
     if (!account.bech32Address) {
       return;
@@ -117,15 +118,22 @@ export const useCosmosClaimRewards = () => {
     state.setIsLoading(true);
 
     (async () => {
+      if (!("cosmos" in chainInfo)) {
+        return;
+      }
       // feemarket feature가 있는 경우 이후의 로직에서 사용할 수 있는 fee currency를 찾아야하기 때문에 undefined로 시작시킨다.
-      let feeCurrency = chainInfo.hasFeature("feemarket")
+      let feeCurrency = chainInfo.cosmos.features?.includes("feemarket")
         ? undefined
-        : chainInfo.feeCurrencies.find(
+        : chainInfo.cosmos.feeCurrencies.find(
             (cur) =>
-              cur.coinMinimalDenom === chainInfo.stakeCurrency?.coinMinimalDenom
+              cur.coinMinimalDenom ===
+              chainInfo.cosmos.stakeCurrency?.coinMinimalDenom
           );
 
-      if (chainInfo.hasFeature("osmosis-base-fee-beta") && feeCurrency) {
+      if (
+        chainInfo.cosmos.features?.includes("osmosis-base-fee-beta") &&
+        feeCurrency
+      ) {
         const queryBaseFee = queriesStore.get(chainInfo.chainId).osmosis
           .queryBaseFee;
         const queryRemoteBaseFeeStep = queriesStore.simpleQuery.queryGet<{
@@ -186,7 +194,7 @@ export const useCosmosClaimRewards = () => {
           | undefined;
 
         const feeCurrencies = await (async () => {
-          if (chainInfo.hasFeature("feemarket")) {
+          if (chainInfo.cosmos.features?.includes("feemarket")) {
             const queryFeeMarketGasPrices =
               queriesStore.get(chainId).cosmos.queryFeeMarketGasPrices;
             await queryFeeMarketGasPrices.waitFreshResponse();
@@ -200,9 +208,9 @@ export const useCosmosClaimRewards = () => {
                 continue;
               }
 
-              const currency = await chainInfo.findCurrencyAsync(
-                gasPrice.denom
-              );
+              const currency = await chainStore
+                .getModularChainInfoImpl(chainId)
+                .findCurrencyAsync(gasPrice.denom);
               if (currency) {
                 let multiplication = {
                   low: 1.1,
@@ -244,7 +252,7 @@ export const useCosmosClaimRewards = () => {
                   }
                   const specific =
                     multificationConfig.response.data[
-                      chainInfo.chainIdentifier
+                      ChainIdHelper.parse(chainId).identifier
                     ];
                   if (
                     specific &&
@@ -288,13 +296,13 @@ export const useCosmosClaimRewards = () => {
 
             return result;
           } else {
-            return chainInfo.feeCurrencies;
+            return chainInfo.cosmos.feeCurrencies;
           }
         })();
         for (const chainFeeCurrency of feeCurrencies) {
-          const currency = await chainInfo.findCurrencyAsync(
-            chainFeeCurrency.coinMinimalDenom
-          );
+          const currency = await chainStore
+            .getModularChainInfoImpl(chainId)
+            .findCurrencyAsync(chainFeeCurrency.coinMinimalDenom);
           if (currency) {
             const balance = queries.queryBalances
               .getQueryBech32Address(account.bech32Address)
@@ -382,9 +390,10 @@ export const useCosmosClaimRewards = () => {
           }
 
           // Ensure fee currency fetched before querying balance
-          const feeCurrencyFetched = await chainInfo.findCurrencyAsync(
-            feeCurrency.coinMinimalDenom
-          );
+          const feeCurrencyFetched = await chainStore
+            .getModularChainInfoImpl(chainId)
+            .findCurrencyAsync(feeCurrency.coinMinimalDenom);
+
           if (!feeCurrencyFetched) {
             throw new Error(
               intl.formatMessage({
@@ -592,7 +601,7 @@ export const useCosmosClaimRewards = () => {
     chainId: string,
     state: ClaimAllEachState
   ) => {
-    const cosmosChainInfo = chainStore.getChain(chainId);
+    const cosmosChainInfo = chainStore.getModularChain(chainId);
     const account = accountStore.getAccount(chainId);
     if (!account.bech32Address) {
       return;

apps/extension/src/hooks/use-buy-support-service-infos.ts

@@ -63,13 +63,14 @@ export const useBuySupportServiceInfos = (selectedTokenInfo?: {
                 Object.entries(
                   serviceInfo.buySupportCoinDenomsByChainId
                 ).reduce((finalAcc, [chainId, coinDenoms]) => {
-                  if (chainStore.hasChain(chainId)) {
+                  if (chainStore.hasModularChain(chainId)) {
                     const currencyCodeMap = coinDenoms?.reduce(
                       (acc, coinDenom) => {
-                        const chainInfo = chainStore.getChain(chainId);
-                        const matchedCurrency = chainInfo.currencies.find(
-                          (currency) => currency.coinDenom === coinDenom
-                        );
+                        const chainInfo =
+                          chainStore.getModularChainInfoImpl(chainId);
+                        const matchedCurrency = chainInfo
+                          .getCurrencies()
+                          .find((currency) => currency.coinDenom === coinDenom);
                         const currencyCode = getCurrencyCodeForMoonpay(
                           matchedCurrency?.coinDenom
                         );
@@ -106,13 +107,16 @@ export const useBuySupportServiceInfos = (selectedTokenInfo?: {
                   serviceInfo.buySupportCoinDenomsByChainId
                 ).reduce(
                   (finalAcc, [chainId, coinDenoms]) => {
-                    if (chainStore.hasChain(chainId)) {
-                      const chainInfo = chainStore.getChain(chainId);
+                    if (chainStore.hasModularChain(chainId)) {
+                      const chainInfo =
+                        chainStore.getModularChainInfoImpl(chainId);
                       const coins = coinDenoms?.reduce(
                         (coinsAcc, coinDenom) => {
-                          const matchedCurrency = chainInfo.currencies.find(
-                            (currency) => currency.coinDenom === coinDenom
-                          );
+                          const matchedCurrency = chainInfo
+                            .getCurrencies()
+                            .find(
+                              (currency) => currency.coinDenom === coinDenom
+                            );
 
                           if (matchedCurrency) {
                             const currencyCode = matchedCurrency.coinDenom;
@@ -161,10 +165,11 @@ export const useBuySupportServiceInfos = (selectedTokenInfo?: {
                   (modularChainInfo) => modularChainInfo.chainId === chainId
                 );
 
-                if (chainStore.hasChain(chainId)) {
-                  const address = chainStore.isEvmChain(chainId)
-                    ? accountStore.getAccount(chainId).ethereumHexAddress
-                    : accountStore.getAccount(chainId).bech32Address;
+                if (chainStore.hasModularChain(chainId)) {
+                  const address =
+                    modularChainInfo && "evm" in modularChainInfo
+                      ? accountStore.getAccount(chainId).ethereumHexAddress
+                      : accountStore.getAccount(chainId).bech32Address;
 
                   coinDenoms.forEach((coinDenom) => {
                     if (!seenCoinDenoms.has(coinDenom)) {

apps/extension/src/hooks/use-get-apy.tsx

@@ -1,14 +1,15 @@
+import { ChainIdHelper } from "@keplr-wallet/cosmos";
 import { useStore } from "../stores";
 import { Dec } from "@keplr-wallet/unit";
 
 export function useGetEarnApy(chainId: string) {
-  const { queriesStore, chainStore } = useStore();
+  const { queriesStore } = useStore();
 
   const queryAPY = queriesStore.simpleQuery.queryGet<{
     earnApy: number;
   }>(
     "https://pjld2aanw3elvteui4gwyxgx4m0ceweg.lambda-url.us-west-2.on.aws",
-    `/earn-apy/${chainStore.getChain(chainId).chainIdentifier}`
+    `/earn-apy/${ChainIdHelper.parse(chainId).identifier}`
   );
 
   const aprAvailable =

apps/extension/src/hooks/use-get-icns-name.ts

@@ -5,7 +5,10 @@ export const useGetIcnsName = (bech32Address?: string) => {
   const icnsPrimaryName = (() => {
     if (
       uiConfigStore.icnsInfo &&
-      chainStore.hasChain(uiConfigStore.icnsInfo.chainId) &&
+      chainStore.hasModularChain(uiConfigStore.icnsInfo.chainId) &&
+      chainStore
+        .getModularChainInfoImpl(uiConfigStore.icnsInfo.chainId)
+        .matchModule("cosmos") &&
       bech32Address
     ) {
       const queries = queriesStore.get(uiConfigStore.icnsInfo.chainId);