@sodax/wallet-sdk-react 1.2.7-beta → 1.3.1-beta-rc1

package/dist/index.d.cts

@@ -1,11 +1,10 @@
-import { ChainId, ChainType, XToken, IEvmWalletProvider, ISuiWalletProvider, IIconWalletProvider, IInjectiveWalletProvider, IStellarWalletProvider, ISolanaWalletProvider, RpcConfig } from '@sodax/types';
+import { ChainId, ChainType, XToken, IEvmWalletProvider, ISuiWalletProvider, IIconWalletProvider, IInjectiveWalletProvider, IStellarWalletProvider, ISolanaWalletProvider, INearWalletProvider, RpcConfig } from '@sodax/types';
 import { Config, Connector } from 'wagmi';
 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 { Connection } from '@solana/web3.js';
-import { AnchorProvider } from '@coral-xyz/anchor';
 import { WalletContextState } from '@solana/wallet-adapter-react';
 import { StellarWalletsKit } from '@creit.tech/stellar-wallets-kit';
 import * as StellarSdk from '@stellar/stellar-sdk';
@@ -202,7 +201,6 @@ declare class SolanaXService extends XService {
     private static instance;
     connection: Connection | undefined;
     wallet: WalletContextState | undefined;
-    provider: AnchorProvider | undefined;
     private constructor();
     static getInstance(): SolanaXService;
     getBalance(address: string | undefined, xToken: XToken): Promise<bigint>;
@@ -243,7 +241,6 @@ type StellarWalletType = {
     type: string;
     url: string;
 };
-
 declare class StellarWalletsKitXConnector extends XConnector {
     _wallet: StellarWalletType;
     constructor(wallet: StellarWalletType);
@@ -274,7 +271,7 @@ declare class SuiXConnector extends XConnector {
 
 declare function useXAccount(chainIdentifier?: ChainType | ChainId): XAccount;
 
-declare function useXAccounts(): Partial<Record<"ICON" | "EVM" | "INJECTIVE" | "SUI" | "STELLAR" | "SOLANA", XAccount>>;
+declare function useXAccounts(): Partial<Record<"ICON" | "EVM" | "INJECTIVE" | "SUI" | "STELLAR" | "SOLANA" | "NEAR", XAccount>>;
 
 /**
  * Hook for connecting to various blockchain wallets across different chains
@@ -334,7 +331,7 @@ declare function useXConnection(xChainType: ChainType | undefined): XConnection
  * - Stellar: Uses custom Stellar connectors
  * - Solana: Uses Solana wallet adapters (filtered to installed wallets only)
  *
- * @param xChainType - The blockchain type to get connectors for ('EVM' | 'SUI' | 'STELLAR' | 'SOLANA')
+ * @param xChainType - The blockchain type to get connectors for ('EVM' | 'SUI' | 'STELLAR' | 'SOLANA' | 'NEAR')
  * @returns An array of XConnector instances compatible with the specified chain type
  */
 declare function useXConnectors(xChainType: ChainType | undefined): XConnector[];
@@ -413,7 +410,7 @@ declare const useEvmSwitchChain: (expectedXChainId: ChainId) => UseEvmSwitchChai
 
 /**
  * Hook to get the appropriate wallet provider based on the chain type.
- * Supports EVM, SUI, ICON and INJECTIVE chains.
+ * Supports EVM, SUI, ICON, INJECTIVE, STELLAR, SOLANA and NEAR chains.
  *
  * @param {ChainId | undefined} spokeChainId - The chain ID to get the wallet provider for. Can be any valid ChainId value.
  * @returns {EvmWalletProvider | SuiWalletProvider | IconWalletProvider | InjectiveWalletProvider | undefined}
@@ -428,7 +425,7 @@ declare const useEvmSwitchChain: (expectedXChainId: ChainId) => UseEvmSwitchChai
  * const walletProvider = useWalletProvider('sui');
  * ```
  */
-declare function useWalletProvider(spokeChainId: ChainId | undefined): IEvmWalletProvider | ISuiWalletProvider | IIconWalletProvider | IInjectiveWalletProvider | IStellarWalletProvider | ISolanaWalletProvider | undefined;
+declare function useWalletProvider(spokeChainId: ChainId | undefined): IEvmWalletProvider | ISuiWalletProvider | IIconWalletProvider | IInjectiveWalletProvider | IStellarWalletProvider | ISolanaWalletProvider | INearWalletProvider | undefined;
 
 type SignMessageReturnType = `0x${string}` | Uint8Array | string | undefined;
 declare function useXSignMessage(): UseMutationResult<SignMessageReturnType, Error, {

package/dist/index.d.ts

@@ -1,11 +1,10 @@
-import { ChainId, ChainType, XToken, IEvmWalletProvider, ISuiWalletProvider, IIconWalletProvider, IInjectiveWalletProvider, IStellarWalletProvider, ISolanaWalletProvider, RpcConfig } from '@sodax/types';
+import { ChainId, ChainType, XToken, IEvmWalletProvider, ISuiWalletProvider, IIconWalletProvider, IInjectiveWalletProvider, IStellarWalletProvider, ISolanaWalletProvider, INearWalletProvider, RpcConfig } from '@sodax/types';
 import { Config, Connector } from 'wagmi';
 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 { Connection } from '@solana/web3.js';
-import { AnchorProvider } from '@coral-xyz/anchor';
 import { WalletContextState } from '@solana/wallet-adapter-react';
 import { StellarWalletsKit } from '@creit.tech/stellar-wallets-kit';
 import * as StellarSdk from '@stellar/stellar-sdk';
@@ -202,7 +201,6 @@ declare class SolanaXService extends XService {
     private static instance;
     connection: Connection | undefined;
     wallet: WalletContextState | undefined;
-    provider: AnchorProvider | undefined;
     private constructor();
     static getInstance(): SolanaXService;
     getBalance(address: string | undefined, xToken: XToken): Promise<bigint>;
@@ -243,7 +241,6 @@ type StellarWalletType = {
     type: string;
     url: string;
 };
-
 declare class StellarWalletsKitXConnector extends XConnector {
     _wallet: StellarWalletType;
     constructor(wallet: StellarWalletType);
@@ -274,7 +271,7 @@ declare class SuiXConnector extends XConnector {
 
 declare function useXAccount(chainIdentifier?: ChainType | ChainId): XAccount;
 
-declare function useXAccounts(): Partial<Record<"ICON" | "EVM" | "INJECTIVE" | "SUI" | "STELLAR" | "SOLANA", XAccount>>;
+declare function useXAccounts(): Partial<Record<"ICON" | "EVM" | "INJECTIVE" | "SUI" | "STELLAR" | "SOLANA" | "NEAR", XAccount>>;
 
 /**
  * Hook for connecting to various blockchain wallets across different chains
@@ -334,7 +331,7 @@ declare function useXConnection(xChainType: ChainType | undefined): XConnection
  * - Stellar: Uses custom Stellar connectors
  * - Solana: Uses Solana wallet adapters (filtered to installed wallets only)
  *
- * @param xChainType - The blockchain type to get connectors for ('EVM' | 'SUI' | 'STELLAR' | 'SOLANA')
+ * @param xChainType - The blockchain type to get connectors for ('EVM' | 'SUI' | 'STELLAR' | 'SOLANA' | 'NEAR')
  * @returns An array of XConnector instances compatible with the specified chain type
  */
 declare function useXConnectors(xChainType: ChainType | undefined): XConnector[];
@@ -413,7 +410,7 @@ declare const useEvmSwitchChain: (expectedXChainId: ChainId) => UseEvmSwitchChai
 
 /**
  * Hook to get the appropriate wallet provider based on the chain type.
- * Supports EVM, SUI, ICON and INJECTIVE chains.
+ * Supports EVM, SUI, ICON, INJECTIVE, STELLAR, SOLANA and NEAR chains.
  *
  * @param {ChainId | undefined} spokeChainId - The chain ID to get the wallet provider for. Can be any valid ChainId value.
  * @returns {EvmWalletProvider | SuiWalletProvider | IconWalletProvider | InjectiveWalletProvider | undefined}
@@ -428,7 +425,7 @@ declare const useEvmSwitchChain: (expectedXChainId: ChainId) => UseEvmSwitchChai
  * const walletProvider = useWalletProvider('sui');
  * ```
  */
-declare function useWalletProvider(spokeChainId: ChainId | undefined): IEvmWalletProvider | ISuiWalletProvider | IIconWalletProvider | IInjectiveWalletProvider | IStellarWalletProvider | ISolanaWalletProvider | undefined;
+declare function useWalletProvider(spokeChainId: ChainId | undefined): IEvmWalletProvider | ISuiWalletProvider | IIconWalletProvider | IInjectiveWalletProvider | IStellarWalletProvider | ISolanaWalletProvider | INearWalletProvider | undefined;
 
 type SignMessageReturnType = `0x${string}` | Uint8Array | string | undefined;
 declare function useXSignMessage(): UseMutationResult<SignMessageReturnType, Error, {

package/dist/index.mjs

@@ -1,4 +1,6 @@
 import { baseChainInfo, ChainTypeArr, KAIA_MAINNET_CHAIN_ID, REDBELLY_MAINNET_CHAIN_ID, LIGHTLINK_MAINNET_CHAIN_ID, HYPEREVM_MAINNET_CHAIN_ID, POLYGON_MAINNET_CHAIN_ID, OPTIMISM_MAINNET_CHAIN_ID, SONIC_MAINNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, BASE_MAINNET_CHAIN_ID, ARBITRUM_MAINNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, ETHEREUM_MAINNET_CHAIN_ID } from '@sodax/types';
+import { NearConnector } from '@hot-labs/near-connect';
+import { JsonRpcProvider } from 'near-api-js';
 import { erc20Abi, defineChain } from 'viem';
 import { getPublicClient } from 'wagmi/actions';
 import { useConnections, useAccount, useConnect, useConnectors, useDisconnect, useSwitchChain, usePublicClient, useWalletClient, useSignMessage, WagmiProvider, createConfig, http, useConfig } from 'wagmi';
@@ -22,12 +24,11 @@ import { useWallet, ConnectionProvider, WalletProvider as WalletProvider$1, useC
 import { create } from 'zustand';
 import { devtools, persist, createJSONStorage } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
-import { QueryClient, useMutation, useQuery, keepPreviousData, QueryClientProvider } from '@tanstack/react-query';
+import { QueryClient, useMutation, useQuery, QueryClientProvider } from '@tanstack/react-query';
 import { mainnet as mainnet$1 } from 'viem/chains';
-import { SolanaWalletProvider, StellarWalletProvider, InjectiveWalletProvider, IconWalletProvider, SuiWalletProvider, EvmWalletProvider } from '@sodax/wallet-sdk-core';
+import { NearWalletProvider, SolanaWalletProvider, StellarWalletProvider, InjectiveWalletProvider, IconWalletProvider, SuiWalletProvider, EvmWalletProvider } from '@sodax/wallet-sdk-core';
 import { getFullnodeUrl } from '@mysten/sui/client';
 import { UnsafeBurnerWalletAdapter } from '@solana/wallet-adapter-wallets';
-import { AnchorProvider } from '@coral-xyz/anchor';
 
 // src/actions/getXChainType.ts
 function getXChainType(xChainId) {
@@ -37,26 +38,6 @@ function getXChainType(xChainId) {
   return baseChainInfo[xChainId].type;
 }
 
-// src/actions/getXService.ts
-function getXService(xChainType) {
-  switch (xChainType) {
-    case "EVM":
-      return EvmXService.getInstance();
-    case "SUI":
-      return SuiXService.getInstance();
-    case "SOLANA":
-      return SolanaXService.getInstance();
-    case "ICON":
-      return IconXService.getInstance();
-    case "INJECTIVE":
-      return InjectiveXService.getInstance();
-    case "STELLAR":
-      return StellarXService.getInstance();
-    default:
-      throw new Error(`Unsupported chain type: ${xChainType}`);
-  }
-}
-
 // src/core/XService.ts
 var XService = class {
   constructor(xChainType) {
@@ -112,6 +93,55 @@ var XService = class {
     return this.getXConnectors().find((xConnector) => xConnector.id === xConnectorId);
   }
 };
+var NearXService = class _NearXService extends XService {
+  constructor() {
+    super("NEAR");
+    this.walletSelector = new NearConnector({
+      network: "mainnet",
+      logger: console,
+      autoConnect: true,
+      excludedWallets: ["okx-wallet"]
+    });
+  }
+  static getInstance() {
+    if (!_NearXService.instance) {
+      _NearXService.instance = new _NearXService();
+    }
+    return _NearXService.instance;
+  }
+  async getBalance(address, xToken) {
+    const url = "https://1rpc.io/near";
+    const provider = new JsonRpcProvider({ url });
+    if (xToken.symbol === "NEAR") {
+      const account = await provider.viewAccount({ accountId: address ?? "" });
+      return BigInt(account.amount);
+    }
+    const res = await provider.callFunction({ contractId: xToken.address, method: "ft_balance_of", args: { account_id: address } });
+    return BigInt(res ?? 0);
+  }
+};
+
+// src/actions/getXService.ts
+function getXService(xChainType) {
+  switch (xChainType) {
+    case "EVM":
+      return EvmXService.getInstance();
+    case "SUI":
+      return SuiXService.getInstance();
+    case "SOLANA":
+      return SolanaXService.getInstance();
+    case "ICON":
+      return IconXService.getInstance();
+    case "INJECTIVE":
+      return InjectiveXService.getInstance();
+    case "STELLAR":
+      return StellarXService.getInstance();
+    case "NEAR":
+      return NearXService.getInstance();
+    default:
+      throw new Error(`Unsupported chain type: ${xChainType}`);
+  }
+}
 
 // src/core/XConnector.ts
 var XConnector = class {
@@ -537,7 +567,7 @@ var SolanaXService = class _SolanaXService extends XService {
     if (!address) return BigInt(0);
     const connection = this.connection;
     if (!connection) {
-      throw new Error("Connection is not initialized");
+      return BigInt(0);
     }
     try {
       if (isNativeToken(xToken)) {
@@ -547,10 +577,9 @@ var SolanaXService = class _SolanaXService extends XService {
       const tokenAccountPubkey = getAssociatedTokenAddressSync(new PublicKey(xToken.address), new PublicKey(address));
       const tokenAccount = await getAccount(connection, tokenAccountPubkey);
       return BigInt(tokenAccount.amount);
-    } catch (e) {
-      console.log("error", e);
+    } catch {
+      return BigInt(0);
     }
-    return BigInt(0);
   }
 };
 
@@ -815,7 +844,7 @@ var SuiXConnector = class extends XConnector {
 };
 var initXServices = () => {
   const xServices = {};
-  ["EVM", "INJECTIVE", "STELLAR", "SUI", "SOLANA", "ICON"].forEach((key) => {
+  ["EVM", "INJECTIVE", "STELLAR", "SUI", "SOLANA", "ICON", "NEAR"].forEach((key) => {
     const xChainType = key;
     switch (xChainType) {
       // EVM, SUI, Solana wallet connectors are supported by their own sdks. wagmi, @mysten/dapp-kit, @solana/wallet-adapter-react.
@@ -844,6 +873,10 @@ var initXServices = () => {
         xServices[xChainType] = IconXService.getInstance();
         xServices[xChainType].setXConnectors([new IconHanaXConnector()]);
         break;
+      case "NEAR":
+        xServices[xChainType] = NearXService.getInstance();
+        xServices[xChainType].setXConnectors([]);
+        break;
     }
   });
   return xServices;
@@ -1059,12 +1092,59 @@ function useXService(xChainType) {
   return xService;
 }
 
+// src/xchains/near/NearXConnector.ts
+var NearXConnector = class extends XConnector {
+  constructor(wallet) {
+    super("NEAR", wallet.manifest.name, wallet.manifest.id);
+    this._wallet = wallet;
+  }
+  getXService() {
+    return NearXService.getInstance();
+  }
+  async connect() {
+    const walletSelector = this.getXService().walletSelector;
+    const wallet = await walletSelector.connect({ walletId: this._wallet.manifest.id });
+    const accounts = await wallet.getAccounts();
+    if (accounts.length === 0 || accounts[0] === void 0) {
+      return void 0;
+    }
+    return {
+      address: accounts[0].accountId,
+      xChainType: this.xChainType
+    };
+  }
+  async disconnect() {
+    const walletSelector = this.getXService().walletSelector;
+    await walletSelector.disconnect(this._wallet);
+  }
+  get icon() {
+    return this._wallet.manifest.icon;
+  }
+};
+
+// src/xchains/near/useNearXConnectors.ts
+var useNearXConnectors = () => {
+  const xService = useXService("NEAR");
+  return useQuery({
+    queryKey: ["near-wallets"],
+    queryFn: async () => {
+      if (!xService) {
+        return [];
+      }
+      await xService.walletSelector.whenManifestLoaded;
+      const wallets = xService.walletSelector.availableWallets;
+      return wallets.map((wallet) => new NearXConnector(wallet));
+    }
+  });
+};
+
 // src/hooks/useXConnectors.ts
 function useXConnectors(xChainType) {
   const xService = useXService(xChainType);
   const evmConnectors = useConnectors();
   const suiWallets = useWallets();
   const { data: stellarXConnectors } = useStellarXConnectors();
+  const { data: nearXConnectors } = useNearXConnectors();
   const { wallets: solanaWallets } = useWallet();
   const xConnectors = useMemo(() => {
     if (!xChainType || !xService) {
@@ -1079,10 +1159,12 @@ function useXConnectors(xChainType) {
         return stellarXConnectors || [];
       case "SOLANA":
         return solanaWallets.filter((wallet) => wallet.readyState === "Installed").map((wallet) => new SolanaXConnector(wallet));
+      case "NEAR":
+        return nearXConnectors || [];
       default:
         return xService.getXConnectors();
     }
-  }, [xService, xChainType, evmConnectors, suiWallets, stellarXConnectors, solanaWallets]);
+  }, [xService, xChainType, evmConnectors, suiWallets, stellarXConnectors, solanaWallets, nearXConnectors]);
   return xConnectors;
 }
 function useXDisconnect() {
@@ -1103,6 +1185,11 @@ function useXDisconnect() {
         case "SOLANA":
           await solanaWallet.disconnect();
           break;
+        case "NEAR": {
+          const nearXService = getXService("NEAR");
+          nearXService.walletSelector.disconnect();
+          break;
+        }
         default: {
           const xService = getXService(xChainType);
           const xConnectorId = xConnections[xChainType]?.xConnectorId;
@@ -1131,8 +1218,7 @@ function useXBalances({
       const balances = await xService.getBalances(address, xTokens);
       return balances;
     },
-    enabled: !!xService,
-    placeholderData: keepPreviousData,
+    enabled: !!xService && !!address && (xTokens?.length ?? 0) > 0,
     refetchInterval: 5e3
   });
 }
@@ -1262,9 +1348,16 @@ function useWalletProvider(spokeChainId) {
         }
         return new SolanaWalletProvider({
           wallet: solanaXService.wallet,
-          connection: solanaXService.connection
+          endpoint: solanaXService.connection.rpcEndpoint
         });
       }
+      case "NEAR": {
+        const nearXService = xService;
+        if (!nearXService.walletSelector) {
+          return void 0;
+        }
+        return new NearWalletProvider({ wallet: nearXService.walletSelector });
+      }
       default:
         return void 0;
     }
@@ -1324,11 +1417,6 @@ function useXSignMessage() {
     }
   });
 }
-function useAnchorProvider() {
-  const { connection } = useConnection();
-  const wallet = useWallet();
-  return new AnchorProvider(connection, wallet, { commitment: "confirmed" });
-}
 var Hydrate = () => {
   const suiClient = useSuiClient();
   useEffect(() => {
@@ -1350,7 +1438,6 @@ var Hydrate = () => {
   }, [suiAccount]);
   const { connection: solanaConnection } = useConnection();
   const solanaWallet = useWallet();
-  const solanaProvider = useAnchorProvider();
   useEffect(() => {
     if (solanaConnection) {
       SolanaXService.getInstance().connection = solanaConnection;
@@ -1361,11 +1448,6 @@ var Hydrate = () => {
       SolanaXService.getInstance().wallet = solanaWallet;
     }
   }, [solanaWallet]);
-  useEffect(() => {
-    if (solanaProvider) {
-      SolanaXService.getInstance().provider = solanaProvider;
-    }
-  }, [solanaProvider]);
   const wagmiConfig = useConfig();
   useEffect(() => {
     if (wagmiConfig) {
@@ -1426,7 +1508,7 @@ var SodaxWalletProvider = ({ children, rpcConfig }) => {
     return createWagmiConfig(rpcConfig);
   }, [rpcConfig]);
   const wallets = useMemo(() => [new UnsafeBurnerWalletAdapter()], []);
-  return /* @__PURE__ */ React2.createElement(QueryClientProvider, { client: queryClient }, /* @__PURE__ */ React2.createElement(WagmiProvider, { reconnectOnMount: false, config: wagmiConfig }, /* @__PURE__ */ React2.createElement(SuiClientProvider, { networks: { mainnet: { url: getFullnodeUrl("mainnet") } }, defaultNetwork: "mainnet" }, /* @__PURE__ */ React2.createElement(WalletProvider, { autoConnect: true }, /* @__PURE__ */ React2.createElement(ConnectionProvider, { endpoint: rpcConfig["solana"] ?? "" }, /* @__PURE__ */ React2.createElement(WalletProvider$1, { wallets, autoConnect: true }, /* @__PURE__ */ React2.createElement(Hydrate, null), children))))));
+  return /* @__PURE__ */ React2.createElement(QueryClientProvider, { client: queryClient }, /* @__PURE__ */ React2.createElement(WagmiProvider, { reconnectOnMount: false, config: wagmiConfig }, /* @__PURE__ */ React2.createElement(SuiClientProvider, { networks: { mainnet: { url: getFullnodeUrl("mainnet") } }, defaultNetwork: "mainnet" }, /* @__PURE__ */ React2.createElement(WalletProvider, { autoConnect: true }, /* @__PURE__ */ React2.createElement(ConnectionProvider, { endpoint: rpcConfig["solana"] ?? "https://api.mainnet-beta.solana.com" }, /* @__PURE__ */ React2.createElement(WalletProvider$1, { wallets, autoConnect: true }, /* @__PURE__ */ React2.createElement(Hydrate, null), children))))));
 };
 reconnectIcon();
 reconnectStellar();