@interchain-kit/react 0.2.208 → 0.2.212

package/store/index.js

@@ -14,226 +14,5 @@ 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 });
-exports.createInterchainStore = void 0;
-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 immerSyncUp = (newWalletManager) => {
-    return (draft) => {
-        draft.chains = newWalletManager.chains;
-        draft.assetLists = newWalletManager.assetLists;
-        draft.wallets = newWalletManager.wallets;
-        draft.signerOptions = newWalletManager.signerOptions;
-        draft.endpointOptions = newWalletManager.endpointOptions;
-        draft.signerOptionMap = newWalletManager.signerOptionMap;
-        draft.endpointOptionsMap = newWalletManager.endpointOptionsMap;
-        draft.preferredSignTypeMap = newWalletManager.preferredSignTypeMap;
-    };
-};
-const createInterchainStore = (walletManager) => {
-    const { chains, assetLists, wallets, signerOptions, endpointOptions } = walletManager;
-    // const walletManager = new WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions)
-    return (0, zustand_1.createStore)((0, middleware_1.persist)((0, immer_1.immer)((set, get) => ({
-        chainWalletState: [],
-        currentWalletName: '',
-        currentChainName: '',
-        chains: [...walletManager.chains],
-        assetLists: [...walletManager.assetLists],
-        wallets: walletManager.wallets,
-        signerOptions: walletManager.signerOptions,
-        endpointOptions: walletManager.endpointOptions,
-        preferredSignTypeMap: { ...walletManager.preferredSignTypeMap },
-        signerOptionMap: { ...walletManager.signerOptionMap },
-        endpointOptionsMap: { ...walletManager.endpointOptionsMap },
-        walletConnectQRCodeUri: '',
-        updateChainWalletState: (walletName, chainName, data) => {
-            set(draft => {
-                let targetIndex = draft.chainWalletState.findIndex(cws => cws.walletName === walletName && cws.chainName === chainName);
-                draft.chainWalletState[targetIndex] = { ...draft.chainWalletState[targetIndex], ...data };
-            });
-        },
-        init: async () => {
-            const existedChainWalletStatesMap = new Map(get().chainWalletState.map(cws => [cws.walletName + cws.chainName, cws]));
-            wallets.forEach(wallet => {
-                chains.forEach(chain => {
-                    if (!existedChainWalletStatesMap.has(wallet.info.name + chain.chainName)) {
-                        set(draft => {
-                            draft.chainWalletState.push({
-                                chainName: chain.chainName,
-                                walletName: wallet.info.name,
-                                walletState: core_1.WalletState.Disconnected,
-                                rpcEndpoint: "",
-                                errorMessage: "",
-                                account: undefined
-                            });
-                        });
-                    }
-                });
-            });
-            const NotExistWallets = [];
-            await Promise.all(get().wallets.map(async (wallet) => {
-                try {
-                    await wallet.init();
-                }
-                catch (error) {
-                    if (error === core_1.clientNotExistError.message) {
-                        NotExistWallets.push(wallet.info.name);
-                    }
-                }
-            }));
-            set(draft => {
-                draft.chainWalletState = draft.chainWalletState.map(cws => {
-                    if (NotExistWallets.includes(cws.walletName)) {
-                        return { ...cws, walletState: core_1.WalletState.NotExist };
-                    }
-                    return cws;
-                });
-            });
-            // return walletManager.init()
-        },
-        setCurrentChainName: (chainName) => {
-            set(draft => { draft.currentChainName = chainName; });
-        },
-        setCurrentWalletName: (walletName) => {
-            set(draft => { draft.currentWalletName = walletName; });
-        },
-        getDraftChainWalletState: (state, walletName, chainName) => {
-            const targetIndex = state.chainWalletState.findIndex(cws => cws.walletName === walletName && cws.chainName === chainName);
-            return state.chainWalletState[targetIndex];
-        },
-        getChainWalletState: (walletName, chainName) => {
-            return get().chainWalletState.find(cws => cws.walletName === walletName && cws.chainName === chainName);
-        },
-        addChains: (chains, assetLists, signerOptions, endpointOptions) => {
-            walletManager.addChains(chains, assetLists, signerOptions, endpointOptions);
-            // console.log(walletManager.chains, walletManager.assetLists)
-            // set(immerSyncUp(walletManager))
-            // set(draft => {
-            //   draft.chains = walletManager.chains
-            // })
-            set(draft => {
-                chains.forEach(newChain => {
-                    const existChain = draft.chains.find(c => c.chainId === newChain.chainId);
-                    if (!existChain) {
-                        draft.chains.push(newChain);
-                        const assetList = assetLists.find(a => a.chainName === newChain.chainName);
-                        draft.assetLists.push(assetList);
-                        draft.wallets.forEach(w => {
-                            draft.chainWalletState.push({
-                                chainName: newChain.chainName,
-                                walletName: w.info.name,
-                                walletState: core_1.WalletState.Disconnected,
-                                rpcEndpoint: "",
-                                errorMessage: "",
-                                account: undefined
-                            });
-                        });
-                    }
-                    draft.signerOptionMap[newChain.chainName] = signerOptions?.signing?.(newChain.chainName);
-                    draft.endpointOptionsMap[newChain.chainName] = endpointOptions?.endpoints?.[newChain.chainName];
-                });
-            });
-        },
-        connect: async (walletName, chainName) => {
-            get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Connecting });
-            try {
-                await walletManager.connect(walletName, chainName, (uri) => {
-                    set(draft => {
-                        draft.walletConnectQRCodeUri = uri;
-                    });
-                });
-                set(draft => {
-                    draft.currentChainName = chainName;
-                    draft.currentWalletName = walletName;
-                });
-                get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Connected });
-            }
-            catch (error) {
-                if (error.message === 'Request rejected') {
-                    get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Rejected, errorMessage: error.message });
-                    return;
-                }
-                get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Disconnected, errorMessage: error.message });
-            }
-        },
-        disconnect: async (walletName, chainName) => {
-            try {
-                await walletManager.disconnect(walletName, chainName);
-                get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Disconnected, account: null });
-            }
-            catch (error) {
-            }
-        },
-        getAccount: async (walletName, chainName) => {
-            const account = await walletManager.getAccount(walletName, chainName);
-            get().updateChainWalletState(walletName, chainName, { account });
-            return account;
-        },
-        getRpcEndpoint: async (walletName, chainName) => {
-            const exist = get().getChainWalletState(walletName, chainName).rpcEndpoint;
-            if (exist)
-                return exist;
-            const rpcEndpoint = await walletManager.getRpcEndpoint(walletName, chainName);
-            get().updateChainWalletState(walletName, chainName, { rpcEndpoint });
-            return rpcEndpoint;
-        },
-        getChainLogoUrl(chainName) {
-            return walletManager.getChainLogoUrl(chainName);
-        },
-        getChainByName(chainName) {
-            return walletManager.getChainByName(chainName);
-        },
-        getAssetListByName(chainName) {
-            return walletManager.getAssetListByName(chainName);
-        },
-        getDownloadLink(walletName) {
-            return walletManager.getDownloadLink(walletName);
-        },
-        getOfflineSigner(walletName, chainName) {
-            return walletManager.getOfflineSigner(walletName, chainName);
-        },
-        getPreferSignType(chainName) {
-            const result = walletManager.getPreferSignType(chainName);
-            set(immerSyncUp(walletManager));
-            return result;
-        },
-        getSignerOptions(chainName) {
-            const result = walletManager.getSignerOptions(chainName);
-            set(immerSyncUp(walletManager));
-            return result;
-        },
-        getWalletByName(walletName) {
-            return walletManager.getWalletByName(walletName);
-        },
-        getSigningClient(walletName, chainName) {
-            return walletManager.getSigningClient(walletName, chainName);
-        },
-        getEnv() {
-            return walletManager.getEnv();
-        },
-    })), {
-        name: 'interchain-kit-store',
-        storage: (0, middleware_1.createJSONStorage)(() => localStorage),
-        partialize: state => ({
-            chainWalletState: state.chainWalletState,
-            currentWalletName: state.currentWalletName,
-            currentChainName: state.currentChainName
-        }),
-        onRehydrateStorage: (state) => {
-            // console.log('interchain-kit store hydration starts')
-            // optional
-            return (state, error) => {
-                if (error) {
-                    console.log('an error happened during hydration', error);
-                }
-                else {
-                    // console.log('interchain-kit store hydration finished')
-                }
-            };
-        },
-    }));
-};
-exports.createInterchainStore = createInterchainStore;
 __exportStar(require("./chain-wallet"), exports);
 __exportStar(require("./store"), exports);

package/store/store.d.ts

@@ -1,20 +1,19 @@
 import { AssetList, Chain } from "@chain-registry/v2-types";
 import { BaseWallet, EndpointOptions, SignerOptions, WalletAccount, WalletManager, WalletState } from "@interchain-kit/core";
-import { SignerOptions as InterchainSignerOptions } from '@interchainjs/cosmos/types/signing-client';
 import { HttpEndpoint } from '@interchainjs/types';
-type ChainWalletState = {
+export type ChainWalletState = {
     chainName: string;
     walletName: string;
     walletState: WalletState;
     rpcEndpoint: string | HttpEndpoint;
     errorMessage: string;
-    signerOption: InterchainSignerOptions;
     account: WalletAccount;
 };
 export interface InterchainStore extends WalletManager {
     chainWalletState: ChainWalletState[];
     currentWalletName: string;
     currentChainName: string;
+    walletConnectQRCodeUri: string;
     setCurrentChainName: (chainName: string) => void;
     setCurrentWalletName: (walletName: string) => void;
     getDraftChainWalletState: (state: InterchainStore, walletName: string, chainName: string) => ChainWalletState;
@@ -42,4 +41,3 @@ export declare const createInterchainStore: (walletManager: WalletManager) => Om
     setState(nextStateOrUpdater: InterchainStore | Partial<InterchainStore> | ((state: import("immer").WritableDraft<InterchainStore>) => void), shouldReplace?: false): void;
     setState(nextStateOrUpdater: InterchainStore | ((state: import("immer").WritableDraft<InterchainStore>) => void), shouldReplace: true): void;
 };
-export {};

package/store/store.js

@@ -20,22 +20,8 @@ const immerSyncUp = (newWalletManager) => {
 const createInterchainStore = (walletManager) => {
     const { chains, assetLists, wallets, signerOptions, endpointOptions } = walletManager;
     // const walletManager = new WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions)
-    const chainWalletState = [];
-    wallets.forEach(wallet => {
-        chains.forEach(chain => {
-            chainWalletState.push({
-                chainName: chain.chainName,
-                walletName: wallet.info.name,
-                walletState: core_1.WalletState.Disconnected,
-                rpcEndpoint: "",
-                errorMessage: "",
-                signerOption: undefined,
-                account: undefined
-            });
-        });
-    });
     return (0, zustand_1.createStore)((0, middleware_1.persist)((0, immer_1.immer)((set, get) => ({
-        chainWalletState,
+        chainWalletState: [],
         currentWalletName: '',
         currentChainName: '',
         chains: [...walletManager.chains],
@@ -46,13 +32,59 @@ const createInterchainStore = (walletManager) => {
         preferredSignTypeMap: { ...walletManager.preferredSignTypeMap },
         signerOptionMap: { ...walletManager.signerOptionMap },
         endpointOptionsMap: { ...walletManager.endpointOptionsMap },
+        walletConnectQRCodeUri: '',
         updateChainWalletState: (walletName, chainName, data) => {
             set(draft => {
                 let targetIndex = draft.chainWalletState.findIndex(cws => cws.walletName === walletName && cws.chainName === chainName);
                 draft.chainWalletState[targetIndex] = { ...draft.chainWalletState[targetIndex], ...data };
             });
         },
-        init: () => walletManager.init(),
+        init: async () => {
+            const existedChainWalletStatesMap = new Map(get().chainWalletState.map(cws => [cws.walletName + cws.chainName, cws]));
+            wallets.forEach(wallet => {
+                chains.forEach(chain => {
+                    if (!existedChainWalletStatesMap.has(wallet.info.name + chain.chainName)) {
+                        set(draft => {
+                            draft.chainWalletState.push({
+                                chainName: chain.chainName,
+                                walletName: wallet.info.name,
+                                walletState: core_1.WalletState.Disconnected,
+                                rpcEndpoint: "",
+                                errorMessage: "",
+                                account: undefined
+                            });
+                        });
+                    }
+                });
+            });
+            const NotExistWallets = [];
+            const ExistWallets = [];
+            await Promise.all(get().wallets.map(async (wallet) => {
+                try {
+                    await wallet.init();
+                    ExistWallets.push(wallet.info.name);
+                }
+                catch (error) {
+                    if (error === core_1.clientNotExistError) {
+                        NotExistWallets.push(wallet.info.name);
+                    }
+                }
+            }));
+            set(draft => {
+                draft.chainWalletState = draft.chainWalletState.map(cws => {
+                    if (NotExistWallets.includes(cws.walletName)) {
+                        return { ...cws, walletState: core_1.WalletState.NotExist };
+                    }
+                    return cws;
+                });
+                draft.chainWalletState = draft.chainWalletState.map(cws => {
+                    if (ExistWallets.includes(cws.walletName)) {
+                        return { ...cws, walletState: cws.walletState === core_1.WalletState.NotExist ? core_1.WalletState.Disconnected : cws.walletState };
+                    }
+                    return cws;
+                });
+            });
+        },
         setCurrentChainName: (chainName) => {
             set(draft => { draft.currentChainName = chainName; });
         },
@@ -85,25 +117,41 @@ const createInterchainStore = (walletManager) => {
                                 chainName: newChain.chainName,
                                 walletName: w.info.name,
                                 walletState: core_1.WalletState.Disconnected,
-                                rpcEndpoint: endpointOptions?.endpoints?.[newChain.chainName]?.rpc?.[0],
+                                rpcEndpoint: endpointOptions?.endpoints[newChain.chainName]?.rpc?.[0] || '',
                                 errorMessage: "",
-                                signerOption: signerOptions?.signing?.(newChain.chainName),
                                 account: undefined
                             });
                         });
                     }
+                    else {
+                        draft.updateChainWalletState(newChain.chainName, newChain.chainName, {
+                            rpcEndpoint: endpointOptions?.endpoints[newChain.chainName]?.rpc?.[0] || '',
+                        });
+                    }
                     draft.signerOptionMap[newChain.chainName] = signerOptions?.signing?.(newChain.chainName);
                     draft.endpointOptionsMap[newChain.chainName] = endpointOptions?.endpoints?.[newChain.chainName];
                 });
             });
         },
         connect: async (walletName, chainName) => {
-            get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Connecting });
+            const state = get().getChainWalletState(walletName, chainName)?.walletState;
+            if (state === core_1.WalletState.NotExist) {
+                return;
+            }
+            if (walletName === 'WalletConnect' && state === core_1.WalletState.Connected) {
+                return;
+            }
+            set(draft => {
+                draft.currentChainName = chainName;
+                draft.currentWalletName = walletName;
+                draft.walletConnectQRCodeUri = '';
+            });
+            get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Connecting, errorMessage: '' });
             try {
-                await walletManager.connect(walletName, chainName);
-                set(draft => {
-                    draft.currentChainName = chainName;
-                    draft.currentWalletName = walletName;
+                await walletManager.connect(walletName, chainName, (uri) => {
+                    set(draft => {
+                        draft.walletConnectQRCodeUri = uri;
+                    });
                 });
                 get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Connected });
             }
@@ -186,7 +234,7 @@ const createInterchainStore = (walletManager) => {
                     console.log('an error happened during hydration', error);
                 }
                 else {
-                    console.log('interchain-kit store hydration finished');
+                    // console.log('interchain-kit store hydration finished')
                 }
             };
         },

package/utils/wallet.d.ts

@@ -5,3 +5,29 @@ export declare const getWalletInfo: (wallet: BaseWallet) => {
     logo: string;
     mobileDisabled: boolean;
 };
+export declare const transferToWalletUISchema: (w: BaseWallet) => {
+    name: string;
+    prettyName: string;
+    logo: string;
+    mobileDisabled: boolean;
+    shape: "list";
+    originalWallet: {
+        session: import("@walletconnect/types").SessionTypes.Struct;
+        info: import("@interchain-kit/core").Wallet;
+        errorMessage: string;
+        walletState: import("@interchain-kit/core").WalletState;
+        events: import("events")<import("@interchain-kit/core").WalletEvents>;
+        chainMap: Map<import("@chain-registry/v2-types").Chain["chainId"], import("@chain-registry/v2-types").Chain>;
+        assetLists: import("@chain-registry/v2-types").AssetList[];
+        client: any;
+    };
+    subLogo: string;
+} | {
+    name: string;
+    prettyName: string;
+    logo: string;
+    mobileDisabled: boolean;
+    shape: "list";
+    originalWallet: BaseWallet;
+    subLogo?: undefined;
+};

package/utils/wallet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWalletInfo = void 0;
+exports.transferToWalletUISchema = exports.getWalletInfo = void 0;
 const getWalletInfo = (wallet) => {
     return {
         name: wallet?.info?.name,
@@ -10,3 +10,28 @@ const getWalletInfo = (wallet) => {
     };
 };
 exports.getWalletInfo = getWalletInfo;
+const transferToWalletUISchema = (w) => {
+    if (w.info.mode === "wallet-connect") {
+        const wc = w;
+        if (wc.session) {
+            return {
+                name: wc.session?.peer.metadata?.name,
+                prettyName: `${wc.session?.peer.metadata?.name} - Mobile`,
+                logo: wc.session?.peer.metadata?.icons?.[0],
+                mobileDisabled: true,
+                shape: "list",
+                originalWallet: { ...w, session: wc.session },
+                subLogo: w.info.logo,
+            };
+        }
+    }
+    return {
+        name: w.info.name,
+        prettyName: w.info.prettyName,
+        logo: w.info.logo,
+        mobileDisabled: true,
+        shape: "list",
+        originalWallet: w,
+    };
+};
+exports.transferToWalletUISchema = transferToWalletUISchema;

package/esm/hooks/useAccount.js

@@ -1,39 +0,0 @@
-import { useEffect, useMemo, useState } from "react";
-import { WalletManagerState, WalletState } from "@interchain-kit/core";
-import { useWalletManager } from './useWalletManager';
-export const useAccount = (chainName, walletName) => {
-    const walletManager = useWalletManager();
-    const [isFetching, setIsFetching] = useState(false);
-    const wallet = useMemo(() => {
-        return walletManager.wallets.find(w => w.info.name === walletName);
-    }, [walletManager, walletName]);
-    const [account, setAccount] = useState(null);
-    const chain = useMemo(() => {
-        return walletManager.chains.find(c => c.chainName === chainName);
-    }, [walletManager, chainName]);
-    const getAccount = async () => {
-        if (wallet && chain) {
-            if (wallet.walletState === WalletState.Connected && account === null && !isFetching) {
-                setIsFetching(true);
-                const account = await walletManager.getAccount(walletName, chainName);
-                setAccount(account);
-                setIsFetching(false);
-            }
-            if (wallet.walletState === WalletState.Disconnected) {
-                setAccount(null);
-            }
-        }
-        if (!wallet) {
-            setAccount(null);
-        }
-    };
-    useEffect(() => {
-        if (wallet && walletManager.state === WalletManagerState.Initialized) {
-            wallet.events.on('accountChanged', getAccount);
-        }
-    }, [wallet, walletManager.state]);
-    useEffect(() => {
-        getAccount();
-    }, [wallet, chainName, wallet?.walletState]);
-    return account;
-};

package/hooks/useAccount.d.ts

@@ -1,2 +0,0 @@
-import { WalletAccount } from "@interchain-kit/core";
-export declare const useAccount: (chainName: string, walletName: string) => WalletAccount | null;

package/hooks/useAccount.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useAccount = void 0;
-const react_1 = require("react");
-const core_1 = require("@interchain-kit/core");
-const useWalletManager_1 = require("./useWalletManager");
-const useAccount = (chainName, walletName) => {
-    const walletManager = (0, useWalletManager_1.useWalletManager)();
-    const [isFetching, setIsFetching] = (0, react_1.useState)(false);
-    const wallet = (0, react_1.useMemo)(() => {
-        return walletManager.wallets.find(w => w.info.name === walletName);
-    }, [walletManager, walletName]);
-    const [account, setAccount] = (0, react_1.useState)(null);
-    const chain = (0, react_1.useMemo)(() => {
-        return walletManager.chains.find(c => c.chainName === chainName);
-    }, [walletManager, chainName]);
-    const getAccount = async () => {
-        if (wallet && chain) {
-            if (wallet.walletState === core_1.WalletState.Connected && account === null && !isFetching) {
-                setIsFetching(true);
-                const account = await walletManager.getAccount(walletName, chainName);
-                setAccount(account);
-                setIsFetching(false);
-            }
-            if (wallet.walletState === core_1.WalletState.Disconnected) {
-                setAccount(null);
-            }
-        }
-        if (!wallet) {
-            setAccount(null);
-        }
-    };
-    (0, react_1.useEffect)(() => {
-        if (wallet && walletManager.state === core_1.WalletManagerState.Initialized) {
-            wallet.events.on('accountChanged', getAccount);
-        }
-    }, [wallet, walletManager.state]);
-    (0, react_1.useEffect)(() => {
-        getAccount();
-    }, [wallet, chainName, wallet?.walletState]);
-    return account;
-};
-exports.useAccount = useAccount;