@interchain-kit/react 0.2.222 → 0.3.0

package/esm/hooks/index.js

@@ -3,4 +3,3 @@ export * from './useChain';
 export * from './useChainWallet';
 export * from './useSigningClient';
 export * from './useAsync';
-export * from './useRpcEndpoint';

package/esm/hooks/useAsync.js

@@ -1,7 +1,7 @@
 import { useState, useEffect, useRef } from 'react';
 export const cache = new Map();
 export const activeRequests = new Map();
-export function useAsync({ queryKey, queryFn, enabled = true }) {
+export function useAsync({ queryKey, queryFn, enabled = true, disableCache = false, }) {
     const [state, setState] = useState({
         data: null,
         isLoading: false,
@@ -23,7 +23,7 @@ export function useAsync({ queryKey, queryFn, enabled = true }) {
     useEffect(() => {
         if (!enabled)
             return;
-        if (cache.has(cacheKey)) {
+        if (!disableCache && cache.has(cacheKey)) {
             setState(prev => ({
                 ...prev,
                 data: cache.get(cacheKey),
@@ -55,7 +55,9 @@ export function useAsync({ queryKey, queryFn, enabled = true }) {
         setState(prev => ({ ...prev, isLoading: true, error: null }));
         const requestPromise = queryFnRef.current()
             .then((data) => {
-            cache.set(cacheKey, data);
+            if (!disableCache) {
+                cache.set(cacheKey, data);
+            }
             if (mountedRef.current) {
                 setState({
                     data,
@@ -73,18 +75,19 @@ export function useAsync({ queryKey, queryFn, enabled = true }) {
                     error,
                 });
             }
-            // throw error;
         })
             .finally(() => {
             activeRequests.delete(cacheKey);
         });
         activeRequests.set(cacheKey, requestPromise);
-    }, [cacheKey, enabled]); // 不再依赖 queryFn
+    }, [cacheKey, enabled, disableCache]);
     const refetch = async () => {
         try {
             setState(prev => ({ ...prev, isLoading: true, error: null }));
             const data = await queryFnRef.current();
-            cache.set(cacheKey, data);
+            if (!disableCache) {
+                cache.set(cacheKey, data);
+            }
             if (mountedRef.current) {
                 setState({
                     data,

package/esm/hooks/useSigningClient.js

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

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;
@@ -144,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) => {
@@ -196,7 +200,13 @@ export const createInterchainStore = (walletManager) => {
             }
         },
         getRpcEndpoint: async (walletName, chainName) => {
-            return walletManager.getRpcEndpoint(walletName, chainName);
+            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);

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

@@ -3,4 +3,3 @@ export * from './useChain';
 export * from './useChainWallet';
 export * from './useSigningClient';
 export * from './useAsync';
-export * from './useRpcEndpoint';

package/hooks/index.js

@@ -19,4 +19,3 @@ __exportStar(require("./useChain"), exports);
 __exportStar(require("./useChainWallet"), exports);
 __exportStar(require("./useSigningClient"), exports);
 __exportStar(require("./useAsync"), exports);
-__exportStar(require("./useRpcEndpoint"), exports);

package/hooks/useAsync.d.ts

@@ -17,8 +17,13 @@ type UseAsyncRequestOptions<T> = {
      * @default true
      */
     enabled?: boolean;
+    /**
+     * Whether to disable caching
+     * @default false
+     */
+    disableCache?: boolean;
 };
-export declare function useAsync<T>({ queryKey, queryFn, enabled }: UseAsyncRequestOptions<T>): {
+export declare function useAsync<T>({ queryKey, queryFn, enabled, disableCache, }: UseAsyncRequestOptions<T>): {
     data: T;
     isLoading: boolean;
     error: Error;

package/hooks/useAsync.js

@@ -5,7 +5,7 @@ exports.useAsync = useAsync;
 const react_1 = require("react");
 exports.cache = new Map();
 exports.activeRequests = new Map();
-function useAsync({ queryKey, queryFn, enabled = true }) {
+function useAsync({ queryKey, queryFn, enabled = true, disableCache = false, }) {
     const [state, setState] = (0, react_1.useState)({
         data: null,
         isLoading: false,
@@ -27,7 +27,7 @@ function useAsync({ queryKey, queryFn, enabled = true }) {
     (0, react_1.useEffect)(() => {
         if (!enabled)
             return;
-        if (exports.cache.has(cacheKey)) {
+        if (!disableCache && exports.cache.has(cacheKey)) {
             setState(prev => ({
                 ...prev,
                 data: exports.cache.get(cacheKey),
@@ -59,7 +59,9 @@ function useAsync({ queryKey, queryFn, enabled = true }) {
         setState(prev => ({ ...prev, isLoading: true, error: null }));
         const requestPromise = queryFnRef.current()
             .then((data) => {
-            exports.cache.set(cacheKey, data);
+            if (!disableCache) {
+                exports.cache.set(cacheKey, data);
+            }
             if (mountedRef.current) {
                 setState({
                     data,
@@ -77,18 +79,19 @@ function useAsync({ queryKey, queryFn, enabled = true }) {
                     error,
                 });
             }
-            // throw error;
         })
             .finally(() => {
             exports.activeRequests.delete(cacheKey);
         });
         exports.activeRequests.set(cacheKey, requestPromise);
-    }, [cacheKey, enabled]); // 不再依赖 queryFn
+    }, [cacheKey, enabled, disableCache]);
     const refetch = async () => {
         try {
             setState(prev => ({ ...prev, isLoading: true, error: null }));
             const data = await queryFnRef.current();
-            exports.cache.set(cacheKey, data);
+            if (!disableCache) {
+                exports.cache.set(cacheKey, data);
+            }
             if (mountedRef.current) {
                 setState({
                     data,

package/hooks/useSigningClient.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.2.222",
+  "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.222",
+    "@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": "fa6f119bb50e3044e2de4a21e370ecec33937459"
+  "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;
@@ -147,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) => {
@@ -199,7 +203,13 @@ const createInterchainStore = (walletManager) => {
             }
         },
         getRpcEndpoint: async (walletName, chainName) => {
-            return walletManager.getRpcEndpoint(walletName, chainName);
+            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);

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);

package/esm/hooks/useRpcEndpoint.js

@@ -1,22 +0,0 @@
-import { useAsync } from "./useAsync";
-import { useWalletManager } from "./useWalletManager";
-export const useRpcEndpoint = (chainName, walletName) => {
-    const { getRpcEndpoint, updateChainWalletState, wallets } = useWalletManager();
-    const { data, error, isLoading } = useAsync({
-        queryKey: `rpc-endpoint-${chainName}`,
-        queryFn: async () => {
-            const rpc = await getRpcEndpoint(walletName, chainName);
-            wallets.forEach(wallet => {
-                updateChainWalletState(wallet.info.name, chainName, {
-                    rpcEndpoint: rpc
-                });
-            });
-            return rpc;
-        }
-    });
-    return {
-        rpcEndpoint: data,
-        error,
-        isLoading
-    };
-};

package/hooks/useRpcEndpoint.d.ts

@@ -1,5 +0,0 @@
-export declare const useRpcEndpoint: (chainName: string, walletName: string) => {
-    rpcEndpoint: string | import("@interchainjs/types").HttpEndpoint;
-    error: Error;
-    isLoading: boolean;
-};

package/hooks/useRpcEndpoint.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useRpcEndpoint = void 0;
-const useAsync_1 = require("./useAsync");
-const useWalletManager_1 = require("./useWalletManager");
-const useRpcEndpoint = (chainName, walletName) => {
-    const { getRpcEndpoint, updateChainWalletState, wallets } = (0, useWalletManager_1.useWalletManager)();
-    const { data, error, isLoading } = (0, useAsync_1.useAsync)({
-        queryKey: `rpc-endpoint-${chainName}`,
-        queryFn: async () => {
-            const rpc = await getRpcEndpoint(walletName, chainName);
-            wallets.forEach(wallet => {
-                updateChainWalletState(wallet.info.name, chainName, {
-                    rpcEndpoint: rpc
-                });
-            });
-            return rpc;
-        }
-    });
-    return {
-        rpcEndpoint: data,
-        error,
-        isLoading
-    };
-};
-exports.useRpcEndpoint = useRpcEndpoint;