@sign-global/tokentable 0.4.1-beta.9 → 0.4.2-beta.2

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

@@ -81,7 +81,7 @@ interface SidResponse {
   sid: string;
 }
 
-interface TwitterConnectParams {
+interface SocialConnectParams {
   code: string;
   projectId: string;
 }
@@ -100,13 +100,20 @@ 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: SocialConnectParams, baseURL?: string): Promise<SidResponse> => {
   const client = createApiClient(baseURL);
   return client.post('/airdrop-open/connect-twitter', data, {
     headers: getSidHeader(data.projectId)
   });
 };
 
+export const connectGoogleApi = async (data: SocialConnectParams, baseURL?: string): Promise<SidResponse> => {
+  const client = createApiClient(baseURL);
+  return client.post('/airdrop-open/connect-google', data, {
+    headers: getSidHeader(data.projectId)
+  });
+};
+
 export const checkEligibility = async (
   data: { projectId: string },
   baseURL?: string
@@ -148,6 +155,7 @@ export const checkGetSignatures = async (
   data: {
     projectId: string;
     claimIds: string[];
+    recipient: string;
   },
   baseURL?: string
 ): Promise<{ signatures: IClaimSignature[] }> => {

package/src/airdrop/types/index.ts

@@ -76,7 +76,8 @@ export enum AirdropSigIdentityTypeEnum {
   Twitter = 'X Account',
   SolanaWallet = 'Solana Wallet',
   EVMWallet = 'EVM Wallet',
-  TONWallet = 'TON Wallet'
+  TONWallet = 'TON Wallet',
+  Google = 'Google Account'
 }
 
 export interface IProjectExtra {