@interchain-kit/react 0.0.1-beta.56 → 0.0.1-beta.58

package/esm/hooks/useChain.js

@@ -1,6 +1,7 @@
 import { useWalletModal } from "../modal";
 import { useWalletManager } from './useWalletManager';
 import { ChainNameNotExist } from '@interchain-kit/core';
+import { ChainWallet } from '../store/chain-wallet';
 export const useChain = (chainName) => {
     const { assetLists, currentWalletName, disconnect, setCurrentChainName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = useWalletManager();
     const chain = getChainByName(chainName);
@@ -33,12 +34,7 @@ export const useChain = (chainName) => {
         chain,
         assetList,
         address: chainWalletStateToShow?.account?.address,
-        wallet: wallet ? Object.assign(wallet, {
-            walletState: chainWalletStateToShow?.walletState,
-            connect: () => connect(currentWalletName, chainName),
-            disconnect: () => disconnect(currentWalletName, chainName),
-            getAccount: () => getAccount(currentWalletName, chainName)
-        }) : undefined,
+        wallet: new ChainWallet(wallet, () => connect(currentWalletName, chainName), () => disconnect(currentWalletName, chainName), () => getAccount(currentWalletName, chainName)),
         rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(currentWalletName, chainName),
     };

package/esm/hooks/useChainWallet.js

@@ -1,6 +1,7 @@
 import { useWalletManager } from "./useWalletManager";
+import { ChainWallet } from "../store/chain-wallet";
 export const useChainWallet = (chainName, walletName) => {
-    const { assetLists, disconnect, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = useWalletManager();
+    const { assetLists, disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = useWalletManager();
     const chain = getChainByName(chainName);
     const wallet = getWalletByName(walletName);
     const assetList = assetLists.find(a => a.chainName === chainName);
@@ -9,6 +10,8 @@ export const useChainWallet = (chainName, walletName) => {
         //for migration cosmos kit
         connect: async () => {
             await connect(walletName, chainName);
+            setCurrentWalletName(walletName);
+            setCurrentChainName(chainName);
             await getAccount(walletName, chainName);
         },
         disconnect: () => disconnect(walletName, chainName),
@@ -21,12 +24,7 @@ export const useChainWallet = (chainName, walletName) => {
         chain,
         assetList,
         address: chainWalletStateToShow?.account?.address,
-        wallet: wallet ? Object.assign(wallet, {
-            walletState: chainWalletStateToShow?.walletState,
-            connect: () => connect(walletName, chainName),
-            disconnect: () => disconnect(walletName, chainName),
-            getAccount: () => getAccount(walletName, chainName)
-        }) : undefined,
+        wallet: new ChainWallet(wallet, () => connect(walletName, chainName), () => disconnect(walletName, chainName), () => getAccount(currentWalletName, chainName)),
         rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(walletName, chainName),
     };

package/esm/store/chain-wallet.js

@@ -0,0 +1,59 @@
+import { BaseWallet } from "@interchain-kit/core";
+export class ChainWallet extends BaseWallet {
+    originalWallet;
+    connectWithState;
+    disconnectWithState;
+    getAccountWithState;
+    constructor(originalWallet, connectWithState, disconnectWithState, getAccountWithState) {
+        super(originalWallet.info);
+        this.originalWallet = originalWallet;
+        this.connectWithState = connectWithState;
+        this.disconnectWithState = disconnectWithState;
+        this.getAccountWithState = getAccountWithState;
+    }
+    async init(meta) {
+        return this.originalWallet.init(meta);
+    }
+    async connect(chainId) {
+        return this.connectWithState(chainId);
+    }
+    async disconnect(chainId) {
+        return this.disconnectWithState(chainId);
+    }
+    async getAccount(chainId) {
+        return this.getAccountWithState(chainId);
+    }
+    async getAccounts(chainIds) {
+        return this.originalWallet.getAccounts(chainIds);
+    }
+    async getSimpleAccount(chainId) {
+        return this.originalWallet.getSimpleAccount(chainId);
+    }
+    getOfflineSigner(chainId) {
+        return this.originalWallet.getOfflineSigner(chainId);
+    }
+    getOfflineSignerAmino(chainId) {
+        return this.originalWallet.getOfflineSignerAmino(chainId);
+    }
+    getOfflineSignerDirect(chainId) {
+        return this.originalWallet.getOfflineSignerDirect(chainId);
+    }
+    async signAmino(chainId, signer, signDoc, signOptions) {
+        return this.originalWallet.signAmino(chainId, signer, signDoc, signOptions);
+    }
+    async signArbitrary(chainId, signer, data) {
+        return this.originalWallet.signArbitrary(chainId, signer, data);
+    }
+    async verifyArbitrary(chainId, signer, data) {
+        return this.originalWallet.verifyArbitrary(chainId, signer, data);
+    }
+    async signDirect(chainId, signer, signDoc, signOptions) {
+        return this.originalWallet.signDirect(chainId, signer, signDoc, signOptions);
+    }
+    async sendTx(chainId, tx, mode) {
+        return this.originalWallet.sendTx(chainId, tx, mode);
+    }
+    async addSuggestChain(chain, assetLists) {
+        return this.originalWallet.addSuggestChain(chain, assetLists);
+    }
+}

package/esm/types/index.js

@@ -1,2 +1 @@
-export * from './wallet';
 export * from './sign-client';

package/hooks/useChain.js

@@ -4,6 +4,7 @@ exports.useChain = void 0;
 const modal_1 = require("../modal");
 const useWalletManager_1 = require("./useWalletManager");
 const core_1 = require("@interchain-kit/core");
+const chain_wallet_1 = require("../store/chain-wallet");
 const useChain = (chainName) => {
     const { assetLists, currentWalletName, disconnect, setCurrentChainName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = (0, useWalletManager_1.useWalletManager)();
     const chain = getChainByName(chainName);
@@ -36,12 +37,7 @@ const useChain = (chainName) => {
         chain,
         assetList,
         address: chainWalletStateToShow?.account?.address,
-        wallet: wallet ? Object.assign(wallet, {
-            walletState: chainWalletStateToShow?.walletState,
-            connect: () => connect(currentWalletName, chainName),
-            disconnect: () => disconnect(currentWalletName, chainName),
-            getAccount: () => getAccount(currentWalletName, chainName)
-        }) : undefined,
+        wallet: new chain_wallet_1.ChainWallet(wallet, () => connect(currentWalletName, chainName), () => disconnect(currentWalletName, chainName), () => getAccount(currentWalletName, chainName)),
         rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(currentWalletName, chainName),
     };

package/hooks/useChainWallet.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useChainWallet = void 0;
 const useWalletManager_1 = require("./useWalletManager");
+const chain_wallet_1 = require("../store/chain-wallet");
 const useChainWallet = (chainName, walletName) => {
-    const { assetLists, disconnect, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = (0, useWalletManager_1.useWalletManager)();
+    const { assetLists, disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = (0, useWalletManager_1.useWalletManager)();
     const chain = getChainByName(chainName);
     const wallet = getWalletByName(walletName);
     const assetList = assetLists.find(a => a.chainName === chainName);
@@ -12,6 +13,8 @@ const useChainWallet = (chainName, walletName) => {
         //for migration cosmos kit
         connect: async () => {
             await connect(walletName, chainName);
+            setCurrentWalletName(walletName);
+            setCurrentChainName(chainName);
             await getAccount(walletName, chainName);
         },
         disconnect: () => disconnect(walletName, chainName),
@@ -24,12 +27,7 @@ const useChainWallet = (chainName, walletName) => {
         chain,
         assetList,
         address: chainWalletStateToShow?.account?.address,
-        wallet: wallet ? Object.assign(wallet, {
-            walletState: chainWalletStateToShow?.walletState,
-            connect: () => connect(walletName, chainName),
-            disconnect: () => disconnect(walletName, chainName),
-            getAccount: () => getAccount(walletName, chainName)
-        }) : undefined,
+        wallet: new chain_wallet_1.ChainWallet(wallet, () => connect(walletName, chainName), () => disconnect(walletName, chainName), () => getAccount(currentWalletName, chainName)),
         rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(walletName, chainName),
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.0.1-beta.56",
+  "version": "0.0.1-beta.58",
   "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.56",
+    "@interchain-kit/core": "0.0.1-beta.58",
     "@interchain-ui/react": "1.26.1",
     "@interchainjs/cosmos": "1.6.3",
     "@interchainjs/cosmos-types": "1.6.3",
@@ -46,5 +46,5 @@
     "react-dom": "^18.3.1",
     "zustand": "^5.0.3"
   },
-  "gitHead": "f089ac6f99ebc8671dd19a2405fd6b187dbe3145"
+  "gitHead": "3e181eabfedf82ee9321d10cf0d46d63a348da31"
 }

package/store/chain-wallet.d.ts

@@ -0,0 +1,26 @@
+import { Chain, AssetList } from "@chain-registry/v2-types";
+import { BaseWallet, BroadcastMode, DirectSignDoc, SignOptions, SimpleAccount, WalletAccount } from "@interchain-kit/core";
+import { OfflineSigner, OfflineAminoSigner, OfflineDirectSigner, AminoSignResponse, StdSignature, DirectSignResponse } from "@interchainjs/cosmos/types/wallet";
+import { StdSignDoc } from "@interchainjs/types";
+export declare class ChainWallet<TWallet extends BaseWallet> extends BaseWallet {
+    originalWallet: TWallet;
+    connectWithState: TWallet['connect'];
+    disconnectWithState: TWallet['disconnect'];
+    getAccountWithState: TWallet['getAccount'];
+    constructor(originalWallet: TWallet, connectWithState: TWallet['connect'], disconnectWithState: TWallet['disconnect'], getAccountWithState: TWallet['getAccount']);
+    init(meta?: unknown): Promise<void>;
+    connect(chainId: string | string[]): Promise<void>;
+    disconnect(chainId: string | string[]): Promise<void>;
+    getAccount(chainId: string): Promise<WalletAccount>;
+    getAccounts(chainIds: string[]): Promise<WalletAccount[]>;
+    getSimpleAccount(chainId: string): Promise<SimpleAccount>;
+    getOfflineSigner(chainId: string): OfflineSigner;
+    getOfflineSignerAmino(chainId: string): OfflineAminoSigner;
+    getOfflineSignerDirect(chainId: string): OfflineDirectSigner;
+    signAmino(chainId: string, signer: string, signDoc: StdSignDoc, signOptions?: SignOptions): Promise<AminoSignResponse>;
+    signArbitrary(chainId: string, signer: string, data: string | Uint8Array): Promise<StdSignature>;
+    verifyArbitrary(chainId: string, signer: string, data: string | Uint8Array): Promise<boolean>;
+    signDirect(chainId: string, signer: string, signDoc: DirectSignDoc, signOptions?: SignOptions): Promise<DirectSignResponse>;
+    sendTx(chainId: string, tx: Uint8Array, mode: BroadcastMode): Promise<Uint8Array>;
+    addSuggestChain(chain: Chain, assetLists: AssetList[]): Promise<void>;
+}

package/store/chain-wallet.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChainWallet = void 0;
+const core_1 = require("@interchain-kit/core");
+class ChainWallet extends core_1.BaseWallet {
+    originalWallet;
+    connectWithState;
+    disconnectWithState;
+    getAccountWithState;
+    constructor(originalWallet, connectWithState, disconnectWithState, getAccountWithState) {
+        super(originalWallet.info);
+        this.originalWallet = originalWallet;
+        this.connectWithState = connectWithState;
+        this.disconnectWithState = disconnectWithState;
+        this.getAccountWithState = getAccountWithState;
+    }
+    async init(meta) {
+        return this.originalWallet.init(meta);
+    }
+    async connect(chainId) {
+        return this.connectWithState(chainId);
+    }
+    async disconnect(chainId) {
+        return this.disconnectWithState(chainId);
+    }
+    async getAccount(chainId) {
+        return this.getAccountWithState(chainId);
+    }
+    async getAccounts(chainIds) {
+        return this.originalWallet.getAccounts(chainIds);
+    }
+    async getSimpleAccount(chainId) {
+        return this.originalWallet.getSimpleAccount(chainId);
+    }
+    getOfflineSigner(chainId) {
+        return this.originalWallet.getOfflineSigner(chainId);
+    }
+    getOfflineSignerAmino(chainId) {
+        return this.originalWallet.getOfflineSignerAmino(chainId);
+    }
+    getOfflineSignerDirect(chainId) {
+        return this.originalWallet.getOfflineSignerDirect(chainId);
+    }
+    async signAmino(chainId, signer, signDoc, signOptions) {
+        return this.originalWallet.signAmino(chainId, signer, signDoc, signOptions);
+    }
+    async signArbitrary(chainId, signer, data) {
+        return this.originalWallet.signArbitrary(chainId, signer, data);
+    }
+    async verifyArbitrary(chainId, signer, data) {
+        return this.originalWallet.verifyArbitrary(chainId, signer, data);
+    }
+    async signDirect(chainId, signer, signDoc, signOptions) {
+        return this.originalWallet.signDirect(chainId, signer, signDoc, signOptions);
+    }
+    async sendTx(chainId, tx, mode) {
+        return this.originalWallet.sendTx(chainId, tx, mode);
+    }
+    async addSuggestChain(chain, assetLists) {
+        return this.originalWallet.addSuggestChain(chain, assetLists);
+    }
+}
+exports.ChainWallet = ChainWallet;

package/types/index.d.ts

@@ -1,2 +1 @@
-export * from './wallet';
 export * from './sign-client';

package/types/index.js

@@ -14,5 +14,4 @@ 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("./wallet"), exports);
 __exportStar(require("./sign-client"), exports);

package/esm/types/wallet.js

@@ -1 +0,0 @@
-export {};

package/esm/utils/helpers.js

@@ -1,11 +0,0 @@
-export function bindAllMethodsToContext(context) {
-    return new Proxy(context, {
-        get(target, prop, receiver) {
-            const value = Reflect.get(target, prop, receiver);
-            if (typeof value === 'function') {
-                return value.bind(context);
-            }
-            return value;
-        }
-    });
-}

package/types/wallet.d.ts

@@ -1,11 +0,0 @@
-import { BaseWallet } from "@interchain-kit/core";
-import { ConnectState } from "../enum";
-export type UseWalletReturnType = {
-    wallet: BaseWallet;
-    connect: (chainId: string | string[]) => void;
-    connectState: ConnectState;
-};
-export type WalletState = {
-    name: string;
-    connectState: ConnectState;
-};

package/types/wallet.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/utils/helpers.d.ts

@@ -1 +0,0 @@
-export declare function bindAllMethodsToContext<T extends object>(context: T): T;

package/utils/helpers.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bindAllMethodsToContext = bindAllMethodsToContext;
-function bindAllMethodsToContext(context) {
-    return new Proxy(context, {
-        get(target, prop, receiver) {
-            const value = Reflect.get(target, prop, receiver);
-            if (typeof value === 'function') {
-                return value.bind(context);
-            }
-            return value;
-        }
-    });
-}