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

package/dist/esm/airdrop/contracts/solana/fee_collector.d.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";

package/dist/esm/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/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.d.ts

@@ -216,7 +216,12 @@ export type FungibleTokenDistributorSolana = {
                     "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on";
                 },
                 {
-                    "name": "userFee";
+                    "name": "feeTokenMint";
+                    "writable": true;
+                    "optional": true;
+                },
+                {
+                    "name": "fee";
                     "writable": true;
                 },
                 {
@@ -495,6 +500,20 @@ export type FungibleTokenDistributorSolana = {
                         ];
                     };
                 },
+                {
+                    "name": "feeCollector";
+                    "optional": true;
+                    "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on";
+                },
+                {
+                    "name": "feeCollectorStorage";
+                    "optional": true;
+                },
+                {
+                    "name": "fee";
+                    "writable": true;
+                    "optional": true;
+                },
                 {
                     "name": "authority";
                     "writable": true;
@@ -510,6 +529,10 @@ export type FungibleTokenDistributorSolana = {
                     "name": "projectId";
                     "type": "string";
                 },
+                {
+                    "name": "projectToken";
+                    "type": "pubkey";
+                },
                 {
                     "name": "owner";
                     "type": "pubkey";
@@ -517,6 +540,10 @@ export type FungibleTokenDistributorSolana = {
                 {
                     "name": "feeCollector";
                     "type": "pubkey";
+                },
+                {
+                    "name": "initFeeAccount";
+                    "type": "bool";
                 }
             ];
         },
@@ -650,6 +677,20 @@ export type FungibleTokenDistributorSolana = {
                         ];
                     };
                 },
+                {
+                    "name": "feeCollector";
+                    "optional": true;
+                    "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on";
+                },
+                {
+                    "name": "feeCollectorStorage";
+                    "optional": true;
+                },
+                {
+                    "name": "fee";
+                    "writable": true;
+                    "optional": true;
+                },
                 {
                     "name": "systemProgram";
                     "address": "11111111111111111111111111111111";
@@ -663,6 +704,10 @@ export type FungibleTokenDistributorSolana = {
                 {
                     "name": "feeCollector";
                     "type": "pubkey";
+                },
+                {
+                    "name": "initFeeAccount";
+                    "type": "bool";
                 }
             ];
         },
@@ -838,6 +883,11 @@ export type FungibleTokenDistributorSolana = {
                     "writable": true;
                     "signer": true;
                 },
+                {
+                    "name": "newOwner";
+                    "writable": true;
+                    "signer": true;
+                },
                 {
                     "name": "systemProgram";
                     "address": "11111111111111111111111111111111";
@@ -891,6 +941,11 @@ export type FungibleTokenDistributorSolana = {
                     "writable": true;
                     "signer": true;
                 },
+                {
+                    "name": "newAdmin";
+                    "writable": true;
+                    "signer": true;
+                },
                 {
                     "name": "systemProgram";
                     "address": "11111111111111111111111111111111";

package/dist/esm/airdrop/contracts/solana/fungible_token_distributor_solana.json

@@ -210,7 +210,12 @@
                     "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
                 },
                 {
-                    "name": "user_fee",
+                    "name": "fee_token_mint",
+                    "writable": true,
+                    "optional": true
+                },
+                {
+                    "name": "fee",
                     "writable": true
                 },
                 {
@@ -489,6 +494,20 @@
                         ]
                     }
                 },
+                {
+                    "name": "fee_collector",
+                    "optional": true,
+                    "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
+                },
+                {
+                    "name": "fee_collector_storage",
+                    "optional": true
+                },
+                {
+                    "name": "fee",
+                    "writable": true,
+                    "optional": true
+                },
                 {
                     "name": "authority",
                     "writable": true,
@@ -504,6 +523,10 @@
                     "name": "project_id",
                     "type": "string"
                 },
+                {
+                    "name": "project_token",
+                    "type": "pubkey"
+                },
                 {
                     "name": "owner",
                     "type": "pubkey"
@@ -511,6 +534,10 @@
                 {
                     "name": "fee_collector",
                     "type": "pubkey"
+                },
+                {
+                    "name": "init_fee_account",
+                    "type": "bool"
                 }
             ]
         },
@@ -644,6 +671,20 @@
                         ]
                     }
                 },
+                {
+                    "name": "fee_collector",
+                    "optional": true,
+                    "address": "4dfP4CMvznzUuuYLhybXy71zasrhtjrFkChSFjtqS3on"
+                },
+                {
+                    "name": "fee_collector_storage",
+                    "optional": true
+                },
+                {
+                    "name": "fee",
+                    "writable": true,
+                    "optional": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -657,6 +698,10 @@
                 {
                     "name": "fee_collector",
                     "type": "pubkey"
+                },
+                {
+                    "name": "init_fee_account",
+                    "type": "bool"
                 }
             ]
         },
@@ -832,6 +877,11 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "new_owner",
+                    "writable": true,
+                    "signer": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -885,6 +935,11 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "new_admin",
+                    "writable": true,
+                    "signer": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"

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.6",
   "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

@@ -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,7 +169,7 @@ 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();
 
@@ -196,18 +213,18 @@ export class AirdropSignatureClient extends SolanaContractClientBase<FungibleTok
             authority: this.wallet.publicKey,
             airdrop: airdropPDA,
             claim: claimPDA,
-            vault: vaultPDA,
+            // 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: TOKEN_2022_PROGRAM_ID,
+            feeTokenMint: null
           })
           .transaction()
       );
-      console.log(tx);
     }
 
     return await this.program.provider.sendAndConfirm?.(tx);

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);
+    }
   }
 }