@interchain-kit/store 0.3.47 → 0.3.49

package/esm/index.js

@@ -1,3 +1,3 @@
-export * from './wallet-manager';
-export * from './types';
 export * from './store';
+export * from './types';
+export * from './wallet-manager';

package/esm/proxied-wallets/create-proxied-wallet.js

@@ -1,8 +1,9 @@
-import { isInstanceOf } from '@interchain-kit/core';
+import { isInstanceOf, SolanaWallet } from '@interchain-kit/core';
 import { CosmosWallet, EthereumWallet, MultiChainWallet } from '@interchain-kit/core';
 import { createCosmosWallet } from './cosmos-wallet';
 import { createEthereumWallet } from './ethereum-wallet';
 import { createMultiChainWallet } from './multi-chain-wallet';
+import { createSolanaWallet } from './solana-wallet';
 // import { createWCWallet } from './wc-wallet';
 export const createProxiedWallet = (wallet, store) => {
     // WalletConnect wallets are now handled by the generic AOP system
@@ -13,6 +14,9 @@ export const createProxiedWallet = (wallet, store) => {
     if (isInstanceOf(wallet, EthereumWallet)) {
         return createEthereumWallet(wallet, store);
     }
+    if (isInstanceOf(wallet, SolanaWallet)) {
+        return createSolanaWallet(wallet, store);
+    }
     if (isInstanceOf(wallet, MultiChainWallet)) {
         Array.from(wallet.networkWalletMap.keys()).forEach(chainType => {
             const chainWallet = wallet.networkWalletMap.get(chainType);
@@ -22,6 +26,9 @@ export const createProxiedWallet = (wallet, store) => {
             if (isInstanceOf(chainWallet, EthereumWallet)) {
                 wallet.setNetworkWallet(chainType, createEthereumWallet(chainWallet, store));
             }
+            if (isInstanceOf(chainWallet, SolanaWallet)) {
+                wallet.setNetworkWallet(chainType, createSolanaWallet(chainWallet, store));
+            }
         });
         return createMultiChainWallet(wallet, store);
     }

package/esm/proxied-wallets/solana-wallet.js

@@ -0,0 +1,13 @@
+import { createAOPProxy } from '../utils';
+export const createSolanaWallet = (target, store) => {
+    return createAOPProxy({
+        target,
+        advice: {
+            signTransaction: {
+                onError(methodName, target, error, transaction) {
+                    store.updateChainWalletState(target.info.name, 'solana', { errorMessage: error.message });
+                },
+            },
+        }
+    });
+};

package/esm/store/index.js

@@ -120,6 +120,6 @@ export class InterchainStore {
         this.setState({ chainWalletStates: newChainWalletStates });
     }
     isChainWalletStateExisted(walletName, chainName) {
-        return this.chainWalletIndexMap.get(`${walletName}-${chainName}`);
+        return this.chainWalletIndexMap.get(`${walletName}-${chainName}`) !== undefined;
     }
 }

package/esm/wallet-manager/chain-wallet-store.js

@@ -11,6 +11,7 @@ export class ChainWalletStore extends BaseWallet {
         this.chain = chain;
         this.store = store;
         this.walletManager = walletManager;
+        this.info = this.wallet.info;
     }
     get walletState() {
         return this.store.getChainWalletState(this.chain.chainName, this.wallet.info.name)?.walletState || WalletState.NotExist;
@@ -35,7 +36,7 @@ export class ChainWalletStore extends BaseWallet {
             });
         }
         try {
-            this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: WalletState.Connecting });
+            this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: WalletState.Connecting, errorMessage: '' });
             await this.wallet.connect(this.chain.chainId);
             const account = await this.getAccount();
             this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: WalletState.Connected, account });
@@ -61,7 +62,6 @@ export class ChainWalletStore extends BaseWallet {
     async refreshAccount() {
         try {
             const account = await this.wallet.getAccount(this.chain.chainId);
-            console.log(this.wallet);
             this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { account });
         }
         catch (error) {

package/esm/wallet-manager/index.js

@@ -1,3 +1,3 @@
+export * from './chain-wallet-store';
 export * from './wallet-manager-store';
 export * from './wallet-store';
-export * from './chain-wallet-store';

package/esm/wallet-manager/wallet-manager-store.js

@@ -36,9 +36,7 @@ export class WalletManagerStore {
                     currentChainName: state.currentChainName,
                 });
             });
-            await Promise.all(this.wallets.map(wallet => {
-                return wallet.init();
-            }));
+            await Promise.all(this.wallets.map(wallet => wallet.init()));
             this.store.setState({ isReady: true });
         }
         catch (error) {
@@ -48,11 +46,10 @@ export class WalletManagerStore {
     }
     restore() {
         const oldState = this.localStorage.load();
-        // 直接设置state，避免触发emit
         this.store.setState({
             chainWalletStates: oldState.chainWalletStates || [],
             currentWalletName: oldState.currentWalletName || '',
-            currentChainName: oldState.currentChainName || '',
+            currentChainName: oldState.currentChainName || ''
         });
         // 重建索引映射
         this.store.buildIndexMap();
@@ -82,6 +79,22 @@ export class WalletManagerStore {
         // 合并过滤后的状态和新增的状态
         const finalChainWalletStates = [...filteredChainWalletStates, ...newChainWalletStates];
         this.store.setState({ chainWalletStates: finalChainWalletStates });
+        let isOldWalletNameExisted = false;
+        let isOldChainNameExisted = false;
+        for (const cws of finalChainWalletStates) {
+            if (cws.walletName === oldState.currentWalletName) {
+                isOldWalletNameExisted = true;
+            }
+            if (cws.chainName === oldState.currentChainName) {
+                isOldChainNameExisted = true;
+            }
+        }
+        // 直接设置state，避免触发emit
+        this.store.setState({
+            chainWalletStates: finalChainWalletStates,
+            currentWalletName: isOldWalletNameExisted ? oldState.currentWalletName : '',
+            currentChainName: isOldChainNameExisted ? oldState.currentChainName : '',
+        });
         this.store.buildIndexMap();
     }
     subscribe(callback) {

package/esm/wallet-manager/wallet-store.js

@@ -1,4 +1,4 @@
-import { BaseWallet, WalletState } from '@interchain-kit/core';
+import { BaseWallet, getWalletByType, WalletState } from '@interchain-kit/core';
 import { ChainWalletStore } from './chain-wallet-store';
 export class WalletStore extends BaseWallet {
     wallet;
@@ -51,7 +51,7 @@ export class WalletStore extends BaseWallet {
             await this.wallet.init();
         }
         catch (error) {
-            this.store.updateWalletState(this.wallet.info.name, { walletState: WalletState.NotExist, errorMessage: '' });
+            this.store.updateWalletState(this.wallet.info.name, { walletState: WalletState.NotExist, errorMessage: error.message });
         }
     }
     getChainWalletStore(chainName) {
@@ -96,4 +96,7 @@ export class WalletStore extends BaseWallet {
         }
         return this.getChainWalletStore(chain.chainName).getProvider();
     }
+    getWalletOfType(WalletClass) {
+        return getWalletByType(this.wallet, WalletClass);
+    }
 }

package/index.d.ts

@@ -1,3 +1,3 @@
-export * from './wallet-manager';
-export * from './types';
 export * from './store';
+export * from './types';
+export * from './wallet-manager';

package/index.js

@@ -14,6 +14,6 @@ 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-manager"), exports);
-__exportStar(require("./types"), exports);
 __exportStar(require("./store"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./wallet-manager"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/store",
-  "version": "0.3.47",
+  "version": "0.3.49",
   "author": "Hyperweb  <developers@hyperweb.io>",
   "description": "interchain-kit wallet connector store package",
   "main": "index.js",
@@ -31,5 +31,5 @@
     "watch:dev": "tsc -w -p tsconfig.esm.json & tsc -w"
   },
   "keywords": [],
-  "gitHead": "4583b572672abd85a0918f39f534a5bf9312c261"
+  "gitHead": "a509c9b1ac6935b1ee58926e25ad1e66f86711c1"
 }

package/proxied-wallets/create-proxied-wallet.js

@@ -6,6 +6,7 @@ const core_2 = require("@interchain-kit/core");
 const cosmos_wallet_1 = require("./cosmos-wallet");
 const ethereum_wallet_1 = require("./ethereum-wallet");
 const multi_chain_wallet_1 = require("./multi-chain-wallet");
+const solana_wallet_1 = require("./solana-wallet");
 // import { createWCWallet } from './wc-wallet';
 const createProxiedWallet = (wallet, store) => {
     // WalletConnect wallets are now handled by the generic AOP system
@@ -16,6 +17,9 @@ const createProxiedWallet = (wallet, store) => {
     if ((0, core_1.isInstanceOf)(wallet, core_2.EthereumWallet)) {
         return (0, ethereum_wallet_1.createEthereumWallet)(wallet, store);
     }
+    if ((0, core_1.isInstanceOf)(wallet, core_1.SolanaWallet)) {
+        return (0, solana_wallet_1.createSolanaWallet)(wallet, store);
+    }
     if ((0, core_1.isInstanceOf)(wallet, core_2.MultiChainWallet)) {
         Array.from(wallet.networkWalletMap.keys()).forEach(chainType => {
             const chainWallet = wallet.networkWalletMap.get(chainType);
@@ -25,6 +29,9 @@ const createProxiedWallet = (wallet, store) => {
             if ((0, core_1.isInstanceOf)(chainWallet, core_2.EthereumWallet)) {
                 wallet.setNetworkWallet(chainType, (0, ethereum_wallet_1.createEthereumWallet)(chainWallet, store));
             }
+            if ((0, core_1.isInstanceOf)(chainWallet, core_1.SolanaWallet)) {
+                wallet.setNetworkWallet(chainType, (0, solana_wallet_1.createSolanaWallet)(chainWallet, store));
+            }
         });
         return (0, multi_chain_wallet_1.createMultiChainWallet)(wallet, store);
     }

package/proxied-wallets/solana-wallet.d.ts

@@ -0,0 +1,3 @@
+import { SolanaWallet } from '@interchain-kit/core';
+import { InterchainStore } from '../store';
+export declare const createSolanaWallet: (target: SolanaWallet, store: InterchainStore) => import("../utils").AOPProxyType<SolanaWallet>;

package/proxied-wallets/solana-wallet.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSolanaWallet = void 0;
+const utils_1 = require("../utils");
+const createSolanaWallet = (target, store) => {
+    return (0, utils_1.createAOPProxy)({
+        target,
+        advice: {
+            signTransaction: {
+                onError(methodName, target, error, transaction) {
+                    store.updateChainWalletState(target.info.name, 'solana', { errorMessage: error.message });
+                },
+            },
+        }
+    });
+};
+exports.createSolanaWallet = createSolanaWallet;

package/store/index.d.ts

@@ -17,5 +17,5 @@ export declare class InterchainStore {
     getChainWalletState(walletName: string, chainName: string): ChainWalletState | undefined;
     buildIndexMap(): void;
     updateWalletState(walletName: string, state: Partial<ChainWalletState>): void;
-    isChainWalletStateExisted(walletName: string, chainName: string): number;
+    isChainWalletStateExisted(walletName: string, chainName: string): boolean;
 }

package/store/index.js

@@ -123,7 +123,7 @@ class InterchainStore {
         this.setState({ chainWalletStates: newChainWalletStates });
     }
     isChainWalletStateExisted(walletName, chainName) {
-        return this.chainWalletIndexMap.get(`${walletName}-${chainName}`);
+        return this.chainWalletIndexMap.get(`${walletName}-${chainName}`) !== undefined;
     }
 }
 exports.InterchainStore = InterchainStore;

package/utils/local-storage.d.ts

@@ -1,4 +1,4 @@
-import { InterchainStoreType } from "../types";
+import { InterchainStoreType } from '../types';
 export declare class LocalStorage {
     save(value: Partial<InterchainStoreType>): void;
     load(): Partial<InterchainStoreType>;

package/wallet-manager/chain-wallet-store.js

@@ -14,6 +14,7 @@ class ChainWalletStore extends core_1.BaseWallet {
         this.chain = chain;
         this.store = store;
         this.walletManager = walletManager;
+        this.info = this.wallet.info;
     }
     get walletState() {
         return this.store.getChainWalletState(this.chain.chainName, this.wallet.info.name)?.walletState || core_1.WalletState.NotExist;
@@ -38,7 +39,7 @@ class ChainWalletStore extends core_1.BaseWallet {
             });
         }
         try {
-            this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: core_1.WalletState.Connecting });
+            this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: core_1.WalletState.Connecting, errorMessage: '' });
             await this.wallet.connect(this.chain.chainId);
             const account = await this.getAccount();
             this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: core_1.WalletState.Connected, account });
@@ -64,7 +65,6 @@ class ChainWalletStore extends core_1.BaseWallet {
     async refreshAccount() {
         try {
             const account = await this.wallet.getAccount(this.chain.chainId);
-            console.log(this.wallet);
             this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { account });
         }
         catch (error) {

package/wallet-manager/index.d.ts

@@ -1,3 +1,3 @@
+export * from './chain-wallet-store';
 export * from './wallet-manager-store';
 export * from './wallet-store';
-export * from './chain-wallet-store';

package/wallet-manager/index.js

@@ -14,6 +14,6 @@ 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("./chain-wallet-store"), exports);
 __exportStar(require("./wallet-manager-store"), exports);
 __exportStar(require("./wallet-store"), exports);
-__exportStar(require("./chain-wallet-store"), exports);

package/wallet-manager/wallet-manager-store.js

@@ -39,9 +39,7 @@ class WalletManagerStore {
                     currentChainName: state.currentChainName,
                 });
             });
-            await Promise.all(this.wallets.map(wallet => {
-                return wallet.init();
-            }));
+            await Promise.all(this.wallets.map(wallet => wallet.init()));
             this.store.setState({ isReady: true });
         }
         catch (error) {
@@ -51,11 +49,10 @@ class WalletManagerStore {
     }
     restore() {
         const oldState = this.localStorage.load();
-        // 直接设置state，避免触发emit
         this.store.setState({
             chainWalletStates: oldState.chainWalletStates || [],
             currentWalletName: oldState.currentWalletName || '',
-            currentChainName: oldState.currentChainName || '',
+            currentChainName: oldState.currentChainName || ''
         });
         // 重建索引映射
         this.store.buildIndexMap();
@@ -85,6 +82,22 @@ class WalletManagerStore {
         // 合并过滤后的状态和新增的状态
         const finalChainWalletStates = [...filteredChainWalletStates, ...newChainWalletStates];
         this.store.setState({ chainWalletStates: finalChainWalletStates });
+        let isOldWalletNameExisted = false;
+        let isOldChainNameExisted = false;
+        for (const cws of finalChainWalletStates) {
+            if (cws.walletName === oldState.currentWalletName) {
+                isOldWalletNameExisted = true;
+            }
+            if (cws.chainName === oldState.currentChainName) {
+                isOldChainNameExisted = true;
+            }
+        }
+        // 直接设置state，避免触发emit
+        this.store.setState({
+            chainWalletStates: finalChainWalletStates,
+            currentWalletName: isOldWalletNameExisted ? oldState.currentWalletName : '',
+            currentChainName: isOldChainNameExisted ? oldState.currentChainName : '',
+        });
         this.store.buildIndexMap();
     }
     subscribe(callback) {

package/wallet-manager/wallet-store.d.ts

@@ -18,4 +18,5 @@ export declare class WalletStore extends BaseWallet {
     getAccount(chainId: Chain['chainId']): Promise<WalletAccount>;
     addSuggestChain(chainId: Chain['chainId']): Promise<void>;
     getProvider(chainId: Chain['chainId']): Promise<any>;
+    getWalletOfType<T>(WalletClass: new (...args: any[]) => T): T;
 }

package/wallet-manager/wallet-store.js

@@ -54,7 +54,7 @@ class WalletStore extends core_1.BaseWallet {
             await this.wallet.init();
         }
         catch (error) {
-            this.store.updateWalletState(this.wallet.info.name, { walletState: core_1.WalletState.NotExist, errorMessage: '' });
+            this.store.updateWalletState(this.wallet.info.name, { walletState: core_1.WalletState.NotExist, errorMessage: error.message });
         }
     }
     getChainWalletStore(chainName) {
@@ -99,5 +99,8 @@ class WalletStore extends core_1.BaseWallet {
         }
         return this.getChainWalletStore(chain.chainName).getProvider();
     }
+    getWalletOfType(WalletClass) {
+        return (0, core_1.getWalletByType)(this.wallet, WalletClass);
+    }
 }
 exports.WalletStore = WalletStore;