@sign-global/tokentable 0.4.1-beta.9 → 0.4.3-beta.0

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/airdrop/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/airdrop/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,EAC7B,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC"}

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

@@ -56,6 +56,7 @@ export declare const disconnectRecipient: (data: DisconnectParams, baseURL?: str
 export declare const checkGetSignatures: (data: {
     projectId: string;
     claimIds: string[];
+    recipient: string;
 }, baseURL?: string) => Promise<{
     signatures: IClaimSignature[];
 }>;

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

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

package/package.json

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

package/src/airdrop/SignatureAirdropClient.ts

@@ -263,7 +263,7 @@ export class SignatureAirdropClient {
   }: {
     claimIds: string[];
     walletClient: IWalletClient;
-    recipient?: string;
+    recipient: string;
   }) {
     if (!claimIds.length) {
       throw new Error('Claim IDs cannot be empty');
@@ -279,7 +279,8 @@ export class SignatureAirdropClient {
     const res = await checkGetSignatures(
       {
         claimIds,
-        projectId: this.projectId!
+        projectId: this.projectId!,
+        recipient
       },
       this.endpoint
     );

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

@@ -4,6 +4,7 @@ import { ChainId, EvmContractClientOption } from '../../types';
 import { AirdropSignatureClient } from './contracts/AirdropSignatureClient';
 import { DeployerClient } from './contracts/DeployClient';
 import { FeeCollectorClient } from './contracts/FeeCollectorClient';
+import { AirdropSignatureFeeClient } from './contracts/AirdropSignatureFeeClient';
 
 export class SignatureAirdropService {
   options: EvmContractClientOption;
@@ -18,6 +19,13 @@ export class SignatureAirdropService {
 
     return new AirdropSignatureClient(this.options);
   }
+  private get airdropWithFeeClient(): AirdropSignatureFeeClient {
+    if (!this.options) {
+      throw new Error('options is empty');
+    }
+
+    return new AirdropSignatureFeeClient(this.options);
+  }
 
   async getDeployerClient(): Promise<DeployerClient> {
     const deployer = await this.getDeployer();
@@ -86,10 +94,17 @@ export class SignatureAirdropService {
       claimId: string;
       data: string;
       signature: string;
+      fees?: string;
       extraData?: string;
     }[],
     recipient?: string
   ) {
+    const version = await this.getVersion();
+
+    if (version.includes('FungibleTokenWithFeesECDSADistributor')) {
+      const totalFees = data.map((item) => BigInt(item.fees || '0')).reduce((sum, fee) => sum + fee, BigInt(0));
+      return this.airdropWithFeeClient.claim(data, totalFees);
+    }
     const defaultRecipient = this.options.walletClient?.account?.address;
     const delegateMode = recipient ? getAddress(recipient) !== defaultRecipient : false;
     const feeData = (await this.getClaimFee(this.options.contractAddress, 1n)) || 0n;

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

@@ -32,6 +32,8 @@ export class AirdropSignatureClient extends ContractBaseClient {
       'extraData'
     ].map((key) => data.map((item) => item[key as keyof (typeof data)[0]] || ''));
 
+    console.log('params', [recipients, userClaimIds, datas, signatures, extraDatas], value);
+
     return this.writeContract({
       functionName: 'claim',
       args: [recipients, userClaimIds, datas, signatures, extraDatas],

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

@@ -0,0 +1,61 @@
+import { EvmContractClientOption } from '../../../types';
+import ABI from './abis/FungibleTokenWithFeesECDSADistributor.json';
+import { ContractBaseClient } from './ContractBaseClient';
+
+export class AirdropSignatureFeeClient extends ContractBaseClient {
+  constructor(options: EvmContractClientOption) {
+    super({
+      ...options,
+      abi: ABI
+    });
+  }
+
+  async getClaimStatus(userClaimId: string) {
+    return this.readContract({ functionName: 'getClaimStatus', args: [userClaimId] });
+  }
+
+  async claim(
+    data: {
+      recipient: string;
+      data: string;
+      claimId: string;
+      signature: string;
+      extraData?: string;
+    }[],
+    value?: bigint
+  ) {
+    const [recipients = [], userClaimIds = [], datas = [], signatures = [], extraDatas = []] = [
+      'recipient',
+      'claimId',
+      'data',
+      'signature',
+      'extraData'
+    ].map((key) => data.map((item) => item[key as keyof (typeof data)[0]] || ''));
+
+    return this.writeContract({
+      functionName: 'claim',
+      args: [recipients, userClaimIds, datas, signatures, extraDatas],
+      value: value || 0n
+    });
+  }
+
+  async batchFetchClaimed(userClaimIds: string[]) {
+    const res = (await this.readContract({ functionName: 'getClaimStatus', args: [userClaimIds] })) as boolean[];
+    return res;
+  }
+
+  async getDeployer() {
+    const res = (await this.readContract({ functionName: 'getStorage' })) as any[];
+    return res?.[3] as string;
+  }
+
+  async getVersion() {
+    const res = (await this.readContract({ functionName: 'getStorage' })) as any[];
+    return res?.[0];
+  }
+
+  async getPaused() {
+    const res = (await this.readContract({ functionName: 'getStorage' })) as any[];
+    return res?.[2] as boolean;
+  }
+}

package/src/airdrop/contracts/evm/contracts/abis/FungibleTokenWithFeesECDSADistributor.json

@@ -0,0 +1,260 @@
+[
+  {
+    "inputs": [{ "internalType": "address", "name": "target", "type": "address" }],
+    "name": "AddressEmptyCode",
+    "type": "error"
+  },
+  { "inputs": [], "name": "ClaimClaimed", "type": "error" },
+  {
+    "inputs": [{ "internalType": "address", "name": "implementation", "type": "address" }],
+    "name": "ERC1967InvalidImplementation",
+    "type": "error"
+  },
+  { "inputs": [], "name": "ERC1967NonPayable", "type": "error" },
+  { "inputs": [], "name": "EnforcedPause", "type": "error" },
+  { "inputs": [], "name": "ExpectedPause", "type": "error" },
+  { "inputs": [], "name": "FailedCall", "type": "error" },
+  { "inputs": [], "name": "IncorrectFees", "type": "error" },
+  { "inputs": [], "name": "InvalidInitialization", "type": "error" },
+  { "inputs": [], "name": "InvalidSignature", "type": "error" },
+  { "inputs": [], "name": "NotInitializing", "type": "error" },
+  { "inputs": [], "name": "OutsideClaimableTimeRange", "type": "error" },
+  {
+    "inputs": [{ "internalType": "address", "name": "owner", "type": "address" }],
+    "name": "OwnableInvalidOwner",
+    "type": "error"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "account", "type": "address" }],
+    "name": "OwnableUnauthorizedAccount",
+    "type": "error"
+  },
+  { "inputs": [], "name": "ReentrancyGuardReentrantCall", "type": "error" },
+  {
+    "inputs": [{ "internalType": "address", "name": "token", "type": "address" }],
+    "name": "SafeERC20FailedOperation",
+    "type": "error"
+  },
+  { "inputs": [], "name": "TimeInactive", "type": "error" },
+  { "inputs": [], "name": "UUPSUnauthorizedCallContext", "type": "error" },
+  {
+    "inputs": [{ "internalType": "bytes32", "name": "slot", "type": "bytes32" }],
+    "name": "UUPSUnsupportedProxiableUUID",
+    "type": "error"
+  },
+  { "inputs": [], "name": "UnsupportedOperation", "type": "error" },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint64", "name": "version", "type": "uint64" }],
+    "name": "Initialized",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "address", "name": "account", "type": "address" }],
+    "name": "Paused",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "address", "name": "account", "type": "address" }],
+    "name": "Unpaused",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": true, "internalType": "address", "name": "implementation", "type": "address" }],
+    "name": "Upgraded",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "UPGRADE_INTERFACE_VERSION",
+    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address[]", "name": "recipients", "type": "address[]" },
+      { "internalType": "bytes32[]", "name": "userClaimIds", "type": "bytes32[]" },
+      { "internalType": "bytes[]", "name": "datas", "type": "bytes[]" },
+      { "internalType": "bytes[]", "name": "signatures", "type": "bytes[]" },
+      { "internalType": "bytes[]", "name": "extraDatas", "type": "bytes[]" }
+    ],
+    "name": "claim",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
+    "name": "decodeUserClaimData",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "uint256", "name": "claimableTimestamp", "type": "uint256" },
+          { "internalType": "uint256", "name": "claimableAmount", "type": "uint256" }
+        ],
+        "internalType": "struct FungibleTokenECDSADistributorData",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes", "name": "userClaimData", "type": "bytes" }],
+    "name": "decodeUserClaimDataWithFees",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "uint256", "name": "claimableTimestamp", "type": "uint256" },
+          { "internalType": "uint256", "name": "claimableAmount", "type": "uint256" },
+          { "internalType": "uint256", "name": "fees", "type": "uint256" }
+        ],
+        "internalType": "struct FungibleTokenWithFeesECDSADistributorData",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes32", "name": "userClaimId", "type": "bytes32" },
+      { "internalType": "bytes", "name": "userClaimData", "type": "bytes" }
+    ],
+    "name": "encodeHashToBeSigned",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes32[]", "name": "userClaimIds", "type": "bytes32[]" }],
+    "name": "getClaimStatus",
+    "outputs": [{ "internalType": "bool[]", "name": "", "type": "bool[]" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getStorage",
+    "outputs": [
+      { "internalType": "string", "name": "version_", "type": "string" },
+      { "internalType": "address", "name": "owner", "type": "address" },
+      { "internalType": "bool", "name": "paused", "type": "bool" },
+      { "internalType": "address", "name": "deployer", "type": "address" },
+      { "internalType": "address", "name": "authorizedSigner", "type": "address" },
+      { "internalType": "address", "name": "token", "type": "address" },
+      { "internalType": "address", "name": "claimHook", "type": "address" },
+      { "internalType": "uint256", "name": "startTime", "type": "uint256" },
+      { "internalType": "uint256", "name": "endTime", "type": "uint256" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "owner_", "type": "address" }],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "paused",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "proxiableUUID",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  { "inputs": [], "name": "renounceOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "token", "type": "address" },
+      { "internalType": "uint256", "name": "startTime", "type": "uint256" },
+      { "internalType": "uint256", "name": "endTime", "type": "uint256" },
+      { "internalType": "address", "name": "authorizedSigner", "type": "address" }
+    ],
+    "name": "setBaseParams",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "hook", "type": "address" }],
+    "name": "setClaimHook",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  { "inputs": [], "name": "togglePause", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
+  {
+    "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "newImplementation", "type": "address" },
+      { "internalType": "bytes", "name": "data", "type": "bytes" }
+    ],
+    "name": "upgradeToAndCall",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "signer", "type": "address" },
+      { "internalType": "bytes32", "name": "hash", "type": "bytes32" },
+      { "internalType": "bytes", "name": "signature", "type": "bytes" }
+    ],
+    "name": "verify",
+    "outputs": [],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "version",
+    "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],
+    "name": "withdraw",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  { "stateMutability": "payable", "type": "receive" }
+]

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

@@ -3,7 +3,7 @@ import { SolanaContractClientBase, SolanaContractInfo } from './SolanaContractCl
 import IDL from './fungible_token_distributor_solana.json';
 import * as anchor from '@coral-xyz/anchor';
 import { FungibleTokenDistributorSolana } from './fungible_token_distributor_solana';
-import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
 import { FeeCollectorClient } from './FeeCollectorClient';
 import { fetchTokenVersion, getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
 
@@ -80,8 +80,9 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     const airdropPDA = await this.getAirdropPDA();
     const config: any = await this.fetchAccountData('airdrop', airdropPDA);
 
+    const version = await this.getVersion();
     return {
-      version: '1.0.0' as string,
+      version: version,
       token: config.token.toString() as string,
       startTime: Number(config.startTime),
       endTime: Number(config.endTime),
@@ -223,7 +224,7 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
             fee: feePDA,
             authorityFeeAta: null,
             tokenProgram: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID,
-            feeTokenProgram: TOKEN_PROGRAM_ID,
+            feeTokenProgram: null,
             feeTokenMint: null
           })
           .transaction()

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

@@ -155,7 +155,8 @@
           "address": "11111111111111111111111111111111"
         },
         {
-          "name": "token_program"
+          "name": "token_program",
+          "optional": true
         },
         {
           "name": "associated_token_program",

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

@@ -161,7 +161,8 @@ export type FeeCollector = {
           "address": "11111111111111111111111111111111"
         },
         {
-          "name": "tokenProgram"
+          "name": "tokenProgram",
+          "optional": true
         },
         {
           "name": "associatedTokenProgram",

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

@@ -193,7 +193,8 @@
           "name": "token_program"
         },
         {
-          "name": "fee_token_program"
+          "name": "fee_token_program",
+          "optional": true
         },
         {
           "name": "associated_token_program",

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

@@ -199,7 +199,8 @@ export type FungibleTokenDistributorSolana = {
           "name": "tokenProgram"
         },
         {
-          "name": "feeTokenProgram"
+          "name": "feeTokenProgram",
+          "optional": true
         },
         {
           "name": "associatedTokenProgram",

package/src/airdrop/index.ts

@@ -1,4 +1,10 @@
 export { AirdropClient } from './AirdropClient';
 export { SignatureAirdropClient } from './SignatureAirdropClient';
+export {
+  EvmSignatureAirdropService,
+  SolanaSignatureAirdropService,
+  EvmAirdropService,
+  TonAirdropService
+} from './contracts';
 
 export { CONST } from './constants';

package/src/airdrop/services/index.ts

@@ -148,6 +148,7 @@ export const checkGetSignatures = async (
   data: {
     projectId: string;
     claimIds: string[];
+    recipient: string;
   },
   baseURL?: string
 ): Promise<{ signatures: IClaimSignature[] }> => {