@interchain-kit/react 0.2.221 → 0.3.0

package/esm/hooks/index.js

@@ -1,3 +1,5 @@
 export * from './useWalletManager';
 export * from './useChain';
 export * from './useChainWallet';
+export * from './useSigningClient';
+export * from './useAsync';

package/esm/hooks/useAsync.js

@@ -0,0 +1,117 @@
+import { useState, useEffect, useRef } from 'react';
+export const cache = new Map();
+export const activeRequests = new Map();
+export function useAsync({ queryKey, queryFn, enabled = true, disableCache = false, }) {
+    const [state, setState] = useState({
+        data: null,
+        isLoading: false,
+        error: null,
+    });
+    const mountedRef = useRef(false);
+    const queryFnRef = useRef(queryFn);
+    const cacheKey = Array.isArray(queryKey)
+        ? JSON.stringify(queryKey)
+        : queryKey;
+    // Always update the current function
+    queryFnRef.current = queryFn;
+    useEffect(() => {
+        mountedRef.current = true;
+        return () => {
+            mountedRef.current = false;
+        };
+    }, []);
+    useEffect(() => {
+        if (!enabled)
+            return;
+        if (!disableCache && cache.has(cacheKey)) {
+            setState(prev => ({
+                ...prev,
+                data: cache.get(cacheKey),
+                isLoading: false,
+                error: null,
+            }));
+            return;
+        }
+        if (activeRequests.has(cacheKey)) {
+            activeRequests.get(cacheKey).then((data) => {
+                if (mountedRef.current) {
+                    setState({
+                        data,
+                        isLoading: false,
+                        error: null,
+                    });
+                }
+            }, (error) => {
+                if (mountedRef.current) {
+                    setState({
+                        data: null,
+                        isLoading: false,
+                        error,
+                    });
+                }
+            });
+            return;
+        }
+        setState(prev => ({ ...prev, isLoading: true, error: null }));
+        const requestPromise = queryFnRef.current()
+            .then((data) => {
+            if (!disableCache) {
+                cache.set(cacheKey, data);
+            }
+            if (mountedRef.current) {
+                setState({
+                    data,
+                    isLoading: false,
+                    error: null,
+                });
+            }
+            return data;
+        })
+            .catch((error) => {
+            if (mountedRef.current) {
+                setState({
+                    data: null,
+                    isLoading: false,
+                    error,
+                });
+            }
+        })
+            .finally(() => {
+            activeRequests.delete(cacheKey);
+        });
+        activeRequests.set(cacheKey, requestPromise);
+    }, [cacheKey, enabled, disableCache]);
+    const refetch = async () => {
+        try {
+            setState(prev => ({ ...prev, isLoading: true, error: null }));
+            const data = await queryFnRef.current();
+            if (!disableCache) {
+                cache.set(cacheKey, data);
+            }
+            if (mountedRef.current) {
+                setState({
+                    data,
+                    isLoading: false,
+                    error: null,
+                });
+            }
+            return data;
+        }
+        catch (error) {
+            if (mountedRef.current) {
+                setState({
+                    data: null,
+                    isLoading: false,
+                    error: error,
+                });
+            }
+            throw error;
+        }
+    };
+    return {
+        data: state.data,
+        isLoading: state.isLoading,
+        error: state.error,
+        refetch,
+    };
+}

package/esm/hooks/useChain.js

@@ -2,6 +2,7 @@ import { useWalletModal } from "../modal";
 import { useWalletManager } from './useWalletManager';
 import { ChainNameNotExist } from '@interchain-kit/core';
 import { ChainWallet } from '../store/chain-wallet';
+import { useSigningClient } from './useSigningClient';
 export const useChain = (chainName) => {
     const { assetLists, currentWalletName, disconnect, setCurrentChainName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = useWalletManager();
     const chain = getChainByName(chainName);
@@ -12,6 +13,7 @@ export const useChain = (chainName) => {
     const wallet = getWalletByName(currentWalletName);
     const chainWalletStateToShow = getChainWalletState(currentWalletName, chainName);
     const { open, close } = useWalletModal();
+    const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = useSigningClient(chainName, currentWalletName);
     return {
         //for migration cosmos kit
         connect: () => {
@@ -34,7 +36,10 @@ export const useChain = (chainName) => {
         assetList,
         address: chainWalletStateToShow?.account?.address,
         wallet: new ChainWallet(wallet, () => connect(currentWalletName, chainName), () => disconnect(currentWalletName, chainName), () => getAccount(currentWalletName, chainName)),
-        rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(currentWalletName, chainName),
+        signingClient,
+        isSigningClientLoading,
+        signingClientError,
+        rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
     };
 };

package/esm/hooks/useChainWallet.js

@@ -1,11 +1,13 @@
 import { useWalletManager } from "./useWalletManager";
 import { ChainWallet } from "../store/chain-wallet";
+import { useSigningClient } from "./useSigningClient";
 export const useChainWallet = (chainName, walletName) => {
     const { assetLists, disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = useWalletManager();
     const chain = getChainByName(chainName);
     const wallet = getWalletByName(walletName);
     const assetList = assetLists.find(a => a.chainName === chainName);
     const chainWalletStateToShow = getChainWalletState(walletName, chainName);
+    const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = useSigningClient(chainName, walletName);
     return {
         //for migration cosmos kit
         connect: async () => {
@@ -24,7 +26,10 @@ export const useChainWallet = (chainName, walletName) => {
         assetList,
         address: chainWalletStateToShow?.account?.address,
         wallet: wallet ? new ChainWallet(wallet, () => connect(walletName, chainName), () => disconnect(walletName, chainName), () => getAccount(walletName, chainName)) : null,
-        rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(walletName, chainName),
+        signingClient,
+        isSigningClientLoading,
+        signingClientError,
+        rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
     };
 };

package/esm/hooks/useSigningClient.js

@@ -0,0 +1,21 @@
+import { useWalletManager } from "./useWalletManager";
+import { useAsync } from "./useAsync";
+import { WalletState } from "@interchain-kit/core";
+export const useSigningClient = (chainName, walletName) => {
+    const { getSigningClient, getChainWalletState, getRpcEndpoint } = useWalletManager();
+    const chainWalletState = getChainWalletState(walletName, chainName);
+    const { data, isLoading, error } = useAsync({
+        queryKey: `signing-client-${chainName}-${walletName}`,
+        queryFn: async () => {
+            await getRpcEndpoint(walletName, chainName);
+            return getSigningClient(walletName, chainName);
+        },
+        enabled: chainWalletState?.walletState === WalletState.Connected,
+        disableCache: true,
+    });
+    return {
+        signingClient: data,
+        error,
+        isLoading,
+    };
+};

package/esm/store/store.js

@@ -2,6 +2,7 @@ import { clientNotExistError, WalletState } from "@interchain-kit/core";
 import { createStore } from "zustand";
 import { immer } from "zustand/middleware/immer";
 import { persist, createJSONStorage } from 'zustand/middleware';
+import { dedupeAsync } from '../utils';
 const immerSyncUp = (newWalletManager) => {
     return (draft) => {
         draft.chains = newWalletManager.chains;
@@ -37,11 +38,17 @@ export const createInterchainStore = (walletManager) => {
             });
         },
         init: async () => {
-            const existedChainWalletStatesMap = new Map(get().chainWalletState.map(cws => [cws.walletName + cws.chainName, cws]));
+            const oldChainWalletStatesMap = new Map(get().chainWalletState.map(cws => [cws.walletName + cws.chainName, cws]));
+            set(draft => {
+                draft.chainWalletState = [];
+            });
             wallets.forEach(wallet => {
                 chains.forEach(chain => {
-                    if (!existedChainWalletStatesMap.has(wallet.info.name + chain.chainName)) {
-                        set(draft => {
+                    set(draft => {
+                        if (oldChainWalletStatesMap.has(wallet.info.name + chain.chainName)) {
+                            draft.chainWalletState.push(oldChainWalletStatesMap.get(wallet.info.name + chain.chainName));
+                        }
+                        else {
                             draft.chainWalletState.push({
                                 chainName: chain.chainName,
                                 walletName: wallet.info.name,
@@ -50,8 +57,8 @@ export const createInterchainStore = (walletManager) => {
                                 errorMessage: "",
                                 account: undefined
                             });
-                        });
-                    }
+                        }
+                    });
                 });
             });
             const NotExistWallets = [];
@@ -138,6 +145,9 @@ export const createInterchainStore = (walletManager) => {
                         }
                     });
                 });
+                draft.chainWalletState = draft.chainWalletState.map(cws => {
+                    return { ...cws, rpcEndpoint: newEndpointOptions?.endpoints?.[cws.chainName]?.rpc?.[0] || cws.rpcEndpoint };
+                });
             });
         },
         connect: async (walletName, chainName) => {
@@ -180,13 +190,23 @@ export const createInterchainStore = (walletManager) => {
             }
         },
         getAccount: async (walletName, chainName) => {
-            const account = await walletManager.getAccount(walletName, chainName);
-            get().updateChainWalletState(walletName, chainName, { account });
-            return account;
+            try {
+                const account = await walletManager.getAccount(walletName, chainName);
+                get().updateChainWalletState(walletName, chainName, { account });
+                return account;
+            }
+            catch (error) {
+                console.log(error);
+            }
         },
         getRpcEndpoint: async (walletName, chainName) => {
-            const rpcEndpoint = await walletManager.getRpcEndpoint(walletName, chainName);
-            return rpcEndpoint;
+            return dedupeAsync(`${chainName}-rpcEndpoint`, async () => {
+                const rpcEndpoint = await walletManager.getRpcEndpoint(walletName, chainName);
+                get().wallets.map(wallet => {
+                    get().updateChainWalletState(wallet.info.name, chainName, { rpcEndpoint });
+                });
+                return rpcEndpoint;
+            });
         },
         getChainLogoUrl(chainName) {
             return walletManager.getChainLogoUrl(chainName);
@@ -216,7 +236,7 @@ export const createInterchainStore = (walletManager) => {
         getWalletByName(walletName) {
             return walletManager.getWalletByName(walletName);
         },
-        getSigningClient(walletName, chainName) {
+        async getSigningClient(walletName, chainName) {
             return walletManager.getSigningClient(walletName, chainName);
         },
         getEnv() {
@@ -226,7 +246,12 @@ export const createInterchainStore = (walletManager) => {
         name: 'interchain-kit-store',
         storage: createJSONStorage(() => localStorage),
         partialize: state => ({
-            chainWalletState: state.chainWalletState,
+            chainWalletState: state.chainWalletState.map(cws => ({
+                chainName: cws.chainName,
+                walletName: cws.walletName,
+                account: cws.account,
+                walletState: cws.walletState,
+            })),
             currentWalletName: state.currentWalletName,
             currentChainName: state.currentChainName
         }),

package/esm/utils/dedupeAsync.js

@@ -0,0 +1,18 @@
+const pendingRequests = new Map();
+/**
+ * Deduplicate async calls to avoid multiple identical requests.
+ * @param key - A unique key representing the request.
+ * @param asyncFn - A function that returns a Promise.
+ * @returns A Promise resolving to the result of the async function.
+ */
+export async function dedupeAsync(key, asyncFn) {
+    if (pendingRequests.has(key)) {
+        return pendingRequests.get(key);
+    }
+    const promise = asyncFn()
+        .finally(() => {
+        pendingRequests.delete(key);
+    });
+    pendingRequests.set(key, promise);
+    return promise;
+}

package/esm/utils/index.js

@@ -1 +1,2 @@
 export * from './wallet';
+export * from './dedupeAsync';

package/hooks/index.d.ts

@@ -1,3 +1,5 @@
 export * from './useWalletManager';
 export * from './useChain';
 export * from './useChainWallet';
+export * from './useSigningClient';
+export * from './useAsync';

package/hooks/index.js

@@ -17,3 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./useWalletManager"), exports);
 __exportStar(require("./useChain"), exports);
 __exportStar(require("./useChainWallet"), exports);
+__exportStar(require("./useSigningClient"), exports);
+__exportStar(require("./useAsync"), exports);

package/hooks/useAsync.d.ts

@@ -0,0 +1,32 @@
+export declare const cache: Map<string, any>;
+export declare const activeRequests: Map<string, Promise<any>>;
+type UseAsyncRequestOptions<T> = {
+    /**
+     * Unique key for the query
+     */
+    queryKey: string | any[];
+    /**
+     * Query function that returns a promise
+     * Note: For best performance, use a stable function reference
+     * (defined outside component or wrapped in useCallback)
+     * But not required - the hook will work without it
+     */
+    queryFn: () => Promise<T>;
+    /**
+     * Whether the query should execute
+     * @default true
+     */
+    enabled?: boolean;
+    /**
+     * Whether to disable caching
+     * @default false
+     */
+    disableCache?: boolean;
+};
+export declare function useAsync<T>({ queryKey, queryFn, enabled, disableCache, }: UseAsyncRequestOptions<T>): {
+    data: T;
+    isLoading: boolean;
+    error: Error;
+    refetch: () => Promise<T>;
+};
+export {};

package/hooks/useAsync.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.activeRequests = exports.cache = void 0;
+exports.useAsync = useAsync;
+const react_1 = require("react");
+exports.cache = new Map();
+exports.activeRequests = new Map();
+function useAsync({ queryKey, queryFn, enabled = true, disableCache = false, }) {
+    const [state, setState] = (0, react_1.useState)({
+        data: null,
+        isLoading: false,
+        error: null,
+    });
+    const mountedRef = (0, react_1.useRef)(false);
+    const queryFnRef = (0, react_1.useRef)(queryFn);
+    const cacheKey = Array.isArray(queryKey)
+        ? JSON.stringify(queryKey)
+        : queryKey;
+    // Always update the current function
+    queryFnRef.current = queryFn;
+    (0, react_1.useEffect)(() => {
+        mountedRef.current = true;
+        return () => {
+            mountedRef.current = false;
+        };
+    }, []);
+    (0, react_1.useEffect)(() => {
+        if (!enabled)
+            return;
+        if (!disableCache && exports.cache.has(cacheKey)) {
+            setState(prev => ({
+                ...prev,
+                data: exports.cache.get(cacheKey),
+                isLoading: false,
+                error: null,
+            }));
+            return;
+        }
+        if (exports.activeRequests.has(cacheKey)) {
+            exports.activeRequests.get(cacheKey).then((data) => {
+                if (mountedRef.current) {
+                    setState({
+                        data,
+                        isLoading: false,
+                        error: null,
+                    });
+                }
+            }, (error) => {
+                if (mountedRef.current) {
+                    setState({
+                        data: null,
+                        isLoading: false,
+                        error,
+                    });
+                }
+            });
+            return;
+        }
+        setState(prev => ({ ...prev, isLoading: true, error: null }));
+        const requestPromise = queryFnRef.current()
+            .then((data) => {
+            if (!disableCache) {
+                exports.cache.set(cacheKey, data);
+            }
+            if (mountedRef.current) {
+                setState({
+                    data,
+                    isLoading: false,
+                    error: null,
+                });
+            }
+            return data;
+        })
+            .catch((error) => {
+            if (mountedRef.current) {
+                setState({
+                    data: null,
+                    isLoading: false,
+                    error,
+                });
+            }
+        })
+            .finally(() => {
+            exports.activeRequests.delete(cacheKey);
+        });
+        exports.activeRequests.set(cacheKey, requestPromise);
+    }, [cacheKey, enabled, disableCache]);
+    const refetch = async () => {
+        try {
+            setState(prev => ({ ...prev, isLoading: true, error: null }));
+            const data = await queryFnRef.current();
+            if (!disableCache) {
+                exports.cache.set(cacheKey, data);
+            }
+            if (mountedRef.current) {
+                setState({
+                    data,
+                    isLoading: false,
+                    error: null,
+                });
+            }
+            return data;
+        }
+        catch (error) {
+            if (mountedRef.current) {
+                setState({
+                    data: null,
+                    isLoading: false,
+                    error: error,
+                });
+            }
+            throw error;
+        }
+    };
+    return {
+        data: state.data,
+        isLoading: state.isLoading,
+        error: state.error,
+        refetch,
+    };
+}

package/hooks/useChain.js

@@ -5,6 +5,7 @@ const modal_1 = require("../modal");
 const useWalletManager_1 = require("./useWalletManager");
 const core_1 = require("@interchain-kit/core");
 const chain_wallet_1 = require("../store/chain-wallet");
+const useSigningClient_1 = require("./useSigningClient");
 const useChain = (chainName) => {
     const { assetLists, currentWalletName, disconnect, setCurrentChainName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = (0, useWalletManager_1.useWalletManager)();
     const chain = getChainByName(chainName);
@@ -15,6 +16,7 @@ const useChain = (chainName) => {
     const wallet = getWalletByName(currentWalletName);
     const chainWalletStateToShow = getChainWalletState(currentWalletName, chainName);
     const { open, close } = (0, modal_1.useWalletModal)();
+    const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = (0, useSigningClient_1.useSigningClient)(chainName, currentWalletName);
     return {
         //for migration cosmos kit
         connect: () => {
@@ -37,8 +39,11 @@ const useChain = (chainName) => {
         assetList,
         address: chainWalletStateToShow?.account?.address,
         wallet: new chain_wallet_1.ChainWallet(wallet, () => connect(currentWalletName, chainName), () => disconnect(currentWalletName, chainName), () => getAccount(currentWalletName, chainName)),
-        rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(currentWalletName, chainName),
+        signingClient,
+        isSigningClientLoading,
+        signingClientError,
+        rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
     };
 };
 exports.useChain = useChain;

package/hooks/useChainWallet.js

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useChainWallet = void 0;
 const useWalletManager_1 = require("./useWalletManager");
 const chain_wallet_1 = require("../store/chain-wallet");
+const useSigningClient_1 = require("./useSigningClient");
 const useChainWallet = (chainName, walletName) => {
     const { assetLists, disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = (0, useWalletManager_1.useWalletManager)();
     const chain = getChainByName(chainName);
     const wallet = getWalletByName(walletName);
     const assetList = assetLists.find(a => a.chainName === chainName);
     const chainWalletStateToShow = getChainWalletState(walletName, chainName);
+    const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = (0, useSigningClient_1.useSigningClient)(chainName, walletName);
     return {
         //for migration cosmos kit
         connect: async () => {
@@ -27,8 +29,11 @@ const useChainWallet = (chainName, walletName) => {
         assetList,
         address: chainWalletStateToShow?.account?.address,
         wallet: wallet ? new chain_wallet_1.ChainWallet(wallet, () => connect(walletName, chainName), () => disconnect(walletName, chainName), () => getAccount(walletName, chainName)) : null,
-        rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(walletName, chainName),
+        signingClient,
+        isSigningClientLoading,
+        signingClientError,
+        rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
     };
 };
 exports.useChainWallet = useChainWallet;

package/hooks/useSigningClient.d.ts

@@ -0,0 +1,5 @@
+export declare const useSigningClient: (chainName: string, walletName: string) => {
+    signingClient: import("@interchainjs/cosmos/signing-client").SigningClient;
+    error: Error;
+    isLoading: boolean;
+};

package/hooks/useSigningClient.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSigningClient = void 0;
+const useWalletManager_1 = require("./useWalletManager");
+const useAsync_1 = require("./useAsync");
+const core_1 = require("@interchain-kit/core");
+const useSigningClient = (chainName, walletName) => {
+    const { getSigningClient, getChainWalletState, getRpcEndpoint } = (0, useWalletManager_1.useWalletManager)();
+    const chainWalletState = getChainWalletState(walletName, chainName);
+    const { data, isLoading, error } = (0, useAsync_1.useAsync)({
+        queryKey: `signing-client-${chainName}-${walletName}`,
+        queryFn: async () => {
+            await getRpcEndpoint(walletName, chainName);
+            return getSigningClient(walletName, chainName);
+        },
+        enabled: chainWalletState?.walletState === core_1.WalletState.Connected,
+        disableCache: true,
+    });
+    return {
+        signingClient: data,
+        error,
+        isLoading,
+    };
+};
+exports.useSigningClient = useSigningClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.2.221",
+  "version": "0.3.0",
   "author": "Hyperweb <developers@hyperweb.io>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -34,17 +34,13 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.53.40",
-    "@interchain-kit/core": "0.2.221",
+    "@interchain-kit/core": "0.3.0",
     "@interchain-ui/react": "1.26.1",
-    "@interchainjs/cosmos": "1.10.1",
-    "@interchainjs/cosmos-types": "1.10.1",
+    "@interchainjs/cosmos": "1.11.2",
+    "@interchainjs/cosmos-types": "1.11.2",
     "@react-icons/all-files": "^4.1.0",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
     "@walletconnect/types": "^2.17.3",
-    "interchainjs": "1.10.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "interchainjs": "1.11.2",
     "zustand": "^5.0.3"
   },
   "devDependencies": {
@@ -61,5 +57,11 @@
     "jest-environment-jsdom": "^29.7.0",
     "ts-jest": "^29.3.0"
   },
-  "gitHead": "8858e1325a57cd4082cb9658fb480952d1a0eec9"
+  "peerDependencies": {
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
+  "gitHead": "2fa62ae0dbeb2833b55d59c0cfe8446d1c7a7b06"
 }

package/store/store.js

@@ -5,6 +5,7 @@ const core_1 = require("@interchain-kit/core");
 const zustand_1 = require("zustand");
 const immer_1 = require("zustand/middleware/immer");
 const middleware_1 = require("zustand/middleware");
+const utils_1 = require("../utils");
 const immerSyncUp = (newWalletManager) => {
     return (draft) => {
         draft.chains = newWalletManager.chains;
@@ -40,11 +41,17 @@ const createInterchainStore = (walletManager) => {
             });
         },
         init: async () => {
-            const existedChainWalletStatesMap = new Map(get().chainWalletState.map(cws => [cws.walletName + cws.chainName, cws]));
+            const oldChainWalletStatesMap = new Map(get().chainWalletState.map(cws => [cws.walletName + cws.chainName, cws]));
+            set(draft => {
+                draft.chainWalletState = [];
+            });
             wallets.forEach(wallet => {
                 chains.forEach(chain => {
-                    if (!existedChainWalletStatesMap.has(wallet.info.name + chain.chainName)) {
-                        set(draft => {
+                    set(draft => {
+                        if (oldChainWalletStatesMap.has(wallet.info.name + chain.chainName)) {
+                            draft.chainWalletState.push(oldChainWalletStatesMap.get(wallet.info.name + chain.chainName));
+                        }
+                        else {
                             draft.chainWalletState.push({
                                 chainName: chain.chainName,
                                 walletName: wallet.info.name,
@@ -53,8 +60,8 @@ const createInterchainStore = (walletManager) => {
                                 errorMessage: "",
                                 account: undefined
                             });
-                        });
-                    }
+                        }
+                    });
                 });
             });
             const NotExistWallets = [];
@@ -141,6 +148,9 @@ const createInterchainStore = (walletManager) => {
                         }
                     });
                 });
+                draft.chainWalletState = draft.chainWalletState.map(cws => {
+                    return { ...cws, rpcEndpoint: newEndpointOptions?.endpoints?.[cws.chainName]?.rpc?.[0] || cws.rpcEndpoint };
+                });
             });
         },
         connect: async (walletName, chainName) => {
@@ -183,13 +193,23 @@ const createInterchainStore = (walletManager) => {
             }
         },
         getAccount: async (walletName, chainName) => {
-            const account = await walletManager.getAccount(walletName, chainName);
-            get().updateChainWalletState(walletName, chainName, { account });
-            return account;
+            try {
+                const account = await walletManager.getAccount(walletName, chainName);
+                get().updateChainWalletState(walletName, chainName, { account });
+                return account;
+            }
+            catch (error) {
+                console.log(error);
+            }
         },
         getRpcEndpoint: async (walletName, chainName) => {
-            const rpcEndpoint = await walletManager.getRpcEndpoint(walletName, chainName);
-            return rpcEndpoint;
+            return (0, utils_1.dedupeAsync)(`${chainName}-rpcEndpoint`, async () => {
+                const rpcEndpoint = await walletManager.getRpcEndpoint(walletName, chainName);
+                get().wallets.map(wallet => {
+                    get().updateChainWalletState(wallet.info.name, chainName, { rpcEndpoint });
+                });
+                return rpcEndpoint;
+            });
         },
         getChainLogoUrl(chainName) {
             return walletManager.getChainLogoUrl(chainName);
@@ -219,7 +239,7 @@ const createInterchainStore = (walletManager) => {
         getWalletByName(walletName) {
             return walletManager.getWalletByName(walletName);
         },
-        getSigningClient(walletName, chainName) {
+        async getSigningClient(walletName, chainName) {
             return walletManager.getSigningClient(walletName, chainName);
         },
         getEnv() {
@@ -229,7 +249,12 @@ const createInterchainStore = (walletManager) => {
         name: 'interchain-kit-store',
         storage: (0, middleware_1.createJSONStorage)(() => localStorage),
         partialize: state => ({
-            chainWalletState: state.chainWalletState,
+            chainWalletState: state.chainWalletState.map(cws => ({
+                chainName: cws.chainName,
+                walletName: cws.walletName,
+                account: cws.account,
+                walletState: cws.walletState,
+            })),
             currentWalletName: state.currentWalletName,
             currentChainName: state.currentChainName
         }),

package/types/chain.d.ts

@@ -19,8 +19,11 @@ export type UseChainReturnType = {
     assetList: AssetList;
     address: string;
     wallet: ChainWallet<BaseWallet>;
-    rpcEndpoint: string | HttpEndpoint;
+    rpcEndpoint: string | HttpEndpoint | unknown;
     getSigningClient: () => Promise<SigningClient>;
+    signingClient: SigningClient | null;
+    isSigningClientLoading: boolean;
+    signingClientError: Error | unknown | null;
 } & CosmosKitUseChainReturnType;
 export type UseChainWalletReturnType = Omit<UseChainReturnType, 'openView' | 'closeView'>;
 export type UseInterchainClientReturnType = {

package/utils/dedupeAsync.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Deduplicate async calls to avoid multiple identical requests.
+ * @param key - A unique key representing the request.
+ * @param asyncFn - A function that returns a Promise.
+ * @returns A Promise resolving to the result of the async function.
+ */
+export declare function dedupeAsync<T>(key: string, asyncFn: () => Promise<T>): Promise<T>;

package/utils/dedupeAsync.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dedupeAsync = dedupeAsync;
+const pendingRequests = new Map();
+/**
+ * Deduplicate async calls to avoid multiple identical requests.
+ * @param key - A unique key representing the request.
+ * @param asyncFn - A function that returns a Promise.
+ * @returns A Promise resolving to the result of the async function.
+ */
+async function dedupeAsync(key, asyncFn) {
+    if (pendingRequests.has(key)) {
+        return pendingRequests.get(key);
+    }
+    const promise = asyncFn()
+        .finally(() => {
+        pendingRequests.delete(key);
+    });
+    pendingRequests.set(key, promise);
+    return promise;
+}

package/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './wallet';
+export * from './dedupeAsync';

package/utils/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./wallet"), exports);
+__exportStar(require("./dedupeAsync"), exports);