@sign-global/tokentable 0.4.1-beta.5 → 0.4.1-beta.7

package/dist/esm/utils/web3.js

@@ -1,6 +1,6 @@
 import TonWeb from 'tonweb';
-import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddress, getAccount, createAssociatedTokenAccountInstruction, TokenAccountNotFoundError, TokenInvalidAccountOwnerError, TokenInvalidMintError, TokenInvalidOwnerError, TOKEN_PROGRAM_ID } from '@solana/spl-token';
-import { Transaction } from '@solana/web3.js';
+import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddress, getAccount, createAssociatedTokenAccountInstruction, TokenAccountNotFoundError, TokenInvalidAccountOwnerError, TokenInvalidMintError, TokenInvalidOwnerError, TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
+import { clusterApiUrl, Connection, PublicKey, Transaction } from '@solana/web3.js';
 export function flipAddressType(address) {
     if (!address)
         return '';
@@ -63,4 +63,45 @@ export async function getOrCreateAssociatedTokenAccount({ connection, payer, min
         throw new TokenInvalidOwnerError();
     return account;
 }
+export var SplTokenVersion;
+(function (SplTokenVersion) {
+    SplTokenVersion["SplToken"] = "spl-token";
+    SplTokenVersion["SplToken2022"] = "spl-token-2022";
+})(SplTokenVersion || (SplTokenVersion = {}));
+async function _getTokenProgramAndParsedAccountData(conn, tokenAddress) {
+    const tokenMintAddress = new PublicKey(tokenAddress);
+    const parsedMintAccountInfo = await conn.getParsedAccountInfo(tokenMintAddress);
+    const parsedMintAccountData = parsedMintAccountInfo.value?.data;
+    if (parsedMintAccountData?.program === SplTokenVersion.SplToken) {
+        return {
+            name: SplTokenVersion.SplToken,
+            programId: TOKEN_PROGRAM_ID,
+            parsedMintAccountData
+        };
+    }
+    else if (parsedMintAccountData?.program === SplTokenVersion.SplToken2022) {
+        return {
+            name: SplTokenVersion.SplToken2022,
+            programId: TOKEN_2022_PROGRAM_ID,
+            parsedMintAccountData
+        };
+    }
+    return null;
+}
+function _getConnection(clusterOrEndpoint) {
+    let endpoint;
+    try {
+        endpoint = clusterApiUrl(clusterOrEndpoint ?? 'mainnet-beta');
+    }
+    catch {
+        endpoint = clusterOrEndpoint;
+    }
+    const conn = new Connection(endpoint);
+    return conn;
+}
+export async function fetchTokenVersion(tokenAddress, options) {
+    const conn = _getConnection(options.clusterOrEndpoint);
+    const data = await _getTokenProgramAndParsedAccountData(conn, tokenAddress);
+    return data ? { name: data.name, programId: data.programId } : null;
+}
 //# sourceMappingURL=web3.js.map

package/dist/esm/utils/web3.js.map

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

package/dist/esm/wallets/providers/evm/EvmWallet.js

@@ -25,26 +25,36 @@ export class EvmWallet extends WalletBase {
         await disconnect(evmStore.config);
     }
     async sign(_message) {
-        const sign = await signMessage(evmStore.config, {
-            message: _message
-        });
-        return {
-            message: _message,
-            signature: sign
-        };
+        try {
+            const sign = await signMessage(evmStore.config, {
+                message: _message
+            });
+            return {
+                message: _message,
+                signature: sign
+            };
+        }
+        catch (error) {
+            throw error;
+        }
     }
     async signin(statement, prepare = true) {
-        return new Promise((resolve) => {
-            const signCallback = (data) => {
-                this.address = data.address;
-                this.chainId = data.chainId;
-                let fullMessage = statement;
-                if (prepare) {
-                    const msg = prepareSignMessage({ statement, chainId: data.chainId, address: data.address });
-                    fullMessage = get4361Message(msg);
+        return new Promise((resolve, reject) => {
+            const signCallback = async (data) => {
+                try {
+                    this.address = data.address;
+                    this.chainId = data.chainId;
+                    let fullMessage = statement;
+                    if (prepare) {
+                        const msg = prepareSignMessage({ statement, chainId: data.chainId, address: data.address });
+                        fullMessage = get4361Message(msg);
+                    }
+                    const res = await this.sign(fullMessage);
+                    resolve(res);
+                }
+                catch (error) {
+                    reject(error);
                 }
-                const res = this.sign(fullMessage);
-                resolve(res);
             };
             const account = getAccount(evmStore.config);
             this.provider = evmStore.walletClient;

package/dist/esm/wallets/providers/evm/EvmWallet.js.map

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

package/package.json

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

package/src/airdrop/SignatureAirdropClient.ts

@@ -247,8 +247,9 @@ export class SignatureAirdropClient {
     return strategy.getVersion();
   }
 
-  async getClaimFee(amount?: bigint): Promise<undefined | bigint | string> {
-    const strategy = await this.getStrategy();
+  // solana prams need to wallet
+  async getClaimFee(amount?: bigint, walletClient?: IWalletClient): Promise<undefined | bigint> {
+    const strategy = await this.getStrategy(walletClient);
     if (!strategy.getClaimFee) {
       throw new Error('getClaimFee is not supported for this chain');
     }

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

@@ -5,7 +5,7 @@ import * as anchor from '@coral-xyz/anchor';
 import { FungibleTokenDistributorSolana } from './fungible_token_distributor_solana';
 import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
 import { FeeCollectorClient } from './FeeCollectorClient';
-import { getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
+import { fetchTokenVersion, getOrCreateAssociatedTokenAccount, hexStrToU8Array } from '../../../utils';
 
 export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTokenDistributorSolana> {
   projectId: string;
@@ -17,8 +17,16 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     this.projectId = options.projectId;
   }
 
-  getVersion() {
-    return '1.0.0';
+  async getVersionPDA(): Promise<PublicKey> {
+    const [versionPDA] = await this.findProgramAddress([anchor.utils.bytes.utf8.encode('version')]);
+
+    return versionPDA;
+  }
+
+  async getVersion() {
+    const versionPDA = await this.getVersionPDA();
+    const versionData = await this.fetchAccountData('version', versionPDA);
+    return versionData.version;
   }
 
   get FeeCollector() {
@@ -29,8 +37,8 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     });
   }
 
-  async getClaimFee() {
-    return this.FeeCollector.getClaimFee();
+  async getClaimFee(amount: bigint) {
+    return this.FeeCollector.getClaimFee(amount.toString());
   }
 
   async getStoragePDA(): Promise<PublicKey> {
@@ -137,6 +145,15 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     await this.invokeInstruction('togglePause', {}, [this.projectId]);
   }
 
+  async getFeeInfo() {
+    const airdropPDA = await this.getAirdropPDA();
+    const config = await this.fetchAccountData('airdrop', airdropPDA);
+    return {
+      feeToken: config.feeToken.toString(),
+      feeCollector: config.feeCollector.toString()
+    };
+  }
+
   async claim(
     data: {
       recipient: string;
@@ -152,9 +169,11 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
     const config = await this.getContractInfo();
 
     const feeCollectorStoragePDA = await this.FeeCollector.getStoragePDA();
-    const userFeePDA = await this.FeeCollector.getUserFeePDA();
+    const feePDA = await this.FeeCollector.getProjectFeePDA();
     const airdropPDA = await this.getAirdropPDA();
-    const vaultPDA = await this.getVaultPDA();
+    const tokenVersion = await fetchTokenVersion(config.token, {
+      clusterOrEndpoint: this.chainId
+    });
 
     const authorityATA = await getOrCreateAssociatedTokenAccount({
       connection: this.connection,
@@ -162,12 +181,13 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
       mint: new PublicKey(config.token),
       owner: new PublicKey(this.wallet.publicKey),
       signTransaction: (this.wallet as any).signTransaction,
-      programId: TOKEN_2022_PROGRAM_ID
+      programId: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID
     });
 
-    const tx = new anchor.web3.Transaction();
-
+    let lastHash = '';
+    // solana max transaction size of 1232
     for (const claim of data) {
+      const tx = new anchor.web3.Transaction();
       tx.add(
         anchor.web3.Ed25519Program.createInstructionWithPublicKey({
           publicKey: new PublicKey(config.signer).toBytes(),
@@ -196,20 +216,23 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
             authority: this.wallet.publicKey,
             airdrop: airdropPDA,
             claim: claimPDA,
-            vault: vaultPDA,
             authorityAta: authorityATA.address,
             tokenMint: new PublicKey(config.token),
             feeCollectorStorage: feeCollectorStoragePDA,
             feeCollectorVault: null,
-            userFee: userFeePDA,
+            fee: feePDA,
             authorityFeeAta: null,
-            tokenProgram: TOKEN_2022_PROGRAM_ID
+            tokenProgram: tokenVersion?.programId || TOKEN_2022_PROGRAM_ID,
+            feeTokenMint: null
           })
           .transaction()
       );
-      console.log(tx);
+
+      const hash = await this.program.provider.sendAndConfirm?.(tx);
+
+      lastHash = hash!;
     }
 
-    return await this.program.provider.sendAndConfirm?.(tx);
+    return lastHash;
   }
 }

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

@@ -20,21 +20,24 @@ export class FeeCollectorClient extends SolanaContractClientBase<FeeCollector> {
     return storagePDA;
   }
 
-  async getUserFeePDA(): Promise<PublicKey> {
-    const [userFeePDA] = await this.findProgramAddress([
+  async getProjectFeePDA(): Promise<PublicKey> {
+    const [projectFeePDA] = await this.findProgramAddress([
       anchor.utils.bytes.utf8.encode('fee'),
       anchor.utils.bytes.utf8.encode(this.projectId)
     ]);
-    return userFeePDA;
+    return projectFeePDA;
   }
 
   async setDefaultFee(fee: string) {
     return this.invokeInstruction('setDefaultFee', {}, [new anchor.BN(fee)]);
   }
 
-  async getClaimFee(): Promise<string> {
-    const storagePDA = await this.getStoragePDA();
-    const storageData = await this.program.account.feeCollectorStorage.fetch(storagePDA);
-    return storageData.defaultFeesBips.toString();
+  async getClaimFee(tokenAmount: string): Promise<bigint> {
+    try {
+      const fee = await this.invokeView('getFee', [this.projectId, new anchor.BN(tokenAmount)]);
+      return BigInt(fee);
+    } catch (error) {
+      return BigInt(0);
+    }
   }
 }

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

@@ -39,8 +39,8 @@ export class SignatureAirdropService {
     return '';
   }
 
-  async getClaimFee(address: string, amount: bigint): Promise<string> {
-    const fee = this.airdropClient.getClaimFee();
+  async getClaimFee(address: string, amount: bigint): Promise<bigint> {
+    const fee = await this.airdropClient.getClaimFee(amount);
     return fee;
   }
 

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

@@ -1,4 +1,4 @@
-import { Program, AnchorProvider, setProvider, Wallet, Idl, AccountNamespace } from '@coral-xyz/anchor';
+import { Program, AnchorProvider, setProvider, Wallet, Idl } from '@coral-xyz/anchor';
 import {
   AllAccountsMap,
   AllInstructions,
@@ -70,7 +70,7 @@ export abstract class SolanaContractClientBase<T extends Idl = Idl> {
   async invokeView<M extends keyof MakeMethodsNamespace<T, AllInstructions<T>>>(
     methodName: M,
     args: Parameters<MakeMethodsNamespace<T, AllInstructions<T>>[M]>
-  ): Promise<ReturnType<MakeMethodsNamespace<T, AllInstructions<T>>[M]>> {
+  ): Promise<any> {
     try {
       if (!this.program.methods[methodName]) {
         throw new Error(`Method ${methodName} not found in program`);
@@ -91,27 +91,35 @@ export abstract class SolanaContractClientBase<T extends Idl = Idl> {
     args: any,
     options?: { signers?: Signer[] }
   ): Promise<string> {
-    const latestBlockhash = await this.connection.getLatestBlockhash();
-
+    if (!this.program.methods[methodName]) {
+      throw new Error(`Method ${methodName} not found in program`);
+    }
     let instruction = this.program.methods[methodName](...args).accounts(accounts);
 
     if (options?.signers?.length) {
       instruction = instruction.signers(options.signers);
     }
 
-    console.log(instruction, 'in');
-
     const tx = await instruction.rpc();
 
-    await this.connection.confirmTransaction({
-      signature: tx,
-      blockhash: latestBlockhash.blockhash,
-      lastValidBlockHeight: latestBlockhash.lastValidBlockHeight
-    });
+    await this.confirmTransaction(tx);
     console.log(tx);
 
     return tx;
   }
+
+  async confirmTransaction(tx: string): Promise<string> {
+    const latestBlockhash = await this.connection.getLatestBlockhash();
+    await this.connection.confirmTransaction(
+      {
+        signature: tx,
+        blockhash: latestBlockhash.blockhash,
+        lastValidBlockHeight: latestBlockhash.lastValidBlockHeight
+      },
+      'confirmed'
+    );
+    return tx;
+  }
   // protected abstract getProgramAccount(accountName: string, address: PublicKey): Promise<any>;
 
   // protected abstract getEventLogs(signature: string, eventName: string): Promise<any[]>;

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

@@ -40,6 +40,11 @@
             ]
           }
         },
+        {
+          "name": "fee_token_mint",
+          "writable": true,
+          "optional": true
+        },
         {
           "name": "vault",
           "writable": true,
@@ -65,7 +70,6 @@
         },
         {
           "name": "fee",
-          "writable": true,
           "pda": {
             "seeds": [
               {
@@ -241,7 +245,6 @@
         },
         {
           "name": "fee",
-          "writable": true,
           "pda": {
             "seeds": [
               {
@@ -258,15 +261,6 @@
               }
             ]
           }
-        },
-        {
-          "name": "authority",
-          "writable": true,
-          "signer": true
-        },
-        {
-          "name": "system_program",
-          "address": "11111111111111111111111111111111"
         }
       ],
       "args": [
@@ -360,6 +354,75 @@
         }
       ]
     },
+    {
+      "name": "init_project_fee",
+      "discriminator": [
+        21,
+        68,
+        31,
+        251,
+        143,
+        139,
+        107,
+        64
+      ],
+      "accounts": [
+        {
+          "name": "storage",
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  115,
+                  116,
+                  111,
+                  114,
+                  97,
+                  103,
+                  101
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "name": "fee",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  102,
+                  101,
+                  101
+                ]
+              },
+              {
+                "kind": "arg",
+                "path": "_project_id"
+              }
+            ]
+          }
+        },
+        {
+          "name": "authority",
+          "writable": true,
+          "signer": true
+        },
+        {
+          "name": "system_program",
+          "address": "11111111111111111111111111111111"
+        }
+      ],
+      "args": [
+        {
+          "name": "project_id",
+          "type": "string"
+        }
+      ]
+    },
     {
       "name": "initialize",
       "discriminator": [
@@ -1015,6 +1078,10 @@
       "type": {
         "kind": "struct",
         "fields": [
+          {
+            "name": "default",
+            "type": "bool"
+          },
           {
             "name": "bips",
             "type": "u64"

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

@@ -46,6 +46,11 @@ export type FeeCollector = {
             ]
           }
         },
+        {
+          "name": "feeTokenMint",
+          "writable": true,
+          "optional": true
+        },
         {
           "name": "vault",
           "writable": true,
@@ -71,7 +76,6 @@ export type FeeCollector = {
         },
         {
           "name": "fee",
-          "writable": true,
           "pda": {
             "seeds": [
               {
@@ -247,7 +251,6 @@ export type FeeCollector = {
         },
         {
           "name": "fee",
-          "writable": true,
           "pda": {
             "seeds": [
               {
@@ -264,15 +267,6 @@ export type FeeCollector = {
               }
             ]
           }
-        },
-        {
-          "name": "authority",
-          "writable": true,
-          "signer": true
-        },
-        {
-          "name": "systemProgram",
-          "address": "11111111111111111111111111111111"
         }
       ],
       "args": [
@@ -366,6 +360,75 @@ export type FeeCollector = {
         }
       ]
     },
+    {
+      "name": "initProjectFee",
+      "discriminator": [
+        21,
+        68,
+        31,
+        251,
+        143,
+        139,
+        107,
+        64
+      ],
+      "accounts": [
+        {
+          "name": "storage",
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  115,
+                  116,
+                  111,
+                  114,
+                  97,
+                  103,
+                  101
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "name": "fee",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "const",
+                "value": [
+                  102,
+                  101,
+                  101
+                ]
+              },
+              {
+                "kind": "arg",
+                "path": "projectId"
+              }
+            ]
+          }
+        },
+        {
+          "name": "authority",
+          "writable": true,
+          "signer": true
+        },
+        {
+          "name": "systemProgram",
+          "address": "11111111111111111111111111111111"
+        }
+      ],
+      "args": [
+        {
+          "name": "projectId",
+          "type": "string"
+        }
+      ]
+    },
     {
       "name": "initialize",
       "discriminator": [
@@ -1021,6 +1084,10 @@ export type FeeCollector = {
       "type": {
         "kind": "struct",
         "fields": [
+          {
+            "name": "default",
+            "type": "bool"
+          },
           {
             "name": "bips",
             "type": "u64"