@sign-global/tokentable 0.0.2 → 0.0.3

package/dist/esm/airdrop/index.js

@@ -1,7 +1,7 @@
 import { AirdropService as TonAirdropService } from './core/ton/AirdropService';
 import { AirdropService as EvmAirdropService } from './core/evm/AirdropService';
 import { getAirdropPro, getAirdropProject, getAirdropQuery } from './services';
-import { ChainType } from './types';
+import { ChainType, ETokenType, EvmAirdropVersionEnum } from './types';
 import { getTonProjectIdByAddress } from './common';
 export class AirdropClient {
     tonClient;
@@ -10,8 +10,11 @@ export class AirdropClient {
     endpoint;
     project;
     claims;
-    contractInstance;
+    contractInstanceWithWallet;
+    contractInstanceWithoutWallet;
     projectPromise;
+    claimHook;
+    cachedVersion = null;
     constructor(params) {
         if ('slug' in params) {
             this.slug = params.slug;
@@ -25,14 +28,9 @@ export class AirdropClient {
         let projectId = this.projectId;
         if (this.slug) {
             const res = await getAirdropPro(this.slug, this.endpoint);
-            const projectMap = res?.childProjectMapping;
+            const projectMap = res?.childProjectMapping || {};
             let legacyProjectId;
-            if (!address) {
-                legacyProjectId = Object.values(projectMap)[0];
-            }
-            else {
-                legacyProjectId = getTonProjectIdByAddress({ address, slug: this.slug, data: projectMap });
-            }
+            legacyProjectId = getTonProjectIdByAddress({ address, slug: this.slug, data: projectMap });
             if (legacyProjectId) {
                 projectId = legacyProjectId;
             }
@@ -42,7 +40,6 @@ export class AirdropClient {
         this.project = await getAirdropProject(projectId, this.endpoint);
     }
     async getProjectInfo() {
-        console.log(this.projectPromise);
         await this.projectPromise;
         if (!this.project)
             throw new Error('Project not found');
@@ -64,23 +61,41 @@ export class AirdropClient {
         return this.claims;
     }
     async getAirdropContractWrapper(options) {
-        if (!this.contractInstance) {
-            const project = await this.getProjectInfo();
-            const instance = project.chainType === ChainType.Evm
-                ? new EvmAirdropService({
-                    contractAddress: project.contractAddress,
-                    chainId: Number(project.chainId),
-                    walletClient: options.walletClient
-                })
-                : new TonAirdropService({
-                    chainId: project.chainId.toString(),
-                    address: project.contractAddress,
-                    walletClient: options.walletClient,
-                    tonClient: this.tonClient
-                });
-            this.contractInstance = instance;
+        const project = await this.getProjectInfo();
+        if (options?.walletClient) {
+            if (!this.contractInstanceWithWallet) {
+                const instance = project.chainType === ChainType.Evm
+                    ? new EvmAirdropService({
+                        contractAddress: project.contractAddress,
+                        chainId: Number(project.chainId),
+                        walletClient: options.walletClient
+                    })
+                    : new TonAirdropService({
+                        chainId: project.chainId.toString(),
+                        address: project.contractAddress,
+                        walletClient: options.walletClient,
+                        tonClient: this.tonClient
+                    });
+                this.contractInstanceWithWallet = instance;
+            }
+            return this.contractInstanceWithWallet;
+        }
+        else {
+            if (!this.contractInstanceWithoutWallet) {
+                const instance = project.chainType === ChainType.Evm
+                    ? new EvmAirdropService({
+                        contractAddress: project.contractAddress,
+                        chainId: Number(project.chainId)
+                    })
+                    : new TonAirdropService({
+                        chainId: project.chainId.toString(),
+                        address: project.contractAddress,
+                        tonClient: this.tonClient
+                    });
+                this.contractInstanceWithoutWallet = instance;
+            }
+            return this.contractInstanceWithoutWallet;
         }
-        return this.contractInstance;
     }
     getClaimDataById(claimId) {
         const claimData = this.claims?.find((it) => it.claimId === claimId);
@@ -88,19 +103,41 @@ export class AirdropClient {
             throw new Error('Claim data not found');
         return claimData;
     }
+    setClaimFeeHook(fn) {
+        this.claimHook = fn;
+    }
     async claimAirdrop({ claimId, walletClient }, options) {
         const claimData = this.getClaimDataById(claimId);
+        const project = await this.getProjectInfo();
         const contractWrapper = await this.getAirdropContractWrapper({
             walletClient
         });
+        if (project.chainType === ChainType.Evm) {
+            const version = await contractWrapper.getVersion();
+            const needsFeeData = !(project.tokenType === ETokenType.Native &&
+                [EvmAirdropVersionEnum.V3, EvmAirdropVersionEnum.V4].includes(version));
+            const value = needsFeeData ? await this.getClaimFee(BigInt(claimData.amount)) : undefined;
+            let extraData = {
+                isLegacy: true,
+                attestationId: BigInt(1)
+            };
+            if (this.claimHook) {
+                extraData = this.claimHook(claimData);
+            }
+            return contractWrapper.claim({
+                proof: claimData.proof,
+                group: claimData.group,
+                data: claimData.data,
+                value: value,
+                extraData: extraData
+            });
+        }
         return contractWrapper.claim(claimData, options);
     }
     async checkClaimed(claimId) {
         const claimData = this.getClaimDataById(claimId);
         const project = await this.getProjectInfo();
-        const contractWrapper = await this.getAirdropContractWrapper({
-            tonClient: this.tonClient
-        });
+        const contractWrapper = await this.getAirdropContractWrapper();
         if (project.chainType === ChainType.Evm) {
             return contractWrapper.isLeafUsed(claimData.leaf);
         }
@@ -108,32 +145,43 @@ export class AirdropClient {
     }
     async getPaused() {
         const project = await this.getProjectInfo();
-        const contractWrapper = await this.getAirdropContractWrapper({
-            tonClient: this.tonClient
-        });
+        const contractWrapper = await this.getAirdropContractWrapper();
         if (project.chainType === ChainType.Evm) {
             throw new Error('EVM chain is not supported');
         }
         return contractWrapper.getPaused();
     }
     async getVersion() {
-        const contractWrapper = await this.getAirdropContractWrapper({
-            tonClient: this.tonClient
-        });
-        return contractWrapper?.getVersion();
+        if (this.cachedVersion) {
+            return this.cachedVersion;
+        }
+        const contractWrapper = await this.getAirdropContractWrapper();
+        this.cachedVersion = await contractWrapper?.getVersion();
+        return this.cachedVersion;
     }
-    async batchFetchClaimed(leafs) {
+    async batchCheckClaimed() {
         const project = await this.getProjectInfo();
         if (project.chainType === ChainType.Ton) {
             throw new Error('TON chain is not supported');
         }
         const contractWrapper = await this.getAirdropContractWrapper({});
+        const leafs = this.claims?.map((it) => it.leaf);
+        if (!leafs)
+            return [];
         return contractWrapper.batchFetchClaimed(leafs);
     }
+    async getNFT() {
+        const project = await this.getProjectInfo();
+        if (project.chainType === ChainType.Ton) {
+            throw new Error('TON chain is not supported');
+        }
+        const contractWrapper = await this.getAirdropContractWrapper({});
+        return contractWrapper.getNFT();
+    }
     async getClaimFee(amount) {
         const project = await this.getProjectInfo();
         const contractWrapper = await this.getAirdropContractWrapper({});
-        return contractWrapper.getClaimFee(project.contractAddress, amount);
+        return contractWrapper.getClaimFee(project.contractAddress, amount || BigInt(1));
     }
 }
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/airdrop/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/airdrop/index.ts"],"names":[],"mappings":"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"}

package/dist/esm/airdrop/types/index.d.ts

@@ -15,6 +15,31 @@ export declare enum ChainType {
     Evm = "evm",
     Ton = "ton"
 }
+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;
+};
 export interface IProject {
     id: string;
     name: string;
@@ -29,13 +54,18 @@ export interface IProject {
     merkleRoot: string;
     ownerAddress: string;
     blockCountries: Record<string, string>;
-    themeConf: Record<string, any>;
+    themeConf: ThemeConfig | null;
     version: string;
     extra?: {
         kyc: boolean;
         tag: string;
     };
 }
+export declare enum ETokenType {
+    Erc20 = "ERC20",
+    Native = "NATIVE_TOKEN",
+    NFT = "ERC721"
+}
 export type IAirdropClaim = {
     index: number;
     recipient: string;

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

@@ -3,6 +3,12 @@ export var ChainType;
     ChainType["Evm"] = "evm";
     ChainType["Ton"] = "ton";
 })(ChainType || (ChainType = {}));
+export var ETokenType;
+(function (ETokenType) {
+    ETokenType["Erc20"] = "ERC20";
+    ETokenType["Native"] = "NATIVE_TOKEN";
+    ETokenType["NFT"] = "ERC721";
+})(ETokenType || (ETokenType = {}));
 export var TonAirdropVersionEnum;
 (function (TonAirdropVersionEnum) {
     TonAirdropVersionEnum["V1"] = "1.0.0";

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/airdrop/types/index.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,wBAAW,CAAA;AACb,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAmDD,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,0CAAiB,CAAA;AACnB,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/airdrop/types/index.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,wBAAW,CAAA;AACb,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAkDD,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,qCAAuB,CAAA;IACvB,4BAAc,CAAA;AAChB,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AA6BD,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,qCAAY,CAAA;IACZ,qCAAY,CAAA;IACZ,0CAAiB,CAAA;AACnB,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;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"}

package/dist/esm/index.d.ts

@@ -1 +1,2 @@
 export { AirdropClient } from './airdrop';
+export * from './airdrop/types';

package/dist/esm/index.js

@@ -1,2 +1,3 @@
 export { AirdropClient } from './airdrop';
+export * from './airdrop/types';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,cAAc,iBAAiB,CAAC"}

package/jest.config.cjs

@@ -0,0 +1,5 @@
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    testMatch: ['**/tests/**/*.test.ts'],
+  };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sign-global/tokentable",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -11,7 +11,8 @@
   "scripts": {
     "build-cjs": "tsc -m commonjs --outDir dist/cjs",
     "build-esm": "tsc -m esnext --outDir dist/esm",
-    "build": "pnpm run build-cjs && pnpm run build-esm"
+    "build": "pnpm run build-cjs && pnpm run build-esm",
+    "test": "jest"
   },
   "author": "Evan",
   "license": "ISC",
@@ -20,10 +21,13 @@
     "@ton/core": "^0.59.0",
     "@ton/ton": "^15.1.0",
     "@tonconnect/ui-react": "^2.0.9",
+    "@types/jest": "^29.5.14",
     "bignumber.js": "^9.1.2",
     "dayjs": "^1.11.13",
+    "jest": "^29.7.0",
     "tonapi-sdk-js": "^2.0.3",
     "tonweb": "^0.0.66",
+    "ts-jest": "^29.2.5",
     "viem": "^2.21.49",
     "wagmi": "^2.13.0"
   },

package/src/airdrop/common/index.ts

@@ -31,7 +31,7 @@ export const getTonProjectIdByAddress = ({
   slug,
   data
 }: {
-  address: string;
+  address?: string;
   slug: string;
   data: Record<string, string>;
 }): string | undefined => {
@@ -39,6 +39,11 @@ export const getTonProjectIdByAddress = ({
   if (!project) {
     project = data;
   }
+
+  if (!address) {
+    const firstProject = Object.values(project)[0];
+    return firstProject;
+  }
   const lastText = address[address.length - 1];
 
   const group = Object.keys(project || {}).find((key) => key.includes(lastText));

package/src/airdrop/core/evm/AirdropService.ts

@@ -94,7 +94,6 @@ export class AirdropService {
   }) {
     const version = await this.getVersion();
 
-    console.log(version, 'version');
     if (version === AirdropVersionEnum.V4) {
       const encodeData = encodeAbiParameters(
         [

package/src/airdrop/index.ts

@@ -3,7 +3,16 @@ import { TonConnectUI } from '@tonconnect/ui-react';
 import { AirdropService as TonAirdropService } from './core/ton/AirdropService';
 import { AirdropService as EvmAirdropService } from './core/evm/AirdropService';
 import { getAirdropPro, getAirdropProject, getAirdropQuery } from './services';
-import { ChainId, ChainType, IAirdropClaim, IAirdropOptions, IProject, IWalletClient } from './types';
+import {
+  ChainId,
+  ChainType,
+  ETokenType,
+  EvmAirdropVersionEnum,
+  IAirdropClaim,
+  IAirdropOptions,
+  IProject,
+  IWalletClient
+} from './types';
 import { getTonProjectIdByAddress } from './common';
 import { WalletClient as ViemWalletClient } from 'viem';
 
@@ -14,8 +23,11 @@ export class AirdropClient {
   private endpoint?: string;
   private project: IProject | undefined;
   protected claims?: IAirdropClaim[];
-  private contractInstance: TonAirdropService | EvmAirdropService | undefined;
+  private contractInstanceWithWallet: TonAirdropService | EvmAirdropService | undefined;
+  private contractInstanceWithoutWallet: TonAirdropService | EvmAirdropService | undefined;
   private projectPromise: Promise<void> | undefined;
+  private claimHook: ((v: any) => any) | undefined;
+  private cachedVersion: string | null = null;
 
   constructor(params: IAirdropOptions) {
     if ('slug' in params) {
@@ -31,14 +43,10 @@ export class AirdropClient {
     let projectId: string | undefined = this.projectId;
     if (this.slug) {
       const res = await getAirdropPro(this.slug, this.endpoint);
-      const projectMap = res?.childProjectMapping;
+      const projectMap = res?.childProjectMapping || {};
 
       let legacyProjectId: string | undefined;
-      if (!address) {
-        legacyProjectId = Object.values(projectMap)[0];
-      } else {
-        legacyProjectId = getTonProjectIdByAddress({ address, slug: this.slug, data: projectMap });
-      }
+      legacyProjectId = getTonProjectIdByAddress({ address, slug: this.slug, data: projectMap });
 
       if (legacyProjectId) {
         projectId = legacyProjectId;
@@ -49,7 +57,6 @@ export class AirdropClient {
   }
 
   async getProjectInfo() {
-    console.log(this.projectPromise);
     await this.projectPromise;
     if (!this.project) throw new Error('Project not found');
     return this.project;
@@ -75,30 +82,46 @@ export class AirdropClient {
     return this.claims;
   }
 
-  async getAirdropContractWrapper(options: {
+  async getAirdropContractWrapper(options?: {
     walletClient?: IWalletClient;
-    tonClient?: TonClient;
   }): Promise<TonAirdropService | EvmAirdropService> {
-    if (!this.contractInstance) {
-      const project = await this.getProjectInfo();
-
-      const instance =
-        project.chainType === ChainType.Evm
-          ? new EvmAirdropService({
-              contractAddress: project.contractAddress,
-              chainId: Number(project.chainId) as ChainId,
-              walletClient: options.walletClient as ViemWalletClient
-            })
-          : new TonAirdropService({
-              chainId: project.chainId.toString(),
-              address: project.contractAddress,
-              walletClient: options.walletClient as TonConnectUI,
-              tonClient: this.tonClient
-            });
-      this.contractInstance = instance;
-    }
+    const project = await this.getProjectInfo();
 
-    return this.contractInstance!;
+    if (options?.walletClient) {
+      if (!this.contractInstanceWithWallet) {
+        const instance =
+          project.chainType === ChainType.Evm
+            ? new EvmAirdropService({
+                contractAddress: project.contractAddress,
+                chainId: Number(project.chainId) as ChainId,
+                walletClient: options.walletClient as ViemWalletClient
+              })
+            : new TonAirdropService({
+                chainId: project.chainId.toString(),
+                address: project.contractAddress,
+                walletClient: options.walletClient as TonConnectUI,
+                tonClient: this.tonClient
+              });
+        this.contractInstanceWithWallet = instance;
+      }
+      return this.contractInstanceWithWallet;
+    } else {
+      if (!this.contractInstanceWithoutWallet) {
+        const instance =
+          project.chainType === ChainType.Evm
+            ? new EvmAirdropService({
+                contractAddress: project.contractAddress,
+                chainId: Number(project.chainId) as ChainId
+              })
+            : new TonAirdropService({
+                chainId: project.chainId.toString(),
+                address: project.contractAddress,
+                tonClient: this.tonClient
+              });
+        this.contractInstanceWithoutWallet = instance;
+      }
+      return this.contractInstanceWithoutWallet;
+    }
   }
 
   private getClaimDataById(claimId: string) {
@@ -107,16 +130,47 @@ export class AirdropClient {
     return claimData;
   }
 
+  setClaimFeeHook(fn: (v: any) => any) {
+    this.claimHook = fn;
+  }
+
   async claimAirdrop(
     { claimId, walletClient }: { claimId: string; walletClient: IWalletClient },
     options: { onLoading?: () => void }
   ) {
     const claimData = this.getClaimDataById(claimId);
+    const project = await this.getProjectInfo();
 
     const contractWrapper = await this.getAirdropContractWrapper({
       walletClient
     });
 
+    if (project.chainType === ChainType.Evm) {
+      const version = await contractWrapper.getVersion();
+      const needsFeeData = !(
+        project.tokenType === ETokenType.Native &&
+        [EvmAirdropVersionEnum.V3, EvmAirdropVersionEnum.V4].includes(version as EvmAirdropVersionEnum)
+      );
+
+      const value = needsFeeData ? await this.getClaimFee(BigInt(claimData.amount)) : undefined;
+
+      let extraData = {
+        isLegacy: true,
+        attestationId: BigInt(1)
+      };
+      if (this.claimHook) {
+        extraData = this.claimHook(claimData);
+      }
+
+      return (contractWrapper as EvmAirdropService).claim({
+        proof: claimData.proof,
+        group: claimData.group,
+        data: claimData.data,
+        value: value as bigint | undefined,
+        extraData: extraData
+      });
+    }
+
     return contractWrapper.claim(claimData, options);
   }
 
@@ -124,9 +178,7 @@ export class AirdropClient {
     const claimData = this.getClaimDataById(claimId);
     const project = await this.getProjectInfo();
 
-    const contractWrapper = await this.getAirdropContractWrapper({
-      tonClient: this.tonClient
-    });
+    const contractWrapper = await this.getAirdropContractWrapper();
 
     if (project.chainType === ChainType.Evm) {
       return (contractWrapper as EvmAirdropService).isLeafUsed(claimData.leaf);
@@ -137,9 +189,7 @@ export class AirdropClient {
 
   async getPaused() {
     const project = await this.getProjectInfo();
-    const contractWrapper = await this.getAirdropContractWrapper({
-      tonClient: this.tonClient
-    });
+    const contractWrapper = await this.getAirdropContractWrapper();
     if (project.chainType === ChainType.Evm) {
       throw new Error('EVM chain is not supported');
     }
@@ -147,13 +197,16 @@ export class AirdropClient {
   }
 
   async getVersion() {
-    const contractWrapper = await this.getAirdropContractWrapper({
-      tonClient: this.tonClient
-    });
-    return contractWrapper?.getVersion();
+    if (this.cachedVersion) {
+      return this.cachedVersion;
+    }
+    const contractWrapper = await this.getAirdropContractWrapper();
+
+    this.cachedVersion = await contractWrapper?.getVersion();
+    return this.cachedVersion;
   }
 
-  async batchFetchClaimed(leafs: string[]) {
+  async batchCheckClaimed() {
     const project = await this.getProjectInfo();
 
     if (project.chainType === ChainType.Ton) {
@@ -161,15 +214,30 @@ export class AirdropClient {
     }
 
     const contractWrapper = await this.getAirdropContractWrapper({});
+    const leafs = this.claims?.map((it) => it.leaf);
+
+    if (!leafs) return [];
 
     return (contractWrapper as EvmAirdropService).batchFetchClaimed(leafs);
   }
 
-  async getClaimFee(amount: bigint) {
+  async getNFT() {
+    const project = await this.getProjectInfo();
+
+    if (project.chainType === ChainType.Ton) {
+      throw new Error('TON chain is not supported');
+    }
+
+    const contractWrapper = await this.getAirdropContractWrapper({});
+
+    return (contractWrapper as EvmAirdropService).getNFT();
+  }
+
+  async getClaimFee(amount?: bigint) {
     const project = await this.getProjectInfo();
 
     const contractWrapper = await this.getAirdropContractWrapper({});
 
-    return contractWrapper.getClaimFee(project.contractAddress, amount);
+    return contractWrapper.getClaimFee(project.contractAddress, amount || BigInt(1));
   }
 }