@tomo-inc/wallet-adaptor-base 0.0.18 → 0.0.19

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var walletUtils = require('@tomo-inc/wallet-utils');
 var chains = require('viem/chains');
 var core = require('@wallet-standard/core');
 var walletConnectProtocol = require('@tomo-inc/wallet-connect-protocol');
@@ -116,24 +117,6 @@ var getAllWallets = async (baseUrl) => {
   const walletList = allWallets = walletListData == null ? void 0 : walletListData.data;
   return walletList;
 };
-
-// src/type.ts
-var ProviderProtocol = /* @__PURE__ */ ((ProviderProtocol2) => {
-  ProviderProtocol2["EIP6963"] = "eip6963";
-  ProviderProtocol2["WALLET_STANDARD"] = "wallet-standard";
-  ProviderProtocol2["WALLET_CONNECT"] = "wallet-connect";
-  ProviderProtocol2["INJECT"] = "inject";
-  return ProviderProtocol2;
-})(ProviderProtocol || {});
-var ProviderChainType = /* @__PURE__ */ ((ProviderChainType2) => {
-  ProviderChainType2["inject"] = "inject";
-  ProviderChainType2["deeplink"] = "deeplink";
-  ProviderChainType2["walletConnect"] = "walletConnect";
-  return ProviderChainType2;
-})(ProviderChainType || {});
-var SupportedChainTypes = ["evm", "solana", "aptos", "dogecoin"];
-
-// src/wallets/detector.ts
 function getEvmExplicitInjectedProvider(flag) {
   const _window = typeof window !== "undefined" ? window : void 0;
   if (typeof _window === "undefined" || typeof _window.ethereum === "undefined") return;
@@ -258,42 +241,39 @@ function tomoConnectorDector(wallet) {
   const isAptosExists = hasInjectedProvider(aptosNS);
   const isDogecoinExists = hasInjectedProvider(dogecoinNS);
   const isInstalled = isEvmExists || isSolanaExists || isAptosExists || isDogecoinExists;
+  const DEFAULT_PROVIDER = {
+    provider: void 0,
+    protocol: void 0,
+    standard: walletUtils.ProviderStandard.NORMAL
+  };
   const providers = {};
   if (evmNS.namespace || evmNS.flag) {
     providers.evm = isEvmExists ? {
       provider: getInjectedProvider(evmNS),
-      protocol: "eip6963" /* EIP6963 */
-    } : {
-      provider: void 0,
-      protocol: void 0
-    };
+      protocol: walletUtils.ProviderProtocol.INJECT,
+      standard: walletUtils.ProviderStandard.EIP1193
+    } : DEFAULT_PROVIDER;
   }
   if (solanaNS.namespace) {
     providers.solana = isSolanaExists ? {
       provider: getInjectedProvider(solanaNS),
-      protocol: "inject" /* INJECT */
-    } : {
-      provider: void 0,
-      protocol: void 0
-    };
+      protocol: walletUtils.ProviderProtocol.INJECT,
+      standard: walletUtils.ProviderStandard.NORMAL
+    } : DEFAULT_PROVIDER;
   }
   if (aptosNS.namespace) {
     providers.aptos = isAptosExists ? {
       provider: getInjectedProvider(aptosNS),
-      protocol: "inject" /* INJECT */
-    } : {
-      provider: void 0,
-      protocol: void 0
-    };
+      protocol: walletUtils.ProviderProtocol.INJECT,
+      standard: walletUtils.ProviderStandard.NORMAL
+    } : DEFAULT_PROVIDER;
   }
   if (dogecoinNS.namespace) {
     providers.dogecoin = isDogecoinExists ? {
       provider: getInjectedProvider(dogecoinNS),
-      protocol: "inject" /* INJECT */
-    } : {
-      provider: void 0,
-      protocol: void 0
-    };
+      protocol: walletUtils.ProviderProtocol.INJECT,
+      standard: walletUtils.ProviderStandard.NORMAL
+    } : DEFAULT_PROVIDER;
   }
   return {
     info: {
@@ -312,23 +292,18 @@ function tomoConnectorDector(wallet) {
       }
     },
     isInstalled,
-    providers
+    connectors: providers
   };
 }
 function wagmiConnectorDector(wallet) {
   var _a, _b, _c, _d;
   const tempConfig = {};
   const connector = wallet.createConnector(tempConfig);
-  const evmNS = {
-    namespace: (wallet == null ? void 0 : wallet.namespace) || "",
-    flag: (wallet == null ? void 0 : wallet.flag) || ""
-  };
-  const isEvm = hasInjectedProvider(evmNS);
-  isEvm || wallet.installed || false;
   const providers = {
     evm: {
       provider: connector,
-      protocol: "eip6963" /* EIP6963 */
+      protocol: walletUtils.ProviderProtocol.INJECT,
+      standard: walletUtils.ProviderStandard.EIP1193
     }
   };
   return {
@@ -346,7 +321,7 @@ function wagmiConnectorDector(wallet) {
       }
     },
     isInstalled: true,
-    providers
+    connectors: providers
   };
 }
 function connectorDector(wallet, connectorType) {
@@ -364,8 +339,6 @@ var getDefaultConnectors = async (baseUrl) => {
   }));
   return defaultWallets == null ? void 0 : defaultWallets.map((wallet) => connectorDector(wallet, "tomo"));
 };
-
-// src/wallets/wallet-eip6963.ts
 var announceEvent = "eip6963:announceProvider";
 var requestEvent = "eip6963:requestProvider";
 var walletType = "evm";
@@ -396,17 +369,18 @@ async function eip6963Wallets() {
                 }
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 [walletType]: {
                   provider,
-                  protocol: "eip6963" /* EIP6963 */
+                  standard: walletUtils.ProviderStandard.EIP1193,
+                  protocol: walletUtils.ProviderProtocol.INJECT
                 }
               }
             });
           }
         }
       } catch (error) {
-        console.warn(`${"eip6963" /* EIP6963 */} detect error:`, error);
+        console.warn(`${walletUtils.ProviderProtocol.INJECT} detect error:`, error);
       }
     }
     window.addEventListener(announceEvent, handleProviderAnnouncement);
@@ -465,10 +439,11 @@ async function walletStandardWallets() {
                 }
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 solana: {
                   provider: wallet.features,
-                  protocol: "wallet-standard" /* WALLET_STANDARD */
+                  standard: walletUtils.ProviderStandard.WALLET_STANDARD,
+                  protocol: walletUtils.ProviderProtocol.INJECT
                 }
               }
             });
@@ -491,10 +466,11 @@ async function walletStandardWallets() {
                 }
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 aptos: {
                   provider: wallet.features,
-                  protocol: "wallet-standard" /* WALLET_STANDARD */
+                  standard: walletUtils.ProviderStandard.WALLET_STANDARD,
+                  protocol: walletUtils.ProviderProtocol.INJECT
                 }
               }
             });
@@ -517,10 +493,11 @@ async function walletStandardWallets() {
                 }
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 sui: {
                   provider: wallet.features,
-                  protocol: "wallet-standard" /* WALLET_STANDARD */
+                  standard: walletUtils.ProviderStandard.WALLET_STANDARD,
+                  protocol: walletUtils.ProviderProtocol.INJECT
                 }
               }
             });
@@ -1160,15 +1137,24 @@ function convertWalletToConnector(wallet) {
     },
     isInstalled: true,
     // Always available
-    providers: {
-      evm: {
-        provider: createWalletConnectEVMProvider(walletConnectConfig == null ? void 0 : walletConnectConfig.evmNamespaces),
-        protocol: "wallet-connect" /* WALLET_CONNECT */
+    connectors: {
+      [walletUtils.ChainTypeEnum.EVM]: {
+        standard: walletUtils.ProviderStandard.NORMAL,
+        protocol: walletUtils.ProviderProtocol.WALLET_CONNECT,
+        provider: createWalletConnectEVMProvider(walletConnectConfig == null ? void 0 : walletConnectConfig.evmNamespaces)
       },
-      solana: {
-        provider: createWalletConnectSolanaProvider(walletConnectConfig == null ? void 0 : walletConnectConfig.solanaNamespaces),
-        protocol: "wallet-connect" /* WALLET_CONNECT */
+      [walletUtils.ChainTypeEnum.SOLANA]: {
+        standard: walletUtils.ProviderStandard.NORMAL,
+        protocol: walletUtils.ProviderProtocol.WALLET_CONNECT,
+        provider: createWalletConnectSolanaProvider(walletConnectConfig == null ? void 0 : walletConnectConfig.solanaNamespaces)
       }
+      // [ChainTypeEnum.BITCOIN]: null,
+      // [ChainTypeEnum.DOGECOIN]: null,
+      // [ChainTypeEnum.APTOS]: null,
+      // [ChainTypeEnum.COSMOS]: null,
+      // [ChainTypeEnum.TON]: null,
+      // [ChainTypeEnum.TRON]: null,
+      // [ChainTypeEnum.SUI]: null,
     }
   };
 }
@@ -1868,12 +1854,12 @@ async function loadConnectors({
     const _connector = connectorsFromConfig.find((c) => c.info.name === connector.info.name);
     if (_connector) {
       _connector.isInstalled = true;
-      _connector.providers = __spreadValues(__spreadValues({}, _connector.providers), connector.providers);
+      _connector.connectors = __spreadValues(__spreadValues({}, _connector.connectors), connector.connectors);
     } else {
       connectorsFromConfig.push(connector);
     }
   }
-  const allConnectors = connectorsFromConfig.filter((wallet) => chainType !== "all" ? !!wallet.providers[chainType] : true).sort((a, b) => {
+  const allConnectors = connectorsFromConfig.filter((wallet) => chainType !== "all" ? !!wallet.connectors[chainType] : true).sort((a, b) => {
     if (a.recommoned && !b.recommoned) return -1;
     if (!a.recommoned && b.recommoned) return 1;
     if (a.isInstalled && !b.isInstalled) return -1;
@@ -1886,9 +1872,6 @@ async function loadConnectors({
   };
 }
 
-exports.ProviderChainType = ProviderChainType;
-exports.ProviderProtocol = ProviderProtocol;
-exports.SupportedChainTypes = SupportedChainTypes;
 exports.addChain = addChain;
 exports.connect = connect;
 exports.connectMobile = connectMobile;

package/dist/index.d.cts

@@ -1,18 +1,8 @@
+import { ChainTypeEnum, ProviderProtocol, ProviderStandard } from '@tomo-inc/wallet-utils';
+
 type WalletProvider = any;
-declare enum ProviderProtocol {
-    EIP6963 = "eip6963",
-    WALLET_STANDARD = "wallet-standard",
-    WALLET_CONNECT = "wallet-connect",
-    INJECT = "inject"
-}
-declare enum ProviderChainType {
-    inject = "inject",
-    deeplink = "deeplink",
-    walletConnect = "walletConnect"
-}
 type WalletConnectorType = "wagmi" | "tomo";
-type AdaptorChainType = "all" | "evm" | "solana" | "aptos" | "dogecoin";
-declare const SupportedChainTypes: string[];
+type AdaptorChainType = ChainTypeEnum | "all";
 interface WalletInfo {
     uuid: string;
     name: string;
@@ -45,19 +35,16 @@ interface WalletInfo {
     };
 }
 interface ConnectorProvider {
-    provider: any;
+    provider: WalletProvider;
     protocol: ProviderProtocol;
+    standard: ProviderStandard;
 }
+type ConnectorProviders = Partial<Record<ChainTypeEnum, ConnectorProvider | null>>;
 interface Connector {
     info: WalletInfo;
     isInstalled?: boolean;
     recommoned?: boolean;
-    providers: {
-        evm?: ConnectorProvider;
-        solana?: ConnectorProvider;
-        aptos?: ConnectorProvider;
-        dogecoin?: ConnectorProvider;
-    };
+    connectors: Partial<Record<ChainTypeEnum, ConnectorProvider | null>>;
 }
 interface ConnectParams {
     dappLink: string;
@@ -249,4 +236,4 @@ declare function loadConnectors({ chainType, recommendedConnectors, connectorTyp
     recommoned: Connector[];
 }>;
 
-export { type AdaptorChainType, type BalanceParams, type ChainInfo, type ConnectParams, type Connector, type ConnectorProvider, type ITokenInfo, ProviderChainType, ProviderProtocol, type SignInParams, SupportedChainTypes, type WalletConfig, type WalletConnectConfig, type WalletConnectorType, type WalletInfo, type WalletOptions, type WalletProvider, addChain, connect, connectMobile, disconnect, getAllWallets, getBalance, isMobile, isWagmiConnector, loadConnectors, setWalletConnectConfig, signInWithWallet, signMessage, switchChain, walletBaseUrl };
+export { type AdaptorChainType, type BalanceParams, type ChainInfo, type ConnectParams, type Connector, type ConnectorProvider, type ConnectorProviders, type ITokenInfo, type SignInParams, type WalletConfig, type WalletConnectConfig, type WalletConnectorType, type WalletInfo, type WalletOptions, type WalletProvider, addChain, connect, connectMobile, disconnect, getAllWallets, getBalance, isMobile, isWagmiConnector, loadConnectors, setWalletConnectConfig, signInWithWallet, signMessage, switchChain, walletBaseUrl };

package/dist/index.d.ts

@@ -1,18 +1,8 @@
+import { ChainTypeEnum, ProviderProtocol, ProviderStandard } from '@tomo-inc/wallet-utils';
+
 type WalletProvider = any;
-declare enum ProviderProtocol {
-    EIP6963 = "eip6963",
-    WALLET_STANDARD = "wallet-standard",
-    WALLET_CONNECT = "wallet-connect",
-    INJECT = "inject"
-}
-declare enum ProviderChainType {
-    inject = "inject",
-    deeplink = "deeplink",
-    walletConnect = "walletConnect"
-}
 type WalletConnectorType = "wagmi" | "tomo";
-type AdaptorChainType = "all" | "evm" | "solana" | "aptos" | "dogecoin";
-declare const SupportedChainTypes: string[];
+type AdaptorChainType = ChainTypeEnum | "all";
 interface WalletInfo {
     uuid: string;
     name: string;
@@ -45,19 +35,16 @@ interface WalletInfo {
     };
 }
 interface ConnectorProvider {
-    provider: any;
+    provider: WalletProvider;
     protocol: ProviderProtocol;
+    standard: ProviderStandard;
 }
+type ConnectorProviders = Partial<Record<ChainTypeEnum, ConnectorProvider | null>>;
 interface Connector {
     info: WalletInfo;
     isInstalled?: boolean;
     recommoned?: boolean;
-    providers: {
-        evm?: ConnectorProvider;
-        solana?: ConnectorProvider;
-        aptos?: ConnectorProvider;
-        dogecoin?: ConnectorProvider;
-    };
+    connectors: Partial<Record<ChainTypeEnum, ConnectorProvider | null>>;
 }
 interface ConnectParams {
     dappLink: string;
@@ -249,4 +236,4 @@ declare function loadConnectors({ chainType, recommendedConnectors, connectorTyp
     recommoned: Connector[];
 }>;
 
-export { type AdaptorChainType, type BalanceParams, type ChainInfo, type ConnectParams, type Connector, type ConnectorProvider, type ITokenInfo, ProviderChainType, ProviderProtocol, type SignInParams, SupportedChainTypes, type WalletConfig, type WalletConnectConfig, type WalletConnectorType, type WalletInfo, type WalletOptions, type WalletProvider, addChain, connect, connectMobile, disconnect, getAllWallets, getBalance, isMobile, isWagmiConnector, loadConnectors, setWalletConnectConfig, signInWithWallet, signMessage, switchChain, walletBaseUrl };
+export { type AdaptorChainType, type BalanceParams, type ChainInfo, type ConnectParams, type Connector, type ConnectorProvider, type ConnectorProviders, type ITokenInfo, type SignInParams, type WalletConfig, type WalletConnectConfig, type WalletConnectorType, type WalletInfo, type WalletOptions, type WalletProvider, addChain, connect, connectMobile, disconnect, getAllWallets, getBalance, isMobile, isWagmiConnector, loadConnectors, setWalletConnectConfig, signInWithWallet, signMessage, switchChain, walletBaseUrl };

package/dist/index.js

@@ -1,3 +1,4 @@
+import { ProviderProtocol, ProviderStandard, ChainTypeEnum } from '@tomo-inc/wallet-utils';
 import { mainnet } from 'viem/chains';
 import { getWallets } from '@wallet-standard/core';
 import { WalletConnectClient } from '@tomo-inc/wallet-connect-protocol';
@@ -114,24 +115,6 @@ var getAllWallets = async (baseUrl) => {
   const walletList = allWallets = walletListData == null ? void 0 : walletListData.data;
   return walletList;
 };
-
-// src/type.ts
-var ProviderProtocol = /* @__PURE__ */ ((ProviderProtocol2) => {
-  ProviderProtocol2["EIP6963"] = "eip6963";
-  ProviderProtocol2["WALLET_STANDARD"] = "wallet-standard";
-  ProviderProtocol2["WALLET_CONNECT"] = "wallet-connect";
-  ProviderProtocol2["INJECT"] = "inject";
-  return ProviderProtocol2;
-})(ProviderProtocol || {});
-var ProviderChainType = /* @__PURE__ */ ((ProviderChainType2) => {
-  ProviderChainType2["inject"] = "inject";
-  ProviderChainType2["deeplink"] = "deeplink";
-  ProviderChainType2["walletConnect"] = "walletConnect";
-  return ProviderChainType2;
-})(ProviderChainType || {});
-var SupportedChainTypes = ["evm", "solana", "aptos", "dogecoin"];
-
-// src/wallets/detector.ts
 function getEvmExplicitInjectedProvider(flag) {
   const _window = typeof window !== "undefined" ? window : void 0;
   if (typeof _window === "undefined" || typeof _window.ethereum === "undefined") return;
@@ -256,42 +239,39 @@ function tomoConnectorDector(wallet) {
   const isAptosExists = hasInjectedProvider(aptosNS);
   const isDogecoinExists = hasInjectedProvider(dogecoinNS);
   const isInstalled = isEvmExists || isSolanaExists || isAptosExists || isDogecoinExists;
+  const DEFAULT_PROVIDER = {
+    provider: void 0,
+    protocol: void 0,
+    standard: ProviderStandard.NORMAL
+  };
   const providers = {};
   if (evmNS.namespace || evmNS.flag) {
     providers.evm = isEvmExists ? {
       provider: getInjectedProvider(evmNS),
-      protocol: "eip6963" /* EIP6963 */
-    } : {
-      provider: void 0,
-      protocol: void 0
-    };
+      protocol: ProviderProtocol.INJECT,
+      standard: ProviderStandard.EIP1193
+    } : DEFAULT_PROVIDER;
   }
   if (solanaNS.namespace) {
     providers.solana = isSolanaExists ? {
       provider: getInjectedProvider(solanaNS),
-      protocol: "inject" /* INJECT */
-    } : {
-      provider: void 0,
-      protocol: void 0
-    };
+      protocol: ProviderProtocol.INJECT,
+      standard: ProviderStandard.NORMAL
+    } : DEFAULT_PROVIDER;
   }
   if (aptosNS.namespace) {
     providers.aptos = isAptosExists ? {
       provider: getInjectedProvider(aptosNS),
-      protocol: "inject" /* INJECT */
-    } : {
-      provider: void 0,
-      protocol: void 0
-    };
+      protocol: ProviderProtocol.INJECT,
+      standard: ProviderStandard.NORMAL
+    } : DEFAULT_PROVIDER;
   }
   if (dogecoinNS.namespace) {
     providers.dogecoin = isDogecoinExists ? {
       provider: getInjectedProvider(dogecoinNS),
-      protocol: "inject" /* INJECT */
-    } : {
-      provider: void 0,
-      protocol: void 0
-    };
+      protocol: ProviderProtocol.INJECT,
+      standard: ProviderStandard.NORMAL
+    } : DEFAULT_PROVIDER;
   }
   return {
     info: {
@@ -310,23 +290,18 @@ function tomoConnectorDector(wallet) {
       }
     },
     isInstalled,
-    providers
+    connectors: providers
   };
 }
 function wagmiConnectorDector(wallet) {
   var _a, _b, _c, _d;
   const tempConfig = {};
   const connector = wallet.createConnector(tempConfig);
-  const evmNS = {
-    namespace: (wallet == null ? void 0 : wallet.namespace) || "",
-    flag: (wallet == null ? void 0 : wallet.flag) || ""
-  };
-  const isEvm = hasInjectedProvider(evmNS);
-  isEvm || wallet.installed || false;
   const providers = {
     evm: {
       provider: connector,
-      protocol: "eip6963" /* EIP6963 */
+      protocol: ProviderProtocol.INJECT,
+      standard: ProviderStandard.EIP1193
     }
   };
   return {
@@ -344,7 +319,7 @@ function wagmiConnectorDector(wallet) {
       }
     },
     isInstalled: true,
-    providers
+    connectors: providers
   };
 }
 function connectorDector(wallet, connectorType) {
@@ -362,8 +337,6 @@ var getDefaultConnectors = async (baseUrl) => {
   }));
   return defaultWallets == null ? void 0 : defaultWallets.map((wallet) => connectorDector(wallet, "tomo"));
 };
-
-// src/wallets/wallet-eip6963.ts
 var announceEvent = "eip6963:announceProvider";
 var requestEvent = "eip6963:requestProvider";
 var walletType = "evm";
@@ -394,17 +367,18 @@ async function eip6963Wallets() {
                 }
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 [walletType]: {
                   provider,
-                  protocol: "eip6963" /* EIP6963 */
+                  standard: ProviderStandard.EIP1193,
+                  protocol: ProviderProtocol.INJECT
                 }
               }
             });
           }
         }
       } catch (error) {
-        console.warn(`${"eip6963" /* EIP6963 */} detect error:`, error);
+        console.warn(`${ProviderProtocol.INJECT} detect error:`, error);
       }
     }
     window.addEventListener(announceEvent, handleProviderAnnouncement);
@@ -463,10 +437,11 @@ async function walletStandardWallets() {
                 }
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 solana: {
                   provider: wallet.features,
-                  protocol: "wallet-standard" /* WALLET_STANDARD */
+                  standard: ProviderStandard.WALLET_STANDARD,
+                  protocol: ProviderProtocol.INJECT
                 }
               }
             });
@@ -489,10 +464,11 @@ async function walletStandardWallets() {
                 }
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 aptos: {
                   provider: wallet.features,
-                  protocol: "wallet-standard" /* WALLET_STANDARD */
+                  standard: ProviderStandard.WALLET_STANDARD,
+                  protocol: ProviderProtocol.INJECT
                 }
               }
             });
@@ -515,10 +491,11 @@ async function walletStandardWallets() {
                 }
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 sui: {
                   provider: wallet.features,
-                  protocol: "wallet-standard" /* WALLET_STANDARD */
+                  standard: ProviderStandard.WALLET_STANDARD,
+                  protocol: ProviderProtocol.INJECT
                 }
               }
             });
@@ -1158,15 +1135,24 @@ function convertWalletToConnector(wallet) {
     },
     isInstalled: true,
     // Always available
-    providers: {
-      evm: {
-        provider: createWalletConnectEVMProvider(walletConnectConfig == null ? void 0 : walletConnectConfig.evmNamespaces),
-        protocol: "wallet-connect" /* WALLET_CONNECT */
+    connectors: {
+      [ChainTypeEnum.EVM]: {
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.WALLET_CONNECT,
+        provider: createWalletConnectEVMProvider(walletConnectConfig == null ? void 0 : walletConnectConfig.evmNamespaces)
       },
-      solana: {
-        provider: createWalletConnectSolanaProvider(walletConnectConfig == null ? void 0 : walletConnectConfig.solanaNamespaces),
-        protocol: "wallet-connect" /* WALLET_CONNECT */
+      [ChainTypeEnum.SOLANA]: {
+        standard: ProviderStandard.NORMAL,
+        protocol: ProviderProtocol.WALLET_CONNECT,
+        provider: createWalletConnectSolanaProvider(walletConnectConfig == null ? void 0 : walletConnectConfig.solanaNamespaces)
       }
+      // [ChainTypeEnum.BITCOIN]: null,
+      // [ChainTypeEnum.DOGECOIN]: null,
+      // [ChainTypeEnum.APTOS]: null,
+      // [ChainTypeEnum.COSMOS]: null,
+      // [ChainTypeEnum.TON]: null,
+      // [ChainTypeEnum.TRON]: null,
+      // [ChainTypeEnum.SUI]: null,
     }
   };
 }
@@ -1866,12 +1852,12 @@ async function loadConnectors({
     const _connector = connectorsFromConfig.find((c) => c.info.name === connector.info.name);
     if (_connector) {
       _connector.isInstalled = true;
-      _connector.providers = __spreadValues(__spreadValues({}, _connector.providers), connector.providers);
+      _connector.connectors = __spreadValues(__spreadValues({}, _connector.connectors), connector.connectors);
     } else {
       connectorsFromConfig.push(connector);
     }
   }
-  const allConnectors = connectorsFromConfig.filter((wallet) => chainType !== "all" ? !!wallet.providers[chainType] : true).sort((a, b) => {
+  const allConnectors = connectorsFromConfig.filter((wallet) => chainType !== "all" ? !!wallet.connectors[chainType] : true).sort((a, b) => {
     if (a.recommoned && !b.recommoned) return -1;
     if (!a.recommoned && b.recommoned) return 1;
     if (a.isInstalled && !b.isInstalled) return -1;
@@ -1884,4 +1870,4 @@ async function loadConnectors({
   };
 }
 
-export { ProviderChainType, ProviderProtocol, SupportedChainTypes, addChain, connect, connectMobile, disconnect, getAllWallets, getBalance, isMobile, isWagmiConnector, loadConnectors, setWalletConnectConfig, signInWithWallet, signMessage, switchChain, walletBaseUrl };
+export { addChain, connect, connectMobile, disconnect, getAllWallets, getBalance, isMobile, isWagmiConnector, loadConnectors, setWalletConnectConfig, signInWithWallet, signMessage, switchChain, walletBaseUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomo-inc/wallet-adaptor-base",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "author": "tomo.inc",
   "license": "MIT",
   "private": false,
@@ -22,6 +22,7 @@
     "@solana/web3.js": "^1.98.0",
     "@wallet-standard/core": "^1.1.0",
     "viem": "2.21.54",
+    "@tomo-inc/wallet-utils": "0.0.17",
     "@tomo-inc/wallet-connect-protocol": "0.0.17"
   },
   "devDependencies": {

package/src/__tests__/wallet-standard.test.ts

@@ -1,6 +1,6 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { ProviderStandard } from "@tomo-inc/wallet-utils";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { walletStandardWallets } from "../wallets/wallet-standard";
-import { ProviderProtocol } from "../type";
 
 // Mock @wallet-standard/core - use vi.hoisted to avoid initialization issues
 const { mockWallets, mockWalletsAPI } = vi.hoisted(() => {
@@ -63,7 +63,7 @@ describe("wallet-standard", () => {
 
       expect(result.solanaWallets).toHaveLength(1);
       expect(result.solanaWallets[0].info.name).toBe("Solana Wallet");
-      expect(result.solanaWallets[0].providers.solana?.protocol).toBe(ProviderProtocol.WALLET_STANDARD);
+      expect(result.solanaWallets[0].connectors.solana?.protocol).toBe(ProviderStandard.WALLET_STANDARD);
       expect(result.solanaWallets[0].isInstalled).toBe(true);
     });
 
@@ -86,7 +86,7 @@ describe("wallet-standard", () => {
 
       expect(result.aptosWallets).toHaveLength(1);
       expect(result.aptosWallets[0].info.name).toBe("Aptos Wallet");
-      expect(result.aptosWallets[0].providers.aptos?.protocol).toBe(ProviderProtocol.WALLET_STANDARD);
+      expect(result.aptosWallets[0].connectors.aptos?.protocol).toBe(ProviderStandard.WALLET_STANDARD);
     });
 
     it("should detect Sui wallets", async () => {

package/src/index.ts

@@ -5,7 +5,7 @@ import { isWagmiConnector } from "./utils/wallet-config";
 import { getAllWallets, walletBaseUrl } from "./wallets";
 import { getDefaultConnectors } from "./wallets/defaultConnectors";
 import { connectorDector, supportedWalletConfigTypes, walletConfigAdapter } from "./wallets/detector";
-import { WagmiWalletConfig, WalletConfig } from "./wallets/Wallet";
+import { WagmiWalletConfig, WalletConfig } from "./wallets/types";
 import { eip6963Wallets } from "./wallets/wallet-eip6963";
 import { walletStandardWallets } from "./wallets/wallet-standard";
 import { setWalletConnectConfig, walletConnectWallets } from "./wallets/wallet-walletconnect";
@@ -77,14 +77,14 @@ export async function loadConnectors({
     const _connector = connectorsFromConfig.find((c) => c.info.name === connector.info.name);
     if (_connector) {
       _connector.isInstalled = true;
-      _connector.providers = { ..._connector.providers, ...connector.providers };
+      _connector.connectors = { ..._connector.connectors, ...connector.connectors };
     } else {
       connectorsFromConfig.push(connector);
     }
   }
 
   const allConnectors = connectorsFromConfig
-    .filter((wallet) => (chainType !== "all" ? !!wallet.providers[chainType] : true))
+    .filter((wallet) => (chainType !== "all" ? !!wallet.connectors[chainType] : true))
     .sort((a, b) => {
       // First priority: recommoned wallets
       if (a.recommoned && !b.recommoned) return -1;

package/src/type.ts

@@ -1,24 +1,9 @@
+import { ChainTypeEnum, ProviderProtocol, ProviderStandard } from "@tomo-inc/wallet-utils";
 export type WalletProvider = any;
 
-export enum ProviderProtocol {
-  EIP6963 = "eip6963",
-  WALLET_STANDARD = "wallet-standard",
-  WALLET_CONNECT = "wallet-connect",
-  INJECT = "inject",
-}
-
-export enum ProviderChainType {
-  inject = "inject",
-  deeplink = "deeplink",
-  walletConnect = "walletConnect",
-}
-
 export type WalletConnectorType = "wagmi" | "tomo";
 
-export type AdaptorChainType = "all" | "evm" | "solana" | "aptos" | "dogecoin";
-
-export const SupportedChainTypes = ["evm", "solana", "aptos", "dogecoin"];
-
+export type AdaptorChainType = ChainTypeEnum | "all";
 export interface WalletInfo {
   uuid: string;
   name: string;
@@ -53,21 +38,17 @@ export interface WalletInfo {
 }
 
 export interface ConnectorProvider {
-  provider: any;
+  provider: WalletProvider;
   protocol: ProviderProtocol;
+  standard: ProviderStandard;
 }
 
+export type ConnectorProviders = Partial<Record<ChainTypeEnum, ConnectorProvider | null>>;
 export interface Connector {
   info: WalletInfo;
   isInstalled?: boolean;
   recommoned?: boolean;
-
-  providers: {
-    evm?: ConnectorProvider;
-    solana?: ConnectorProvider;
-    aptos?: ConnectorProvider;
-    dogecoin?: ConnectorProvider;
-  };
+  connectors: Partial<Record<ChainTypeEnum, ConnectorProvider | null>>;
 }
 
 export interface ConnectParams {

package/src/utils/wallet-config.ts

@@ -1,4 +1,4 @@
-import { WagmiWalletConfig, WalletConfig } from "../wallets/Wallet";
+import { WagmiWalletConfig, WalletConfig } from "../wallets/types";
 
 /**
  * Check if the object has key WalletConfig properties

package/src/wallets/detector.ts

@@ -1,6 +1,7 @@
+import { ProviderProtocol, ProviderStandard } from "@tomo-inc/wallet-utils";
 import { mainnet } from "viem/chains";
-import { Connector, ProviderProtocol, WalletConnectorType } from "../type";
-import { WagmiWalletConfig, WalletConfig } from "./Wallet";
+import { Connector, WalletConnectorType } from "../type";
+import { WagmiWalletConfig, WalletConfig } from "./types";
 
 type WalletProviderFlags = string;
 type WindowProvider = any;
@@ -194,50 +195,48 @@ function tomoConnectorDector(wallet: WalletConfig): Connector {
   const isDogecoinExists = hasInjectedProvider(dogecoinNS);
   const isInstalled = isEvmExists || isSolanaExists || isAptosExists || isDogecoinExists;
 
+  const DEFAULT_PROVIDER = {
+    provider: undefined,
+    protocol: undefined,
+    standard: ProviderStandard.NORMAL,
+  };
+
   const providers: any = {};
   if (evmNS.namespace || evmNS.flag) {
     providers.evm = isEvmExists
       ? {
           provider: getInjectedProvider(evmNS),
-          protocol: ProviderProtocol.EIP6963,
+          protocol: ProviderProtocol.INJECT,
+          standard: ProviderStandard.EIP1193,
         }
-      : {
-          provider: undefined,
-          protocol: undefined,
-        };
+      : DEFAULT_PROVIDER;
   }
   if (solanaNS.namespace) {
     providers.solana = isSolanaExists
       ? {
           provider: getInjectedProvider(solanaNS),
           protocol: ProviderProtocol.INJECT,
+          standard: ProviderStandard.NORMAL,
         }
-      : {
-          provider: undefined,
-          protocol: undefined,
-        };
+      : DEFAULT_PROVIDER;
   }
   if (aptosNS.namespace) {
     providers.aptos = isAptosExists
       ? {
           provider: getInjectedProvider(aptosNS),
           protocol: ProviderProtocol.INJECT,
+          standard: ProviderStandard.NORMAL,
         }
-      : {
-          provider: undefined,
-          protocol: undefined,
-        };
+      : DEFAULT_PROVIDER;
   }
   if (dogecoinNS.namespace) {
     providers.dogecoin = isDogecoinExists
       ? {
           provider: getInjectedProvider(dogecoinNS),
           protocol: ProviderProtocol.INJECT,
+          standard: ProviderStandard.NORMAL,
         }
-      : {
-          provider: undefined,
-          protocol: undefined,
-        };
+      : DEFAULT_PROVIDER;
   }
   return {
     info: {
@@ -256,24 +255,25 @@ function tomoConnectorDector(wallet: WalletConfig): Connector {
       },
     },
     isInstalled,
-    providers,
+    connectors: providers,
   };
 }
 
 function wagmiConnectorDector(wallet: WagmiWalletConfig): Connector {
   const tempConfig = {} as Record<string, any>;
   const connector = wallet.createConnector(tempConfig);
-  const evmNS = {
-    namespace: wallet?.namespace || "",
-    flag: wallet?.flag || "",
-  };
+  // const evmNS = {
+  //   namespace: wallet?.namespace || "",
+  //   flag: wallet?.flag || "",
+  // };
 
-  const isEvm = hasInjectedProvider(evmNS);
-  const isInstalled = isEvm || wallet.installed || false;
+  // const isEvm = hasInjectedProvider(evmNS);
+  // const isInstalled = isEvm || wallet.installed || false;
   const providers = {
     evm: {
       provider: connector,
-      protocol: ProviderProtocol.EIP6963,
+      protocol: ProviderProtocol.INJECT,
+      standard: ProviderStandard.EIP1193,
     },
   };
   return {
@@ -291,7 +291,7 @@ function wagmiConnectorDector(wallet: WagmiWalletConfig): Connector {
       },
     },
     isInstalled: true,
-    providers,
+    connectors: providers,
   };
 }
 

package/src/wallets/index.ts

@@ -1,4 +1,4 @@
-import { WalletConfig } from "./Wallet";
+import { WalletConfig } from "./types";
 
 export const walletBaseUrl = "https://web3-assets.tomo.inc";
 

package/src/wallets/wallet-eip6963.ts

@@ -1,4 +1,5 @@
-import { Connector, ProviderProtocol, WalletInfo } from "../type";
+import { ProviderProtocol, ProviderStandard } from "@tomo-inc/wallet-utils";
+import { Connector, WalletInfo } from "../type";
 import { uniqueConnectors } from "../utils/utils";
 
 const announceEvent = "eip6963:announceProvider";
@@ -41,17 +42,18 @@ export async function eip6963Wallets(): Promise<Connector[]> {
                 },
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 [walletType]: {
                   provider,
-                  protocol: ProviderProtocol.EIP6963,
+                  standard: ProviderStandard.EIP1193,
+                  protocol: ProviderProtocol.INJECT,
                 },
               },
             });
           }
         }
       } catch (error) {
-        console.warn(`${ProviderProtocol.EIP6963} detect error:`, error);
+        console.warn(`${ProviderProtocol.INJECT} detect error:`, error);
       }
     }
 

package/src/wallets/wallet-standard.ts

@@ -1,6 +1,7 @@
-import { uniqueConnectors } from "../utils/utils";
-import { Connector, ProviderProtocol } from "../type";
+import { ProviderProtocol, ProviderStandard } from "@tomo-inc/wallet-utils";
 import { getWallets } from "@wallet-standard/core";
+import { Connector } from "../type";
+import { uniqueConnectors } from "../utils/utils";
 
 const disabledWallets = {
   "Bitget Wallet": true,
@@ -71,10 +72,11 @@ export async function walletStandardWallets(): Promise<{
                 },
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 solana: {
                   provider: wallet.features,
-                  protocol: ProviderProtocol.WALLET_STANDARD,
+                  standard: ProviderStandard.WALLET_STANDARD,
+                  protocol: ProviderProtocol.INJECT,
                 },
               },
             });
@@ -101,10 +103,11 @@ export async function walletStandardWallets(): Promise<{
                 },
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 aptos: {
                   provider: wallet.features,
-                  protocol: ProviderProtocol.WALLET_STANDARD,
+                  standard: ProviderStandard.WALLET_STANDARD,
+                  protocol: ProviderProtocol.INJECT,
                 },
               },
             });
@@ -131,10 +134,11 @@ export async function walletStandardWallets(): Promise<{
                 },
               },
               isInstalled: true,
-              providers: {
+              connectors: {
                 sui: {
                   provider: wallet.features,
-                  protocol: ProviderProtocol.WALLET_STANDARD,
+                  standard: ProviderStandard.WALLET_STANDARD,
+                  protocol: ProviderProtocol.INJECT,
                 },
               } as any,
             });

package/src/wallets/wallet-walletconnect.ts

@@ -1,5 +1,6 @@
 import { NamespaceConfig } from "@tomo-inc/wallet-connect-protocol";
-import { Connector, ProviderProtocol } from "../type";
+import { ChainTypeEnum, ProviderProtocol, ProviderStandard } from "@tomo-inc/wallet-utils";
+import { Connector } from "../type";
 import { walletBaseUrl } from "./index";
 import { WalletConnectProvider } from "./providers/WalletConnectProvider";
 import { WalletConnectSolanaProvider } from "./providers/WalletConnectSolanaProvider";
@@ -76,15 +77,24 @@ function convertWalletToConnector(wallet: Record<string, any>): Connector {
       },
     },
     isInstalled: true, // Always available
-    providers: {
-      evm: {
-        provider: createWalletConnectEVMProvider(walletConnectConfig?.evmNamespaces),
+    connectors: {
+      [ChainTypeEnum.EVM]: {
+        standard: ProviderStandard.NORMAL,
         protocol: ProviderProtocol.WALLET_CONNECT,
+        provider: createWalletConnectEVMProvider(walletConnectConfig?.evmNamespaces),
       },
-      solana: {
-        provider: createWalletConnectSolanaProvider(walletConnectConfig?.solanaNamespaces),
+      [ChainTypeEnum.SOLANA]: {
+        standard: ProviderStandard.NORMAL,
         protocol: ProviderProtocol.WALLET_CONNECT,
+        provider: createWalletConnectSolanaProvider(walletConnectConfig?.solanaNamespaces),
       },
+      // [ChainTypeEnum.BITCOIN]: null,
+      // [ChainTypeEnum.DOGECOIN]: null,
+      // [ChainTypeEnum.APTOS]: null,
+      // [ChainTypeEnum.COSMOS]: null,
+      // [ChainTypeEnum.TON]: null,
+      // [ChainTypeEnum.TRON]: null,
+      // [ChainTypeEnum.SUI]: null,
     },
   };
 }