@sign-global/tokentable 0.4.1-beta.4 → 0.4.1-beta.6

package/src/airdrop/types/index.ts

@@ -1,8 +1,9 @@
-import { TonConnectUI } from '@tonconnect/ui-react';
+import { TonConnectUI as TonWalletClient } from '@tonconnect/ui-react';
 import { AirdropService as TonAirdropService } from '../contracts/ton/AirdropService';
 import { AirdropService as EvmAirdropService } from '../contracts/evm/AirdropService';
 import { ChainConfig } from '../constants';
 import { WalletClient as ViemWalletClient } from 'viem';
+import { WalletContextState as SolanaWalletState } from '@solana/wallet-adapter-react';
 
 export type ChainId = keyof typeof ChainConfig;
 
@@ -164,8 +165,9 @@ export enum EvmAirdropVersionEnum {
   V4 = '0.4.0' // zeta kyc、kyc threshold
 }
 
-export type IWalletClient = TonConnectUI | ViemWalletClient;
+export type IWalletClient = TonWalletClient | ViemWalletClient | SolanaWalletState;
 
+export type { TonWalletClient, ViemWalletClient, SolanaWalletState };
 export type IAirdropService = TonAirdropService | EvmAirdropService;
 
 type BaseAirdropOptions = {

package/src/wallets/providers/evm/EvmWallet.ts

@@ -44,29 +44,37 @@ export class EvmWallet extends WalletBase<EVMStoreType> {
   }
 
   async sign(_message: string) {
-    const sign = await signMessage(evmStore.config!, {
-      message: _message
-    });
-    return {
-      message: _message,
-      signature: sign
-    };
+    try {
+      const sign = await signMessage(evmStore.config!, {
+        message: _message
+      });
+      return {
+        message: _message,
+        signature: sign
+      };
+    } catch (error) {
+      throw error;
+    }
   }
 
   override async signin(statement: string, prepare = true): Promise<ISignResult> {
-    return new Promise((resolve) => {
-      const signCallback = (data: ReturnType<typeof useAccount>) => {
-        this.address = data.address;
-        this.chainId = data.chainId;
-        let fullMessage = statement;
-        if (prepare) {
-          const msg = prepareSignMessage({ statement, chainId: data.chainId!, address: data.address! });
-          fullMessage = get4361Message(msg);
+    return new Promise((resolve, reject) => {
+      const signCallback = async (data: ReturnType<typeof useAccount>) => {
+        try {
+          this.address = data.address;
+          this.chainId = data.chainId;
+          let fullMessage = statement;
+          if (prepare) {
+            const msg = prepareSignMessage({ statement, chainId: data.chainId!, address: data.address! });
+            fullMessage = get4361Message(msg);
+          }
+
+          const res = await this.sign(fullMessage);
+
+          resolve(res);
+        } catch (error) {
+          reject(error);
         }
-
-        const res = this.sign(fullMessage);
-
-        resolve(res);
       };
 
       const account = getAccount(evmStore.config!);