@keplr-wallet/background 0.13.13 → 0.13.15-rc.0

package/src/keyring-ethereum/service.ts

@@ -12,6 +12,7 @@ import {
   EthereumSignResponse,
   EthSignType,
   JsonRpcResponse,
+  isEthSignChain,
 } from "@keplr-wallet/types";
 import { Bech32Address } from "@keplr-wallet/cosmos";
 import { Buffer } from "buffer/";
@@ -84,19 +85,30 @@ export class KeyRingEthereumService {
     message: Uint8Array,
     signType: EthSignType
   ): Promise<EthereumSignResponse> {
-    const chainInfo = this.chainsService.getChainInfoOrThrow(chainId);
-    if (chainInfo.hideInUI) {
+    const modularChainInfo =
+      this.chainsService.getModularChainInfoOrThrow(chainId);
+    if (modularChainInfo.hideInUI) {
       throw new Error("Can't sign for hidden chain");
     }
-    const isEthermintLike = KeyRingService.isEthermintLike(chainInfo);
-    const evmInfo = ChainsService.getEVMInfo(chainInfo);
-    const forceEVMLedger = chainInfo.features?.includes(
-      "force-enable-evm-ledger"
-    );
-
-    if (!isEthermintLike && !evmInfo) {
+    if (!isEthSignChain(modularChainInfo)) {
       throw new Error("Not ethermint like and EVM chain");
     }
+    const forceEVMLedger = (() => {
+      if (
+        modularChainInfo.type === "cosmos" ||
+        modularChainInfo.type === "ethermint"
+      ) {
+        return modularChainInfo.cosmos.features?.includes(
+          "force-enable-evm-ledger"
+        );
+      }
+      if (modularChainInfo.type === "evm") {
+        return modularChainInfo.evm.features?.includes(
+          "force-enable-evm-ledger"
+        );
+      }
+      return false;
+    })();
 
     const keyInfo = this.keyRingService.getKeyInfo(vaultId);
     if (!keyInfo) {
@@ -341,14 +353,9 @@ export class KeyRingEthereumService {
     message: Uint8Array,
     signType: EthSignType
   ): Promise<EthereumSignResponse> {
-    const chainInfo = this.chainsService.getChainInfoOrThrow(chainId);
-    // if (chainInfo.hideInUI) {
-    //   throw new Error("Can't sign for hidden chain");
-    // }
-    const isEthermintLike = KeyRingService.isEthermintLike(chainInfo);
-    const evmInfo = ChainsService.getEVMInfo(chainInfo);
-
-    if (!isEthermintLike && !evmInfo) {
+    const modularChainInfo =
+      this.chainsService.getModularChainInfoOrThrow(chainId);
+    if (!isEthSignChain(modularChainInfo)) {
       throw new Error("Not ethermint like and EVM chain");
     }
 

package/src/keyring-ledger/service.ts

@@ -2,8 +2,7 @@ import { PlainObject, Vault } from "../vault";
 import { Buffer } from "buffer/";
 import { PubKeySecp256k1, PubKeyStarknet } from "@keplr-wallet/crypto";
 import { KeplrError } from "@keplr-wallet/router";
-import { ModularChainInfo } from "@keplr-wallet/types";
-import { KeyRingService } from "../keyring";
+import { ModularChainInfo, isEthSignChain } from "@keplr-wallet/types";
 import { Network as BitcoinNetwork } from "bitcoinjs-lib";
 import { PubKeyBitcoinCompatible } from "@keplr-wallet/crypto";
 import { Descriptor } from "../keyring-bitcoin";
@@ -46,21 +45,22 @@ export class KeyRingLedgerService {
     _coinType: number,
     modularChainInfo: ModularChainInfo
   ): PubKeySecp256k1 {
-    if ("starknet" in modularChainInfo) {
+    if (modularChainInfo.type === "starknet") {
       throw new Error(
         "'getPubKeyStarknet' should be called for Starknet chain"
       );
     }
-    if (!("cosmos" in modularChainInfo)) {
-      // TODO: 나중에 starknet을 어떻게 지원할지 생각해본다.
+    if (
+      modularChainInfo.type !== "cosmos" &&
+      modularChainInfo.type !== "ethermint" &&
+      modularChainInfo.type !== "evm"
+    ) {
       throw new Error("Chain is not a cosmos chain");
     }
 
     let app = "Cosmos";
 
-    const isEthermintLike = KeyRingService.isEthermintLike(
-      modularChainInfo.cosmos
-    );
+    const isEthermintLike = isEthSignChain(modularChainInfo);
     if (isEthermintLike) {
       app = "Ethereum";
       if (!vault.insensitive[app]) {
@@ -100,7 +100,7 @@ export class KeyRingLedgerService {
     vault: Vault,
     modularChainInfo: ModularChainInfo
   ): PubKeyStarknet {
-    if (!("starknet" in modularChainInfo)) {
+    if (modularChainInfo.type !== "starknet") {
       throw new Error("'modularChainInfo' should have Starknet chain info");
     }
 
@@ -127,7 +127,7 @@ export class KeyRingLedgerService {
     network: BitcoinNetwork,
     modularChainInfo: ModularChainInfo
   ): PubKeyBitcoinCompatible {
-    if (!("bitcoin" in modularChainInfo)) {
+    if (modularChainInfo.type !== "bitcoin") {
       throw new Error("'modularChainInfo' should have Bitcoin chain info");
     }
 

package/src/keyring-starknet/service.ts

@@ -85,7 +85,7 @@ export class KeyRingStarknetService {
     }
     const modularChainInfo =
       this.chainsService.getModularChainInfoOrThrow(chainId);
-    if (!("starknet" in modularChainInfo)) {
+    if (modularChainInfo.type !== "starknet") {
       throw new Error("Chain is not a starknet chain");
     }
     return new RpcProvider({
@@ -164,7 +164,7 @@ export class KeyRingStarknetService {
     yHigh: Uint8Array;
   }> {
     const chainInfo = this.chainsService.getModularChainInfoOrThrow(chainId);
-    if (!("starknet" in chainInfo)) {
+    if (chainInfo.type !== "starknet") {
       throw new Error("Chain is not a starknet chain");
     }
 
@@ -251,7 +251,7 @@ export class KeyRingStarknetService {
 
           const modularChainInfo =
             this.chainsService.getModularChainInfoOrThrow(currentChainId);
-          if (!("starknet" in modularChainInfo)) {
+          if (modularChainInfo.type !== "starknet") {
             throw new Error("Chain is not a starknet chain");
           }
 
@@ -269,7 +269,7 @@ export class KeyRingStarknetService {
 
           const modularChainInfo =
             this.chainsService.getModularChainInfoOrThrow(currentChainId);
-          if (!("starknet" in modularChainInfo)) {
+          if (modularChainInfo.type !== "starknet") {
             throw new Error("Chain is not a starknet chain");
           }
 
@@ -354,7 +354,7 @@ export class KeyRingStarknetService {
 
           const newCurrentChainInfo =
             this.chainsService.getModularChainInfo(newCurrentChainId);
-          if (!newCurrentChainInfo || !("starknet" in newCurrentChainInfo)) {
+          if (!newCurrentChainInfo || newCurrentChainInfo.type !== "starknet") {
             return false;
           }
 
@@ -437,7 +437,7 @@ export class KeyRingStarknetService {
           const currentChainId = this.forceGetCurrentChainId(origin, chainId);
           const modularChainInfo =
             this.chainsService.getModularChainInfoOrThrow(currentChainId);
-          if (!("starknet" in modularChainInfo)) {
+          if (modularChainInfo.type !== "starknet") {
             throw new Error("Chain is not a starknet chain");
           }
 
@@ -488,7 +488,7 @@ export class KeyRingStarknetService {
           const currentChainId = this.forceGetCurrentChainId(origin, chainId);
           const modularChainInfo =
             this.chainsService.getModularChainInfoOrThrow(currentChainId);
-          if (!("starknet" in modularChainInfo)) {
+          if (modularChainInfo.type !== "starknet") {
             throw new Error("Chain is not a starknet chain");
           }
 

package/src/manage-view-asset-token/service.ts

@@ -13,7 +13,6 @@ import { computedFn } from "mobx-utils";
 import { ChainIdHelper } from "@keplr-wallet/cosmos";
 import { ChainsUIService } from "../chains-ui";
 import { ChainsService } from "../chains";
-import { ChainInfo } from "@keplr-wallet/types";
 import { VaultService } from "../vault";
 
 const DISABLED_VIEW_ASSET_TOKEN_MAP_KEY = "disabledViewAssetTokenMap";
@@ -99,10 +98,10 @@ export class ManageViewAssetTokenService {
     });
   };
 
-  protected readonly onChainRemoved = (chainInfo: ChainInfo) => {
+  protected readonly onChainRemoved = (chainId: string) => {
     //이상하긴 하지만 ChainsUIService과 비슷하게 처리 하도록 구현
     //해서 다른 vault에서 체인을 삭제하면 전체 vault에서 삭제됨
-    const chainIdentifier = ChainIdHelper.parse(chainInfo.chainId).identifier;
+    const chainIdentifier = ChainIdHelper.parse(chainId).identifier;
     const vaultIds = this.disabledViewAssetTokenMap.keys();
     runInAction(() => {
       for (const vaultId of vaultIds) {

package/src/permission/service.ts

@@ -11,11 +11,7 @@ import {
 } from "./types";
 import { KVStore } from "@keplr-wallet/common";
 import { ChainsService } from "../chains";
-import {
-  ChainInfo,
-  GENESIS_HASH_TO_NETWORK,
-  GenesisHash,
-} from "@keplr-wallet/types";
+import { GENESIS_HASH_TO_NETWORK, GenesisHash } from "@keplr-wallet/types";
 import { action, autorun, makeObservable, observable, runInAction } from "mobx";
 import { migrate } from "./migrate";
 import { computedFn } from "mobx-utils";
@@ -150,8 +146,8 @@ export class PermissionService {
     });
   }
 
-  protected readonly onChainRemoved = (chainInfo: ChainInfo) => {
-    this.removeAllPermissions(chainInfo.chainId);
+  protected readonly onChainRemoved = (chainId: string) => {
+    this.removeAllPermissions(chainId);
   };
 
   getAllPermissionDataPerOrigin(): AllPermissionDataPerOrigin {