@sign-global/tokentable 0.4.1-beta.3 → 0.4.1-beta.5

package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.json

@@ -1,5 +1,5 @@
 {
-    "address": "EA9xKVuSHRae4wyrBSB1Hi22fgeti36S9kM6fVM2YYZb",
+    "address": "FCkSnf5Qd5Jva3ZdjFNGyZNhpCxmvjikXDkpWgE1vD3R",
     "metadata": {
         "name": "fungible_token_distributor_solana",
         "version": "0.1.0",
@@ -207,7 +207,7 @@
                 {
                     "name": "fee_collector",
                     "optional": true,
-                    "address": "88vcxLLBpjFMdmErmhxnHHnQMz5XYyNcRmmp41kQH65b"
+                    "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
                 },
                 {
                     "name": "user_fee",

package/dist/esm/airdrop/types/index.d.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;
 export interface EvmContractClientOption {
     chainId: ChainId;
@@ -143,7 +144,8 @@ export declare enum EvmAirdropVersionEnum {
     V3 = "0.3.0",// zeta 收费
     V4 = "0.4.0"
 }
-export type IWalletClient = TonConnectUI | ViemWalletClient;
+export type IWalletClient = TonWalletClient | ViemWalletClient | SolanaWalletState;
+export type { TonWalletClient, ViemWalletClient, SolanaWalletState };
 export type IAirdropService = TonAirdropService | EvmAirdropService;
 type BaseAirdropOptions = {
     endpoint?: string;
@@ -166,4 +168,3 @@ export interface IContractConfig {
 export declare enum ErrorCode {
     WALLET_ALREADY_CONNECTED = "Wallet already connected"
 }
-export {};

package/dist/esm/airdrop/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/airdrop/types/index.ts"],"names":[],"mappings":"AAeA,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,wBAAW,CAAA;IACX,8BAAiB,CAAA;AACnB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;AAsDD,MAAM,CAAN,IAAY,0BAKX;AALD,WAAY,0BAA0B;IACpC,mDAAqB,CAAA;IACrB,4DAA8B,CAAA;IAC9B,sDAAwB,CAAA;IACxB,sDAAwB,CAAA;AAC1B,CAAC,EALW,0BAA0B,KAA1B,0BAA0B,QAKrC;AAUD,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,qCAAuB,CAAA;IACvB,4BAAc,CAAA;AAChB,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AA6DD,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,0CAAiB,CAAA;IACjB,4CAAmB,CAAA;AACrB,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC;AAED,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,qCAAY,CAAA,CAAC,yBAAyB;AACxC,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;AA6BD,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,6BAA6B;IAC7B,kEAAqD,CAAA;AACvD,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/airdrop/types/index.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,wBAAW,CAAA;IACX,8BAAiB,CAAA;AACnB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;AAsDD,MAAM,CAAN,IAAY,0BAKX;AALD,WAAY,0BAA0B;IACpC,mDAAqB,CAAA;IACrB,4DAA8B,CAAA;IAC9B,sDAAwB,CAAA;IACxB,sDAAwB,CAAA;AAC1B,CAAC,EALW,0BAA0B,KAA1B,0BAA0B,QAKrC;AAUD,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,qCAAuB,CAAA;IACvB,4BAAc,CAAA;AAChB,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AA6DD,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,0CAAiB,CAAA;IACjB,4CAAmB,CAAA;AACrB,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC;AAED,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,qCAAY,CAAA,CAAC,yBAAyB;AACxC,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;AA8BD,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,6BAA6B;IAC7B,kEAAqD,CAAA;AACvD,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sign-global/tokentable",
-  "version": "0.4.1-beta.3",
+  "version": "0.4.1-beta.5",
   "publishConfig": {
     "access": "public"
   },

package/src/airdrop/SignatureAirdropClient.ts

@@ -1,4 +1,3 @@
-import { getAddress } from 'viem';
 import { CONST } from './constants';
 import { EvmSignatureAirdropService, SolanaSignatureAirdropService } from './contracts';
 import { WalletFactory } from '../wallets';
@@ -20,7 +19,9 @@ import {
   IAirdropSignatureIdentity,
   IClaimSignature,
   IProject,
-  IWalletClient
+  IWalletClient,
+  SolanaWalletState,
+  ViemWalletClient
 } from './types';
 import { cleanUrlParams, isMobile } from '../utils';
 
@@ -31,6 +32,8 @@ export class SignatureAirdropClient {
   protected claims?: IAirdropSignatureClaim[];
   protected identities?: IAirdropSignatureIdentity[];
   private projectPromise: Promise<void> | undefined;
+  private twitterPromise: Promise<void> | undefined;
+  private strategyCache: Map<string, EvmSignatureAirdropService | SolanaSignatureAirdropService> = new Map();
   constructor(params: IAirdropOptions) {
     this.projectId = params.projectId;
     this.endpoint = params.endpoint;
@@ -40,7 +43,7 @@ export class SignatureAirdropClient {
       this.projectPromise = this.initializeProjects();
     }
     if (isMobile()) {
-      this.checkAndHandleTwitterCode();
+      this.twitterPromise = this.checkAndHandleTwitterCode();
     }
   }
 
@@ -57,7 +60,7 @@ export class SignatureAirdropClient {
         if (res?.sid) {
           this.setSid(this.projectId!, res.sid);
         }
-        cleanUrlParams(['code', 'state']);
+        cleanUrlParams(['code', 'type']);
       }
     } catch (error) {
       console.error(error);
@@ -174,6 +177,9 @@ export class SignatureAirdropClient {
 
   async getClaims() {
     const project = await this.getProjectInfo();
+    if (this.twitterPromise) {
+      await this.twitterPromise;
+    }
     const res = await checkEligibility(
       {
         projectId: project.id
@@ -208,19 +214,32 @@ export class SignatureAirdropClient {
   ): Promise<EvmSignatureAirdropService | SolanaSignatureAirdropService> {
     const project = await this.getProjectInfo();
 
-    if (project.chainType === ChainType.Solana) {
-      return new SolanaSignatureAirdropService({
-        chainId: project.chainId,
-        projectId: project.id,
-        token: project.tokenAddress,
-        walletClient: walletClient as any
-      });
+    const cacheKey = walletClient
+      ? project.chainType === ChainType.Evm
+        ? (walletClient as ViemWalletClient).account?.address!
+        : project.chainType === ChainType.Solana
+        ? (walletClient as SolanaWalletState).publicKey!.toString()
+        : 'walletClient'
+      : 'default';
+    if (this.strategyCache.has(cacheKey)) {
+      return this.strategyCache.get(cacheKey)!;
     }
-    return new EvmSignatureAirdropService({
-      chainId: Number(project.chainId) as ChainId,
-      contractAddress: project.contractAddress,
-      walletClient: walletClient as any
-    });
+
+    const strategy =
+      project.chainType === ChainType.Solana
+        ? new SolanaSignatureAirdropService({
+            chainId: project.chainId,
+            projectId: project.id,
+            token: project.tokenAddress,
+            walletClient: walletClient as any
+          })
+        : new EvmSignatureAirdropService({
+            chainId: Number(project.chainId) as ChainId,
+            contractAddress: project.contractAddress,
+            walletClient: walletClient as any
+          });
+    this.strategyCache.set(cacheKey, strategy);
+    return strategy;
   }
 
   async getVersion(): Promise<string> {
@@ -228,7 +247,7 @@ export class SignatureAirdropClient {
     return strategy.getVersion();
   }
 
-  async getClaimFee(amount?: bigint): Promise<undefined | bigint> {
+  async getClaimFee(amount?: bigint): Promise<undefined | bigint | string> {
     const strategy = await this.getStrategy();
     if (!strategy.getClaimFee) {
       throw new Error('getClaimFee is not supported for this chain');
@@ -255,6 +274,7 @@ export class SignatureAirdropClient {
       throw new Error('No claims available');
     }
     const service = await this.getStrategy(walletClient);
+    const project = await this.getProjectInfo();
     const res = await checkGetSignatures(
       {
         claimIds,
@@ -274,6 +294,10 @@ export class SignatureAirdropClient {
       throw new Error('No matching claims found');
     }
 
+    // only evm use
+    const defaultRecipient =
+      project.chainType === ChainType.Evm ? (walletClient as ViemWalletClient).account?.address! : '';
+
     const claimData = filteredClaims.map((it) => {
       const signature = signatureMap[it.claimId];
       if (!signature) {
@@ -282,16 +306,12 @@ export class SignatureAirdropClient {
 
       return {
         ...it,
-        recipient: recipient ? recipient : walletClient.account?.address!,
+        recipient: recipient ? recipient : defaultRecipient,
         ...signature
       };
     });
-    const delegateMode = recipient ? getAddress(recipient) !== walletClient.account?.address : false;
-    const feeData = (await this.getClaimFee(1n)) || 0n;
-    const hash = (await service!.claim(
-      claimData,
-      delegateMode ? feeData * BigInt(claimData.length) : feeData
-    )) as `0x${string}`;
+
+    const hash = (await service!.claim(claimData, recipient)) as `0x${string}`;
     return hash;
   }
 

package/src/airdrop/constants/chain-config.ts

@@ -4,7 +4,6 @@ import {
   baseSepolia,
   cyber,
   mainnet,
-  mantaTestnet,
   polygonMumbai,
   polygonAmoy,
   sepolia,
@@ -12,7 +11,8 @@ import {
   zetachainAthensTestnet,
   zkSync,
   bsc,
-  berachainTestnet
+  berachainTestnet,
+  arbitrum
 } from 'viem/chains';
 import { mevmDevNet, tonMainNet, tonTestNet } from './network';
 
@@ -49,6 +49,10 @@ export const ChainConfig = {
     contractAddress: '0x00aFD4466E4Afa4F43cCd414b1BC65e574ACA2f5',
     rpcUrl: 'https://zetachain-mainnet.g.alchemy.com/v2/1tmk0FrhwTJHXh0XIyae7_SXw1lDCjgs'
   },
+  [arbitrum.id]: {
+    contractAddress: '0x759ac3CA33FeeAfB8C41aEbC8687A7Bd849Fc87a',
+    rpcUrl: arbitrum.rpcUrls.default.http[0]
+  },
   [berachainTestnet.id]: {
     contractAddress: '',
     rpcUrl: '',
@@ -97,6 +101,7 @@ export const SupportedChains = [
   polygonMumbai,
   polygonAmoy,
   mevmDevNet,
+  arbitrum,
   tonTestNet,
   tonMainNet
 ];

package/src/airdrop/contracts/evm/SignatureAirdropService.ts

@@ -1,3 +1,4 @@
+import { getAddress } from 'viem';
 import { ZERO_ADDRESS } from '../../constants';
 import { ChainId, EvmContractClientOption } from '../../types';
 import { AirdropSignatureClient } from './contracts/AirdropSignatureClient';
@@ -87,8 +88,12 @@ export class SignatureAirdropService {
       signature: string;
       extraData?: string;
     }[],
-    value?: bigint
+    recipient?: string
   ) {
+    const defaultRecipient = this.options.walletClient?.account?.address;
+    const delegateMode = recipient ? getAddress(recipient) !== defaultRecipient : false;
+    const feeData = (await this.getClaimFee(this.options.contractAddress, 1n)) || 0n;
+    const value = delegateMode ? feeData * BigInt(data.length) : feeData;
     return this.airdropClient.claim(data, value);
   }
 }

package/src/airdrop/contracts/solana/AirdropSignatureClient.ts

@@ -29,6 +29,10 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     });
   }
 
+  async getClaimFee() {
+    return this.FeeCollector.getClaimFee();
+  }
+
   async getStoragePDA(): Promise<PublicKey> {
     const [storagePDA] = await this.findProgramAddress([
       anchor.utils.bytes.utf8.encode('storage'),
@@ -172,32 +176,12 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
         })
       );
 
-      console.log(
-        anchor.web3.Ed25519Program.programId.toString(),
-        {
-          publicKey: new PublicKey(config.signer).toBytes(),
-          message: Uint8Array.from(hexStrToU8Array(claim.hash)),
-          signature: new Uint8Array(hexStrToU8Array(claim.signature))
-        },
-        'sign'
-      );
-
       const claimPDA = await this.getClaimPDA(claim.claimId);
 
       const decodedData = {
         claimableTimestamp: new anchor.BN(claim.unlockingAt),
         claimableAmount: new anchor.BN(claim.value)
       };
-      console.log(
-        airdropPDA.toString(),
-        claimPDA,
-        this.projectId,
-        new Uint8Array(hexStrToU8Array(claim.claimId)),
-        [],
-        decodedData,
-        Buffer.from(hexStrToU8Array(claim.signature)),
-        'txdata'
-      );
 
       tx.add(
         await this.program.methods

package/src/airdrop/contracts/solana/FeeCollectorClient.ts

@@ -31,4 +31,10 @@ export class FeeCollectorClient extends SolanaContractClientBase<FeeCollector> {
   async setDefaultFee(fee: string) {
     return this.invokeInstruction('setDefaultFee', {}, [new anchor.BN(fee)]);
   }
+
+  async getClaimFee(): Promise<string> {
+    const storagePDA = await this.getStoragePDA();
+    const storageData = await this.program.account.feeCollectorStorage.fetch(storagePDA);
+    return storageData.defaultFeesBips.toString();
+  }
 }

package/src/airdrop/contracts/solana/SignatureAirdropService.ts

@@ -39,15 +39,9 @@ export class SignatureAirdropService {
     return '';
   }
 
-  async getClaimFee(address: string, amount: bigint): Promise<bigint | undefined> {
-    // const feeCollector = await this.feeCollectors(this.options.contractAddress as string);
-    // if (!feeCollector || feeCollector === ZERO_ADDRESS) {
-    //   return undefined;
-    // }
-    // const feeClient = this.getFeeClient(feeCollector as string);
-    // const fee = (await feeClient.getFee(address, amount)) as bigint;
-    // return fee;
-    return 0n;
+  async getClaimFee(address: string, amount: bigint): Promise<string> {
+    const fee = this.airdropClient.getClaimFee();
+    return fee;
   }
 
   async batchFetchClaimed(userClaimIds: string[]): Promise<boolean[]> {
@@ -70,7 +64,7 @@ export class SignatureAirdropService {
       value: string;
       hash: string;
     }[],
-    value?: bigint
+    recipient?: string
   ) {
     return this.airdropClient.claim(data);
   }

package/src/airdrop/contracts/solana/fee_collector.json

@@ -1,5 +1,5 @@
 {
-  "address": "88vcxLLBpjFMdmErmhxnHHnQMz5XYyNcRmmp41kQH65b",
+  "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on",
   "metadata": {
     "name": "fee_collector",
     "version": "0.1.0",