@sodax/wallet-sdk-react 1.5.1-beta → 1.5.2-beta

package/dist/index.d.cts

@@ -11,6 +11,7 @@ import { IconService } from 'icon-sdk-js';
 import { IndexerGrpcAccountPortfolioApi, ChainGrpcWasmApi } from '@injectivelabs/sdk-ts';
 import { MsgBroadcaster } from '@injectivelabs/wallet-core';
 import { WalletStrategy } from '@injectivelabs/wallet-strategy';
+import { Wallet } from '@injectivelabs/wallet-base';
 import { Connection } from '@solana/web3.js';
 import { WalletContextState } from '@solana/wallet-adapter-react';
 import { StellarWalletsKit } from '@creit.tech/stellar-wallets-kit';
@@ -1276,24 +1277,15 @@ declare class InjectiveXService extends XService {
     getBalance(address: string | undefined, xToken: XToken): Promise<bigint>;
 }
 
-declare class InjectiveKelprXConnector extends XConnector {
-    constructor();
+declare class InjectiveXConnector extends XConnector {
+    private wallet;
+    constructor(name: string, wallet: Wallet);
     getXService(): InjectiveXService;
     connect(): Promise<XAccount | undefined>;
     disconnect(): Promise<void>;
-    get icon(): string;
-}
-
-declare class InjectiveMetamaskXConnector extends XConnector {
-    constructor();
-    getXService(): InjectiveXService;
-    connect(): Promise<XAccount | undefined>;
-    disconnect(): Promise<void>;
-    get icon(): string;
+    get icon(): string | undefined;
 }
 
-declare const switchEthereumChain: (chainId: any) => Promise<void>;
-
 declare class SolanaXService extends XService {
     private static instance;
     connection: Connection | undefined;
@@ -1584,4 +1576,4 @@ declare const useXWagmiStore: zustand.UseBoundStore<Omit<Omit<Omit<zustand.Store
     } | undefined): void;
 }>;
 
-export { BitcoinXConnector, BitcoinXService, type CurrencyKey, EvmXConnector, EvmXService, IconHanaXConnector, IconXService, InjectiveKelprXConnector, InjectiveMetamaskXConnector, InjectiveXService, OKXXConnector, STACKS_PROVIDERS, SodaxWalletProvider, type SodaxWalletProviderOptions, type SodaxWalletProviderProps, SolanaXConnector, SolanaXService, type StacksProviderConfig, StacksXConnector, StacksXService, StellarWalletsKitXConnector, StellarXService, SuiXConnector, SuiXService, UnisatXConnector, type WagmiOptions, WalletId, type XAccount, type XConnection, XConnector, XService, XverseXConnector, createWagmiConfig as createWagmi, createWagmiConfig, getWagmiChainId, getXChainType, getXService, isNativeToken, switchEthereumChain, useBitcoinXConnectors, useEvmSwitchChain, useStacksXConnectors, useWalletProvider, useXAccount, useXAccounts, useXBalances, useXConnect, useXConnection, useXConnectors, useXDisconnect, useXService, useXSignMessage, useXWagmiStore };
+export { BitcoinXConnector, BitcoinXService, type CurrencyKey, EvmXConnector, EvmXService, IconHanaXConnector, IconXService, InjectiveXConnector, InjectiveXService, OKXXConnector, STACKS_PROVIDERS, SodaxWalletProvider, type SodaxWalletProviderOptions, type SodaxWalletProviderProps, SolanaXConnector, SolanaXService, type StacksProviderConfig, StacksXConnector, StacksXService, StellarWalletsKitXConnector, StellarXService, SuiXConnector, SuiXService, UnisatXConnector, type WagmiOptions, WalletId, type XAccount, type XConnection, XConnector, XService, XverseXConnector, createWagmiConfig as createWagmi, createWagmiConfig, getWagmiChainId, getXChainType, getXService, isNativeToken, useBitcoinXConnectors, useEvmSwitchChain, useStacksXConnectors, useWalletProvider, useXAccount, useXAccounts, useXBalances, useXConnect, useXConnection, useXConnectors, useXDisconnect, useXService, useXSignMessage, useXWagmiStore };

package/dist/index.d.ts

@@ -11,6 +11,7 @@ import { IconService } from 'icon-sdk-js';
 import { IndexerGrpcAccountPortfolioApi, ChainGrpcWasmApi } from '@injectivelabs/sdk-ts';
 import { MsgBroadcaster } from '@injectivelabs/wallet-core';
 import { WalletStrategy } from '@injectivelabs/wallet-strategy';
+import { Wallet } from '@injectivelabs/wallet-base';
 import { Connection } from '@solana/web3.js';
 import { WalletContextState } from '@solana/wallet-adapter-react';
 import { StellarWalletsKit } from '@creit.tech/stellar-wallets-kit';
@@ -1276,24 +1277,15 @@ declare class InjectiveXService extends XService {
     getBalance(address: string | undefined, xToken: XToken): Promise<bigint>;
 }
 
-declare class InjectiveKelprXConnector extends XConnector {
-    constructor();
+declare class InjectiveXConnector extends XConnector {
+    private wallet;
+    constructor(name: string, wallet: Wallet);
     getXService(): InjectiveXService;
     connect(): Promise<XAccount | undefined>;
     disconnect(): Promise<void>;
-    get icon(): string;
-}
-
-declare class InjectiveMetamaskXConnector extends XConnector {
-    constructor();
-    getXService(): InjectiveXService;
-    connect(): Promise<XAccount | undefined>;
-    disconnect(): Promise<void>;
-    get icon(): string;
+    get icon(): string | undefined;
 }
 
-declare const switchEthereumChain: (chainId: any) => Promise<void>;
-
 declare class SolanaXService extends XService {
     private static instance;
     connection: Connection | undefined;
@@ -1584,4 +1576,4 @@ declare const useXWagmiStore: zustand.UseBoundStore<Omit<Omit<Omit<zustand.Store
     } | undefined): void;
 }>;
 
-export { BitcoinXConnector, BitcoinXService, type CurrencyKey, EvmXConnector, EvmXService, IconHanaXConnector, IconXService, InjectiveKelprXConnector, InjectiveMetamaskXConnector, InjectiveXService, OKXXConnector, STACKS_PROVIDERS, SodaxWalletProvider, type SodaxWalletProviderOptions, type SodaxWalletProviderProps, SolanaXConnector, SolanaXService, type StacksProviderConfig, StacksXConnector, StacksXService, StellarWalletsKitXConnector, StellarXService, SuiXConnector, SuiXService, UnisatXConnector, type WagmiOptions, WalletId, type XAccount, type XConnection, XConnector, XService, XverseXConnector, createWagmiConfig as createWagmi, createWagmiConfig, getWagmiChainId, getXChainType, getXService, isNativeToken, switchEthereumChain, useBitcoinXConnectors, useEvmSwitchChain, useStacksXConnectors, useWalletProvider, useXAccount, useXAccounts, useXBalances, useXConnect, useXConnection, useXConnectors, useXDisconnect, useXService, useXSignMessage, useXWagmiStore };
+export { BitcoinXConnector, BitcoinXService, type CurrencyKey, EvmXConnector, EvmXService, IconHanaXConnector, IconXService, InjectiveXConnector, InjectiveXService, OKXXConnector, STACKS_PROVIDERS, SodaxWalletProvider, type SodaxWalletProviderOptions, type SodaxWalletProviderProps, SolanaXConnector, SolanaXService, type StacksProviderConfig, StacksXConnector, StacksXService, StellarWalletsKitXConnector, StellarXService, SuiXConnector, SuiXService, UnisatXConnector, type WagmiOptions, WalletId, type XAccount, type XConnection, XConnector, XService, XverseXConnector, createWagmiConfig as createWagmi, createWagmiConfig, getWagmiChainId, getXChainType, getXService, isNativeToken, useBitcoinXConnectors, useEvmSwitchChain, useStacksXConnectors, useWalletProvider, useXAccount, useXAccounts, useXBalances, useXConnect, useXConnection, useXConnectors, useXDisconnect, useXService, useXSignMessage, useXWagmiStore };

package/dist/index.mjs

@@ -15,11 +15,11 @@ import { erc20Abi, defineChain } from 'viem';
 import { getPublicClient } from 'wagmi/actions';
 import { mainnet, avalanche, arbitrum, base, bsc, sonic, optimism, polygon, lightlinkPhoenix, kaia, redbellyMainnet } from 'wagmi/chains';
 import { getNetworkEndpoints, Network } from '@injectivelabs/networks';
-import { IndexerGrpcAccountPortfolioApi, ChainGrpcWasmApi, getInjectiveAddress, getEthereumAddress } from '@injectivelabs/sdk-ts';
+import { getInjectiveAddress, IndexerGrpcAccountPortfolioApi, ChainGrpcWasmApi, getEthereumAddress } from '@injectivelabs/sdk-ts';
 import { ChainId } from '@injectivelabs/ts-types';
 import { MsgBroadcaster } from '@injectivelabs/wallet-core';
 import { WalletStrategy } from '@injectivelabs/wallet-strategy';
-import { Wallet, isEvmBrowserWallet } from '@injectivelabs/wallet-base';
+import { Wallet, isEvmBrowserWallet, isCosmosBrowserWallet } from '@injectivelabs/wallet-base';
 import { isCosmosWalletInstalled } from '@injectivelabs/wallet-cosmos';
 import { PublicKey } from '@solana/web3.js';
 import { getAssociatedTokenAddressSync, getAccount } from '@solana/spl-token';
@@ -767,76 +767,48 @@ var InjectiveXService = class _InjectiveXService extends XService {
     return 0n;
   }
 };
-var InjectiveKelprXConnector = class extends XConnector {
-  constructor() {
-    super("INJECTIVE", "Keplr", Wallet.Keplr);
-  }
-  getXService() {
-    return InjectiveXService.getInstance();
-  }
-  async connect() {
-    if (!isCosmosWalletInstalled(Wallet.Keplr)) {
-      window.open("https://chrome.google.com/webstore/detail/keplr/dmkamcknogkgcdfhhbddcghachkejeap?hl=en", "_blank");
-      return;
-    }
-    this.getXService().walletStrategy.setWallet(Wallet.Keplr);
-    const addresses = await this.getXService().walletStrategy.getAddresses();
-    return {
-      address: addresses?.[0],
-      xChainType: this.xChainType
-    };
-  }
-  async disconnect() {
-  }
-  get icon() {
-    return "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/keplr.svg";
-  }
+var WALLET_ICONS = {
+  metamask: "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/metamask.svg",
+  keplr: "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/keplr.svg",
+  leap: "https://assets.leapwallet.io/logos/leap-cosmos-logo.svg",
+  rabby: "https://raw.githubusercontent.com/RabbyHub/logo/master/symbol.svg",
+  phantom: "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/phantom.svg",
+  "okx-wallet": "https://static.okx.com/cdn/assets/imgs/247/58E63FEA47A2B7D7.png",
+  "trust-wallet": "https://trustwallet.com/assets/images/media/assets/twLogo.svg"
 };
-var InjectiveMetamaskXConnector = class extends XConnector {
-  constructor() {
-    super("INJECTIVE", "MetaMask", Wallet.Metamask);
+var InjectiveXConnector = class extends XConnector {
+  constructor(name, wallet) {
+    super("INJECTIVE", name, wallet);
+    this.wallet = wallet;
   }
   getXService() {
     return InjectiveXService.getInstance();
   }
   async connect() {
-    if (!isEvmBrowserWallet(Wallet.Metamask)) {
-      window.open("https://chromewebstore.google.com/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn?hl=en", "_blank");
-      return;
+    if (isCosmosBrowserWallet(this.wallet) && !isCosmosWalletInstalled(this.wallet)) {
+      return void 0;
     }
-    this.getXService().walletStrategy.setWallet(Wallet.Metamask);
-    const addresses = await this.getXService().walletStrategy.getAddresses();
-    const injectiveAddresses = addresses.map(getInjectiveAddress);
+    const walletStrategy = this.getXService().walletStrategy;
+    await walletStrategy.setWallet(this.wallet);
+    const addresses = await walletStrategy.getAddresses();
+    if (!addresses?.length) return void 0;
+    const address = isEvmBrowserWallet(this.wallet) ? getInjectiveAddress(addresses[0]) : addresses[0];
     return {
-      address: injectiveAddresses?.[0],
+      address,
       xChainType: this.xChainType
     };
   }
   async disconnect() {
-    await this.getXService().walletStrategy.disconnect();
+    if (isEvmBrowserWallet(this.wallet)) {
+      const walletStrategy = this.getXService().walletStrategy;
+      await walletStrategy.setWallet(this.wallet);
+      await walletStrategy.disconnect();
+    }
   }
   get icon() {
-    return "https://raw.githubusercontent.com/balancednetwork/icons/master/wallets/metamask.svg";
+    return WALLET_ICONS[this.wallet];
   }
 };
-
-// src/xchains/injective/utils.ts
-var switchEthereumChain = async (chainId) => {
-  const metamaskProvider = window.ethereum;
-  await Promise.race([
-    metamaskProvider.request({
-      method: "wallet_switchEthereumChain",
-      params: [{ chainId: `0x${chainId}` }]
-    }),
-    new Promise(
-      (resolve) => metamaskProvider.on("change", ({ chain }) => {
-        if (chain?.id === chainId) {
-          resolve();
-        }
-      })
-    )
-  ]);
-};
 var SolanaXService = class _SolanaXService extends XService {
   constructor() {
     super("SOLANA");
@@ -1311,16 +1283,18 @@ var initXServices = () => {
         break;
       case "BITCOIN":
         xServices[xChainType] = BitcoinXService.getInstance();
-        xServices[xChainType].setXConnectors([
-          new UnisatXConnector(),
-          new XverseXConnector(),
-          new OKXXConnector()
-        ]);
+        xServices[xChainType].setXConnectors([new UnisatXConnector(), new XverseXConnector(), new OKXXConnector()]);
         break;
       // Injective, Stellar, Icon wallet connectors are supported by sodax wallet-sdk-react sdk.
       case "INJECTIVE":
         xServices[xChainType] = InjectiveXService.getInstance();
-        xServices[xChainType].setXConnectors([new InjectiveMetamaskXConnector(), new InjectiveKelprXConnector()]);
+        xServices[xChainType].setXConnectors([
+          // EVM wallets (auto-detected via EIP-6963)
+          new InjectiveXConnector("MetaMask", Wallet.Metamask),
+          // Cosmos wallets (detected via window globals)
+          new InjectiveXConnector("Keplr", Wallet.Keplr),
+          new InjectiveXConnector("Leap", Wallet.Leap)
+        ]);
         break;
       case "STELLAR":
         xServices[xChainType] = StellarXService.getInstance();
@@ -1722,15 +1696,23 @@ function useEthereumChainId() {
     const walletStrategy = injectiveXService.walletStrategy;
     if (walletStrategy.getWallet() !== Wallet.Metamask) return;
     const getEthereumChainId = async () => {
-      const chainId = await walletStrategy.getEthereumChainId();
-      setEthereumChainId(Number.parseInt(chainId));
+      try {
+        const chainId = await walletStrategy.getEthereumChainId();
+        setEthereumChainId(Number.parseInt(chainId));
+      } catch (e) {
+        console.warn("Failed to get Ethereum chain ID:", e);
+      }
     };
     getEthereumChainId();
-    walletStrategy.getStrategy().onChainIdChanged(getEthereumChainId);
+    try {
+      walletStrategy.getStrategy().onChainIdChanged(getEthereumChainId);
+    } catch (e) {
+      console.warn("Failed to subscribe to chain ID changes:", e);
+    }
   }, [injectiveXService?.walletStrategy]);
   return ethereumChainId;
 }
-var switchEthereumChain2 = async () => {
+var switchEthereumChain = async () => {
   const metamaskProvider = window.ethereum;
   return await Promise.race([
     metamaskProvider.request({
@@ -1758,7 +1740,7 @@ var useEvmSwitchChain = (expectedXChainId) => {
   const { switchChain } = useSwitchChain();
   const handleSwitchChain = useCallback(() => {
     if (xChainType === "INJECTIVE") {
-      switchEthereumChain2();
+      switchEthereumChain();
     } else {
       switchChain({ chainId: expectedChainId });
     }
@@ -2012,6 +1994,27 @@ var reconnectIcon = async () => {
     });
   }
 };
+var reconnectInjective = async () => {
+  const injectiveConnection = useXWagmiStore.getState().xConnections.INJECTIVE;
+  if (!injectiveConnection) return;
+  const recentXConnectorId = injectiveConnection.xConnectorId;
+  const walletStrategy = InjectiveXService.getInstance().walletStrategy;
+  await walletStrategy.setWallet(recentXConnectorId);
+  const addresses = await walletStrategy.getAddresses();
+  const address = isEvmBrowserWallet(recentXConnectorId) ? getInjectiveAddress(addresses?.[0]) : addresses?.[0];
+  useXWagmiStore.setState({
+    xConnections: {
+      ...useXWagmiStore.getState().xConnections,
+      INJECTIVE: {
+        xAccount: {
+          address,
+          xChainType: "INJECTIVE"
+        },
+        xConnectorId: recentXConnectorId
+      }
+    }
+  });
+};
 
 // src/xchains/stellar/actions.ts
 var reconnectStellar = async () => {
@@ -2058,6 +2061,7 @@ var SodaxWalletProvider = ({ children, rpcConfig, options, initialState }) => {
   return /* @__PURE__ */ React2.createElement(QueryClientProvider, { client: queryClient }, /* @__PURE__ */ React2.createElement(WagmiProvider, { reconnectOnMount: wagmi.reconnectOnMount, config: wagmiConfig, initialState }, /* @__PURE__ */ React2.createElement(SuiClientProvider, { networks: { mainnet: { url: getFullnodeUrl("mainnet") } }, defaultNetwork: "mainnet" }, /* @__PURE__ */ React2.createElement(WalletProvider, { autoConnect: sui.autoConnect }, /* @__PURE__ */ React2.createElement(ConnectionProvider, { endpoint: rpcConfig["solana"] ?? "https://api.mainnet-beta.solana.com" }, /* @__PURE__ */ React2.createElement(WalletProvider$1, { wallets, autoConnect: solana.autoConnect }, /* @__PURE__ */ React2.createElement(Hydrate, { rpcConfig }), children))))));
 };
 reconnectIcon();
+reconnectInjective();
 reconnectStellar();
 
 // src/types/index.ts
@@ -2070,6 +2074,6 @@ var WalletId = /* @__PURE__ */ ((WalletId2) => {
   return WalletId2;
 })(WalletId || {});
 
-export { BitcoinXConnector, BitcoinXService, EvmXConnector, EvmXService, IconHanaXConnector, IconXService, InjectiveKelprXConnector, InjectiveMetamaskXConnector, InjectiveXService, OKXXConnector, STACKS_PROVIDERS, SodaxWalletProvider, SolanaXConnector, SolanaXService, StacksXConnector, StacksXService, StellarWalletsKitXConnector, StellarXService, SuiXConnector, SuiXService, UnisatXConnector, WalletId, XConnector, XService, XverseXConnector, createWagmiConfig as createWagmi, createWagmiConfig, getWagmiChainId, getXChainType, getXService, isNativeToken, switchEthereumChain, useBitcoinXConnectors, useEvmSwitchChain, useStacksXConnectors, useWalletProvider, useXAccount, useXAccounts, useXBalances, useXConnect, useXConnection, useXConnectors, useXDisconnect, useXService, useXSignMessage, useXWagmiStore };
+export { BitcoinXConnector, BitcoinXService, EvmXConnector, EvmXService, IconHanaXConnector, IconXService, InjectiveXConnector, InjectiveXService, OKXXConnector, STACKS_PROVIDERS, SodaxWalletProvider, SolanaXConnector, SolanaXService, StacksXConnector, StacksXService, StellarWalletsKitXConnector, StellarXService, SuiXConnector, SuiXService, UnisatXConnector, WalletId, XConnector, XService, XverseXConnector, createWagmiConfig as createWagmi, createWagmiConfig, getWagmiChainId, getXChainType, getXService, isNativeToken, useBitcoinXConnectors, useEvmSwitchChain, useStacksXConnectors, useWalletProvider, useXAccount, useXAccounts, useXBalances, useXConnect, useXConnection, useXConnectors, useXDisconnect, useXService, useXSignMessage, useXWagmiStore };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map