@keplr-wallet/stores 0.12.300-rc.0 → 0.12.304

package/src/chain/types.ts

@@ -86,37 +86,11 @@ export interface IModularChainInfoImpl<
 > {
   readonly embedded: M;
   readonly chainId: string;
-  readonly stakeCurrency: Currency | undefined;
-  readonly feeCurrencies: FeeCurrency[] | undefined;
 
-  getCurrencies(): AppCurrency[];
-  getCurrenciesByModule(module: ChainInfoModule): AppCurrency[];
+  getCurrencies(module: ChainInfoModule): AppCurrency[];
   addCurrencies(module: ChainInfoModule, ...currencies: AppCurrency[]): void;
   removeCurrencies(
     module: ChainInfoModule,
     ...coinMinimalDenoms: string[]
   ): void;
-  findCurrency(coinMinimalDenom: string): AppCurrency | undefined;
-  forceFindCurrency(coinMinimalDenom: string): AppCurrency;
-  findCurrencyWithoutReaction(
-    coinMinimalDenom: string
-  ): AppCurrency | undefined;
-  forceFindCurrencyWithoutReaction(coinMinimalDenom: string): AppCurrency;
-  findCurrencyAsync(coinMinimalDenom: string): Promise<AppCurrency | undefined>;
-  hasFeature(feature: string): boolean;
-  addUnknownDenoms(args: {
-    module: ChainInfoModule;
-    coinMinimalDenoms: string[];
-  }): void;
-  addUnknownDenomsWithoutReaction(args: {
-    module: ChainInfoModule;
-    coinMinimalDenoms: string[];
-  }): void;
-  isCurrencyRegistrationInProgress(coinMinimalDenom: string): boolean;
-  matchModules(
-    conditions:
-      | { or: ChainInfoModule[]; and?: undefined }
-      | { and: ChainInfoModule[]; or?: undefined }
-  ): boolean;
-  matchModule(module: ChainInfoModule): boolean;
 }

package/src/common/utils/index.ts

@@ -1,11 +1,11 @@
 import { Currency } from "@keplr-wallet/types";
 import { CoinPrimitive } from "../types";
 import { CoinPretty, Dec, Int } from "@keplr-wallet/unit";
-import { IModularChainInfoImpl } from "../../chain/types";
+import { IChainInfoImpl } from "../../chain";
 
 export class StoreUtils {
   public static toCoinPretties(
-    chainInfo: IModularChainInfoImpl,
+    chainInfo: IChainInfoImpl,
     balances: CoinPrimitive[]
   ): CoinPretty[] {
     const result: CoinPretty[] = [];

package/src/lsm/currency-registrar.ts

@@ -69,7 +69,7 @@ export class LSMCurrencyRegistrar {
         done: boolean;
       }
     | undefined {
-    if (!this.chainStore.hasModularChain(chainId)) {
+    if (!this.chainStore.hasChain(chainId)) {
       return;
     }
 
@@ -78,16 +78,14 @@ export class LSMCurrencyRegistrar {
       return;
     }
 
-    const chainInfo = this.chainStore.getModularChain(chainId);
-    if (!("cosmos" in chainInfo) || !chainInfo.cosmos.stakeCurrency) {
+    const chainInfo = this.chainStore.getChain(chainId);
+    if (!chainInfo.stakeCurrency) {
       return;
     }
 
     if (
-      !chainInfo.cosmos.bech32Config ||
-      !coinMinimalDenom.startsWith(
-        chainInfo.cosmos.bech32Config.bech32PrefixValAddr
-      )
+      !chainInfo.bech32Config ||
+      !coinMinimalDenom.startsWith(chainInfo.bech32Config.bech32PrefixValAddr)
     ) {
       return;
     }
@@ -101,7 +99,7 @@ export class LSMCurrencyRegistrar {
     try {
       Bech32Address.validate(
         valAddress,
-        chainInfo.cosmos.bech32Config?.bech32PrefixValAddr
+        chainInfo.bech32Config?.bech32PrefixValAddr
       );
     } catch {
       // noop
@@ -198,7 +196,7 @@ export class LSMCurrencyRegistrar {
 
           return "Unknown";
         })()}/${id}`,
-        coinDecimals: chainInfo.cosmos.stakeCurrency.coinDecimals,
+        coinDecimals: chainInfo.stakeCurrency.coinDecimals,
         coinImageUrl: validator.thumbnail || undefined,
       },
       done: !validator.isFetching,

package/src/query/balances.ts

@@ -74,16 +74,12 @@ export class ObservableQueryBalancesImplMap {
 
   @computed
   get stakable(): IObservableQueryBalanceImpl | undefined {
-    const modularChainInfoImpl = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    );
-    const chainInfo = modularChainInfoImpl.embedded;
-
-    if (!("cosmos" in chainInfo) || !chainInfo.cosmos.stakeCurrency) {
+    const chainInfo = this.chainGetter.getChain(this.chainId);
+    if (!chainInfo.stakeCurrency) {
       return undefined;
     }
 
-    return this.getBalanceInner(chainInfo.cosmos.stakeCurrency);
+    return this.getBalanceInner(chainInfo.stakeCurrency);
   }
 
   /**
@@ -91,16 +87,12 @@ export class ObservableQueryBalancesImplMap {
    */
   @computed
   get balances(): IObservableQueryBalanceImpl[] {
-    const result = [];
+    const chainInfo = this.chainGetter.getChain(this.chainId);
 
-    const modularChainInfoImpl = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    );
-
-    const currencies = modularChainInfoImpl.getCurrencies();
+    const result = [];
 
-    for (let i = 0; i < currencies.length; i++) {
-      const currency = currencies[i];
+    for (let i = 0; i < chainInfo.currencies.length; i++) {
+      const currency = chainInfo.currencies[i];
       const balanceInner = this.getBalanceInner(currency);
       if (balanceInner) {
         result.push(balanceInner);
@@ -137,10 +129,7 @@ export class ObservableQueryBalancesImplMap {
    */
   @computed
   get positiveNativeUnstakables(): IObservableQueryBalanceImpl[] {
-    const chainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in chainInfo)) {
-      return [];
-    }
+    const chainInfo = this.chainGetter.getChain(this.chainId);
 
     const balances = this.balances;
     return balances.filter(
@@ -148,21 +137,17 @@ export class ObservableQueryBalancesImplMap {
         new DenomHelper(bal.currency.coinMinimalDenom).type === "native" &&
         bal.balance.toDec().gt(new Dec(0)) &&
         bal.currency.coinMinimalDenom !==
-          chainInfo.cosmos.stakeCurrency?.coinMinimalDenom
+          chainInfo.stakeCurrency?.coinMinimalDenom
     );
   }
 
   @computed
   get unstakables(): IObservableQueryBalanceImpl[] {
-    const chainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in chainInfo)) {
-      return [];
-    }
+    const chainInfo = this.chainGetter.getChain(this.chainId);
 
-    const currencies = chainInfo.cosmos.currencies.filter(
+    const currencies = chainInfo.currencies.filter(
       (cur) =>
-        cur.coinMinimalDenom !==
-        chainInfo.cosmos.stakeCurrency?.coinMinimalDenom
+        cur.coinMinimalDenom !== chainInfo.stakeCurrency?.coinMinimalDenom
     );
 
     const result = [];
@@ -197,9 +182,7 @@ export class ObservableQueryBalancesImplMap {
   readonly getBalance = computedFn(
     (currency: AppCurrency): IObservableQueryBalanceImpl | undefined => {
       const bal = this.balances.find(
-        (bal) =>
-          DenomHelper.normalizeDenom(bal.currency.coinMinimalDenom) ===
-          DenomHelper.normalizeDenom(currency.coinMinimalDenom)
+        (bal) => bal.currency.coinMinimalDenom === currency.coinMinimalDenom
       );
       if (bal) {
         return bal;

package/src/query/chain-query.ts

@@ -16,13 +16,9 @@ export class ObservableChainQuery<
     chainGetter: ChainGetter,
     url: string
   ) {
-    const modularChainInfo = chainGetter.getModularChain(chainId);
+    const chainInfo = chainGetter.getChain(chainId);
 
-    super(
-      sharedContext,
-      "cosmos" in modularChainInfo ? modularChainInfo.cosmos.rest : "",
-      url
-    );
+    super(sharedContext, chainInfo.rest, url);
 
     this._chainId = chainId;
     this.chainGetter = chainGetter;

package/src/query/chain-rpc-query.ts

@@ -16,13 +16,9 @@ export class ObservableChainQueryRPC<
     chainGetter: ChainGetter,
     url: string
   ) {
-    const modularChainInfo = chainGetter.getModularChain(chainId);
+    const chainInfo = chainGetter.getChain(chainId);
 
-    super(
-      sharedContext,
-      "cosmos" in modularChainInfo ? modularChainInfo.cosmos.rpc : "",
-      url
-    );
+    super(sharedContext, chainInfo.rpc, url);
 
     this._chainId = chainId;
     this.chainGetter = chainGetter;

package/src/query/cosmos/balance/balances.ts

@@ -47,12 +47,9 @@ export class ObservableQueryCosmosBalancesImplParent extends ObservableChainQuer
   ) {
     super.onReceiveResponse(response);
 
-    const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+    const chainInfo = this.chainGetter.getChain(this.chainId);
     const denoms = response.data.balances.map((coin) => coin.denom);
-    chainInfo.addUnknownDenoms({
-      module: "cosmos",
-      coinMinimalDenoms: denoms,
-    });
+    chainInfo.addUnknownDenoms(...denoms);
   }
 }
 
@@ -86,9 +83,8 @@ export class ObservableQueryCosmosBalancesImpl
   get currency(): AppCurrency {
     const denom = this.denomHelper.denom;
 
-    return this.chainGetter
-      .getModularChainInfoImpl(this.chainId)
-      .forceFindCurrency(denom);
+    const chainInfo = this.chainGetter.getChain(this.chainId);
+    return chainInfo.forceFindCurrency(denom);
   }
 
   get error(): Readonly<QueryError<unknown>> | undefined {

package/src/query/cosmos/balance/spendable.ts

@@ -31,10 +31,10 @@ export class ObservableChainQuerySpendableBalances extends ObservableChainQuery<
 
     const res: CoinPretty[] = [];
 
+    const chainInfo = this.chainGetter.getChain(this.chainId);
+
     for (const bal of this.response.data.balances) {
-      const currency = this.chainGetter
-        .getModularChainInfoImpl(this.chainId)
-        .findCurrency(bal.denom);
+      const currency = chainInfo.findCurrency(bal.denom);
       if (currency) {
         res.push(new CoinPretty(currency, bal.amount));
       }

package/src/query/cosmos/ibc/channel.ts

@@ -29,11 +29,8 @@ export class ObservableChainQueryIBCChannel extends ObservableChainQuery<Channel
     super.onStart();
 
     this.disposer = autorun(() => {
-      if (
-        this.chainGetter
-          .getModularChainInfoImpl(this.chainId)
-          .hasFeature("ibc-go")
-      ) {
+      const chainInfo = this.chainGetter.getChain(this.chainId);
+      if (chainInfo.features && chainInfo.features.includes("ibc-go")) {
         this.setUrl(
           `/ibc/core/channel/v1/channels/${this.channelId}/ports/${this.portId}`
         );

package/src/query/cosmos/ibc/client-state.ts

@@ -29,8 +29,8 @@ export class ObservableChainQueryClientState extends ObservableChainQuery<Client
     super.onStart();
 
     this.disposer = autorun(() => {
-      const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
-      if (chainInfo.hasFeature("ibc-go")) {
+      const chainInfo = this.chainGetter.getChain(this.chainId);
+      if (chainInfo.features && chainInfo.features.includes("ibc-go")) {
         this.setUrl(
           `/ibc/core/channel/v1/channels/${this.channelId}/ports/${this.portId}/client_state`
         );

package/src/query/cosmos/ibc/denom-trace.ts

@@ -30,13 +30,13 @@ export class ObservableChainQueryDenomTrace extends ObservableChainQuery<
     super.onStart();
 
     this.disposer = autorun(() => {
-      const modularChainInfoImpl = this.chainGetter.getModularChainInfoImpl(
-        this.chainId
-      );
-      if (modularChainInfoImpl.hasFeature("ibc-v2")) {
-        this.setUrl(`/ibc/apps/transfer/v1/denoms/${this.hash}`);
-      } else if (modularChainInfoImpl.hasFeature("ibc-go")) {
-        this.setUrl(`/ibc/apps/transfer/v1/denom_traces/${this.hash}`);
+      const chainInfo = this.chainGetter.getChain(this.chainId);
+      if (chainInfo.features) {
+        if (chainInfo.features.includes("ibc-v2")) {
+          this.setUrl(`/ibc/apps/transfer/v1/denoms/${this.hash}`);
+        } else if (chainInfo.features.includes("ibc-go")) {
+          this.setUrl(`/ibc/apps/transfer/v1/denom_traces/${this.hash}`);
+        }
       }
     });
   }

package/src/query/cosmos/staking/babylon-btc-delegation-reward.ts

@@ -32,16 +32,13 @@ export class ObservableQueryBabylonBtcDelegationRewardInner extends ObservableCh
     // If bech32 address is empty, it will always fail, so don't need to fetch it.
     return (
       this.bech32Address.length > 0 ||
-      this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency !=
-        null
+      this.chainGetter.getChain(this.chainId).stakeCurrency != null
     );
   }
 
   @computed
   get claimable(): CoinPretty | undefined {
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return;

package/src/query/cosmos/staking/delegations.ts

@@ -33,16 +33,13 @@ export class ObservableQueryDelegationsInner extends ObservableChainQuery<Delega
     // If bech32 address is empty, it will always fail, so don't need to fetch it.
     return (
       this.bech32Address.length > 0 ||
-      this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency !=
-        null
+      this.chainGetter.getChain(this.chainId).stakeCurrency != null
     );
   }
 
   @computed
   get total(): CoinPretty | undefined {
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return;
@@ -72,9 +69,7 @@ export class ObservableQueryDelegationsInner extends ObservableChainQuery<Delega
       return [];
     }
 
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return [];
@@ -113,7 +108,7 @@ export class ObservableQueryDelegationsInner extends ObservableChainQuery<Delega
     (validatorAddress: string): CoinPretty | undefined => {
       const delegations = this.delegations;
 
-      const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
+      const stakeCurrency = this.chainGetter.getChain(
         this.chainId
       ).stakeCurrency;
 

package/src/query/cosmos/staking/initia-delegations.ts

@@ -34,16 +34,15 @@ export class ObservableQueryInitiaDelegationsInner extends ObservableChainQuery<
     // If bech32 address is empty, it will always fail, so don't need to fetch it.
     return (
       this.bech32Address.length > 0 ||
-      this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency !=
-        null
+      this.chainGetter.getChain(this.chainId).stakeCurrency != null
     );
   }
 
   // a function to extract amount from delegation balance
   // For Initia chain, the balance is an array of Coin
   protected getAmountFromBalanceArray(balance: Coin[]): string {
-    const stakeDenom = this.chainGetter.getModularChainInfoImpl(this.chainId)
-      .stakeCurrency?.coinMinimalDenom;
+    const stakeDenom = this.chainGetter.getChain(this.chainId).stakeCurrency
+      ?.coinMinimalDenom;
 
     if (!stakeDenom) {
       return "0";
@@ -55,9 +54,7 @@ export class ObservableQueryInitiaDelegationsInner extends ObservableChainQuery<
 
   @computed
   get total(): CoinPretty | undefined {
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return;
@@ -89,9 +86,7 @@ export class ObservableQueryInitiaDelegationsInner extends ObservableChainQuery<
       return [];
     }
 
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return [];
@@ -121,9 +116,7 @@ export class ObservableQueryInitiaDelegationsInner extends ObservableChainQuery<
       return [];
     }
 
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     return this.response.data.delegation_responses
       .filter((del) => {
@@ -145,7 +138,7 @@ export class ObservableQueryInitiaDelegationsInner extends ObservableChainQuery<
     (validatorAddress: string): CoinPretty | undefined => {
       const delegations = this.delegations;
 
-      const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
+      const stakeCurrency = this.chainGetter.getChain(
         this.chainId
       ).stakeCurrency;
 

package/src/query/cosmos/staking/initia-unbonding-delegations.ts

@@ -30,7 +30,7 @@ export class ObservableQueryInitiaUnbondingDelegationsInner extends ObservableCh
   }
 
   protected override canFetch(): boolean {
-    if (!this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency) {
+    if (!this.chainGetter.getChain(this.chainId).stakeCurrency) {
       return false;
     }
     // If bech32 address is empty, it will always fail, so don't need to fetch it.
@@ -40,8 +40,8 @@ export class ObservableQueryInitiaUnbondingDelegationsInner extends ObservableCh
   // a function to extract amount from unbonding balance
   // For Initia chain, the balance is an array of Coin
   protected getAmountFromBalanceArray(balance: Coin[]): string {
-    const stakeDenom = this.chainGetter.getModularChainInfoImpl(this.chainId)
-      .stakeCurrency?.coinMinimalDenom;
+    const stakeDenom = this.chainGetter.getChain(this.chainId).stakeCurrency
+      ?.coinMinimalDenom;
 
     if (!stakeDenom) {
       return "0";
@@ -53,9 +53,7 @@ export class ObservableQueryInitiaUnbondingDelegationsInner extends ObservableCh
 
   @computed
   get total(): CoinPretty | undefined {
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return;
@@ -90,9 +88,7 @@ export class ObservableQueryInitiaUnbondingDelegationsInner extends ObservableCh
   }[] {
     const unbondings = this.unbondings;
 
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return [];
@@ -130,9 +126,7 @@ export class ObservableQueryInitiaUnbondingDelegationsInner extends ObservableCh
       return [];
     }
 
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     return this.response.data.unbonding_responses.map((unbonding) => {
       const filtered = unbonding.entries.filter((entry) =>

package/src/query/cosmos/staking/initia-validators.ts

@@ -42,7 +42,7 @@ export class ObservableQueryInitiaValidatorsInner extends ObservableChainQuery<I
   }
 
   protected override canFetch(): boolean {
-    if (!this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency) {
+    if (!this.chainGetter.getChain(this.chainId).stakeCurrency) {
       return false;
     }
     return super.canFetch();
@@ -54,9 +54,7 @@ export class ObservableQueryInitiaValidatorsInner extends ObservableChainQuery<I
       return [];
     }
 
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return [];
@@ -150,7 +148,7 @@ export class ObservableQueryInitiaValidatorsInner extends ObservableChainQuery<I
         return;
       }
 
-      const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+      const chainInfo = this.chainGetter.getChain(this.chainId);
       const stakeCurrency = chainInfo.stakeCurrency;
 
       if (!stakeCurrency) {

package/src/query/cosmos/staking/pool.ts

@@ -23,7 +23,7 @@ export class ObservableQueryStakingPool extends ObservableChainQuery<StakingPool
   }
 
   protected override canFetch(): boolean {
-    if (!this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency) {
+    if (!this.chainGetter.getChain(this.chainId).stakeCurrency) {
       return false;
     }
     return super.canFetch();
@@ -31,7 +31,7 @@ export class ObservableQueryStakingPool extends ObservableChainQuery<StakingPool
 
   @computed
   get notBondedTokens(): CoinPretty | undefined {
-    const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+    const chainInfo = this.chainGetter.getChain(this.chainId);
 
     if (!chainInfo.stakeCurrency) {
       return;
@@ -52,7 +52,7 @@ export class ObservableQueryStakingPool extends ObservableChainQuery<StakingPool
 
   @computed
   get bondedTokens(): CoinPretty | undefined {
-    const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+    const chainInfo = this.chainGetter.getChain(this.chainId);
 
     if (!chainInfo.stakeCurrency) {
       return;

package/src/query/cosmos/staking/rewards.ts

@@ -35,7 +35,7 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
   }
 
   protected override canFetch(): boolean {
-    if (!this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency) {
+    if (!this.chainGetter.getChain(this.chainId).stakeCurrency) {
       return false;
     }
     // If bech32 address is empty, it will always fail, so don't need to fetch it.
@@ -44,7 +44,7 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
 
   @computed
   get rewards(): CoinPretty[] {
-    const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+    const chainInfo = this.chainGetter.getChain(this.chainId);
 
     if (!this.response || !this.response.data.rewards) {
       return [];
@@ -75,7 +75,7 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
 
   readonly getRewardsOf = computedFn(
     (validatorAddress: string): CoinPretty[] => {
-      const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+      const chainInfo = this.chainGetter.getChain(this.chainId);
 
       const rewards = this.response?.data.rewards?.find((r) => {
         return r.validator_address === validatorAddress;
@@ -109,7 +109,7 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
 
   @computed
   get stakableReward(): CoinPretty | undefined {
-    const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+    const chainInfo = this.chainGetter.getChain(this.chainId);
 
     if (!chainInfo.stakeCurrency) {
       return;
@@ -127,7 +127,7 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
 
   readonly getStakableRewardOf = computedFn(
     (validatorAddress: string): CoinPretty | undefined => {
-      const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+      const chainInfo = this.chainGetter.getChain(this.chainId);
 
       if (!chainInfo.stakeCurrency) {
         return;
@@ -147,7 +147,7 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
 
   @computed
   get unstakableRewards(): CoinPretty[] {
-    const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+    const chainInfo = this.chainGetter.getChain(this.chainId);
 
     return this.rewards.filter((r) => {
       return (
@@ -162,7 +162,7 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
       return this.getRewardsOf(validatorAddress).filter((r) => {
         return (
           r.currency.coinMinimalDenom !==
-          this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency
+          this.chainGetter.getChain(this.chainId).stakeCurrency
             ?.coinMinimalDenom
         );
       });
@@ -202,7 +202,7 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
         return [];
       }
 
-      const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+      const chainInfo = this.chainGetter.getChain(this.chainId);
 
       if (!chainInfo.stakeCurrency) {
         return [];
@@ -250,12 +250,9 @@ export class ObservableQueryRewardsInner extends ObservableChainQuery<Rewards> {
   ) {
     super.onReceiveResponse(response);
 
-    const chainInfo = this.chainGetter.getModularChainInfoImpl(this.chainId);
+    const chainInfo = this.chainGetter.getChain(this.chainId);
     const denoms = response.data.total.map((coin) => coin.denom);
-    chainInfo.addUnknownDenoms({
-      module: "cosmos",
-      coinMinimalDenoms: denoms,
-    });
+    chainInfo.addUnknownDenoms(...denoms);
   }
 }
 

package/src/query/cosmos/staking/unbonding-delegations.ts

@@ -29,7 +29,7 @@ export class ObservableQueryUnbondingDelegationsInner extends ObservableChainQue
   }
 
   protected override canFetch(): boolean {
-    if (!this.chainGetter.getModularChainInfoImpl(this.chainId).stakeCurrency) {
+    if (!this.chainGetter.getChain(this.chainId).stakeCurrency) {
       return false;
     }
     // If bech32 address is empty, it will always fail, so don't need to fetch it.
@@ -38,9 +38,7 @@ export class ObservableQueryUnbondingDelegationsInner extends ObservableChainQue
 
   @computed
   get total(): CoinPretty | undefined {
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return;
@@ -74,9 +72,7 @@ export class ObservableQueryUnbondingDelegationsInner extends ObservableChainQue
   }[] {
     const unbondings = this.unbondings;
 
-    const stakeCurrency = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    ).stakeCurrency;
+    const stakeCurrency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!stakeCurrency) {
       return [];