@sign-global/tokentable 0.4.0-beta.1 → 0.4.0-beta.11

package/src/airdrop/core/useWeb3ConnectWallet/providers/ton/TonWallet.ts

@@ -57,11 +57,11 @@ export class TonWallet extends WalletBase<TonStoreType> {
 
   async sign(originMsg: string): Promise<ISignResult> {
     const message = await hashSha256(originMsg);
-    const tonConnectUI = tonStore.walletClient as TonConnectUI;
+    const tonConnectUI = tonStore.walletClient as any;
     // const walletInfo = tonConnectUI?.wallet;
     const authType = '';
     // if (walletInfo?.jsBridgeKey && walletInfo?.openMethod !== 'qrcode') {
-    //     authType = walletInfo.jsBridgeKey; 
+    //     authType = walletInfo.jsBridgeKey;
     // }
 
     console.log(this.isConnected, tonConnectUI, 'connected');
@@ -72,12 +72,10 @@ export class TonWallet extends WalletBase<TonStoreType> {
     if (authType) {
       const wallets = await tonConnectUI.getWallets();
 
-      const currentWallet = wallets.find((wallet) =>
+      const currentWallet = wallets.find((wallet: any) =>
         [wallet.name, wallet.appName].includes(authType)
       ) as WalletInfoRemote;
 
-      console.log(wallets, currentWallet, 'ww');
-
       const link = tonConnectUI.connector.connect(
         {
           bridgeUrl: currentWallet.bridgeUrl,
@@ -133,13 +131,19 @@ export class TonWallet extends WalletBase<TonStoreType> {
     };
   }
 
-  override async signin(statement?: string): Promise<ISignResult> {
-    const fullMessage = {
-      statement: statement || 'Welcome to EthSign',
-      issuedAt: new Date().toISOString(),
-      nonce: getCustomNaNoId()
-    };
-    const signRes = await this.sign(JSON.stringify(fullMessage, null, '  '));
+  override async signin(statement: string, prepare = true): Promise<ISignResult> {
+    const fullMessage = prepare
+      ? JSON.stringify(
+          {
+            statement: statement || 'Welcome to EthSign',
+            issuedAt: new Date().toISOString(),
+            nonce: getCustomNaNoId()
+          },
+          null,
+          '  '
+        )
+      : statement;
+    const signRes = await this.sign(fullMessage);
     return signRes;
   }
 

package/src/airdrop/services/index.ts

@@ -1,6 +1,13 @@
 import { apiClient } from '../../utils/api-client';
 import { safeParseJSON } from '../../utils/utils';
-import { IAirdropData, IContractConfig, IProject } from '../types';
+import {
+  AirdropSigIdentityTypeEnum,
+  IAirdropData,
+  IAirdropSignatureData,
+  IClaimSignature,
+  IContractConfig,
+  IProject
+} from '../types';
 
 export { TonWalletService } from './wallet-service/ton';
 
@@ -11,7 +18,7 @@ const createApiClient = (baseURL?: string) => {
 export const getAirdropProject = async (projectId: string, baseURL?: string): Promise<IProject> => {
   const client = createApiClient(baseURL);
   const res = await client.get<any>(`/airdrop-open/projects/${projectId}`);
-  if (!res) return res; // res为null
+  if (!res) return res; // res is null
   const projectConfig = res?.themeConf;
   const blockCountries = safeParseJSON(projectConfig?.blockCountries);
   return {
@@ -70,27 +77,81 @@ export const getJettonInfo = async (
   return client.get(`/airdrop-open/jetton/${data.address}?isTestnet=${data.isTestnet}`);
 };
 
-export const connectTwitter = async (data: { code: string; redirectUri: string }, baseURL?: string) => {
+interface SidResponse {
+  sid: string;
+}
+
+interface TwitterConnectParams {
+  code: string;
+  projectId: string;
+}
+
+interface WalletBindParams {
+  projectId: string;
+  key: string;
+  signature: string;
+  message: string;
+  timestamp: number;
+  recipientType: string;
+}
+
+const getSidHeader = (projectId: string) => ({
+  sid: window.localStorage.getItem(`sid_${projectId}`) || ''
+});
+
+export const connectTwitter = async (data: TwitterConnectParams, baseURL?: string): Promise<SidResponse> => {
+  const client = createApiClient(baseURL);
+  return client.post('/airdrop-open/connect-twitter', data, {
+    headers: getSidHeader(data.projectId)
+  });
+};
+
+export const checkEligibility = async (
+  data: { projectId: string },
+  baseURL?: string
+): Promise<IAirdropSignatureData> => {
+  const headers = getSidHeader(data.projectId);
+  if (!headers.sid)
+    return {
+      claims: [],
+      identities: []
+    };
   const client = createApiClient(baseURL);
-  return client.post('/airdrop-open/connect-twitter', data);
+
+  return client.post('/airdrop-open/check-eligibility', data, {
+    headers: headers
+  });
 };
 
-export const checkEligibility = async (data: { projectId: string }, baseURL?: string) => {
+export const bindWallet = async (data: WalletBindParams, baseURL?: string): Promise<SidResponse> => {
   const client = createApiClient(baseURL);
-  return client.post('/airdrop-open/check-eligibility', data);
+  return client.post('/airdrop-open/connect-wallet', data, {
+    headers: getSidHeader(data.projectId)
+  });
 };
 
-export const bindWallet = async (
+interface DisconnectParams {
+  projectId: string;
+  recipientType: AirdropSigIdentityTypeEnum;
+  recipient?: string;
+}
+
+export const disconnectRecipient = async (data: DisconnectParams, baseURL?: string): Promise<void> => {
+  const client = createApiClient(baseURL);
+  return client.post('/airdrop-open/disconnect', data, {
+    headers: getSidHeader(data.projectId)
+  });
+};
+
+export const checkGetSignatures = async (
   data: {
     projectId: string;
-    key: string;
-    signature: string;
-    message: string;
-    timestamp: number;
-    recipientType: string;
+    claimIds: string[];
   },
   baseURL?: string
-) => {
+): Promise<{ signatures: IClaimSignature[] }> => {
   const client = createApiClient(baseURL);
-  return client.post('/airdrop-open/connect-wallet', data);
+  return client.post('/airdrop-open/check-get-signatures', data, {
+    headers: getSidHeader(data.projectId)
+  });
 };

package/src/airdrop/types/index.ts

@@ -1,7 +1,6 @@
 import { TonConnectUI } from '@tonconnect/ui-react';
 import { AirdropService as TonAirdropService } from '../core/ton/AirdropService';
 import { AirdropService as EvmAirdropService } from '../core/evm/AirdropService';
-import { TonClient } from '@ton/ton';
 import { ChainConfig } from '../constants';
 import { WalletClient as ViemWalletClient } from 'viem';
 
@@ -20,29 +19,29 @@ export enum ChainType {
 }
 
 export type ThemeConfig = {
-  logo: string;
-  title: string;
-  description: string;
-  coverImage: string;
-  subTitle: string;
-  primaryColor: string;
-  secondaryColor: string;
-  buttonPrimaryHover: string;
-  buttonSecondaryHover: string;
-  buttonPrimaryForeground: string;
-  buttonSecondaryForeground: string;
-  welcomeModalText: string;
-  welcomeModalTitle: string;
-  isShowWelcomeModal: boolean;
-  blockCountries: string;
-  termsOfUse: string;
-  successModalPrimaryBtnText: string;
-  successModalUrl: string;
-  successModalTitle: string;
-  successModalDesc: string;
-  successModalShareTexts: string;
-  isUnAvailable: boolean;
-  privacyPolicy: string;
+  logo?: string;
+  title?: string;
+  description?: string;
+  coverImage?: string;
+  subTitle?: string;
+  primaryColor?: string;
+  secondaryColor?: string;
+  buttonPrimaryHover?: string;
+  buttonSecondaryHover?: string;
+  buttonPrimaryForeground?: string;
+  buttonSecondaryForeground?: string;
+  welcomeModalText?: string;
+  welcomeModalTitle?: string;
+  isShowWelcomeModal?: boolean;
+  blockCountries?: string;
+  termsOfUse?: string;
+  successModalPrimaryBtnText?: string;
+  successModalUrl?: string;
+  successModalTitle?: string;
+  successModalDesc?: string;
+  successModalShareTexts?: string;
+  isUnAvailable?: boolean;
+  privacyPolicy?: string;
 };
 
 export interface IProject {
@@ -63,6 +62,7 @@ export interface IProject {
   version: string;
   extra?: IProjectExtra;
   identities: Identity[];
+  projectTag: string;
 }
 
 export interface Identity {
@@ -113,10 +113,40 @@ export type IAirdropClaim = {
   project: IProject;
 };
 
+export type IAirdropSignatureClaim = {
+  percent: number;
+  unlockingAt: number;
+  claimDeadline: number;
+  value: string;
+  recipient: string;
+  recipientType: string;
+  claimId: string;
+  data?: string;
+  signature?: string;
+  claimed?: boolean;
+};
+
+export interface IAirdropSignatureIdentity {
+  type: AirdropSigIdentityTypeEnum;
+  value: string;
+  displayName: string;
+}
+
 export interface IAirdropData {
   claims: IAirdropClaim[];
 }
 
+export interface IAirdropSignatureData {
+  claims: IAirdropSignatureClaim[];
+  identities: IAirdropSignatureIdentity[];
+}
+
+export interface IClaimSignature {
+  claimId: string;
+  data: string;
+  signature: string;
+}
+
 export enum TonAirdropVersionEnum {
   V1 = '1.0.0',
   V2 = '2.0.0',
@@ -136,6 +166,7 @@ export type IAirdropService = TonAirdropService | EvmAirdropService;
 
 type BaseAirdropOptions = {
   endpoint?: string;
+  project?: IProject;
 };
 
 type ProjectIdOptions = BaseAirdropOptions & {

package/src/utils/api-client.ts

@@ -5,6 +5,7 @@ export type ApiClientOptions = {
 export type ApiRequestOptions = {
   params?: Record<string, string | number>;
   skipHandleError?: boolean;
+  headers?: Record<string, string>;
 };
 
 type ApiResponse = {
@@ -48,11 +49,11 @@ export class ApiClient {
   ): Promise<unknown> {
     const finalUrl = (this.options?.baseURL || '') + url;
 
-    const init: RequestInit = { method };
+    const init: RequestInit = { method, headers: options?.headers || {} };
     if (data instanceof FormData) {
       init.body = data;
     } else {
-      init.headers = { 'content-type': 'application/json' };
+      init.headers = { 'content-type': 'application/json', ...init.headers };
       init.body = data ? JSON.stringify(data) : void 0;
     }