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

package/dist/esm/airdrop/contracts/solana/FeeCollectorClient.js

@@ -14,20 +14,24 @@ export class FeeCollectorClient extends SolanaContractClientBase {
         const [storagePDA] = await this.findProgramAddress([anchor.utils.bytes.utf8.encode('storage')]);
         return storagePDA;
     }
-    async getUserFeePDA() {
-        const [userFeePDA] = await this.findProgramAddress([
+    async getProjectFeePDA() {
+        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) {
         return this.invokeInstruction('setDefaultFee', {}, [new anchor.BN(fee)]);
     }
-    async getClaimFee() {
-        const storagePDA = await this.getStoragePDA();
-        const storageData = await this.program.account.feeCollectorStorage.fetch(storagePDA);
-        return storageData.defaultFeesBips.toString();
+    async getClaimFee(tokenAmount) {
+        try {
+            const fee = await this.invokeView('getFee', [this.projectId, new anchor.BN(tokenAmount)]);
+            return BigInt(fee);
+        }
+        catch (error) {
+            return BigInt(0);
+        }
     }
 }
 //# sourceMappingURL=FeeCollectorClient.js.map

package/dist/esm/airdrop/contracts/solana/FeeCollectorClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"FeeCollectorClient.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/FeeCollectorClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAsB,MAAM,wBAAwB,CAAC;AACtF,OAAO,GAAG,MAAM,sBAAsB,CAAC;AAEvC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,MAAM,OAAO,kBAAmB,SAAQ,wBAAsC;IAC5E,SAAS,CAAS;IAClB,YAAY,OAA2B;QACrC,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,GAAG,EAAE,GAAG;SACT,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEhG,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;YACjD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SAC/C,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW;QAC7B,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACrF,OAAO,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;CACF"}
+{"version":3,"file":"FeeCollectorClient.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/FeeCollectorClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAsB,MAAM,wBAAwB,CAAC;AACtF,OAAO,GAAG,MAAM,sBAAsB,CAAC;AAEvC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,MAAM,OAAO,kBAAmB,SAAQ,wBAAsC;IAC5E,SAAS,CAAS;IAClB,YAAY,OAA2B;QACrC,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,GAAG,EAAE,GAAG;SACT,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEhG,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;YACpD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SAC/C,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW;QAC7B,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAmB;QACnC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAC1F,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;CACF"}

package/dist/esm/airdrop/contracts/solana/SignatureAirdropService.d.ts

@@ -8,7 +8,7 @@ export declare class SignatureAirdropService {
     feeTokens: (address: string) => Promise<string>;
     getFeelessThreshold(): Promise<void>;
     getDeployer(): Promise<string>;
-    getClaimFee(address: string, amount: bigint): Promise<string>;
+    getClaimFee(address: string, amount: bigint): Promise<bigint>;
     batchFetchClaimed(userClaimIds: string[]): Promise<boolean[]>;
     getPaused(): Promise<boolean>;
     claim(data: {
@@ -20,5 +20,5 @@ export declare class SignatureAirdropService {
         unlockingAt: number;
         value: string;
         hash: string;
-    }[], recipient?: string): Promise<string | undefined>;
+    }[], recipient?: string): Promise<string>;
 }

package/dist/esm/airdrop/contracts/solana/SignatureAirdropService.js

@@ -30,7 +30,7 @@ export class SignatureAirdropService {
         return '';
     }
     async getClaimFee(address, amount) {
-        const fee = this.airdropClient.getClaimFee();
+        const fee = await this.airdropClient.getClaimFee(amount);
         return fee;
     }
     async batchFetchClaimed(userClaimIds) {

package/dist/esm/airdrop/contracts/solana/SignatureAirdropService.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignatureAirdropService.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/SignatureAirdropService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,MAAM,OAAO,uBAAuB;IAClC,OAAO,CAAqB;IAC5B,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,IAAY,aAAa;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED,aAAa,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACxC,yDAAyD;QACzD,sDAAsD;QACtD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,SAAS,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACpC,yDAAyD;QACzD,kDAAkD;QAClD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,KAAK,CAAC,mBAAmB;QACvB,mDAAmD;IACrD,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,MAAc;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;QAC7C,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,YAAsB;QAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACrE,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IASG,EACH,SAAkB;QAElB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACF"}
+{"version":3,"file":"SignatureAirdropService.js","sourceRoot":"","sources":["../../../../../src/airdrop/contracts/solana/SignatureAirdropService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,MAAM,OAAO,uBAAuB;IAClC,OAAO,CAAqB;IAC5B,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,IAAY,aAAa;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;IAED,aAAa,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACxC,yDAAyD;QACzD,sDAAsD;QACtD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,SAAS,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACpC,yDAAyD;QACzD,kDAAkD;QAClD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,KAAK,CAAC,mBAAmB;QACvB,mDAAmD;IACrD,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,MAAc;QAC/C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,YAAsB;QAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACrE,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,KAAK,CACT,IASG,EACH,SAAkB;QAElB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACF"}

package/dist/esm/airdrop/contracts/solana/SolanaContractClient.d.ts

@@ -17,8 +17,9 @@ export declare abstract class SolanaContractClientBase<T extends Idl = Idl> {
     getConnection(endpoint?: string): Connection;
     protected findProgramAddress(seeds: Array<Buffer | Uint8Array>, programId?: PublicKey): Promise<[PublicKey, number]>;
     fetchAccountData<A extends keyof AllAccountsMap<T>>(accountName: A, address: PublicKey | string, commitment?: Commitment): Promise<IdlAccounts<T>[A]>;
-    invokeView<M extends keyof MakeMethodsNamespace<T, AllInstructions<T>>>(methodName: M, args: Parameters<MakeMethodsNamespace<T, AllInstructions<T>>[M]>): Promise<ReturnType<MakeMethodsNamespace<T, AllInstructions<T>>[M]>>;
+    invokeView<M extends keyof MakeMethodsNamespace<T, AllInstructions<T>>>(methodName: M, args: Parameters<MakeMethodsNamespace<T, AllInstructions<T>>[M]>): Promise<any>;
     invokeInstruction<M extends keyof MakeMethodsNamespace<T, AllInstructions<T>>>(methodName: M, accounts: any, args: any, options?: {
         signers?: Signer[];
     }): Promise<string>;
+    confirmTransaction(tx: string): Promise<string>;
 }

package/dist/esm/airdrop/contracts/solana/SolanaContractClient.js

@@ -50,19 +50,25 @@ export class SolanaContractClientBase {
         }
     }
     async invokeInstruction(methodName, accounts, args, options) {
-        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.confirmTransaction(tx);
+        console.log(tx);
+        return tx;
+    }
+    async confirmTransaction(tx) {
+        const latestBlockhash = await this.connection.getLatestBlockhash();
         await this.connection.confirmTransaction({
             signature: tx,
             blockhash: latestBlockhash.blockhash,
             lastValidBlockHeight: latestBlockhash.lastValidBlockHeight
-        });
-        console.log(tx);
+        }, 'confirmed');
         return tx;
     }
 }

package/dist/esm/airdrop/contracts/solana/SolanaContractClient.js.map

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

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/utils/web3.d.ts

@@ -1,4 +1,4 @@
-import { Commitment, Connection, PublicKey, Transaction } from '@solana/web3.js';
+import { Cluster, Commitment, Connection, PublicKey, Transaction } from '@solana/web3.js';
 export declare function flipAddressType(address: string): string;
 export declare function hexStrToU8Array(hexStr: string): number[];
 export declare function getOrCreateAssociatedTokenAccount({ connection, payer, mint, owner, signTransaction, allowOwnerOffCurve, commitment, programId, associatedTokenProgramId }: {
@@ -12,3 +12,17 @@ export declare function getOrCreateAssociatedTokenAccount({ connection, payer, m
     associatedTokenProgramId?: PublicKey;
     signTransaction: (signature: Transaction) => Promise<Transaction>;
 }): Promise<import("@solana/spl-token").Account>;
+export declare enum SplTokenVersion {
+    SplToken = "spl-token",
+    SplToken2022 = "spl-token-2022"
+}
+export type FetchTokenVersionOptions = {
+    clusterOrEndpoint?: Cluster | string;
+};
+export type FetchTokenMetadataOptions = FetchTokenVersionOptions & {
+    fetchOffchainMetadata?: boolean;
+};
+export declare function fetchTokenVersion(tokenAddress: string, options: FetchTokenMetadataOptions): Promise<{
+    name: SplTokenVersion;
+    programId: PublicKey;
+} | null>;