fix some issue

Author: theothersideofgods

examples/react/package.json

@@ -29,6 +29,7 @@
     "@interchain-kit/coin98-extension": "0.3.47",
     "@interchain-kit/compass-extension": "0.3.47",
     "@interchain-kit/core": "0.3.47",
+    "@interchain-kit/store": "0.3.47",
     "@interchain-kit/cosmos-extension-metamask": "0.3.47",
     "@interchain-kit/exodus-extension": "0.3.47",
     "@interchain-kit/fin-extension": "0.3.47",
@@ -79,4 +80,4 @@
     "vite": "^5.3.1"
   },
   "gitHead": "23631f4e4f9c1781d4de792a8da826cf0041180d"
-}
+}

examples/react/src/main.tsx

@@ -149,7 +149,17 @@ const _chains = [
   //   "http://localhost:26657",
   //   "http://localhost:1317"
   // ),
-];
+].map((c) => {
+  if (c.chainName === "solana") {
+    c.chainId = "4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ";
+  }
+  /**
+   * 主网：solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ（或简化为 solana:mainnet）
+测试网：solana:8E9rvCKLFYuNbobMWfCabm7Kkm2PzQw6A6FMnH7nL5V（或 solana:devnet）
+开发网：solana:EtWTRABZaYq6iMfeAkw（或 solana:devnet）
+   */
+  return c;
+});
 // const _chains = [starshipChain1]
 const _assetLists = [
   ...assetLists.filter((a) => chainNames.includes(a.chainName)),
@@ -185,11 +195,11 @@ const _wallets: BaseWallet[] = [
   // cosmostationWallet,
   // stationWallet,
   // galaxyStationWallet,
-  // walletConnect,
-  // ledgerWallet,
-  // cosmosExtensionMetaMask,
   walletConnect,
   // ledgerWallet,
+  // cosmosExtensionMetaMask,
+  // walletConnect,
+  ledgerWallet,
   // leapCosmosExtensionMetaMask,
   // compassWallet,
   // trustWallet,

examples/react/src/pages/all-wallets.tsx

@@ -4,6 +4,7 @@ import {
   EthereumWallet,
   isMobile,
   MultiChainWallet,
+  SolanaWallet,
   WCWallet,
 } from "@interchain-kit/core";
 import {
@@ -22,7 +23,7 @@ import QRCode from "react-qr-code";
 import { send } from "interchainjs/cosmos/bank/v1beta1/tx.rpc.func";
 import { RpcClient } from "@interchainjs/cosmos/query/rpc";
 import { ethers } from "ethers";
-import { StatefulWallet } from "@interchain-kit/react/store/stateful-wallet";
+
 import {
   Connection,
   PublicKey,
@@ -31,10 +32,11 @@ import {
   SystemProgram,
 } from "@solana/web3.js";
 import { MsgSend } from "interchainjs/cosmos/bank/v1beta1/tx";
+import { ChainWalletStore } from "@interchain-kit/store";
 
 type BalanceProps = {
   address: string;
-  wallet: StatefulWallet;
+  wallet: ChainWalletStore;
   chainName: string;
   chainId: string;
   chain: Chain;
@@ -44,7 +46,7 @@ type BalanceProps = {
 const BalanceTd = ({ address, wallet, chain, assetList }: BalanceProps) => {
   const { rpcEndpoint } = useChainWallet(
     chain.chainName,
-    wallet.info?.name as string
+    wallet.info.name as string
   );
 
   const [isLoading, setIsLoading] = useState(false);
@@ -98,7 +100,7 @@ const BalanceTd = ({ address, wallet, chain, assetList }: BalanceProps) => {
 };
 
 type SendTokenProps = {
-  wallet: StatefulWallet;
+  wallet: ChainWalletStore;
   address: string;
   chain: Chain;
 };
@@ -207,9 +209,14 @@ const SendTokenTd = ({ wallet, address, chain }: SendTokenProps) => {
       transaction.feePayer = new PublicKey(address);
       const { blockhash } = await connection.getLatestBlockhash();
       transaction.recentBlockhash = blockhash;
-      const client = await wallet.getProvider(chain.chainId as string);
-      // 3. Phantom 签名
-      const signed = await client.signTransaction(transaction);
+      // const client = await wallet.getProvider(chain.chainId as string);
+      //3. Phantom 签名
+      // const signed = await client.signTransaction(transaction);
+      // console.log(signed);
+
+      const solanaWallet = wallet.getWalletOfType(SolanaWallet);
+      const signed = await solanaWallet.signTransaction(transaction);
+      console.log(signed);
 
       // 4. 发送交易
       const signature = await connection.sendRawTransaction(signed.serialize());

packages/store/src/store/index.ts

@@ -144,7 +144,7 @@ export class InterchainStore {
   }
 
   isChainWalletStateExisted(walletName: string, chainName: string) {
-    return this.chainWalletIndexMap.get(`${walletName}-${chainName}`)
+    return this.chainWalletIndexMap.get(`${walletName}-${chainName}`) !== undefined;
   }
 }
 

packages/store/src/wallet-manager/chain-wallet-store.ts

@@ -1,6 +1,6 @@
-import { StdSignDoc } from '@interchainjs/types';
 import { Chain } from '@chain-registry/types';
 import { BaseWallet, CosmosWallet, DirectSignDoc, getWalletByType, isInstanceOf, OfflineAminoSigner, OfflineDirectSigner, SignType, WalletAccount, WalletManager, WalletState, WCWallet } from '@interchain-kit/core';
+import { StdSignDoc } from '@interchainjs/types';
 
 import { InterchainStore } from '../store';
 
@@ -21,6 +21,7 @@ export class ChainWalletStore extends BaseWallet {
     this.chain = chain;
     this.store = store;
     this.walletManager = walletManager;
+    this.info = this.wallet.info;
   }
 
   get walletState(): WalletState {
@@ -33,14 +34,14 @@ export class ChainWalletStore extends BaseWallet {
 
   async init(): Promise<void> {
     this.wallet.events.on('accountChanged', () => {
-      this.refreshAccount()
+      this.refreshAccount();
     });
   }
   async connect(): Promise<void> {
 
     const chainWalletState = this.store.getChainWalletState(this.wallet.info.name, this.chain.chainName);
     if (chainWalletState && chainWalletState.walletState === WalletState.NotExist) {
-      return Promise.resolve()
+      return Promise.resolve();
     }
 
     if (isInstanceOf(this.wallet, WCWallet)) {
@@ -51,7 +52,8 @@ export class ChainWalletStore extends BaseWallet {
     }
 
     try {
-      this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: WalletState.Connecting });
+      console.log(1);
+      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 });
@@ -77,9 +79,7 @@ export class ChainWalletStore extends BaseWallet {
 
   async refreshAccount(): Promise<void> {
     try {
-      const account = await this.wallet.getAccount(this.chain.chainId)
-
-      console.log(this.wallet)
+      const account = await this.wallet.getAccount(this.chain.chainId);
 
       this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { account });
     } catch (error) {
@@ -108,20 +108,20 @@ export class ChainWalletStore extends BaseWallet {
 
     const preferredSignTypeFromSettings = this.walletManager.getPreferSignType(this.chain.chainName);
 
-    const account = await this.getAccount()
+    const account = await this.getAccount();
 
     const aminoOfflineSigner = {
       getAccounts: async () => [account],
       signAmino: async (signer: string, signDoc: StdSignDoc) => {
         return cosmosWallet.signAmino(this.chain.chainId, signer, signDoc, {});
       }
-    }
+    };
     const directOfflineSigner = {
       getAccounts: async () => [account],
       signDirect: async (signer: string, signDoc: DirectSignDoc) => {
         return cosmosWallet.signDirect(this.chain.chainId, signer, signDoc, {});
       }
-    }
+    };
 
     const signType = preferSignType || preferredSignTypeFromSettings;
 

packages/store/src/wallet-manager/wallet-store.ts

@@ -1,5 +1,5 @@
 import { Chain } from '@chain-registry/types';
-import { BaseWallet, WalletAccount, WalletManager, WalletState } from '@interchain-kit/core';
+import { BaseWallet, getWalletByType, WalletAccount, WalletManager, WalletState } from '@interchain-kit/core';
 
 import { InterchainStore } from '../store';
 import { ChainWalletStore } from './chain-wallet-store';
@@ -119,4 +119,7 @@ export class WalletStore extends BaseWallet {
     }
     return this.getChainWalletStore(chain.chainName).getProvider();
   }
+  getWalletOfType<T>(WalletClass: new (...args: any[]) => T) {
+    return getWalletByType(this.wallet, WalletClass);
+  }
 }

wallets/coin98-extension/src/extension.ts

@@ -1,10 +1,13 @@
 import { CosmosWallet, EthereumWallet, MultiChainWallet } from '@interchain-kit/core';
 
+import { coin98ExtensionInfo } from './registry';
 
-const coin98Wallet = new MultiChainWallet(Coin98ExtensionInfo);
+export * from './registry';
 
-coin98Wallet.setNetworkWallet('eip155', new EthereumWallet(Coin98ExtensionInfo));
-coin98Wallet.setNetworkWallet('cosmos', new CosmosWallet(Coin98ExtensionInfo));
+const coin98Wallet = new MultiChainWallet(coin98ExtensionInfo);
+
+coin98Wallet.setNetworkWallet('eip155', new EthereumWallet(coin98ExtensionInfo));
+coin98Wallet.setNetworkWallet('cosmos', new CosmosWallet(coin98ExtensionInfo));
 
 export {
   coin98Wallet