@interchain-kit/react 0.3.46 → 0.3.47

package/esm/hooks/useChain.js

@@ -1,15 +1,15 @@
-import { useWalletManager } from './useWalletManager';
 import { ChainNameNotExist, WalletState } from '@interchain-kit/core';
 import { useSigningClient } from './useSigningClient';
+import { useWalletManager } from './useWalletManager';
 import { useWalletModal } from './useWalletModal';
 export const useChain = (chainName) => {
-    const { assetLists, currentWalletName, disconnect, setCurrentChainName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount, getStatefulWalletByName } = useWalletManager();
+    const { currentWalletName, disconnect, setCurrentChainName, getChainByName, getChainWalletState, getChainLogoUrl, getSigningClient, getRpcEndpoint, getChainWalletByName, getAssetListByName } = useWalletManager();
     const chain = getChainByName(chainName);
     if (!chain) {
         throw new ChainNameNotExist(chainName);
     }
-    const assetList = assetLists.find(a => a.chainName === chainName);
-    const wallet = getStatefulWalletByName(currentWalletName);
+    const assetList = getAssetListByName(chainName);
+    const wallet = getChainWalletByName(currentWalletName, chain.chainName);
     const chainWalletStateToShow = getChainWalletState(currentWalletName, chainName);
     const { open, close } = useWalletModal();
     const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = useSigningClient(chainName, currentWalletName);

package/esm/hooks/useChainWallet.js

@@ -1,10 +1,10 @@
-import { useWalletManager } from "./useWalletManager";
-import { useSigningClient } from "./useSigningClient";
+import { useSigningClient } from './useSigningClient';
+import { useWalletManager } from './useWalletManager';
 export const useChainWallet = (chainName, walletName) => {
-    const { assetLists, disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount, getStatefulWalletByName } = useWalletManager();
+    const { disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getChainWalletByName, getAssetListByName } = useWalletManager();
     const chain = getChainByName(chainName);
-    const wallet = getStatefulWalletByName(walletName);
-    const assetList = assetLists.find(a => a.chainName === chainName);
+    const wallet = getChainWalletByName(walletName, chainName);
+    const assetList = getAssetListByName(chainName);
     const chainWalletStateToShow = getChainWalletState(walletName, chainName);
     const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = useSigningClient(chainName, walletName);
     return {

package/esm/hooks/useForceUpdate.js

@@ -0,0 +1,5 @@
+import { useState } from 'react';
+export const useForceUpdate = () => {
+    const [, setState] = useState(0);
+    return () => setState((prev) => prev + 1);
+};

package/esm/hooks/useSigningClient.js

@@ -1,6 +1,6 @@
-import { useWalletManager } from "./useWalletManager";
-import { useAsync } from "./useAsync";
-import { WalletState } from "@interchain-kit/core";
+import { WalletState } from '@interchain-kit/core';
+import { useAsync } from './useAsync';
+import { useWalletManager } from './useWalletManager';
 export const useSigningClient = (chainName, walletName) => {
     const { getSigningClient, getChainWalletState, getRpcEndpoint, isReady } = useWalletManager();
     const chainWalletState = getChainWalletState(walletName, chainName);

package/esm/hooks/useWalletManager.js

@@ -1,6 +1,14 @@
-import { useInterchainWalletContext } from "../provider";
-import { useStore } from 'zustand';
+import { useEffect } from 'react';
+import { useInterchainWalletContext } from '../provider';
+import { bindAllMethods } from '../utils/bindContext';
+import { useForceUpdate } from './useForceUpdate';
 export const useWalletManager = () => {
-    const store = useInterchainWalletContext();
-    return useStore(store);
+    const walletManager = useInterchainWalletContext();
+    const forceUpdate = useForceUpdate();
+    useEffect(() => {
+        const unsubscribe = walletManager.subscribe(() => forceUpdate());
+        return () => unsubscribe();
+    }, []);
+    const wmToReturn = bindAllMethods(walletManager);
+    return wmToReturn;
 };

package/esm/hooks/useWalletModal.js

@@ -1,4 +1,4 @@
-import { useWalletManager } from "./useWalletManager";
+import { useWalletManager } from './useWalletManager';
 export const useWalletModal = () => {
     const { modalIsOpen, openModal, closeModal } = useWalletManager();
     return {

package/esm/index.js

@@ -1,6 +1,5 @@
-export * from './provider';
-export * from './hooks';
-export * from './types';
 export * from './enum';
+export * from './hooks';
 export * from './modal';
-export * from './store';
+export * from './provider';
+export * from './types';

package/esm/modal/modal.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ConnectedContent, ConnectedHeader, ConnectingContent, ConnectingHeader, ErrorContent, ErrorHeader, NotExistContent, NotExistHeader, QRCodeContent, QRCodeHeader, RejectContent, RejectHeader, WalletListContent, WalletListHeader, } from "./views";
-import { useMemo, useState } from "react";
 import { WalletState } from "@interchain-kit/core";
 import { ConnectModal, ThemeProvider, } from "@interchain-ui/react";
+import { useMemo, useState } from "react";
 import { useWalletManager } from "../hooks";
 import { transferToWalletUISchema } from "../utils";
+import { ConnectedContent, ConnectedHeader, ConnectingContent, ConnectingHeader, ErrorContent, ErrorHeader, NotExistContent, NotExistHeader, QRCodeContent, QRCodeHeader, RejectContent, RejectHeader, WalletListContent, WalletListHeader, } from "./views";
 export const InterchainWalletModal = ({ 
 // ==== Custom modal styles
 modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, modalThemeProviderProps, }) => {

package/esm/provider.js

@@ -1,17 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { WalletManagerStore } from "@interchain-kit/store";
 import { useEffect, useRef } from "react";
 import { createContext, useContext } from "react";
-import { WalletManager, } from "@interchain-kit/core";
 import { ModalRenderer } from "./modal";
-import { createInterchainStore } from "./store";
 const InterchainWalletContext = createContext(null);
 export const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, walletModal: ProviderWalletModal, }) => {
     const store = useRef(null);
     if (!store.current) {
-        store.current = createInterchainStore(new WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions));
+        store.current = new WalletManagerStore(chains, assetLists, wallets, signerOptions, endpointOptions);
     }
     useEffect(() => {
-        store.current.getState().init();
+        store.current.init();
     }, []);
     return (_jsxs(InterchainWalletContext.Provider, { value: store.current, children: [children, ProviderWalletModal && (_jsx(ModalRenderer, { walletModal: ProviderWalletModal }))] }));
 };

package/esm/utils/bindContext.js

@@ -0,0 +1,54 @@
+/**
+ * 绑定上下文工具函数的类型定义
+ */
+/**
+ * 绑定对象的所有方法，确保 getter 属性能正确访问原始对象的上下文
+ * @param obj 要绑定方法的对象
+ * @returns 绑定后的对象副本
+ */
+export function bindAllMethods(obj) {
+    if (!obj)
+        return obj;
+    const boundObj = { ...obj };
+    // 处理原型链上的方法和 getter
+    Object.getOwnPropertyNames(Object.getPrototypeOf(obj)).forEach((key) => {
+        const descriptor = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(obj), key);
+        if (descriptor) {
+            if (typeof descriptor.value === 'function' && key !== 'constructor') {
+                // 原型链上的方法
+                boundObj[key] = descriptor.value.bind(obj);
+            }
+            else if (descriptor.get) {
+                // 原型链上的 getter 属性 - 绑定 this 上下文到原始对象
+                Object.defineProperty(boundObj, key, {
+                    get: function () {
+                        return descriptor.get.call(obj);
+                    },
+                    enumerable: descriptor.enumerable,
+                    configurable: descriptor.configurable
+                });
+            }
+        }
+    });
+    // 处理实例上的方法，包括 getter 属性
+    Object.getOwnPropertyNames(obj).forEach((key) => {
+        const descriptor = Object.getOwnPropertyDescriptor(obj, key);
+        if (descriptor) {
+            if (typeof descriptor.value === 'function') {
+                // 普通方法
+                boundObj[key] = descriptor.value.bind(obj);
+            }
+            else if (descriptor.get) {
+                // getter 属性 - 绑定 this 上下文到原始对象
+                Object.defineProperty(boundObj, key, {
+                    get: function () {
+                        return descriptor.get.call(obj);
+                    },
+                    enumerable: descriptor.enumerable,
+                    configurable: descriptor.configurable
+                });
+            }
+        }
+    });
+    return boundObj;
+}

package/hooks/useChain.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useChain = void 0;
-const useWalletManager_1 = require("./useWalletManager");
 const core_1 = require("@interchain-kit/core");
 const useSigningClient_1 = require("./useSigningClient");
+const useWalletManager_1 = require("./useWalletManager");
 const useWalletModal_1 = require("./useWalletModal");
 const useChain = (chainName) => {
-    const { assetLists, currentWalletName, disconnect, setCurrentChainName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount, getStatefulWalletByName } = (0, useWalletManager_1.useWalletManager)();
+    const { currentWalletName, disconnect, setCurrentChainName, getChainByName, getChainWalletState, getChainLogoUrl, getSigningClient, getRpcEndpoint, getChainWalletByName, getAssetListByName } = (0, useWalletManager_1.useWalletManager)();
     const chain = getChainByName(chainName);
     if (!chain) {
         throw new core_1.ChainNameNotExist(chainName);
     }
-    const assetList = assetLists.find(a => a.chainName === chainName);
-    const wallet = getStatefulWalletByName(currentWalletName);
+    const assetList = getAssetListByName(chainName);
+    const wallet = getChainWalletByName(currentWalletName, chain.chainName);
     const chainWalletStateToShow = getChainWalletState(currentWalletName, chainName);
     const { open, close } = (0, useWalletModal_1.useWalletModal)();
     const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = (0, useSigningClient_1.useSigningClient)(chainName, currentWalletName);

package/hooks/useChainWallet.d.ts

@@ -1,2 +1,2 @@
-import { UseChainWalletReturnType } from "../types/chain";
+import { UseChainWalletReturnType } from '../types/chain';
 export declare const useChainWallet: (chainName: string, walletName: string) => UseChainWalletReturnType;

package/hooks/useChainWallet.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useChainWallet = void 0;
-const useWalletManager_1 = require("./useWalletManager");
 const useSigningClient_1 = require("./useSigningClient");
+const useWalletManager_1 = require("./useWalletManager");
 const useChainWallet = (chainName, walletName) => {
-    const { assetLists, disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount, getStatefulWalletByName } = (0, useWalletManager_1.useWalletManager)();
+    const { disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getChainWalletByName, getAssetListByName } = (0, useWalletManager_1.useWalletManager)();
     const chain = getChainByName(chainName);
-    const wallet = getStatefulWalletByName(walletName);
-    const assetList = assetLists.find(a => a.chainName === chainName);
+    const wallet = getChainWalletByName(walletName, chainName);
+    const assetList = getAssetListByName(chainName);
     const chainWalletStateToShow = getChainWalletState(walletName, chainName);
     const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = (0, useSigningClient_1.useSigningClient)(chainName, walletName);
     return {

package/hooks/useForceUpdate.d.ts

@@ -0,0 +1 @@
+export declare const useForceUpdate: () => () => void;

package/hooks/useForceUpdate.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useForceUpdate = void 0;
+const react_1 = require("react");
+const useForceUpdate = () => {
+    const [, setState] = (0, react_1.useState)(0);
+    return () => setState((prev) => prev + 1);
+};
+exports.useForceUpdate = useForceUpdate;

package/hooks/useSigningClient.js

@@ -1,9 +1,9 @@
 "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 useAsync_1 = require("./useAsync");
+const useWalletManager_1 = require("./useWalletManager");
 const useSigningClient = (chainName, walletName) => {
     const { getSigningClient, getChainWalletState, getRpcEndpoint, isReady } = (0, useWalletManager_1.useWalletManager)();
     const chainWalletState = getChainWalletState(walletName, chainName);

package/hooks/useWalletManager.d.ts

@@ -1 +1 @@
-export declare const useWalletManager: () => import("..").InterchainStore;
+export declare const useWalletManager: () => import("../utils/bindContext").BoundObject<import("@interchain-kit/store").WalletManagerStore>;

package/hooks/useWalletManager.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useWalletManager = void 0;
+const react_1 = require("react");
 const provider_1 = require("../provider");
-const zustand_1 = require("zustand");
+const bindContext_1 = require("../utils/bindContext");
+const useForceUpdate_1 = require("./useForceUpdate");
 const useWalletManager = () => {
-    const store = (0, provider_1.useInterchainWalletContext)();
-    return (0, zustand_1.useStore)(store);
+    const walletManager = (0, provider_1.useInterchainWalletContext)();
+    const forceUpdate = (0, useForceUpdate_1.useForceUpdate)();
+    (0, react_1.useEffect)(() => {
+        const unsubscribe = walletManager.subscribe(() => forceUpdate());
+        return () => unsubscribe();
+    }, []);
+    const wmToReturn = (0, bindContext_1.bindAllMethods)(walletManager);
+    return wmToReturn;
 };
 exports.useWalletManager = useWalletManager;

package/index.d.ts

@@ -1,6 +1,5 @@
-export * from './provider';
-export * from './hooks';
-export * from './types';
 export * from './enum';
+export * from './hooks';
 export * from './modal';
-export * from './store';
+export * from './provider';
+export * from './types';

package/index.js

@@ -14,9 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./provider"), exports);
-__exportStar(require("./hooks"), exports);
-__exportStar(require("./types"), exports);
 __exportStar(require("./enum"), exports);
+__exportStar(require("./hooks"), exports);
 __exportStar(require("./modal"), exports);
-__exportStar(require("./store"), exports);
+__exportStar(require("./provider"), exports);
+__exportStar(require("./types"), exports);

package/modal/modal.d.ts

@@ -1,11 +1,11 @@
-import { ReactElement } from "react";
 import { DownloadInfo } from "@interchain-kit/core";
-import { Wallet as InterchainUIWalletType, ThemeProviderProps } from "@interchain-ui/react";
-import { StatefulWallet } from "../store/stateful-wallet";
+import { ThemeProviderProps, Wallet as InterchainUIWalletType } from "@interchain-ui/react";
+import { ReactElement } from "react";
+import { WalletStore } from "@interchain-kit/store/wallet-manager/wallet-store";
 export type WalletModalProps = {
     isOpen: boolean;
-    wallets: StatefulWallet[];
-    currentWallet?: StatefulWallet;
+    wallets: WalletStore[];
+    currentWallet?: WalletStore;
     open: () => void;
     close: () => void;
 };
@@ -24,7 +24,7 @@ export type WalletModalElementProps = {
     wallets: InterchainUIWalletType[];
     username: string;
     address: string;
-    currentWallet?: StatefulWallet;
+    currentWallet?: WalletStore;
     isConnecting: boolean;
     isConnected: boolean;
     isRejected: boolean;
@@ -34,7 +34,7 @@ export type WalletModalElementProps = {
     open: () => void;
     close: () => void;
     disconnect: () => void;
-    onSelectWallet: (wallet: StatefulWallet) => void;
+    onSelectWallet: (wallet: WalletStore) => void;
     onBack: () => void;
     onReconnect: () => void;
     getDownloadLink: (walletName: string) => DownloadInfo;

package/modal/modal.js

@@ -2,18 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModalRenderer = exports.WalletModalElement = exports.InterchainWalletModal = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const views_1 = require("./views");
-const react_1 = require("react");
 const core_1 = require("@interchain-kit/core");
-const react_2 = require("@interchain-ui/react");
+const react_1 = require("@interchain-ui/react");
+const react_2 = require("react");
 const hooks_1 = require("../hooks");
 const utils_1 = require("../utils");
+const views_1 = require("./views");
 const InterchainWalletModal = ({ 
 // ==== Custom modal styles
 modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, modalThemeProviderProps, }) => {
-    const [shouldShowList, setShouldShowList] = (0, react_1.useState)(false);
+    const [shouldShowList, setShouldShowList] = (0, react_2.useState)(false);
     const { modalIsOpen: isOpen, walletConnectQRCodeUri, wallets: statefulWallets, getChainWalletState, currentWalletName, currentChainName, openModal: open, closeModal: close, chains, setCurrentWalletName, getDownloadLink, getEnv, } = (0, hooks_1.useWalletManager)();
-    const [walletToConnect, setWalletToConnect] = (0, react_1.useState)(null);
+    const [walletToConnect, setWalletToConnect] = (0, react_2.useState)(null);
     const walletsForUI = statefulWallets.map((w) => (0, utils_1.transferToWalletUISchema)(w));
     const chainNameToConnect = currentChainName || chains[0].chainName;
     const chainToConnect = chains.find((chain) => chain.chainName === chainNameToConnect);
@@ -36,11 +36,11 @@ modalContainerClassName, modalContentClassName, modalChildrenClassName, modalCon
     const onReconnect = () => {
         currentWallet.connect(chainToConnect.chainId);
     };
-    return ((0, jsx_runtime_1.jsx)(react_2.ThemeProvider, { ...modalThemeProviderProps, children: (0, jsx_runtime_1.jsx)(exports.WalletModalElement, { shouldShowList: shouldShowList, username: account?.username, address: account?.address, disconnect: disconnect, isOpen: isOpen, open: open, close: handleCloseModal, wallets: walletsForUI, walletConnectQRCodeUri: walletConnectQRCodeUri, currentWallet: walletToShow, isConnecting: walletToShow?.walletState === core_1.WalletState.Connecting, isConnected: walletToShow?.walletState === core_1.WalletState.Connected, isRejected: walletToShow?.walletState === core_1.WalletState.Rejected, isDisconnected: walletToShow?.walletState === core_1.WalletState.Disconnected, isNotExist: walletToShow?.walletState === core_1.WalletState.NotExist, errorMessage: errorMessage, onSelectWallet: (w) => onSelectWallet(w), onBack: () => setShouldShowList(true), onReconnect: () => onSelectWallet(walletToShow), getDownloadLink: () => getDownloadLink(walletToShow?.info.name), getEnv: getEnv, modalContainerClassName: modalContainerClassName, modalContentClassName: modalContentClassName, modalChildrenClassName: modalChildrenClassName, modalContentStyles: modalContentStyles, modalThemeProviderProps: modalThemeProviderProps }) }));
+    return ((0, jsx_runtime_1.jsx)(react_1.ThemeProvider, { ...modalThemeProviderProps, children: (0, jsx_runtime_1.jsx)(exports.WalletModalElement, { shouldShowList: shouldShowList, username: account?.username, address: account?.address, disconnect: disconnect, isOpen: isOpen, open: open, close: handleCloseModal, wallets: walletsForUI, walletConnectQRCodeUri: walletConnectQRCodeUri, currentWallet: walletToShow, isConnecting: walletToShow?.walletState === core_1.WalletState.Connecting, isConnected: walletToShow?.walletState === core_1.WalletState.Connected, isRejected: walletToShow?.walletState === core_1.WalletState.Rejected, isDisconnected: walletToShow?.walletState === core_1.WalletState.Disconnected, isNotExist: walletToShow?.walletState === core_1.WalletState.NotExist, errorMessage: errorMessage, onSelectWallet: (w) => onSelectWallet(w), onBack: () => setShouldShowList(true), onReconnect: () => onSelectWallet(walletToShow), getDownloadLink: () => getDownloadLink(walletToShow?.info.name), getEnv: getEnv, modalContainerClassName: modalContainerClassName, modalContentClassName: modalContentClassName, modalChildrenClassName: modalChildrenClassName, modalContentStyles: modalContentStyles, modalThemeProviderProps: modalThemeProviderProps }) }));
 };
 exports.InterchainWalletModal = InterchainWalletModal;
 const WalletModalElement = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, modalThemeProviderProps, modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, }) => {
-    const { header, content } = (0, react_1.useMemo)(() => {
+    const { header, content } = (0, react_2.useMemo)(() => {
         if (shouldShowList ||
             (isDisconnected && currentWallet.errorMessage === "")) {
             return {
@@ -100,7 +100,7 @@ const WalletModalElement = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wa
         wallets,
         isOpen,
     ]);
-    return ((0, jsx_runtime_1.jsx)(react_2.ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, modalContainerClassName: modalContainerClassName, modalContentClassName: modalContentClassName, modalChildrenClassName: modalChildrenClassName, modalContentStyles: modalContentStyles, children: content }));
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, modalContainerClassName: modalContainerClassName, modalContentClassName: modalContentClassName, modalChildrenClassName: modalChildrenClassName, modalContentStyles: modalContentStyles, children: content }));
 };
 exports.WalletModalElement = WalletModalElement;
 const ModalRenderer = ({ walletModal: ProvidedWalletModal, }) => {

package/modal/views/Error.d.ts

@@ -1,10 +1,10 @@
-import { StatefulWallet } from "../../store/stateful-wallet";
+import { WalletStore } from "@interchain-kit/store";
 export declare const ErrorHeader: ({ wallet, close, onBack, }: {
-    wallet: StatefulWallet;
+    wallet: WalletStore;
     close: () => void;
     onBack: () => void;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const ErrorContent: ({ wallet, onBack, }: {
-    wallet: StatefulWallet;
+    wallet: WalletStore;
     onBack: () => void;
 }) => import("react/jsx-runtime").JSX.Element;

package/modal/views/NotExist.d.ts

@@ -1,12 +1,12 @@
 import { DownloadInfo } from "@interchain-kit/core";
-import { StatefulWallet } from "../../store/stateful-wallet";
+import { WalletStore } from "@interchain-kit/store";
 export declare const NotExistHeader: ({ wallet, close, onBack, }: {
-    wallet: StatefulWallet;
+    wallet: WalletStore;
     close: () => void;
     onBack: () => void;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const NotExistContent: ({ wallet, getDownloadLink, getEnv, }: {
-    wallet: StatefulWallet;
+    wallet: WalletStore;
     getDownloadLink: (walletName: string) => DownloadInfo;
     getEnv: () => {
         browser?: string;

package/modal/views/Reject.d.ts

@@ -1,10 +1,10 @@
-import { StatefulWallet } from "../../store/stateful-wallet";
+import { WalletStore } from "@interchain-kit/store";
 export declare const RejectHeader: ({ wallet, close, onBack, }: {
-    wallet: StatefulWallet;
+    wallet: WalletStore;
     close: () => void;
     onBack: () => void;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const RejectContent: ({ wallet, onReconnect, }: {
-    wallet: StatefulWallet;
+    wallet: WalletStore;
     onReconnect: () => void;
 }) => import("react/jsx-runtime").JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.3.46",
+  "version": "0.3.47",
   "author": "Hyperweb <developers@hyperweb.io>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -35,14 +35,15 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/types": "^2.0.1",
-    "@interchain-kit/core": "0.3.46",
+    "@interchain-kit/core": "0.3.47",
+    "@interchain-kit/store": "0.3.47",
     "@interchain-ui/react": "^1.26.3",
-    "@interchainjs/cosmos": "1.17.1",
-    "@interchainjs/cosmos-types": "1.17.1",
-    "@interchainjs/types": "1.17.1",
+    "@interchainjs/cosmos": "1.17.3",
+    "@interchainjs/cosmos-types": "1.17.3",
+    "@interchainjs/types": "1.17.3",
     "@react-icons/all-files": "^4.1.0",
     "@walletconnect/types": "^2.17.3",
-    "interchainjs": "1.17.1",
+    "interchainjs": "1.17.3",
     "jest-transform-stub": "^2.0.0",
     "postcss": "^8.5.6",
     "postcss-cli": "^11.0.1",
@@ -69,5 +70,5 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
-  "gitHead": "15b40f1b694af468aa8a92fedd347a127fefd3ab"
+  "gitHead": "4583b572672abd85a0918f39f534a5bf9312c261"
 }

package/provider.d.ts

@@ -1,10 +1,8 @@
-import React, { ReactElement } from "react";
-import { BaseWallet, SignerOptions, EndpointOptions } from "@interchain-kit/core";
 import { AssetList, Chain } from "@chain-registry/types";
+import { BaseWallet, EndpointOptions, SignerOptions } from "@interchain-kit/core";
+import { WalletManagerStore } from "@interchain-kit/store";
+import React, { ReactElement } from "react";
 import { WalletModalProps } from "./modal";
-import { InterchainStore } from "./store";
-import { StoreApi } from "zustand";
-type InterchainWalletContextType = StoreApi<InterchainStore>;
 type InterchainWalletProviderProps = {
     chains: Chain[];
     assetLists: AssetList[];
@@ -15,5 +13,5 @@ type InterchainWalletProviderProps = {
     walletModal?: (props: WalletModalProps) => ReactElement;
 };
 export declare const ChainProvider: ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, walletModal: ProviderWalletModal, }: InterchainWalletProviderProps) => import("react/jsx-runtime").JSX.Element;
-export declare const useInterchainWalletContext: () => InterchainWalletContextType;
+export declare const useInterchainWalletContext: () => WalletManagerStore;
 export {};

package/provider.js

@@ -2,19 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useInterchainWalletContext = exports.ChainProvider = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const store_1 = require("@interchain-kit/store");
 const react_1 = require("react");
 const react_2 = require("react");
-const core_1 = require("@interchain-kit/core");
 const modal_1 = require("./modal");
-const store_1 = require("./store");
 const InterchainWalletContext = (0, react_2.createContext)(null);
 const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, walletModal: ProviderWalletModal, }) => {
     const store = (0, react_1.useRef)(null);
     if (!store.current) {
-        store.current = (0, store_1.createInterchainStore)(new core_1.WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions));
+        store.current = new store_1.WalletManagerStore(chains, assetLists, wallets, signerOptions, endpointOptions);
     }
     (0, react_1.useEffect)(() => {
-        store.current.getState().init();
+        store.current.init();
     }, []);
     return ((0, jsx_runtime_1.jsxs)(InterchainWalletContext.Provider, { value: store.current, children: [children, ProviderWalletModal && ((0, jsx_runtime_1.jsx)(modal_1.ModalRenderer, { walletModal: ProviderWalletModal }))] }));
 };

package/types/chain.d.ts

@@ -2,7 +2,7 @@ import { HttpEndpoint } from '@interchainjs/types';
 import { Chain, AssetList } from '@chain-registry/types';
 import { WalletState } from '@interchain-kit/core';
 import { SigningClient } from './sign-client';
-import { StatefulWallet } from '../store/stateful-wallet';
+import { ChainWalletStore } from '@interchain-kit/store';
 export type CosmosKitUseChainReturnType = {
     connect: () => void;
     disconnect: () => void;
@@ -18,14 +18,31 @@ export type UseChainReturnType = {
     chain: Chain;
     assetList: AssetList;
     address: string;
-    wallet: StatefulWallet;
+    wallet: ChainWalletStore;
     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 UseChainWalletReturnType = {
+    logoUrl: string | undefined;
+    chain: Chain;
+    assetList: AssetList;
+    address: string;
+    wallet: ChainWalletStore;
+    rpcEndpoint: string | HttpEndpoint | unknown;
+    getSigningClient: () => Promise<SigningClient>;
+    signingClient: SigningClient | null;
+    isSigningClientLoading: boolean;
+    signingClientError: Error | unknown | null;
+    connect: () => Promise<void>;
+    disconnect: () => Promise<void>;
+    getRpcEndpoint: () => Promise<string | HttpEndpoint>;
+    status: WalletState;
+    username: string;
+    message: string;
+};
 export type UseInterchainClientReturnType = {
     signingClient: SigningClient | null;
     error: string | unknown | null;

package/utils/bindContext.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 绑定上下文工具函数的类型定义
+ */
+/**
+ * 可绑定方法的对象类型
+ */
+export interface BindableObject {
+    [key: string]: any;
+}
+/**
+ * 绑定后的对象类型，保持原始对象的类型结构
+ */
+export type BoundObject<T> = {
+    [K in keyof T]: T[K] extends (...args: infer A) => infer R ? (...args: A) => R : T[K];
+};
+/**
+ * 绑定对象的所有方法，确保 getter 属性能正确访问原始对象的上下文
+ * @param obj 要绑定方法的对象
+ * @returns 绑定后的对象副本
+ */
+export declare function bindAllMethods<T extends BindableObject>(obj: T): BoundObject<T>;