@interchain-kit/react 0.0.1-beta.1 → 0.0.1-beta.2

package/esm/hooks/useChain.js

@@ -1,30 +1,19 @@
 import { useWalletManager } from "./useWalletManager";
 import { useAccount } from "./useAccount";
 import { useActiveWallet } from './useActiveWallet';
-import { useEffect, useState } from "react";
+import { useInterchainClient } from './useInterchainClient';
 export const useChain = (chainName) => {
     const walletManager = useWalletManager();
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
     const activeWallet = useActiveWallet();
     const account = useAccount(chainName, activeWallet.option.name);
-    const [clientFactory, setClientFactory] = useState();
-    useEffect(() => {
-        walletManager.createClientFactory(activeWallet, chainName).then(clientFactory => {
-            setClientFactory(clientFactory);
-        });
-    }, [chainName, activeWallet, account?.address]);
+    const interchainClient = useInterchainClient(chainName, activeWallet.option.name);
     return {
         chain: chainToShow,
         assetList,
         address: account?.address,
         wallet: activeWallet,
-        getRpcEndpoint: () => walletManager.getRpcEndpoint(activeWallet, chainName),
-        getClient: () => clientFactory.getClient(),
-        getSigningClient: () => clientFactory.getSigningClient(),
-        getCosmwasmClient: () => clientFactory.getCosmwasmClient(),
-        getSigningCosmwasmClient: () => clientFactory.getSigningCosmwasmClient(),
-        getSigningStargateClient: () => clientFactory.getSigningStargateClient(),
-        getStargateClient: () => clientFactory.getStargateClient(),
+        ...interchainClient
     };
 };

package/esm/hooks/useChainWallet.js

@@ -1,36 +1,18 @@
 import { useWalletManager } from "./useWalletManager";
 import { useAccount } from "./useAccount";
-import { useEffect, useState } from "react";
-import { ChainNotExist, WalletNotExist } from "@interChain-kit/core";
+import { useInterchainClient } from "./useInterchainClient";
 export const useChainWallet = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
     const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
     const account = useAccount(chainName, walletName);
-    const [clientFactory, setClientFactory] = useState();
-    useEffect(() => {
-        if (!wallet) {
-            throw new WalletNotExist(walletName);
-        }
-        if (!chainToShow) {
-            throw new ChainNotExist(chainName);
-        }
-        walletManager.createClientFactory(wallet, chainName).then(clientFactory => {
-            setClientFactory(clientFactory);
-        });
-    }, [chainName, walletName, account?.address]);
+    const interchainClient = useInterchainClient(chainName, walletName);
     return {
         chain: chainToShow,
         assetList,
         address: account?.address,
         wallet,
-        getRpcEndpoint: () => walletManager.getRpcEndpoint(wallet, chainName),
-        getClient: () => clientFactory.getClient(),
-        getSigningClient: async () => clientFactory.getSigningClient(),
-        getCosmwasmClient: () => clientFactory.getCosmwasmClient(),
-        getSigningCosmwasmClient: () => clientFactory.getSigningCosmwasmClient(),
-        getSigningStargateClient: () => clientFactory.getSigningStargateClient(),
-        getStargateClient: () => clientFactory.getStargateClient(),
+        ...interchainClient
     };
 };

package/esm/hooks/useInterchainClient.js

@@ -0,0 +1,60 @@
+import { useEffect, useState } from "react";
+import { useWalletManager } from './useWalletManager';
+import { useAccount } from './useAccount';
+export const useInterchainClient = (chainName, walletName) => {
+    const [rpcEndpoint, setRpcEndpoint] = useState();
+    const [signingClient, setSigningClient] = useState(null);
+    const [client, setClient] = useState(null);
+    const [stargateSigningClient, setStargateSigningClient] = useState(null);
+    const [stargateClient, setStargateClient] = useState();
+    const [cosmWasmSigningClient, setCosmWasmSigningClient] = useState(null);
+    const [error, setError] = useState(null);
+    const [isLoading, setIsLoading] = useState(false);
+    const walletManager = useWalletManager();
+    const account = useAccount(chainName, walletName);
+    const initialize = async () => {
+        const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
+        const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
+        if (!wallet) {
+            throw new Error('Wallet not found');
+        }
+        if (!chainToShow) {
+            throw new Error('Chain not found');
+        }
+        try {
+            setIsLoading(true);
+            const rpcEndpoint = await walletManager.getRpcEndpoint(wallet, chainName);
+            setRpcEndpoint(rpcEndpoint);
+            const clientFactory = await walletManager.createClientFactory(wallet, chainName);
+            const client = await clientFactory.getClient();
+            setClient(client);
+            const signingClient = await clientFactory.getSigningClient();
+            setSigningClient(signingClient);
+            const stargateClient = await clientFactory.getStargateClient();
+            setStargateClient(stargateClient);
+            const signingStargateClient = await clientFactory.getSigningStargateClient(chainToShow.bech32Prefix);
+            setStargateSigningClient(signingStargateClient);
+            const signingCosmwasmClient = await clientFactory.getSigningCosmwasmClient();
+            setCosmWasmSigningClient(signingCosmwasmClient);
+        }
+        catch (error) {
+            setError(error);
+        }
+        finally {
+            setIsLoading(false);
+        }
+    };
+    useEffect(() => {
+        initialize();
+    }, [chainName, walletName, account?.address]);
+    return {
+        rpcEndpoint,
+        signingClient,
+        client,
+        stargateSigningClient,
+        stargateClient,
+        cosmWasmSigningClient,
+        error,
+        isLoading
+    };
+};

package/hooks/useChain.js

@@ -4,31 +4,20 @@ exports.useChain = void 0;
 const useWalletManager_1 = require("./useWalletManager");
 const useAccount_1 = require("./useAccount");
 const useActiveWallet_1 = require("./useActiveWallet");
-const react_1 = require("react");
+const useInterchainClient_1 = require("./useInterchainClient");
 const useChain = (chainName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
     const activeWallet = (0, useActiveWallet_1.useActiveWallet)();
     const account = (0, useAccount_1.useAccount)(chainName, activeWallet.option.name);
-    const [clientFactory, setClientFactory] = (0, react_1.useState)();
-    (0, react_1.useEffect)(() => {
-        walletManager.createClientFactory(activeWallet, chainName).then(clientFactory => {
-            setClientFactory(clientFactory);
-        });
-    }, [chainName, activeWallet, account?.address]);
+    const interchainClient = (0, useInterchainClient_1.useInterchainClient)(chainName, activeWallet.option.name);
     return {
         chain: chainToShow,
         assetList,
         address: account?.address,
         wallet: activeWallet,
-        getRpcEndpoint: () => walletManager.getRpcEndpoint(activeWallet, chainName),
-        getClient: () => clientFactory.getClient(),
-        getSigningClient: () => clientFactory.getSigningClient(),
-        getCosmwasmClient: () => clientFactory.getCosmwasmClient(),
-        getSigningCosmwasmClient: () => clientFactory.getSigningCosmwasmClient(),
-        getSigningStargateClient: () => clientFactory.getSigningStargateClient(),
-        getStargateClient: () => clientFactory.getStargateClient(),
+        ...interchainClient
     };
 };
 exports.useChain = useChain;

package/hooks/useChainWallet.d.ts

@@ -1,15 +1,2 @@
-import { AssetList, Chain } from "@chain-registry/v2-types";
-import { BaseWallet } from "@interChain-kit/core";
-export declare const useChainWallet: (chainName: string, walletName: string) => {
-    chain: Chain;
-    assetList: AssetList;
-    address: string;
-    wallet: BaseWallet;
-    getRpcEndpoint: () => Promise<string | import("@cosmjs/tendermint-rpc").HttpEndpoint>;
-    getClient: () => Promise<import("@cosmjs/stargate").StargateClient | import("@cosmjs/cosmwasm-stargate").CosmWasmClient>;
-    getSigningClient: () => Promise<import("@cosmjs/stargate").SigningStargateClient | import("@cosmjs/cosmwasm-stargate").SigningCosmWasmClient>;
-    getCosmwasmClient: () => Promise<import("@cosmjs/cosmwasm-stargate").CosmWasmClient>;
-    getSigningCosmwasmClient: () => Promise<import("@cosmjs/cosmwasm-stargate").SigningCosmWasmClient>;
-    getSigningStargateClient: () => Promise<import("@cosmjs/stargate").SigningStargateClient>;
-    getStargateClient: () => Promise<import("@cosmjs/stargate").StargateClient>;
-};
+import { UseChainReturnType } from "../types/chain";
+export declare const useChainWallet: (chainName: string, walletName: string) => UseChainReturnType;

package/hooks/useChainWallet.js

@@ -3,38 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useChainWallet = void 0;
 const useWalletManager_1 = require("./useWalletManager");
 const useAccount_1 = require("./useAccount");
-const react_1 = require("react");
-const core_1 = require("@interChain-kit/core");
+const useInterchainClient_1 = require("./useInterchainClient");
 const useChainWallet = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
     const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
     const account = (0, useAccount_1.useAccount)(chainName, walletName);
-    const [clientFactory, setClientFactory] = (0, react_1.useState)();
-    (0, react_1.useEffect)(() => {
-        if (!wallet) {
-            throw new core_1.WalletNotExist(walletName);
-        }
-        if (!chainToShow) {
-            throw new core_1.ChainNotExist(chainName);
-        }
-        walletManager.createClientFactory(wallet, chainName).then(clientFactory => {
-            setClientFactory(clientFactory);
-        });
-    }, [chainName, walletName, account?.address]);
+    const interchainClient = (0, useInterchainClient_1.useInterchainClient)(chainName, walletName);
     return {
         chain: chainToShow,
         assetList,
         address: account?.address,
         wallet,
-        getRpcEndpoint: () => walletManager.getRpcEndpoint(wallet, chainName),
-        getClient: () => clientFactory.getClient(),
-        getSigningClient: async () => clientFactory.getSigningClient(),
-        getCosmwasmClient: () => clientFactory.getCosmwasmClient(),
-        getSigningCosmwasmClient: () => clientFactory.getSigningCosmwasmClient(),
-        getSigningStargateClient: () => clientFactory.getSigningStargateClient(),
-        getStargateClient: () => clientFactory.getStargateClient(),
+        ...interchainClient
     };
 };
 exports.useChainWallet = useChainWallet;

package/hooks/useInterchainClient.d.ts

@@ -0,0 +1,15 @@
+import { CosmWasmSigningClient } from 'interchainjs/cosmwasm-stargate';
+import { StargateSigningClient } from 'interchainjs/stargate';
+import { StargateClient, HttpEndpoint } from '@cosmjs/stargate';
+import { SigningClient } from 'interchainjs/signing-client';
+import { RpcQuery } from 'interchainjs/query/rpc';
+export declare const useInterchainClient: (chainName: string, walletName: string) => {
+    rpcEndpoint: string | HttpEndpoint;
+    signingClient: SigningClient;
+    client: RpcQuery;
+    stargateSigningClient: StargateSigningClient;
+    stargateClient: StargateClient;
+    cosmWasmSigningClient: CosmWasmSigningClient;
+    error: unknown;
+    isLoading: boolean;
+};

package/hooks/useInterchainClient.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useInterchainClient = void 0;
+const react_1 = require("react");
+const useWalletManager_1 = require("./useWalletManager");
+const useAccount_1 = require("./useAccount");
+const useInterchainClient = (chainName, walletName) => {
+    const [rpcEndpoint, setRpcEndpoint] = (0, react_1.useState)();
+    const [signingClient, setSigningClient] = (0, react_1.useState)(null);
+    const [client, setClient] = (0, react_1.useState)(null);
+    const [stargateSigningClient, setStargateSigningClient] = (0, react_1.useState)(null);
+    const [stargateClient, setStargateClient] = (0, react_1.useState)();
+    const [cosmWasmSigningClient, setCosmWasmSigningClient] = (0, react_1.useState)(null);
+    const [error, setError] = (0, react_1.useState)(null);
+    const [isLoading, setIsLoading] = (0, react_1.useState)(false);
+    const walletManager = (0, useWalletManager_1.useWalletManager)();
+    const account = (0, useAccount_1.useAccount)(chainName, walletName);
+    const initialize = async () => {
+        const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
+        const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
+        if (!wallet) {
+            throw new Error('Wallet not found');
+        }
+        if (!chainToShow) {
+            throw new Error('Chain not found');
+        }
+        try {
+            setIsLoading(true);
+            const rpcEndpoint = await walletManager.getRpcEndpoint(wallet, chainName);
+            setRpcEndpoint(rpcEndpoint);
+            const clientFactory = await walletManager.createClientFactory(wallet, chainName);
+            const client = await clientFactory.getClient();
+            setClient(client);
+            const signingClient = await clientFactory.getSigningClient();
+            setSigningClient(signingClient);
+            const stargateClient = await clientFactory.getStargateClient();
+            setStargateClient(stargateClient);
+            const signingStargateClient = await clientFactory.getSigningStargateClient(chainToShow.bech32Prefix);
+            setStargateSigningClient(signingStargateClient);
+            const signingCosmwasmClient = await clientFactory.getSigningCosmwasmClient();
+            setCosmWasmSigningClient(signingCosmwasmClient);
+        }
+        catch (error) {
+            setError(error);
+        }
+        finally {
+            setIsLoading(false);
+        }
+    };
+    (0, react_1.useEffect)(() => {
+        initialize();
+    }, [chainName, walletName, account?.address]);
+    return {
+        rpcEndpoint,
+        signingClient,
+        client,
+        stargateSigningClient,
+        stargateClient,
+        cosmWasmSigningClient,
+        error,
+        isLoading
+    };
+};
+exports.useInterchainClient = useInterchainClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.0.1-beta.1",
+  "version": "0.0.1-beta.2",
   "author": "cosmology-tech <developers@cosmology.zone>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -32,11 +32,11 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.49.6",
-    "@interchain-kit/core": "0.0.1-beta.1",
+    "@interchain-kit/core": "0.0.1-beta.2",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
-  "gitHead": "ddbd4f20f3dee91a506ea462608fc4c1a88c5483"
+  "gitHead": "c501ca36b82d71763b563290dd71a3adec50c31f"
 }

package/types/chain.d.ts

@@ -1,10 +1,22 @@
+import { CosmWasmSigningClient } from 'interchainjs/cosmwasm-stargate';
+import { StargateClient } from '@cosmjs/stargate';
+import { SigningClient } from 'interchainjs/signing-client';
+import { RpcQuery } from 'interchainjs/query/rpc';
+import { StargateSigningClient } from 'interchainjs/stargate';
 import { HttpEndpoint } from '@cosmjs/stargate';
 import { Chain, AssetList } from '@chain-registry/v2-types';
-import { BaseWallet, CosmJsSigner } from '@interChain-kit/core';
+import { BaseWallet } from '@interChain-kit/core';
 export type UseChainReturnType = {
     chain: Chain;
     assetList: AssetList;
     address: string;
     wallet: BaseWallet;
-    getRpcEndpoint: () => Promise<string | HttpEndpoint>;
-} & Omit<CosmJsSigner, 'rpcEndpoint' | 'offlineSigner' | 'signingCosmwasmOptions' | 'signingStargateOptions' | 'stargateOptions'>;
+    rpcEndpoint: string | HttpEndpoint;
+    client: RpcQuery;
+    signingClient: SigningClient;
+    stargateClient: StargateClient;
+    stargateSigningClient: StargateSigningClient;
+    cosmWasmSigningClient: CosmWasmSigningClient;
+    isLoading: boolean;
+    error: unknown;
+};