@interchain-kit/react 0.3.30 → 0.3.31

package/esm/hooks/useSigningClient.js

@@ -2,7 +2,7 @@ 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 { getSigningClient, getChainWalletState, getRpcEndpoint, isReady } = useWalletManager();
     const chainWalletState = getChainWalletState(walletName, chainName);
     const { data, isLoading, error } = useAsync({
         queryKey: `signing-client-${chainName}-${walletName}`,
@@ -13,7 +13,7 @@ export const useSigningClient = (chainName, walletName) => {
                 return getSigningClient(walletName, chainName);
             }
         },
-        enabled: chainWalletState?.walletState === WalletState.Connected,
+        enabled: chainWalletState?.walletState === WalletState.Connected && isReady,
         disableCache: true,
     });
     return {

package/esm/store/store.js

@@ -1,9 +1,11 @@
+import { SigningClient } from '@interchainjs/cosmos/signing-client';
 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';
 import { StatefulWallet } from './stateful-wallet';
+import { AminoGenericOfflineSigner, DirectGenericOfflineSigner } from '@interchainjs/cosmos/types/wallet';
 const immerSyncUp = (newWalletManager) => {
     return (draft) => {
         draft.chains = newWalletManager.chains;
@@ -235,6 +237,10 @@ export const createInterchainStore = (walletManager) => {
             }
             const existedAccount = get().chainWalletState.find(cws => cws.walletName === walletName && cws.chainName === chainName)?.account;
             if (existedAccount) {
+                if (typeof existedAccount.pubkey === 'object') {
+                    // return from localstorage need to restructure to uinit8Array
+                    return { ...existedAccount, pubkey: Uint8Array.from({ ...existedAccount.pubkey, length: Object.keys(existedAccount.pubkey).length }) };
+                }
                 return existedAccount;
             }
             return wallet.getAccount(chain.chainId);
@@ -260,17 +266,39 @@ export const createInterchainStore = (walletManager) => {
         getDownloadLink(walletName) {
             return walletManager.getDownloadLink(walletName);
         },
-        getOfflineSigner(walletName, chainName) {
-            return walletManager.getOfflineSigner(walletName, chainName);
+        async getOfflineSigner(walletName, chainName) {
+            const chain = get().chains.find(c => c.chainName === chainName);
+            const wallet = get().getStatefulWalletByName(walletName);
+            const walletToUse = wallet.originalWallet;
+            console.log(await get().getAccount(walletName, chainName));
+            const preferSignType = get().getPreferSignType(chainName);
+            let offlineSigner;
+            if (preferSignType === 'amino') {
+                offlineSigner = new AminoGenericOfflineSigner({
+                    getAccounts: async () => [await get().getAccount(walletName, chainName)],
+                    signAmino(signerAddress, signDoc) {
+                        return walletToUse.signAmino(chain.chainId, signerAddress, signDoc, walletToUse.defaultSignOptions);
+                    },
+                });
+            }
+            else if (preferSignType === 'direct') {
+                offlineSigner = new DirectGenericOfflineSigner({
+                    getAccounts: async () => [await get().getAccount(walletName, chainName)],
+                    signDirect(signerAddress, signDoc) {
+                        return walletToUse.signDirect(chain.chainId, signerAddress, signDoc, walletToUse.defaultSignOptions);
+                    }
+                });
+            }
+            return offlineSigner;
         },
         getPreferSignType(chainName) {
             const result = walletManager.getPreferSignType(chainName);
-            set(immerSyncUp(walletManager));
+            // set(immerSyncUp(walletManager))
             return result;
         },
         getSignerOptions(chainName) {
             const result = walletManager.getSignerOptions(chainName);
-            set(immerSyncUp(walletManager));
+            // set(immerSyncUp(walletManager))
             return result;
         },
         getWalletByName(walletName) {
@@ -280,7 +308,11 @@ export const createInterchainStore = (walletManager) => {
             return get().wallets.find(w => w.info.name === walletName);
         },
         async getSigningClient(walletName, chainName) {
-            return walletManager.getSigningClient(walletName, chainName);
+            const chainWalletState = get().getChainWalletState(walletName, chainName);
+            const signerOptions = await get().getSignerOptions(chainName);
+            const offlineSigner = await get().getOfflineSigner(walletName, chainName);
+            const signingClient = await SigningClient.connectWithSigner(chainWalletState.rpcEndpoint, offlineSigner, signerOptions);
+            return signingClient;
         },
         getEnv() {
             return walletManager.getEnv();

package/hooks/useSigningClient.js

@@ -5,7 +5,7 @@ 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 { getSigningClient, getChainWalletState, getRpcEndpoint, isReady } = (0, useWalletManager_1.useWalletManager)();
     const chainWalletState = getChainWalletState(walletName, chainName);
     const { data, isLoading, error } = (0, useAsync_1.useAsync)({
         queryKey: `signing-client-${chainName}-${walletName}`,
@@ -16,7 +16,7 @@ const useSigningClient = (chainName, walletName) => {
                 return getSigningClient(walletName, chainName);
             }
         },
-        enabled: chainWalletState?.walletState === core_1.WalletState.Connected,
+        enabled: chainWalletState?.walletState === core_1.WalletState.Connected && isReady,
         disableCache: true,
     });
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.3.30",
+  "version": "0.3.31",
   "author": "Hyperweb <developers@hyperweb.io>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -34,14 +34,14 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.53.40",
-    "@interchain-kit/core": "^0.3.30",
+    "@interchain-kit/core": "^0.3.31",
     "@interchain-ui/react": "1.26.1",
-    "@interchainjs/cosmos": "1.11.9",
-    "@interchainjs/cosmos-types": "1.11.9",
-    "@interchainjs/types": "1.11.9",
+    "@interchainjs/cosmos": "1.11.11",
+    "@interchainjs/cosmos-types": "1.11.11",
+    "@interchainjs/types": "1.11.11",
     "@react-icons/all-files": "^4.1.0",
     "@walletconnect/types": "^2.17.3",
-    "interchainjs": "1.11.9",
+    "interchainjs": "1.11.11",
     "zustand": "^5.0.3"
   },
   "devDependencies": {
@@ -64,5 +64,5 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
-  "gitHead": "82fcd0ffecf471e1ecb4c288b6752d04aa4f1777"
+  "gitHead": "ec8719da721263a2b3f1474aa106ce0da2425bf6"
 }

package/store/store.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInterchainStore = void 0;
+const signing_client_1 = require("@interchainjs/cosmos/signing-client");
 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 stateful_wallet_1 = require("./stateful-wallet");
+const wallet_1 = require("@interchainjs/cosmos/types/wallet");
 const immerSyncUp = (newWalletManager) => {
     return (draft) => {
         draft.chains = newWalletManager.chains;
@@ -238,6 +240,10 @@ const createInterchainStore = (walletManager) => {
             }
             const existedAccount = get().chainWalletState.find(cws => cws.walletName === walletName && cws.chainName === chainName)?.account;
             if (existedAccount) {
+                if (typeof existedAccount.pubkey === 'object') {
+                    // return from localstorage need to restructure to uinit8Array
+                    return { ...existedAccount, pubkey: Uint8Array.from({ ...existedAccount.pubkey, length: Object.keys(existedAccount.pubkey).length }) };
+                }
                 return existedAccount;
             }
             return wallet.getAccount(chain.chainId);
@@ -263,17 +269,39 @@ const createInterchainStore = (walletManager) => {
         getDownloadLink(walletName) {
             return walletManager.getDownloadLink(walletName);
         },
-        getOfflineSigner(walletName, chainName) {
-            return walletManager.getOfflineSigner(walletName, chainName);
+        async getOfflineSigner(walletName, chainName) {
+            const chain = get().chains.find(c => c.chainName === chainName);
+            const wallet = get().getStatefulWalletByName(walletName);
+            const walletToUse = wallet.originalWallet;
+            console.log(await get().getAccount(walletName, chainName));
+            const preferSignType = get().getPreferSignType(chainName);
+            let offlineSigner;
+            if (preferSignType === 'amino') {
+                offlineSigner = new wallet_1.AminoGenericOfflineSigner({
+                    getAccounts: async () => [await get().getAccount(walletName, chainName)],
+                    signAmino(signerAddress, signDoc) {
+                        return walletToUse.signAmino(chain.chainId, signerAddress, signDoc, walletToUse.defaultSignOptions);
+                    },
+                });
+            }
+            else if (preferSignType === 'direct') {
+                offlineSigner = new wallet_1.DirectGenericOfflineSigner({
+                    getAccounts: async () => [await get().getAccount(walletName, chainName)],
+                    signDirect(signerAddress, signDoc) {
+                        return walletToUse.signDirect(chain.chainId, signerAddress, signDoc, walletToUse.defaultSignOptions);
+                    }
+                });
+            }
+            return offlineSigner;
         },
         getPreferSignType(chainName) {
             const result = walletManager.getPreferSignType(chainName);
-            set(immerSyncUp(walletManager));
+            // set(immerSyncUp(walletManager))
             return result;
         },
         getSignerOptions(chainName) {
             const result = walletManager.getSignerOptions(chainName);
-            set(immerSyncUp(walletManager));
+            // set(immerSyncUp(walletManager))
             return result;
         },
         getWalletByName(walletName) {
@@ -283,7 +311,11 @@ const createInterchainStore = (walletManager) => {
             return get().wallets.find(w => w.info.name === walletName);
         },
         async getSigningClient(walletName, chainName) {
-            return walletManager.getSigningClient(walletName, chainName);
+            const chainWalletState = get().getChainWalletState(walletName, chainName);
+            const signerOptions = await get().getSignerOptions(chainName);
+            const offlineSigner = await get().getOfflineSigner(walletName, chainName);
+            const signingClient = await signing_client_1.SigningClient.connectWithSigner(chainWalletState.rpcEndpoint, offlineSigner, signerOptions);
+            return signingClient;
         },
         getEnv() {
             return walletManager.getEnv();