@0xsquid/react-hooks 7.0.4-dest-address-refactor-beta.0 → 7.1.1-wallets-refactor-beta.0

package/dist/hooks/solana/useSolana.js

@@ -1,104 +1,81 @@
 import { ChainType } from "@0xsquid/squid-types";
-import { PhantomWalletAdapter } from "@solana/wallet-adapter-phantom";
 import { Connection } from "@solana/web3.js";
 import { useMutation } from "@tanstack/react-query";
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import { SOLANA_RPC_URL } from "../../core/constants";
-import { getWalletWindowProvider } from "../../services/internal/walletService";
-import { useClient } from "../client/useClient";
+import { RecentWalletStorage } from "../../services";
 import { useWalletStore } from "../store/useWalletStore";
-export const useSolana = () => {
-    // Get current Solana wallet state from global store
-    const solanaWalletState = useWalletStore((state) => state.connectedWalletsByChainType[ChainType.SOLANA]);
-    const solanaAddress = solanaWalletState.address;
-    const isConnected = !!solanaAddress;
-    const solanaConnectedWallet = solanaWalletState.wallet;
-    const { clientWindow, isClient } = useClient();
-    const window = clientWindow;
-    const { setConnectedWallet, disconnectWallet } = useWalletStore();
-    // Safely access wallet provider from window object
-    const solanaWalletObject = useMemo(() => {
-        if (isClient && solanaConnectedWallet?.windowFlag) {
-            return getWalletWindowProvider(window, solanaConnectedWallet, ChainType.SOLANA);
-        }
-        return undefined;
-    }, [solanaConnectedWallet, isClient, window]);
+import { useSolanaWallets } from "./useSolanaWallets";
+export function useSolana() {
+    const disconnectWallet = useWalletStore((store) => store.disconnectWallet);
+    const setConnectedWallet = useWalletStore((store) => store.setConnectedWallet);
+    const { wallets } = useSolanaWallets();
+    const connectedSolanaWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.SOLANA]);
     const connectSolana = useMutation(async ({ wallet, }) => {
-        const selectedWallet = wallet ?? solanaConnectedWallet;
-        if (!selectedWallet) {
-            return undefined;
-        }
-        const walletObject = getWalletWindowProvider(window, selectedWallet, ChainType.SOLANA);
-        if (!walletObject) {
-            return undefined;
+        try {
+            // try to connect silently first
+            await wallet.connector.autoConnect();
         }
-        const response = await walletObject.connect();
-        const address = response.publicKey.toString();
-        if (address) {
-            setConnectedWallet(ChainType.SOLANA, {
-                wallet: selectedWallet,
-                address,
-            });
-            return address;
+        catch {
+            // if auto-connect fails (e.g. not authorized yet)
+            // fallback to connect via popup
+            await wallet.connector.connect();
         }
-        return undefined;
+        const address = wallet.connector.wallet.accounts[0].address;
+        return {
+            wallet,
+            address,
+        };
     });
-    // Clear wallet connection data
-    const clearData = useCallback(() => {
-        disconnectWallet(ChainType.SOLANA);
-    }, [disconnectWallet]);
-    // Handle wallet account changes (e.g., user switches accounts)
-    const handleAccountChange = useCallback((_publicKey) => {
-        let publicKey = _publicKey?.toString();
-        // Inconsistent behavior on different wallets
-        // Try to parse response to handle both PublicKey and { publicKey: PublicKey }
-        const parsedPublicKey = _publicKey?.publicKey;
-        if (typeof parsedPublicKey === "string") {
-            publicKey = parsedPublicKey;
-        }
-        if (publicKey && solanaConnectedWallet) {
-            setConnectedWallet(ChainType.SOLANA, {
-                wallet: solanaConnectedWallet,
-                address: publicKey,
-            });
-        }
-        else {
-            clearData();
+    const disconnectSolana = useCallback(async () => {
+        await connectedSolanaWallet.wallet?.connector.disconnect();
+    }, [connectedSolanaWallet.wallet?.connector]);
+    const autoConnectSolana = useCallback(async () => {
+        const recentSolanaWalletId = RecentWalletStorage.get(ChainType.SOLANA);
+        const recentSolanaWallet = wallets.find((w) => w.connectorId === recentSolanaWalletId);
+        if (!recentSolanaWallet) {
+            return;
         }
-    }, [clearData, setConnectedWallet, solanaConnectedWallet]);
-    // Set up event listeners for wallet account changes
+        await recentSolanaWallet.connector.autoConnect();
+        const [account] = recentSolanaWallet.connector.wallet.accounts;
+        setConnectedWallet(ChainType.SOLANA, {
+            wallet: recentSolanaWallet,
+            address: account.address,
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [wallets.map((w) => w.connectorId)]);
     useEffect(() => {
-        if (solanaWalletObject) {
-            solanaWalletObject.on("connect", handleAccountChange);
-            return () => {
-                solanaWalletObject.off("connect", handleAccountChange);
-            };
+        const wallet = connectedSolanaWallet.wallet;
+        if (!wallet) {
+            return;
         }
-    }, [solanaWalletObject, handleAccountChange]);
-    const signer = useMemo(() => {
-        if (!solanaWalletObject || !solanaAddress) {
-            return undefined;
-        }
-        if (solanaConnectedWallet?.name.toLowerCase() === "phantom" ||
-            "isPhantom" in solanaWalletObject) {
-            const phantomAdapter = new PhantomWalletAdapter();
-            if (!phantomAdapter.connected && solanaAddress) {
-                phantomAdapter.connect().catch(console.error);
+        function onConnect(newAddress) {
+            if (wallet) {
+                setConnectedWallet(ChainType.SOLANA, {
+                    wallet,
+                    address: newAddress.toString(),
+                });
             }
-            return phantomAdapter;
         }
-        return solanaWalletObject;
-    }, [solanaWalletObject, solanaAddress, solanaConnectedWallet]);
+        function onDisconnect() {
+            disconnectWallet(ChainType.SOLANA);
+        }
+        wallet.connector.on("connect", onConnect);
+        wallet.connector.on("disconnect", onDisconnect);
+        return () => {
+            wallet.connector.off("connect", onConnect);
+            wallet.connector.off("disconnect", onDisconnect);
+        };
+    }, [disconnectWallet, setConnectedWallet, connectedSolanaWallet.wallet]);
     return {
         connectSolana,
-        isConnected,
-        clearData,
-        solanaWalletObject,
-        solanaAddress,
-        signer,
-        wallet: solanaConnectedWallet,
+        disconnectSolana,
+        autoConnectSolana,
+        isConnected: !!connectedSolanaWallet.wallet,
+        signer: connectedSolanaWallet.wallet?.connector,
+        wallets,
     };
-};
+}
 export const useSolanaConnection = () => {
     const connectionRef = useRef(new Connection(SOLANA_RPC_URL));
     return connectionRef.current;

package/dist/hooks/solana/useSolana.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSolana.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolana.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useSolana.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolana.ts"],"names":[],"mappings":"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"}

package/dist/hooks/solana/useSolanaWallets.d.ts

@@ -0,0 +1,4 @@
+import { SolanaWallet } from "../../core/types/wallet";
+export declare function useSolanaWallets(): {
+    wallets: SolanaWallet[];
+};

package/dist/hooks/solana/useSolanaWallets.js

@@ -0,0 +1,8 @@
+import { filterSolanaWallets } from "../../services/internal/solanaService";
+import { useStandardWallets } from "../wallet/useStandardWallets";
+export function useSolanaWallets() {
+    return useStandardWallets({
+        filterWallets: filterSolanaWallets,
+    });
+}
+//# sourceMappingURL=useSolanaWallets.js.map

package/dist/hooks/solana/useSolanaWallets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSolanaWallets.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolanaWallets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,UAAU,gBAAgB;IAC9B,OAAO,kBAAkB,CAAe;QACtC,aAAa,EAAE,mBAAmB;KACnC,CAAC,CAAC;AACL,CAAC"}

package/dist/hooks/store/useWalletStore.js

@@ -1,5 +1,6 @@
 import { ChainType } from "@0xsquid/squid-types";
 import { create } from "zustand";
+import { isEmptyObject, RecentWalletStorage } from "../../services";
 export var ConnectingWalletStatus;
 (function (ConnectingWalletStatus) {
     ConnectingWalletStatus[ConnectingWalletStatus["IDLE"] = 0] = "IDLE";
@@ -20,6 +21,7 @@ const initialWalletState = {
 export const useWalletStore = create((set) => ({
     ...initialWalletState,
     setConnectedWallet: (chainType, connectedWalletState) => set((state) => {
+        RecentWalletStorage.set(chainType, connectedWalletState.wallet.connectorId);
         return {
             connectedWalletsByChainType: {
                 ...state.connectedWalletsByChainType,
@@ -29,8 +31,10 @@ export const useWalletStore = create((set) => ({
     }),
     setConnectingWallet: (state) => set({ connectingWalletState: state }),
     disconnectWallet: (chainType) => set((state) => {
-        if (!state.connectedWalletsByChainType[chainType])
+        if (isEmptyObject(state.connectedWalletsByChainType[chainType])) {
             return state;
+        }
+        RecentWalletStorage.remove(chainType);
         return {
             connectedWalletsByChainType: {
                 ...state.connectedWalletsByChainType,

package/dist/hooks/store/useWalletStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWalletStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useWalletStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,MAAM,CAAN,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,mEAAI,CAAA;IACJ,+EAAU,CAAA;IACV,2EAAQ,CAAA;AACV,CAAC,EAJW,sBAAsB,KAAtB,sBAAsB,QAIjC;AAcD,MAAM,kBAAkB,GAAgB;IACtC,uDAAuD;IACvD,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1D,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,GAAG;QACN,CAAC,SAAS,CAAC,EAAE,EAAE;KAChB,CAAC,EACF,EAAgD,CACjD;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACpC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CASlC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACV,GAAG,kBAAkB;IACrB,kBAAkB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,EAAE,CACtD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,oBAAoB;aAClC;SACF,CAAC;IACJ,CAAC,CAAC;IACJ,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACrE,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAC9B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC;YAAE,OAAO,KAAK,CAAC;QAEhE,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,EAAE;aAChB;SACF,CAAC;IACJ,CAAC,CAAC;CACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"useWalletStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useWalletStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEpE,MAAM,CAAN,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,mEAAI,CAAA;IACJ,+EAAU,CAAA;IACV,2EAAQ,CAAA;AACV,CAAC,EAJW,sBAAsB,KAAtB,sBAAsB,QAIjC;AAcD,MAAM,kBAAkB,GAAgB;IACtC,uDAAuD;IACvD,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1D,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,GAAG;QACN,CAAC,SAAS,CAAC,EAAE,EAAE;KAChB,CAAC,EACF,EAAgD,CACjD;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACpC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CASlC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACV,GAAG,kBAAkB;IACrB,kBAAkB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,EAAE,CACtD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,mBAAmB,CAAC,GAAG,CACrB,SAAS,EACT,oBAAoB,CAAC,MAAM,CAAC,WAAW,CACxC,CAAC;QAEF,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,oBAAoB;aAClC;SACF,CAAC;IACJ,CAAC,CAAC;IACJ,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACrE,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAC9B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,IAAI,aAAa,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC,EAAE;YAC/D,OAAO,KAAK,CAAC;SACd;QAED,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEtC,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,EAAE;aAChB;SACF,CAAC;IACJ,CAAC,CAAC;CACL,CAAC,CAAC,CAAC"}

package/dist/hooks/sui/useSui.js

@@ -1,27 +1,82 @@
 import { ChainType } from "@0xsquid/squid-types";
 import { useMutation } from "@tanstack/react-query";
-import { useCallback } from "react";
+import { useCallback, useEffect } from "react";
+import { RecentWalletStorage } from "../../services";
 import { useWalletStore } from "../store/useWalletStore";
 import { useSuiWallets } from "./useSuiWallets";
 export function useSui() {
     const { wallets } = useSuiWallets();
     const connectedSuiWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.SUI]);
+    const setConnectedWallet = useWalletStore((store) => store.setConnectedWallet);
+    const disconnectWallet = useWalletStore((store) => store.disconnectWallet);
     const connectSui = useMutation(async ({ wallet, }) => {
-        const { account } = await wallet.connector().connect();
+        let account;
+        try {
+            // try to connect silently first
+            account = await wallet.connector.connect({ silent: true });
+        }
+        catch {
+            // if auto-connect fails (e.g. not authorized yet)
+            // fallback to connect via popup
+            account = await wallet.connector.connect();
+        }
         return {
             wallet,
-            address: account.address,
-            account,
+            address: account.account.address,
+            account: account.account,
         };
     });
     const disconnectSui = useCallback(async () => {
-        await connectedSuiWallet.wallet?.connector().disconnect();
+        await connectedSuiWallet.wallet?.connector.disconnect();
     }, [connectedSuiWallet.wallet]);
+    const autoConnectSui = useCallback(async () => {
+        const recentSuiWalletId = RecentWalletStorage.get(ChainType.SUI);
+        const recentSuiWallet = wallets.find((w) => w.connectorId === recentSuiWalletId);
+        if (!recentSuiWallet) {
+            return;
+        }
+        const { account } = await recentSuiWallet.connector.connect({
+            silent: true,
+        });
+        setConnectedWallet(ChainType.SUI, {
+            wallet: recentSuiWallet,
+            address: account.address,
+            account,
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [wallets.map((w) => w.connectorId)]);
+    useEffect(() => {
+        const wallet = connectedSuiWallet.wallet;
+        if (!wallet) {
+            return;
+        }
+        function onAccountsChanged({ accounts = [], }) {
+            if (!wallet) {
+                return;
+            }
+            const [account] = accounts;
+            if (account) {
+                setConnectedWallet(ChainType.SUI, {
+                    wallet: wallet,
+                    address: account.address,
+                    account: account,
+                });
+            }
+            else {
+                disconnectWallet(ChainType.SUI);
+            }
+        }
+        const removeListener = wallet.connector.on("change", onAccountsChanged);
+        return () => {
+            removeListener();
+        };
+    }, [disconnectWallet, setConnectedWallet, connectedSuiWallet.wallet]);
     return {
         connectSui,
         disconnectSui,
+        autoConnectSui,
         isConnected: !!connectedSuiWallet.wallet,
-        signer: connectedSuiWallet.wallet?.connector(),
+        signer: connectedSuiWallet.wallet?.connector,
         wallets,
     };
 }

package/dist/hooks/sui/useSui.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSui.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,MAAM;IACpB,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;IACpC,MAAM,kBAAkB,GAAG,cAAc,CACvC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,GAAG,CAAC,CAC5D,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAC5B,KAAK,EAAE,EACL,MAAM,GAGP,EAA+C,EAAE;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvD,OAAO;YACL,MAAM;YACN,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO;SACR,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC3C,MAAM,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;IAC5D,CAAC,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;IAEhC,OAAO;QACL,UAAU;QACV,aAAa;QACb,WAAW,EAAE,CAAC,CAAC,kBAAkB,CAAC,MAAM;QACxC,MAAM,EAAE,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE;QAC9C,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useSui.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSui.ts"],"names":[],"mappings":"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"}

package/dist/hooks/sui/useSuiWallets.d.ts

@@ -1,7 +1,4 @@
 import { SuiWallet } from "../../core/types/wallet";
-/**
- * Returns the list of registered Sui wallets
- */
 export declare function useSuiWallets(): {
     wallets: SuiWallet[];
 };

package/dist/hooks/sui/useSuiWallets.js

@@ -1,42 +1,23 @@
 import { SlushWallet } from "@mysten/slush-wallet";
-import { getWallets as getWalletsApi, } from "@mysten/wallet-standard";
-import { useCallback, useEffect, useRef, useState } from "react";
 import { filterSuiWallets, slushWebWalletData, } from "../../services/internal/suiService";
-/**
- * Returns the list of registered Sui wallets
- */
+import { useStandardWallets } from "../wallet/useStandardWallets";
+function getExtraWallets() {
+    const slushWebWallet = new SlushWallet({
+        name: "Squid",
+        chain: "sui:mainnet",
+        metadata: {
+            enabled: true,
+            icon: slushWebWalletData.icon,
+            id: slushWebWalletData.id,
+            walletName: slushWebWalletData.name,
+        },
+    });
+    return [slushWebWallet];
+}
 export function useSuiWallets() {
-    const isInitializedRef = useRef(false);
-    const [wallets, setWallets] = useState([]);
-    const setRegisteredWallets = useCallback((standardWallets) => {
-        setWallets(filterSuiWallets(standardWallets));
-    }, []);
-    useEffect(() => {
-        const walletsApi = getWalletsApi();
-        const removeOnRegisterListener = walletsApi.on("register", (wallet) => {
-            setRegisteredWallets([wallet]);
-        });
-        if (!isInitializedRef.current) {
-            const slushWebWallet = new SlushWallet({
-                name: "Squid",
-                chain: "sui:mainnet",
-                metadata: {
-                    enabled: true,
-                    icon: slushWebWalletData.icon,
-                    id: slushWebWalletData.id,
-                    walletName: slushWebWalletData.name,
-                },
-            });
-            walletsApi.register(slushWebWallet);
-            setRegisteredWallets(walletsApi.get());
-            isInitializedRef.current = true;
-        }
-        return () => {
-            removeOnRegisterListener();
-        };
-    }, [setRegisteredWallets]);
-    return {
-        wallets,
-    };
+    return useStandardWallets({
+        filterWallets: filterSuiWallets,
+        getExtraWallets,
+    });
 }
 //# sourceMappingURL=useSuiWallets.js.map

package/dist/hooks/sui/useSuiWallets.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSuiWallets.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSuiWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EACL,UAAU,IAAI,aAAa,GAE5B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjE,OAAO,EACL,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAC;AAE5C;;GAEG;AACH,MAAM,UAAU,aAAa;IAG3B,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAc,EAAE,CAAC,CAAC;IAExD,MAAM,oBAAoB,GAAG,WAAW,CACtC,CAAC,eAA0C,EAAE,EAAE;QAC7C,UAAU,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChD,CAAC,EACD,EAAE,CACH,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;QAEnC,MAAM,wBAAwB,GAAG,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACpE,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC7B,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;gBACrC,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,aAAa;gBACpB,QAAQ,EAAE;oBACR,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,kBAAkB,CAAC,IAAI;oBAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE;oBACzB,UAAU,EAAE,kBAAkB,CAAC,IAAI;iBACpC;aACF,CAAC,CAAC;YAEH,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACpC,oBAAoB,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;YACvC,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAC;SACjC;QAED,OAAO,GAAG,EAAE;YACV,wBAAwB,EAAE,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE3B,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useSuiWallets.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSuiWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EACL,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,SAAS,eAAe;IACtB,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;QACrC,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE;YACR,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,kBAAkB,CAAC,IAAI;YAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE;YACzB,UAAU,EAAE,kBAAkB,CAAC,IAAI;SACpC;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,aAAa;IAG3B,OAAO,kBAAkB,CAAY;QACnC,aAAa,EAAE,gBAAgB;QAC/B,eAAe;KAChB,CAAC,CAAC;AACL,CAAC"}

package/dist/hooks/transaction/send/useSendTransaction.js

@@ -8,15 +8,17 @@ import { useHistoryStore } from "../../../hooks/store/useHistoryStore";
 import { useSendTransactionStore, } from "../../../hooks/store/useSendTransactionStore";
 import { useNativeTokenForChain } from "../../../hooks/tokens/useNativeTokenForChain";
 import { useMultiChainWallet } from "../../../hooks/wallet/useMultiChainWallet";
+import { useWallet } from "../../../hooks/wallet/useWallet";
 import { isWalletAddressValid, parseToBigInt, WidgetEvents, } from "../../../services";
 import { getWorkingCosmosRpcUrl } from "../../../services/external/rpcService";
 import { getTransactionError } from "../../../services/internal/errorService";
-import { sendTransactionBitcoin, sendTransactionCosmos, sendTransactionEvm, sendTransactionSolana, } from "../../../services/internal/sendTransaction";
+import { sendTransactionBitcoin, sendTransactionCosmos, sendTransactionEvm, sendTransactionSolana, sendTransactionSui, } from "../../../services/internal/sendTransaction";
 import { useSolanaConnection } from "../../solana/useSolana";
 import { useSigner } from "../../wallet/useSigner";
 export function useSendTransaction({ to, amount, token, chain, }) {
+    const { connectedWalletsByChainType } = useWallet();
     const { connectedAddress } = useMultiChainWallet(chain);
-    const { evmSigner, cosmosSigner, solanaSigner, bitcoinSigner, isSignerReady, } = useSigner({
+    const { evmSigner, cosmosSigner, solanaSigner, bitcoinSigner, suiSigner, isSignerReady, } = useSigner({
         chain,
     });
     const solanaClient = useSolanaConnection();
@@ -144,8 +146,23 @@ export function useSendTransaction({ to, amount, token, chain, }) {
                         signer: bitcoinSigner,
                     });
                     break;
-                default:
-                    throw new Error(`Unsupported chain type: ${token.type}`);
+                case ChainType.SUI:
+                    if (!suiSigner) {
+                        throw new Error("Need Sui signer");
+                    }
+                    const suiAccount = connectedWalletsByChainType[ChainType.SUI];
+                    if (!suiAccount.account) {
+                        throw new Error("Need Sui account");
+                    }
+                    tx = await sendTransactionSui({
+                        amount: rawAmount,
+                        to,
+                        token,
+                        chain,
+                        account: suiAccount.account,
+                        signer: suiSigner,
+                    });
+                    break;
             }
             return {
                 amount,

package/dist/hooks/transaction/send/useSendTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSendTransaction.js","sourceRoot":"","sources":["../../../../src/hooks/transaction/send/useSendTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAS,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAEL,uBAAuB,GACxB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,YAAY,GACb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,kBAAkB,EAElB,qBAAqB,GACtB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAcnD,MAAM,UAAU,kBAAkB,CAAC,EACjC,EAAE,EACF,MAAM,EACN,KAAK,EACL,KAAK,GACoB;IACzB,MAAM,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,EACJ,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,GACd,GAAG,SAAS,CAAC;QACZ,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,mBAAmB,EAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,EAAE,WAAW,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,cAAc,GAAG,uBAAuB,CAC5C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAChC,CAAC;IACF,MAAM,mBAAmB,GAAG,uBAAuB,CACjD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,mBAAmB,CACrC,CAAC;IACF,MAAM,kBAAkB,GAAG,eAAe,CACxC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,CACpC,CAAC;IAEF,MAAM,qBAAqB,GACzB,CAAC,CAAC,gBAAgB,CAAC,OAAO,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC;IAE5D,MAAM,oBAAoB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC5C,IAAI,CAAC,qBAAqB,IAAI,CAAC,gBAAgB,CAAC,OAAO;YAAE,OAAO;QAEhE,YAAY,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC;YACzC,WAAW,EAAE,gBAAgB,CAAC,OAAO;YACrC,sDAAsD;YACtD,MAAM;YACN,SAAS,EAAE,EAAE;YACb,KAAK,EAAE;gBACL,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB;SACF,CAAC,CAAC;IACL,CAAC,EAAE;QACD,qBAAqB;QACrB,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,OAAO;QACd,MAAM;QACN,gBAAgB,CAAC,OAAO;QACxB,EAAE;KACH,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,WAAW,CACvC,CAAC,EAAE,MAAM,EAAsB,EAAE,EAAE;QACjC,IAAI,CAAC,qBAAqB,IAAI,CAAC,gBAAgB,CAAC,OAAO;YAAE,OAAO;QAEhE,YAAY,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC;YAC1C,WAAW,EAAE,gBAAgB,CAAC,OAAO;YACrC,sDAAsD;YACtD,MAAM;YACN,SAAS,EAAE,EAAE;YACb,KAAK,EAAE;gBACL,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB;YACD,MAAM;SACP,CAAC,CAAC;IACL,CAAC,EACD;QACE,qBAAqB;QACrB,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,OAAO;QACd,MAAM;QACN,gBAAgB,CAAC,OAAO;QACxB,EAAE;KACH,CACF,CAAC;IAEF,MAAM,uBAAuB,GAAG,WAAW,CAOzC;QACA,UAAU,EAAE,KAAK,IAAI,EAAE;YACrB,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE,IAAI,MAAM,IAAI,KAAK,CAAC;YAExD,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAE1D,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,SAAS,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;aAC3C;YAED,MAAM,yBAAyB,GAAG,oBAAoB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAElE,IAAI,CAAC,yBAAyB,EAAE;gBAC9B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;aAChD;YAED,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEnE,IAAI,EAAuC,CAAC;YAE5C,QAAQ,KAAK,CAAC,IAAI,EAAE;gBAClB,KAAK,SAAS,CAAC,GAAG;oBAChB,IAAI,CAAC,SAAS,EAAE;wBACd,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;qBACpC;oBAED,EAAE,GAAG,MAAM,kBAAkB,CAAC;wBAC5B,EAAE;wBACF,MAAM,EAAE,SAAS;wBACjB,KAAK;wBACL,MAAM,EAAE,SAAS;wBACjB,MAAM,EAAE,KAAK,CAAC,GAAG;qBAClB,CAAC,CAAC;oBAEH,MAAM;gBAER,KAAK,SAAS,CAAC,MAAM;oBACnB,IAAI,CAAC,YAAY,EAAE;wBACjB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;qBACvC;oBACD,IAAI,CAAC,WAAW,EAAE;wBAChB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;qBAC7C;oBAED,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,KAAK,CAAC,CAAC;oBAEnD,EAAE,GAAG,MAAM,qBAAqB,CAAC;wBAC/B,MAAM,EAAE,SAAS;wBACjB,MAAM;wBACN,MAAM,EAAE,YAAY;wBACpB,EAAE;wBACF,KAAK;wBACL,WAAW;qBACZ,CAAC,CAAC;oBAEH,MAAM;gBAER,KAAK,SAAS,CAAC,MAAM;oBACnB,IAAI,CAAC,YAAY,EAAE;wBACjB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;qBACvC;oBAED,EAAE,GAAG,MAAM,qBAAqB,CAAC;wBAC/B,MAAM,EAAE,SAAS;wBACjB,EAAE;wBACF,KAAK;wBACL,UAAU,EAAE,YAAY;wBACxB,MAAM,EAAE,YAAY;qBACrB,CAAC,CAAC;oBAEH,MAAM;gBAER,KAAK,SAAS,CAAC,GAAG;oBAChB,IAAI,CAAC,aAAa,EAAE;wBAClB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;qBACxC;oBAED,EAAE,GAAG,MAAM,sBAAsB,CAAC;wBAChC,MAAM,EAAE,SAAS;wBACjB,EAAE;wBACF,KAAK;wBACL,MAAM,EAAE,aAAa;qBACtB,CAAC,CAAC;oBAEH,MAAM;gBAER;oBACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;aAC5D;YAED,OAAO;gBACL,MAAM;gBACN,EAAE;gBACF,KAAK;gBACL,MAAM,EAAE,EAAE,CAAC,MAAM;aAClB,CAAC;QACJ,CAAC;QACD,QAAQ,EAAE,CAAC,SAAS,EAAE,EAAE;YACtB,uBAAuB,CAAC,QAAQ,CAAC;gBAC/B,SAAS,EAAE,SAAS,CAAC,EAAE;gBACvB,kBAAkB,EAAE,SAAS;aAC9B,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;YAC5B,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC/C,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAE/C,mBAAmB,CAAC,SAAS,CAAC,EAAE,EAAE;gBAChC,GAAG,SAAU;gBACb,KAAK,EAAE,WAAW;aACnB,CAAC,CAAC;QACL,CAAC;QACD,SAAS,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE;YAC3B,WAAW,CAAC,iBAAiB,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;YAE/D,mBAAmB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAEtC,kBAAkB,CAAC;gBACjB,MAAM,EAAE,aAAa,CAAC,IAAI;gBAC1B,IAAI,EAAE;oBACJ,MAAM,EAAE,EAAE,CAAC,MAAM;oBACjB,KAAK,EAAE;wBACL,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO;wBACzB,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO;wBACzB,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ;wBAC3B,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM;wBACvB,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI;qBACpB;oBACD,IAAI,EAAE,EAAE,CAAC,MAAM;oBACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;oBACrB,SAAS,EAAE,EAAE,CAAC,EAAE;oBAChB,MAAM,EAAE,qBAAqB,CAAC,OAAO;iBACtC;aACF,CAAC,CAAC;YACH,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/C,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;QAE5C,oBAAoB,EAAE,CAAC;QAEvB,OAAO,uBAAuB,CAAC,MAAM,CAAC;YACpC,EAAE,EAAE,aAAa;SAClB,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3D,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"useSendTransaction.js","sourceRoot":"","sources":["../../../../src/hooks/transaction/send/useSendTransaction.ts"],"names":[],"mappings":"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"}

package/dist/hooks/transaction/useExecuteTransaction.js

@@ -12,6 +12,7 @@ import { TransactionStatus } from "../../core/types/transaction";
 import { getWorkingCosmosRpcUrl } from "../../services/external/rpcService";
 import { getSourceExplorerTxUrl, isDepositRoute, sleep, } from "../../services/internal/transactionService";
 import { InjectiveSigningStargateClient } from "@injectivelabs/sdk-ts/dist/cjs/core/stargate";
+import { getClient } from "../../core/client";
 import { CHAIN_IDS } from "../../core/constants";
 import { executeSolanaSwap, executeSolanaTransfer, getCosmosSigningClient, getTransactionError, handleTransactionErrorEvents, isProblematicConnector, isUserRejectionError, normalizeError, } from "../../services";
 import { WidgetEvents } from "../../services/internal/eventService";
@@ -20,7 +21,6 @@ import { useSquidChains } from "../chains/useSquidChains";
 import { useSolanaConnection } from "../solana/useSolana";
 import { useDepositAddressStore } from "../store/useDepositAddressStore";
 import { useSquidStore, useTransactionStore } from "../store/useSquidStore";
-import { useSuiClient } from "../sui/useSuiClient";
 import { useSwap } from "../swap/useSwap";
 import { useSquidTokens } from "../tokens/useSquidTokens";
 import { useHistory } from "../user/useHistory";
@@ -42,7 +42,6 @@ export const useExecuteTransaction = (squidRoute) => {
     const getTransaction = useTransactionStore((state) => state.getTransaction);
     const setTransactionStoreState = useTransactionStore((state) => state.setTransactionState);
     const { connector: activeConnector } = useAccount();
-    const { client: suiClient } = useSuiClient({ chain: fromChain });
     const { getGnosisTransactionHash } = useGnosisContext();
     const { addSwapTransaction, replaceSwapTransactionNonce, replaceSwapTransactionStatus, } = useHistory();
     const { connectedAddress: { address: sourceUserAddress }, changeNetworkIfNeeded, } = useMultiChainWallet(fromChain);
@@ -448,7 +447,7 @@ export const useExecuteTransaction = (squidRoute) => {
         }
     });
     const swapQuerySui = useMutation(async ({ id, route }) => {
-        if (!route || !suiSigner || !suiClient) {
+        if (!route || !suiSigner || !fromChain) {
             throw new Error("Need all parameters");
         }
         if (route.transactionRequest?.type !== SquidDataType.OnChainExecution) {
@@ -463,6 +462,7 @@ export const useExecuteTransaction = (squidRoute) => {
         if (!suiChain) {
             throw new Error(`Source chain (${fromChainId}) does not match any Sui chain`);
         }
+        const suiClient = await getClient(fromChain);
         const txJson = route.transactionRequest.data;
         const tx = Transaction.from(txJson);
         const signedTx = await suiSigner.signTransaction({