@sign-global/tokentable 0.4.0-beta.8 → 0.4.0

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 any;
+    const tonConnectUI = tonStore.walletClient as TonConnectUI;
     // 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,10 +72,12 @@ export class TonWallet extends WalletBase<TonStoreType> {
     if (authType) {
       const wallets = await tonConnectUI.getWallets();
 
-      const currentWallet = wallets.find((wallet: any) =>
+      const currentWallet = wallets.find((wallet) =>
         [wallet.name, wallet.appName].includes(authType)
       ) as WalletInfoRemote;
 
+      console.log(wallets, currentWallet, 'ww');
+
       const link = tonConnectUI.connector.connect(
         {
           bridgeUrl: currentWallet.bridgeUrl,
@@ -131,19 +133,13 @@ export class TonWallet extends WalletBase<TonStoreType> {
     };
   }
 
-  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);
+  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, '  '));
     return signRes;
   }
 

package/src/airdrop/services/index.ts

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

package/src/airdrop/types/index.ts

@@ -1,6 +1,7 @@
 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';
 
@@ -62,7 +63,6 @@ export interface IProject {
   version: string;
   extra?: IProjectExtra;
   identities: Identity[];
-  projectTag: string;
 }
 
 export interface Identity {
@@ -113,33 +113,10 @@ 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;
-}
-
 export interface IAirdropData {
   claims: IAirdropClaim[];
 }
 
-export interface IAirdropSignatureData {
-  claims: IAirdropSignatureClaim[];
-  identities: IAirdropSignatureIdentity[];
-}
-
 export enum TonAirdropVersionEnum {
   V1 = '1.0.0',
   V2 = '2.0.0',
@@ -159,7 +136,6 @@ export type IAirdropService = TonAirdropService | EvmAirdropService;
 
 type BaseAirdropOptions = {
   endpoint?: string;
-  project?: IProject;
 };
 
 type ProjectIdOptions = BaseAirdropOptions & {

package/src/index.ts

@@ -1,10 +1,2 @@
-export {
-  AirdropClient,
-  SignatureAirdropClient,
-  CONST,
-  WalletFactory,
-  EvmProvider,
-  SolanaProvider,
-  TonProvider
-} from './airdrop';
+export { AirdropClient } from './airdrop';
 export * from './airdrop/types';

package/src/utils/api-client.ts

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

package/dist/cjs/airdrop/core/evm/SignatureAirdropService.d.ts

@@ -1,23 +0,0 @@
-import { EvmContractClientOption } from '../../types';
-import { DeployerClient } from './contracts/DeployClient';
-export declare class SignatureAirdropService {
-    options: EvmContractClientOption;
-    constructor(options: EvmContractClientOption);
-    private get airdropClient();
-    getDeployerClient(): Promise<DeployerClient>;
-    private getFeeClient;
-    getDeployer(): Promise<string>;
-    getVersion(): Promise<any>;
-    feeCollectors: (address: string) => Promise<unknown>;
-    feeTokens: (address: string) => Promise<unknown>;
-    getFeelessThreshold(): Promise<void>;
-    getClaimFee(address: string, amount: bigint): Promise<bigint | undefined>;
-    batchFetchClaimed(userClaimIds: string[]): Promise<boolean[]>;
-    claim(data: {
-        recipient: string;
-        claimId: string;
-        data: string;
-        signature: string;
-        extraData?: string;
-    }[], value?: bigint): Promise<`0x${string}`>;
-}

package/dist/cjs/airdrop/core/evm/SignatureAirdropService.js

@@ -1,71 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SignatureAirdropService = void 0;
-const constants_1 = require("../../constants");
-const AirdropSignatureClient_1 = require("./contracts/AirdropSignatureClient");
-const DeployClient_1 = require("./contracts/DeployClient");
-const FeeCollectorClient_1 = require("./contracts/FeeCollectorClient");
-class SignatureAirdropService {
-    options;
-    constructor(options) {
-        this.options = options;
-    }
-    get airdropClient() {
-        if (!this.options) {
-            throw new Error('options is empty');
-        }
-        return new AirdropSignatureClient_1.AirdropSignatureClient(this.options);
-    }
-    async getDeployerClient() {
-        const deployer = await this.getDeployer();
-        return new DeployClient_1.DeployerClient({
-            ...this.options,
-            contractAddress: deployer
-        });
-    }
-    getFeeClient(address) {
-        if (!this.options) {
-            throw new Error('options is empty');
-        }
-        return new FeeCollectorClient_1.FeeCollectorClient({
-            ...this.options,
-            chainId: this.options.chainId,
-            contractAddress: address
-        });
-    }
-    async getDeployer() {
-        return this.airdropClient.getDeployer();
-    }
-    async getVersion() {
-        return this.airdropClient.getVersion();
-    }
-    feeCollectors = async (address) => {
-        const deployerClient = await this.getDeployerClient();
-        return await deployerClient.feeCollectors(address);
-    };
-    feeTokens = async (address) => {
-        const deployerClient = await this.getDeployerClient();
-        return await deployerClient.feeTokens(address);
-    };
-    async getFeelessThreshold() {
-        // return this.airdropClient.getFeelessThreshold();
-    }
-    async getClaimFee(address, amount) {
-        const feeCollector = await this.feeCollectors(this.options.contractAddress);
-        if (!feeCollector || feeCollector === constants_1.ZERO_ADDRESS) {
-            return undefined;
-        }
-        const feeClient = this.getFeeClient(feeCollector);
-        const fee = (await feeClient.getFee(address, amount));
-        return fee;
-    }
-    async batchFetchClaimed(userClaimIds) {
-        const res = await this.airdropClient.batchFetchClaimed(userClaimIds);
-        return res;
-    }
-    async claim(data, value) {
-        return this.airdropClient.claim(data, value);
-    }
-}
-exports.SignatureAirdropService = SignatureAirdropService;
-//# sourceMappingURL=SignatureAirdropService.js.map

package/dist/cjs/airdrop/core/evm/SignatureAirdropService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SignatureAirdropService.js","sourceRoot":"","sources":["../../../../../src/airdrop/core/evm/SignatureAirdropService.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAE/C,+EAA4E;AAC5E,2DAA0D;AAC1D,uEAAoE;AAEpE,MAAa,uBAAuB;IAClC,OAAO,CAA0B;IACjC,YAAY,OAAgC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,IAAY,aAAa;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,+CAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,OAAO,IAAI,6BAAc,CAAC;YACxB,GAAG,IAAI,CAAC,OAAO;YACf,eAAe,EAAE,QAAQ;SAC1B,CAAC,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,OAAe;QAClC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,uCAAkB,CAAC;YAC5B,GAAG,IAAI,CAAC,OAAO;YACf,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAkB;YACxC,eAAe,EAAE,OAAO;SACzB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED,aAAa,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACxC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,OAAO,MAAM,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC,CAAC;IAEF,SAAS,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACpC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,OAAO,MAAM,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC,CAAC;IAEF,KAAK,CAAC,mBAAmB;QACvB,mDAAmD;IACrD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,MAAc;QAC/C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,eAAyB,CAAC,CAAC;QACtF,IAAI,CAAC,YAAY,IAAI,YAAY,KAAK,wBAAY,EAAE,CAAC;YACnD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,YAAsB,CAAC,CAAC;QAC5D,MAAM,GAAG,GAAG,CAAC,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAW,CAAC;QAChE,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,YAAsB;QAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACrE,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IAMG,EACH,KAAc;QAEd,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF;AAnFD,0DAmFC"}

package/dist/cjs/airdrop/core/evm/contracts/AirdropSignatureClient.d.ts

@@ -1,16 +0,0 @@
-import { EvmContractClientOption } from '../../../types';
-import { ContractBaseClient } from './ContractBaseClient';
-export declare class AirdropSignatureClient extends ContractBaseClient {
-    constructor(options: EvmContractClientOption);
-    getClaimStatus(userClaimId: string): Promise<unknown>;
-    claim(data: {
-        recipient: string;
-        data: string;
-        claimId: string;
-        signature: string;
-        extraData?: string;
-    }[], value?: bigint): Promise<`0x${string}`>;
-    batchFetchClaimed(userClaimIds: string[]): Promise<boolean[]>;
-    getDeployer(): Promise<string>;
-    getVersion(): Promise<any>;
-}

package/dist/cjs/airdrop/core/evm/contracts/AirdropSignatureClient.js

@@ -1,47 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AirdropSignatureClient = void 0;
-const FungibleTokenECDSADistributor_json_1 = __importDefault(require("./abis/FungibleTokenECDSADistributor.json"));
-const ContractBaseClient_1 = require("./ContractBaseClient");
-class AirdropSignatureClient extends ContractBaseClient_1.ContractBaseClient {
-    constructor(options) {
-        super({
-            ...options,
-            abi: FungibleTokenECDSADistributor_json_1.default
-        });
-    }
-    async getClaimStatus(userClaimId) {
-        return this.readContract({ functionName: 'getClaimStatus', args: [userClaimId] });
-    }
-    async claim(data, value) {
-        const [recipients = [], userClaimIds = [], datas = [], signatures = [], extraDatas = []] = [
-            'recipient',
-            'claimId',
-            'data',
-            'signature',
-            'extraData'
-        ].map((key) => data.map((item) => item[key] || ''));
-        return this.writeContract({
-            functionName: 'claim',
-            args: [recipients, userClaimIds, datas, signatures, extraDatas],
-            value: value || 0n
-        });
-    }
-    async batchFetchClaimed(userClaimIds) {
-        const res = (await this.readContract({ functionName: 'getClaimStatus', args: [userClaimIds] }));
-        return res;
-    }
-    async getDeployer() {
-        const res = (await this.readContract({ functionName: 'getStorage' }));
-        return res?.[3];
-    }
-    async getVersion() {
-        const res = (await this.readContract({ functionName: 'getStorage' }));
-        return res?.[0];
-    }
-}
-exports.AirdropSignatureClient = AirdropSignatureClient;
-//# sourceMappingURL=AirdropSignatureClient.js.map

package/dist/cjs/airdrop/core/evm/contracts/AirdropSignatureClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AirdropSignatureClient.js","sourceRoot":"","sources":["../../../../../../src/airdrop/core/evm/contracts/AirdropSignatureClient.ts"],"names":[],"mappings":";;;;;;AACA,mHAA4D;AAC5D,6DAA0D;AAE1D,MAAa,sBAAuB,SAAQ,uCAAkB;IAC5D,YAAY,OAAgC;QAC1C,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,GAAG,EAAE,4CAAG;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAmB;QACtC,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,YAAY,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IAMG,EACH,KAAc;QAEd,MAAM,CAAC,UAAU,GAAG,EAAE,EAAE,YAAY,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,UAAU,GAAG,EAAE,EAAE,UAAU,GAAG,EAAE,CAAC,GAAG;YACzF,WAAW;YACX,SAAS;YACT,MAAM;YACN,WAAW;YACX,WAAW;SACZ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAA6B,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAE9E,OAAO,IAAI,CAAC,aAAa,CAAC;YACxB,YAAY,EAAE,OAAO;YACrB,IAAI,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC;YAC/D,KAAK,EAAE,KAAK,IAAI,EAAE;SACnB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,YAAsB;QAC5C,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,YAAY,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAc,CAAC;QAC7G,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAU,CAAC;QAC/E,OAAO,GAAG,EAAE,CAAC,CAAC,CAAW,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAU,CAAC;QAC/E,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;CACF;AAnDD,wDAmDC"}