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

package/src/account/cosmos.ts

@@ -198,14 +198,10 @@ export class CosmosAccountImpl {
         return dec.truncate().toString();
       })();
 
-      const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-      if (!("cosmos" in modularChainInfo)) {
-        throw new Error("cosmos module is not supported on this chain");
-      }
-
       Bech32Address.validate(
         recipient,
-        modularChainInfo.cosmos.bech32Config?.bech32PrefixAccAddr
+        this.chainGetter.getChain(this.chainId).bech32Config
+          ?.bech32PrefixAccAddr
       );
 
       const isThorchain = this.chainId.startsWith("thorchain-");
@@ -346,13 +342,8 @@ export class CosmosAccountImpl {
       onBroadcasted(txHash);
     }
 
-    const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in modularChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     const txTracer = new TendermintTxTracer(
-      modularChainInfo.cosmos.rpc,
+      this.chainGetter.getChain(this.chainId).rpc,
       "/websocket",
       {
         wsObject: this.txOpts.wsObject,
@@ -428,19 +419,16 @@ export class CosmosAccountImpl {
       }
     }
 
-    const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in modularChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     const account = await BaseAccount.fetchFromRest(
-      modularChainInfo.cosmos.rest,
+      this.chainGetter.getChain(this.chainId).rest,
       this.base.bech32Address,
       true
     );
 
     const useEthereumSign =
-      modularChainInfo.cosmos.features?.includes("eth-key-sign") === true;
+      this.chainGetter
+        .getChain(this.chainId)
+        .features?.includes("eth-key-sign") === true;
 
     const eip712Signing = useEthereumSign && this.base.isNanoLedger;
 
@@ -477,12 +465,12 @@ export class CosmosAccountImpl {
           memo: escapeHTML(memo),
         };
 
+        const chainInfo = this.chainGetter.getChain(this.chainId);
         const chainIsInjective = this.chainId.startsWith("injective");
         const chainIsStratos = this.chainId.startsWith("stratos");
         const ethSignPlainJson: boolean =
-          !!modularChainInfo.cosmos.features?.includes(
-            "evm-ledger-sign-plain-json"
-          );
+          chainInfo.features &&
+          chainInfo.features.includes("evm-ledger-sign-plain-json");
 
         if (eip712Signing) {
           if (chainIsInjective) {
@@ -537,7 +525,10 @@ export class CosmosAccountImpl {
           return await experimentalSignEIP712CosmosTx_v0(
             this.chainId,
             this.base.bech32Address,
-            getEip712TypedDataBasedOnChainInfo(modularChainInfo.cosmos, msgs),
+            getEip712TypedDataBasedOnChainInfo(
+              this.chainGetter.getChain(this.chainId),
+              msgs
+            ),
             signDoc,
             signOptions
           );
@@ -556,7 +547,7 @@ export class CosmosAccountImpl {
                         {
                           typeUrl: (() => {
                             if (
-                              modularChainInfo.cosmos.features?.includes(
+                              chainInfo.hasFeature(
                                 "/cosmos.evm.types.v1.ExtensionOptionsWeb3Tx"
                               )
                             ) {
@@ -607,19 +598,11 @@ export class CosmosAccountImpl {
                         return "/stratos.crypto.v1.ethsecp256k1.PubKey";
                       }
 
-                      if (
-                        modularChainInfo.cosmos.features?.includes(
-                          "eth-secp256k1-cosmos"
-                        )
-                      ) {
+                      if (chainInfo.hasFeature("eth-secp256k1-cosmos")) {
                         return "/cosmos.evm.crypto.v1.ethsecp256k1.PubKey";
                       }
 
-                      if (
-                        modularChainInfo.cosmos.features?.includes(
-                          "eth-secp256k1-initia"
-                        )
-                      ) {
+                      if (chainInfo.hasFeature("eth-secp256k1-initia")) {
                         return "/initia.crypto.v1beta1.ethsecp256k1.PubKey";
                       }
 
@@ -688,10 +671,10 @@ export class CosmosAccountImpl {
     tx: Uint8Array;
     signDoc: SignDoc;
   }> {
-    const modularChainInfoImpl = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    );
-    const useEthereumSign = modularChainInfoImpl.hasFeature("eth-key-sign");
+    const useEthereumSign =
+      this.chainGetter
+        .getChain(this.chainId)
+        .features?.includes("eth-key-sign") === true;
 
     const chainIsInjective = this.chainId.startsWith("injective");
     const chainIsStratos = this.chainId.startsWith("stratos");
@@ -729,10 +712,18 @@ export class CosmosAccountImpl {
                     return "/stratos.crypto.v1.ethsecp256k1.PubKey";
                   }
 
-                  if (modularChainInfoImpl.hasFeature("eth-secp256k1-cosmos")) {
+                  if (
+                    this.chainGetter
+                      .getChain(this.chainId)
+                      .hasFeature("eth-secp256k1-cosmos")
+                  ) {
                     return "/cosmos.evm.crypto.v1.ethsecp256k1.PubKey";
                   }
-                  if (modularChainInfoImpl.hasFeature("eth-secp256k1-initia")) {
+                  if (
+                    this.chainGetter
+                      .getChain(this.chainId)
+                      .hasFeature("eth-secp256k1-initia")
+                  ) {
                     return "/initia.crypto.v1beta1.ethsecp256k1.PubKey";
                   }
                   return "/ethermint.crypto.v1.ethsecp256k1.PubKey";
@@ -800,13 +791,8 @@ export class CosmosAccountImpl {
   ): Promise<{
     gasUsed: number;
   }> {
-    const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in modularChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     const account = await BaseAccount.fetchFromRest(
-      modularChainInfo.cosmos.rest,
+      this.chainGetter.getChain(this.chainId).rest,
       this.base.bech32Address,
       true
     );
@@ -846,7 +832,7 @@ export class CosmosAccountImpl {
 
     // TODO: Add response type
     const result = await simpleFetch<any>(
-      modularChainInfo.cosmos.rest,
+      this.chainGetter.getChain(this.chainId).rest,
       "/cosmos/tx/v1beta1/simulate",
       {
         method: "POST",
@@ -1045,28 +1031,16 @@ export class CosmosAccountImpl {
     const destinationChainId =
       channels[channels.length - 1].counterpartyChainId;
 
-    const destinationChainInfo =
-      this.chainGetter.getModularChain(destinationChainId);
-
-    if (!("cosmos" in destinationChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
+    const destinationChainInfo = this.chainGetter.getChain(destinationChainId);
 
     Bech32Address.validate(
       recipient,
-      destinationChainInfo.cosmos.bech32Config?.bech32PrefixAccAddr
+      destinationChainInfo.bech32Config?.bech32PrefixAccAddr
     );
 
-    const counterpartyChainInfo = this.chainGetter.getModularChain(
+    const counterpartyChainBech32Config = this.chainGetter.getChain(
       channels[0].counterpartyChainId
-    );
-    if (!("cosmos" in counterpartyChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
-    const counterpartyChainBech32Config =
-      counterpartyChainInfo.cosmos.bech32Config;
-
+    ).bech32Config;
     if (counterpartyChainBech32Config == null) {
       throw new Error("Counterparty chain bech32 config is not set");
     }
@@ -1077,15 +1051,18 @@ export class CosmosAccountImpl {
       currency,
       async () => {
         if (channels.length === 1) {
-          if (!counterpartyChainBech32Config) {
+          const chainInfo = this.chainGetter.getChain(
+            channels[0].counterpartyChainId
+          );
+          if (!chainInfo.bech32Config) {
             throw new Error("Bech32 config is not set");
           }
           return Bech32Address.fromBech32(recipient).toBech32(
-            counterpartyChainInfo.cosmos.bech32Config.bech32PrefixAccAddr
+            chainInfo.bech32Config.bech32PrefixAccAddr
           );
         }
         const channel = channels[0];
-        const destChainInfo = this.chainGetter.getModularChain(
+        const destChainInfo = this.chainGetter.getChain(
           channel.counterpartyChainId
         );
 
@@ -1123,20 +1100,15 @@ export class CosmosAccountImpl {
           for (let i = 0; i < loopChannels.length; i++) {
             const channel = loopChannels[i];
             if (i === loopChannels.length - 1) {
-              const chainInfo = this.chainGetter.getModularChain(
+              const chainInfo = this.chainGetter.getChain(
                 channel.counterpartyChainId
               );
-
-              if (!("cosmos" in chainInfo)) {
-                throw new Error("cosmos module is not supported on this chain");
-              }
-
-              if (!chainInfo.cosmos.bech32Config) {
+              if (!chainInfo.bech32Config) {
                 throw new Error("Bech32 config is not set");
               }
               Bech32Address.validate(
                 recipient,
-                chainInfo.cosmos.bech32Config.bech32PrefixAccAddr
+                chainInfo.bech32Config.bech32PrefixAccAddr
               );
               const forward = {
                 receiver: recipient,
@@ -1155,7 +1127,7 @@ export class CosmosAccountImpl {
 
               lastForward = forward;
             } else {
-              const destChainInfo = this.chainGetter.getModularChain(
+              const destChainInfo = this.chainGetter.getChain(
                 channel.counterpartyChainId
               );
 
@@ -1283,9 +1255,10 @@ export class CosmosAccountImpl {
           );
         }
 
-        const useEthereumSign = this.chainGetter
-          .getModularChainInfoImpl(this.chainId)
-          .hasFeature("eth-key-sign");
+        const useEthereumSign =
+          this.chainGetter
+            .getChain(this.chainId)
+            .features?.includes("eth-key-sign") === true;
 
         const eip712Signing = useEthereumSign && this.base.isNanoLedger;
         const chainIsInjective = this.chainId.startsWith("injective");
@@ -1349,7 +1322,7 @@ export class CosmosAccountImpl {
               this.chainId.startsWith("injective") ||
               this.chainId.startsWith("stride") ||
               this.chainGetter
-                .getModularChainInfoImpl(this.chainId)
+                .getChain(this.chainId)
                 .hasFeature("ibc-go-v7-hot-fix")
             ) {
               return true;
@@ -1573,21 +1546,15 @@ export class CosmosAccountImpl {
   }
 
   makeRevokeMsg(grantee: string, messageType: string) {
-    const modularChainInfoImpl = this.chainGetter.getModularChainInfoImpl(
-      this.chainId
-    );
-    if (!("cosmos" in modularChainInfoImpl.embedded)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     Bech32Address.validate(
       grantee,
-      modularChainInfoImpl.embedded.cosmos.bech32Config?.bech32PrefixAccAddr
+      this.chainGetter.getChain(this.chainId).bech32Config?.bech32PrefixAccAddr
     );
 
+    const chainInfo = this.chainGetter.getChain(this.chainId);
     const msg =
-      ChainIdHelper.parse(this.chainId).identifier === "osmosis" ||
-      modularChainInfoImpl.hasFeature("authz-msg-revoke-fixed")
+      chainInfo.chainIdentifier === "osmosis" ||
+      chainInfo.hasFeature("authz-msg-revoke-fixed")
         ? {
             type: "cosmos-sdk/MsgRevoke",
             value: {
@@ -1628,17 +1595,12 @@ export class CosmosAccountImpl {
   }
 
   makeDelegateTx(amount: string, validatorAddress: string) {
-    const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in modularChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     Bech32Address.validate(
       validatorAddress,
-      modularChainInfo.cosmos.bech32Config?.bech32PrefixValAddr
+      this.chainGetter.getChain(this.chainId).bech32Config?.bech32PrefixValAddr
     );
 
-    const currency = modularChainInfo.cosmos.stakeCurrency;
+    const currency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!currency) {
       throw new Error("Stake currency is null");
@@ -1745,11 +1707,7 @@ export class CosmosAccountImpl {
           onFulfill?: (tx: any) => void;
         }
   ) {
-    const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in modularChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-    const currency = modularChainInfo.cosmos.stakeCurrency;
+    const currency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!currency) {
       throw new Error("Stake currency is null");
@@ -1809,17 +1767,12 @@ export class CosmosAccountImpl {
   }
 
   makeUndelegateTx(amount: string, validatorAddress: string) {
-    const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in modularChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     Bech32Address.validate(
       validatorAddress,
-      modularChainInfo.cosmos.bech32Config?.bech32PrefixValAddr
+      this.chainGetter.getChain(this.chainId).bech32Config?.bech32PrefixValAddr
     );
 
-    const currency = modularChainInfo.cosmos.stakeCurrency;
+    const currency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!currency) {
       throw new Error("Stake currency is null");
@@ -1961,20 +1914,16 @@ export class CosmosAccountImpl {
     srcValidatorAddress: string,
     dstValidatorAddress: string
   ) {
-    const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in modularChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
     Bech32Address.validate(
       srcValidatorAddress,
-      modularChainInfo.cosmos.bech32Config?.bech32PrefixValAddr
+      this.chainGetter.getChain(this.chainId).bech32Config?.bech32PrefixValAddr
     );
     Bech32Address.validate(
       dstValidatorAddress,
-      modularChainInfo.cosmos.bech32Config?.bech32PrefixValAddr
+      this.chainGetter.getChain(this.chainId).bech32Config?.bech32PrefixValAddr
     );
 
-    const currency = modularChainInfo.cosmos.stakeCurrency;
+    const currency = this.chainGetter.getChain(this.chainId).stakeCurrency;
 
     if (!currency) {
       throw new Error("Stake currency is null");
@@ -2109,15 +2058,11 @@ export class CosmosAccountImpl {
   }
 
   makeWithdrawDelegationRewardTx(validatorAddresses: string[]) {
-    const modularChainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in modularChainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     for (const validatorAddress of validatorAddresses) {
       Bech32Address.validate(
         validatorAddress,
-        modularChainInfo.cosmos.bech32Config?.bech32PrefixValAddr
+        this.chainGetter.getChain(this.chainId).bech32Config
+          ?.bech32PrefixValAddr
       );
     }
 

package/src/account/cosmwasm.ts

@@ -110,14 +110,10 @@ export class CosmwasmAccountImpl {
         throw new Error("Currency is not cw20");
       }
 
-      const chainInfo = this.chainGetter.getModularChain(this.chainId);
-      if (!("cosmos" in chainInfo)) {
-        throw new Error("cosmos module is not supported on this chain");
-      }
-
       Bech32Address.validate(
         recipient,
-        chainInfo.cosmos.bech32Config?.bech32PrefixAccAddr
+        this.chainGetter.getChain(this.chainId).bech32Config
+          ?.bech32PrefixAccAddr
       );
 
       return this.makeExecuteContractTx(
@@ -164,14 +160,9 @@ export class CosmwasmAccountImpl {
           onFulfill?: (tx: any) => void;
         }
   ) {
-    const chainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in chainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     Bech32Address.validate(
       contractAddress,
-      chainInfo.cosmos.bech32Config?.bech32PrefixAccAddr
+      this.chainGetter.getChain(this.chainId).bech32Config?.bech32PrefixAccAddr
     );
 
     const msg = {

package/src/account/secret.ts

@@ -104,11 +104,6 @@ export class SecretAccountImpl {
   ) {
     const denomHelper = new DenomHelper(currency.coinMinimalDenom);
 
-    const chainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in chainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     if (denomHelper.type === "secret20") {
       const actualAmount = (() => {
         let dec = new Dec(amount);
@@ -122,7 +117,8 @@ export class SecretAccountImpl {
 
       Bech32Address.validate(
         recipient,
-        chainInfo.cosmos.bech32Config?.bech32PrefixAccAddr
+        this.chainGetter.getChain(this.chainId).bech32Config
+          ?.bech32PrefixAccAddr
       );
 
       return this.makeExecuteSecretContractTx(
@@ -208,14 +204,9 @@ export class SecretAccountImpl {
           onFulfill?: (tx: any) => void;
         }
   ) {
-    const chainInfo = this.chainGetter.getModularChain(this.chainId);
-    if (!("cosmos" in chainInfo)) {
-      throw new Error("cosmos module is not supported on this chain");
-    }
-
     Bech32Address.validate(
       contractAddress,
-      chainInfo.cosmos.bech32Config?.bech32PrefixAccAddr
+      this.chainGetter.getChain(this.chainId).bech32Config?.bech32PrefixAccAddr
     );
 
     let encryptedMsg: Uint8Array;

package/src/account/store.ts

@@ -74,18 +74,18 @@ export class AccountStore<
 
   getAccount(chainId: string): AccountSetReturn {
     // XXX: 이렇게 쪼개진건 modular chain info가 추가되면서 이 경우도 따로 처리하기 위함임...
-    if (this.chainGetter.hasModularChain(chainId)) {
+    if (this.chainGetter.hasChain(chainId)) {
       // chain identifier를 통한 접근도 허용하기 위해서 chainGetter를 통해 접근하도록 함.
-      return this.get(this.chainGetter.getModularChain(chainId).chainId);
+      return this.get(this.chainGetter.getChain(chainId).chainId);
     }
     return this.get(chainId);
   }
 
   hasAccount(chainId: string): boolean {
     // XXX: 이렇게 쪼개진건 modular chain info가 추가되면서 이 경우도 따로 처리하기 위함임...
-    if (this.chainGetter.hasModularChain(chainId)) {
+    if (this.chainGetter.hasChain(chainId)) {
       // chain identifier를 통한 접근도 허용하기 위해서 chainGetter를 통해 접근하도록 함.
-      return this.has(this.chainGetter.getModularChain(chainId).chainId);
+      return this.has(this.chainGetter.getChain(chainId).chainId);
     }
     return this.has(chainId);
   }