@interchain-kit/react 0.0.1-beta.45 → 0.0.1-beta.46

package/esm/hooks/index.js

@@ -6,3 +6,4 @@ export * from './useConnect';
 export * from './useChainWallet';
 export * from './useConfig';
 export * from './useOfflineSigner';
+export * from './useRpcEndpoint';

package/esm/hooks/useAccount.js

@@ -5,14 +5,22 @@ export const useAccount = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
     useEffect(() => {
-        if (chainAccount?.walletState === WalletState.Connected && !chainAccount?.account && chainName && walletName) {
+        if (chainAccount?.walletState === WalletState.Connected) {
             chainAccount.getAccount();
         }
-    }, [chainAccount?.walletState, chainName, walletName]);
+    }, [chainName, walletName, chainAccount?.walletState]);
+    if (chainAccount?.walletState === WalletState.Connected) {
+        return {
+            account: chainAccount?.account,
+            isLoading: chainAccount.getAccountState().loading,
+            error: chainAccount.getAccountState().error,
+            getAccount: () => chainAccount?.getAccount()
+        };
+    }
     return {
-        account: chainAccount?.account || undefined,
-        isLoading: chainAccount?.getAccountState().loading || false,
-        error: chainAccount?.getAccountState().error || undefined,
-        getAccount: chainAccount?.getAccount
+        account: undefined,
+        isLoading: false,
+        error: null,
+        getAccount: () => chainAccount?.getAccount()
     };
 };

package/esm/hooks/useChain.js

@@ -4,6 +4,7 @@ import { useCurrentWallet } from './useCurrentWallet';
 import { useInterchainClient } from './useInterchainClient';
 import { useWalletModal } from "../modal";
 import { useRpcEndpoint } from "./useRpcEndpoint";
+import { WalletState } from "@interchain-kit/core";
 export const useChain = (chainName) => {
     const walletManager = useWalletManager();
     const currentWallet = useCurrentWallet();
@@ -23,6 +24,26 @@ export const useChain = (chainName) => {
         username: accountHook.account?.username,
         message: currentWallet?.errorMessage
     };
+    if (currentWallet && chainAccount?.walletState === WalletState.Connected) {
+        return {
+            logoUrl: walletManager.getChainLogoUrl(chainName),
+            chain: chainAccount?.chain,
+            assetList: chainAccount?.assetList,
+            address: accountHook.account?.address,
+            wallet: currentWallet,
+            rpcEndpoint: rpcEndpointHook.rpcEndpoint,
+            ...cosmosKitUserChainReturnType, //for migration cosmos kit
+            signingClient: signingClientHook.signingClient,
+            getSigningClient: () => signingClientHook.getSigningClient(),
+            isRpcEndpointLoading: rpcEndpointHook.isLoading,
+            isAccountLoading: accountHook.isLoading,
+            isSigningClientLoading: signingClientHook.isLoading,
+            isLoading: rpcEndpointHook.isLoading || accountHook.isLoading || signingClientHook.isLoading,
+            getRpcEndpointError: rpcEndpointHook.error,
+            getSigningClientError: signingClientHook.error,
+            getAccountError: accountHook.error
+        };
+    }
     return {
         logoUrl: walletManager.getChainLogoUrl(chainName),
         chain: chainAccount?.chain,
@@ -32,6 +53,7 @@ export const useChain = (chainName) => {
         rpcEndpoint: rpcEndpointHook.rpcEndpoint,
         ...cosmosKitUserChainReturnType, //for migration cosmos kit
         signingClient: signingClientHook.signingClient,
+        getSigningClient: () => signingClientHook.getSigningClient(),
         isRpcEndpointLoading: rpcEndpointHook.isLoading,
         isAccountLoading: accountHook.isLoading,
         isSigningClientLoading: signingClientHook.isLoading,

package/esm/hooks/useChainWallet.js

@@ -23,6 +23,7 @@ export const useChainWallet = (chainName, walletName) => {
         address: accountHook.account?.address,
         wallet: walletRepository,
         signingClient: signingClientHook.signingClient,
+        getSigningClient: () => signingClientHook.getSigningClient(),
         isRpcEndpointLoading: rpcEndpointHook.isLoading,
         isAccountLoading: accountHook.isLoading,
         isSigningClientLoading: signingClientHook.isLoading,

package/esm/hooks/useInterchainClient.js

@@ -1,18 +1,20 @@
-import { useEffect } from "react";
 import { useWalletManager } from './useWalletManager';
 import { WalletState } from '@interchain-kit/core';
 export const useInterchainClient = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
-    useEffect(() => {
-        if (chainAccount?.walletState === WalletState.Connected && !chainAccount.signingClient && chainName && walletName) {
-            chainAccount.getSigningClient();
-        }
-    }, [chainAccount?.walletState, chainName, walletName]);
+    if (chainAccount && chainAccount.walletState === WalletState.Connected) {
+        return {
+            signingClient: chainAccount?.signingClient,
+            isLoading: chainAccount?.getSigningClientState().loading,
+            error: chainAccount?.getSigningClientState().error,
+            getSigningClient: () => chainAccount?.getSigningClient()
+        };
+    }
     return {
-        signingClient: chainAccount?.signingClient,
-        isLoading: chainAccount?.getSigningClientState().loading,
-        error: chainAccount?.getSigningClientState().error,
-        getSigningClient: chainAccount?.getSigningClient
+        signingClient: undefined,
+        isLoading: false,
+        error: undefined,
+        getSigningClient: () => chainAccount?.getSigningClient()
     };
 };

package/esm/hooks/useOfflineSigner.js

@@ -1,18 +1,20 @@
-import { useEffect } from "react";
 import { useWalletManager } from "./useWalletManager";
 import { WalletState } from "@interchain-kit/core";
 export const useOfflineSigner = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
-    useEffect(() => {
-        if (chainAccount?.walletState === WalletState.Connected && !chainAccount.offlineSigner && chainName && walletName) {
-            chainAccount.getOfflineSigner();
-        }
-    }, [chainAccount?.walletState, chainName, walletName]);
+    if (chainAccount && chainAccount.walletState === WalletState.Connected) {
+        return {
+            offlineSigner: chainAccount?.offlineSigner,
+            isLoading: chainAccount?.getOfflineSignerState().loading,
+            error: chainAccount?.getOfflineSignerState().error,
+            getOfflineSigner: () => chainAccount?.getOfflineSigner()
+        };
+    }
     return {
-        offlineSigner: chainAccount?.offlineSigner,
-        isLoading: chainAccount?.getOfflineSignerState().loading,
-        error: chainAccount?.getOfflineSignerState().error,
-        getOfflineSigner: chainAccount?.getOfflineSigner
+        offlineSigner: undefined,
+        isLoading: false,
+        error: undefined,
+        getOfflineSigner: () => chainAccount?.getOfflineSigner()
     };
 };

package/esm/hooks/useRpcEndpoint.js

@@ -5,14 +5,22 @@ export const useRpcEndpoint = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
     useEffect(() => {
-        if (chainAccount?.walletState === WalletState.Connected && !chainAccount.rpcEndpoint && chainName && walletName) {
+        if (chainAccount?.walletState === WalletState.Connected) {
             chainAccount.getRpcEndpoint();
         }
-    }, [chainAccount?.walletState, walletName, chainName]);
+    }, [chainName, walletName, chainAccount?.walletState]);
+    if (chainAccount && chainAccount.walletState === WalletState.Connected) {
+        return {
+            rpcEndpoint: chainAccount?.rpcEndpoint,
+            isLoading: chainAccount?.getRpcEndpointState().loading,
+            error: chainAccount?.getRpcEndpointState().error,
+            getRpcEndpoint: () => chainAccount?.getRpcEndpoint()
+        };
+    }
     return {
-        rpcEndpoint: chainAccount?.rpcEndpoint,
-        isLoading: chainAccount?.getRpcEndpointState().loading,
-        error: chainAccount?.getRpcEndpointState().error,
-        getRpcEndpoint: chainAccount?.getRpcEndpoint
+        rpcEndpoint: undefined,
+        isLoading: false,
+        error: undefined,
+        getRpcEndpoint: () => chainAccount?.getRpcEndpoint()
     };
 };

package/esm/provider.js

@@ -8,9 +8,9 @@ export const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endp
     const [_, forceRender] = useState({});
     const walletManager = useMemo(() => {
         const wm = new WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions);
-        return wm.getObservableObj(() => {
-            forceRender({});
-        });
+        const observable = wm.getObservableObj();
+        observable.subscribe(() => forceRender({}));
+        return observable;
     }, []);
     useEffect(() => {
         walletManager.init();

package/hooks/index.d.ts

@@ -6,3 +6,4 @@ export * from './useConnect';
 export * from './useChainWallet';
 export * from './useConfig';
 export * from './useOfflineSigner';
+export * from './useRpcEndpoint';

package/hooks/index.js

@@ -22,3 +22,4 @@ __exportStar(require("./useConnect"), exports);
 __exportStar(require("./useChainWallet"), exports);
 __exportStar(require("./useConfig"), exports);
 __exportStar(require("./useOfflineSigner"), exports);
+__exportStar(require("./useRpcEndpoint"), exports);

package/hooks/useAccount.d.ts

@@ -1,6 +1,6 @@
 export declare const useAccount: (chainName: string, walletName: string) => {
-    account: any;
-    isLoading: any;
-    error: any;
-    getAccount: any;
+    account: import("@interchain-kit/core").WalletAccount;
+    isLoading: boolean;
+    error: Error;
+    getAccount: () => Promise<import("@interchain-kit/core").WalletAccount>;
 };

package/hooks/useAccount.js

@@ -8,15 +8,23 @@ const useAccount = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
     (0, react_1.useEffect)(() => {
-        if (chainAccount?.walletState === core_1.WalletState.Connected && !chainAccount?.account && chainName && walletName) {
+        if (chainAccount?.walletState === core_1.WalletState.Connected) {
             chainAccount.getAccount();
         }
-    }, [chainAccount?.walletState, chainName, walletName]);
+    }, [chainName, walletName, chainAccount?.walletState]);
+    if (chainAccount?.walletState === core_1.WalletState.Connected) {
+        return {
+            account: chainAccount?.account,
+            isLoading: chainAccount.getAccountState().loading,
+            error: chainAccount.getAccountState().error,
+            getAccount: () => chainAccount?.getAccount()
+        };
+    }
     return {
-        account: chainAccount?.account || undefined,
-        isLoading: chainAccount?.getAccountState().loading || false,
-        error: chainAccount?.getAccountState().error || undefined,
-        getAccount: chainAccount?.getAccount
+        account: undefined,
+        isLoading: false,
+        error: null,
+        getAccount: () => chainAccount?.getAccount()
     };
 };
 exports.useAccount = useAccount;

package/hooks/useChain.js

@@ -7,6 +7,7 @@ const useCurrentWallet_1 = require("./useCurrentWallet");
 const useInterchainClient_1 = require("./useInterchainClient");
 const modal_1 = require("../modal");
 const useRpcEndpoint_1 = require("./useRpcEndpoint");
+const core_1 = require("@interchain-kit/core");
 const useChain = (chainName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const currentWallet = (0, useCurrentWallet_1.useCurrentWallet)();
@@ -26,6 +27,26 @@ const useChain = (chainName) => {
         username: accountHook.account?.username,
         message: currentWallet?.errorMessage
     };
+    if (currentWallet && chainAccount?.walletState === core_1.WalletState.Connected) {
+        return {
+            logoUrl: walletManager.getChainLogoUrl(chainName),
+            chain: chainAccount?.chain,
+            assetList: chainAccount?.assetList,
+            address: accountHook.account?.address,
+            wallet: currentWallet,
+            rpcEndpoint: rpcEndpointHook.rpcEndpoint,
+            ...cosmosKitUserChainReturnType, //for migration cosmos kit
+            signingClient: signingClientHook.signingClient,
+            getSigningClient: () => signingClientHook.getSigningClient(),
+            isRpcEndpointLoading: rpcEndpointHook.isLoading,
+            isAccountLoading: accountHook.isLoading,
+            isSigningClientLoading: signingClientHook.isLoading,
+            isLoading: rpcEndpointHook.isLoading || accountHook.isLoading || signingClientHook.isLoading,
+            getRpcEndpointError: rpcEndpointHook.error,
+            getSigningClientError: signingClientHook.error,
+            getAccountError: accountHook.error
+        };
+    }
     return {
         logoUrl: walletManager.getChainLogoUrl(chainName),
         chain: chainAccount?.chain,
@@ -35,6 +56,7 @@ const useChain = (chainName) => {
         rpcEndpoint: rpcEndpointHook.rpcEndpoint,
         ...cosmosKitUserChainReturnType, //for migration cosmos kit
         signingClient: signingClientHook.signingClient,
+        getSigningClient: () => signingClientHook.getSigningClient(),
         isRpcEndpointLoading: rpcEndpointHook.isLoading,
         isAccountLoading: accountHook.isLoading,
         isSigningClientLoading: signingClientHook.isLoading,

package/hooks/useChainWallet.js

@@ -26,6 +26,7 @@ const useChainWallet = (chainName, walletName) => {
         address: accountHook.account?.address,
         wallet: walletRepository,
         signingClient: signingClientHook.signingClient,
+        getSigningClient: () => signingClientHook.getSigningClient(),
         isRpcEndpointLoading: rpcEndpointHook.isLoading,
         isAccountLoading: accountHook.isLoading,
         isSigningClientLoading: signingClientHook.isLoading,

package/hooks/useConfig.d.ts

@@ -1,4 +1,5 @@
 import { AssetList, Chain } from "@chain-registry/v2-types";
+import { EndpointOptions, SignerOptions } from "@interchain-kit/core";
 export declare const useConfig: () => {
     updateChains: (chains: Chain[]) => Chain[];
     updateAssetLists: (assetLists: AssetList[]) => AssetList[];

package/hooks/useCurrentWallet.d.ts

@@ -1 +1,2 @@
+import { WalletRepository } from '@interchain-kit/core/wallet-repository';
 export declare const useCurrentWallet: () => WalletRepository;

package/hooks/useInterchainClient.d.ts

@@ -1,6 +1,6 @@
 export declare const useInterchainClient: (chainName: string, walletName: string) => {
-    signingClient: any;
-    isLoading: any;
-    error: any;
-    getSigningClient: any;
+    signingClient: import("@interchainjs/cosmos/signing-client").SigningClient;
+    isLoading: boolean;
+    error: Error;
+    getSigningClient: () => Promise<import("@interchainjs/cosmos/signing-client").SigningClient>;
 };

package/hooks/useInterchainClient.js

@@ -1,22 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useInterchainClient = void 0;
-const react_1 = require("react");
 const useWalletManager_1 = require("./useWalletManager");
 const core_1 = require("@interchain-kit/core");
 const useInterchainClient = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
-    (0, react_1.useEffect)(() => {
-        if (chainAccount?.walletState === core_1.WalletState.Connected && !chainAccount.signingClient && chainName && walletName) {
-            chainAccount.getSigningClient();
-        }
-    }, [chainAccount?.walletState, chainName, walletName]);
+    if (chainAccount && chainAccount.walletState === core_1.WalletState.Connected) {
+        return {
+            signingClient: chainAccount?.signingClient,
+            isLoading: chainAccount?.getSigningClientState().loading,
+            error: chainAccount?.getSigningClientState().error,
+            getSigningClient: () => chainAccount?.getSigningClient()
+        };
+    }
     return {
-        signingClient: chainAccount?.signingClient,
-        isLoading: chainAccount?.getSigningClientState().loading,
-        error: chainAccount?.getSigningClientState().error,
-        getSigningClient: chainAccount?.getSigningClient
+        signingClient: undefined,
+        isLoading: false,
+        error: undefined,
+        getSigningClient: () => chainAccount?.getSigningClient()
     };
 };
 exports.useInterchainClient = useInterchainClient;

package/hooks/useOfflineSigner.d.ts

@@ -1,6 +1,6 @@
 export declare const useOfflineSigner: (chainName: string, walletName: string) => {
-    offlineSigner: any;
-    isLoading: any;
-    error: any;
-    getOfflineSigner: any;
+    offlineSigner: import("@interchainjs/cosmos/types/wallet").OfflineSigner;
+    isLoading: boolean;
+    error: Error;
+    getOfflineSigner: () => import("@interchainjs/cosmos/types/wallet").ICosmosGenericOfflineSigner;
 };

package/hooks/useOfflineSigner.js

@@ -1,22 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useOfflineSigner = void 0;
-const react_1 = require("react");
 const useWalletManager_1 = require("./useWalletManager");
 const core_1 = require("@interchain-kit/core");
 const useOfflineSigner = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
-    (0, react_1.useEffect)(() => {
-        if (chainAccount?.walletState === core_1.WalletState.Connected && !chainAccount.offlineSigner && chainName && walletName) {
-            chainAccount.getOfflineSigner();
-        }
-    }, [chainAccount?.walletState, chainName, walletName]);
+    if (chainAccount && chainAccount.walletState === core_1.WalletState.Connected) {
+        return {
+            offlineSigner: chainAccount?.offlineSigner,
+            isLoading: chainAccount?.getOfflineSignerState().loading,
+            error: chainAccount?.getOfflineSignerState().error,
+            getOfflineSigner: () => chainAccount?.getOfflineSigner()
+        };
+    }
     return {
-        offlineSigner: chainAccount?.offlineSigner,
-        isLoading: chainAccount?.getOfflineSignerState().loading,
-        error: chainAccount?.getOfflineSignerState().error,
-        getOfflineSigner: chainAccount?.getOfflineSigner
+        offlineSigner: undefined,
+        isLoading: false,
+        error: undefined,
+        getOfflineSigner: () => chainAccount?.getOfflineSigner()
     };
 };
 exports.useOfflineSigner = useOfflineSigner;

package/hooks/useRpcEndpoint.d.ts

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

package/hooks/useRpcEndpoint.js

@@ -8,15 +8,23 @@ const useRpcEndpoint = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
     (0, react_1.useEffect)(() => {
-        if (chainAccount?.walletState === core_1.WalletState.Connected && !chainAccount.rpcEndpoint && chainName && walletName) {
+        if (chainAccount?.walletState === core_1.WalletState.Connected) {
             chainAccount.getRpcEndpoint();
         }
-    }, [chainAccount?.walletState, walletName, chainName]);
+    }, [chainName, walletName, chainAccount?.walletState]);
+    if (chainAccount && chainAccount.walletState === core_1.WalletState.Connected) {
+        return {
+            rpcEndpoint: chainAccount?.rpcEndpoint,
+            isLoading: chainAccount?.getRpcEndpointState().loading,
+            error: chainAccount?.getRpcEndpointState().error,
+            getRpcEndpoint: () => chainAccount?.getRpcEndpoint()
+        };
+    }
     return {
-        rpcEndpoint: chainAccount?.rpcEndpoint,
-        isLoading: chainAccount?.getRpcEndpointState().loading,
-        error: chainAccount?.getRpcEndpointState().error,
-        getRpcEndpoint: chainAccount?.getRpcEndpoint
+        rpcEndpoint: undefined,
+        isLoading: false,
+        error: undefined,
+        getRpcEndpoint: () => chainAccount?.getRpcEndpoint()
     };
 };
 exports.useRpcEndpoint = useRpcEndpoint;

package/hooks/useWalletManager.d.ts

@@ -1 +1,2 @@
+import { WalletManager } from '@interchain-kit/core';
 export declare const useWalletManager: () => WalletManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.0.1-beta.45",
+  "version": "0.0.1-beta.46",
   "author": "cosmology-tech <developers@cosmology.zone>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -33,7 +33,7 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.53.40",
-    "@interchain-kit/core": "0.0.1-beta.45",
+    "@interchain-kit/core": "0.0.1-beta.46",
     "@interchain-ui/react": "1.26.1",
     "@interchainjs/cosmos": "1.6.3",
     "@interchainjs/cosmos-types": "1.6.3",
@@ -48,5 +48,5 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
-  "gitHead": "1d52b0d7c0616c204434fb6a10e8d5a2fca62d92"
+  "gitHead": "c3d891660283751114a218e8abcbc278700442bd"
 }

package/provider.js

@@ -11,9 +11,9 @@ const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endpointOpt
     const [_, forceRender] = (0, react_1.useState)({});
     const walletManager = (0, react_1.useMemo)(() => {
         const wm = new core_1.WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions);
-        return wm.getObservableObj(() => {
-            forceRender({});
-        });
+        const observable = wm.getObservableObj();
+        observable.subscribe(() => forceRender({}));
+        return observable;
     }, []);
     (0, react_1.useEffect)(() => {
         walletManager.init();

package/types/chain.d.ts

@@ -20,6 +20,7 @@ export type UseChainReturnType = {
     wallet: BaseWallet;
     rpcEndpoint: string | HttpEndpoint;
     signingClient: SigningClient;
+    getSigningClient: () => Promise<SigningClient>;
     isRpcEndpointLoading: boolean;
     isAccountLoading: boolean;
     isSigningClientLoading: boolean;

package/utils/wallet.d.ts

@@ -1,6 +1,7 @@
+import { BaseWallet } from "@interchain-kit/core";
 export declare const getWalletInfo: (wallet: BaseWallet) => {
-    name: any;
-    prettyName: any;
+    name: string;
+    prettyName: string;
     logo: string;
     mobileDisabled: boolean;
 };