@sign-global/tokentable 0.4.2-beta.4 → 0.4.3-beta.1

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

@@ -0,0 +1,212 @@
+import { PublicKey } from '@solana/web3.js';
+import { SolanaContractClientBase } from './SolanaContractClient';
+import IDL from './merkle_token_distributor_solana.json';
+import * as anchor from '@coral-xyz/anchor';
+import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { FeeCollectorClient } from './FeeCollectorClient';
+import { fetchTokenVersion } from '../../../utils';
+export class MerkleTokenDistributorClient extends SolanaContractClientBase {
+    projectId;
+    constructor(options) {
+        super({
+            ...options,
+            idl: IDL
+        });
+        this.projectId = options.projectId;
+    }
+    get FeeCollector() {
+        return new FeeCollectorClient({
+            projectId: this.projectId,
+            walletClient: this.wallet,
+            chainId: this.chainId
+        });
+    }
+    async getStoragePDA() {
+        const [storagePDA] = await this.findProgramAddress([
+            anchor.utils.bytes.utf8.encode('storage'),
+            anchor.utils.bytes.utf8.encode(this.projectId)
+        ]);
+        return storagePDA;
+    }
+    async getAirdropPDA() {
+        const [airdropPDA] = await this.findProgramAddress([
+            anchor.utils.bytes.utf8.encode('airdrop'),
+            anchor.utils.bytes.utf8.encode(this.projectId)
+        ]);
+        return airdropPDA;
+    }
+    async getConfigPDA() {
+        const [configPDA] = await this.findProgramAddress([anchor.utils.bytes.utf8.encode('config')]);
+        return configPDA;
+    }
+    async getVersionPDA() {
+        const [versionPDA] = await this.findProgramAddress([anchor.utils.bytes.utf8.encode('version')]);
+        return versionPDA;
+    }
+    async getVaultPDA() {
+        const airdropPDA = await this.getAirdropPDA();
+        const [vaultPDA] = await this.findProgramAddress([anchor.utils.bytes.utf8.encode('vault'), airdropPDA.toBuffer()]);
+        return vaultPDA;
+    }
+    async getContractInfo() {
+        const airdropPDA = await this.getAirdropPDA();
+        const config = await this.fetchAccountData('merkleAirdrop', airdropPDA);
+        const versionPDA = await this.getVersionPDA();
+        const versionData = await this.fetchAccountData('version', versionPDA);
+        return {
+            version: versionData.version,
+            token: config.projectToken.toString(),
+            startTime: Number(config.startTime),
+            endTime: Number(config.endTime),
+            paused: config.paused,
+            root: Buffer.from(config.root).toString('hex'),
+            owner: config.owner.toString()
+        };
+    }
+    async getVersion() {
+        const versionPDA = await this.getVersionPDA();
+        const versionData = await this.fetchAccountData('version', versionPDA);
+        return versionData.version;
+    }
+    async getPaused() {
+        const config = await this.getContractInfo();
+        return config.paused;
+    }
+    async getClaimFee(amount) {
+        return this.FeeCollector.getClaimFee(this.programId, amount.toString());
+    }
+    async getFeeInfo() {
+        const airdropPDA = await this.getAirdropPDA();
+        const config = await this.fetchAccountData('merkleAirdrop', airdropPDA);
+        return {
+            feeToken: config.feeToken.toString(),
+            feeCollector: config.feeCollector.toString()
+        };
+    }
+    async deploy() {
+        return this.invokeInstruction('deploy', {
+            feeCollector: this.FeeCollector.programId,
+            authority: this.wallet.publicKey
+        }, [new PublicKey(this.FeeCollector.programId)]);
+    }
+    async getAirdropAddress() {
+        try {
+            const airdropPDA = await this.getAirdropPDA();
+            await this.fetchAccountData('merkleAirdrop', airdropPDA);
+            return airdropPDA.toString();
+        }
+        catch (error) {
+            return '';
+        }
+    }
+    async initialize({ projectId, token }) {
+        await this.FeeCollector.initProjectFee();
+        const owner = this.wallet.publicKey;
+        const airdropPDA = await this.getAirdropPDA();
+        const projectFeePDA = await this.FeeCollector.getProjectFeePDA(this.programId);
+        const feeCollectorStorage = await this.FeeCollector.getStoragePDA();
+        console.log(airdropPDA.toString(), 'airdropPDA');
+        console.log(projectFeePDA.toString(), 'projectFeePDA', feeCollectorStorage.toString(), 'feeCollectorStorage');
+        const tx = await this.program.methods
+            .initialize(projectId, new PublicKey(token), owner, true)
+            .accountsPartial({
+            feeCollector: this.FeeCollector.programId,
+            feeCollectorStorage: feeCollectorStorage,
+            fee: projectFeePDA
+        })
+            .rpc();
+        await this.confirmTransaction(tx);
+        try {
+            const versionPDA = await this.getVersionPDA();
+            await this.fetchAccountData('version', versionPDA);
+        }
+        catch (err) {
+            // init version only once
+            await this.invokeInstruction('version', {}, []);
+        }
+        const airdropAddress = await this.getAirdropAddress();
+        return airdropAddress;
+    }
+    async setBaseParams(tokenAddress, startTime, endTime, root) {
+        const start = new anchor.BN(startTime), end = new anchor.BN(endTime);
+        await this.invokeInstruction('setBaseParams', {
+            // airdrop: airdropPDA,
+            authority: this.wallet.publicKey
+        }, [this.projectId, new PublicKey(tokenAddress), start, end, Array.from(Buffer.from(root, 'hex')), '']);
+    }
+    async togglePause() {
+        await this.invokeInstruction('togglePause', {}, [this.projectId]);
+    }
+    async setFeeCollector(feeCollector) {
+        await this.invokeInstruction('setFeeCollector', {}, [this.projectId, new PublicKey(feeCollector)]);
+    }
+    async setFeeParams(feeCollector, feeToken) {
+        const tx = new anchor.web3.Transaction()
+            .add(await this.program.methods
+            .setFeeCollector(this.projectId, new PublicKey(feeCollector), true)
+            .accountsPartial({
+            feeCollectorStorage: null,
+            fee: null
+        })
+            .transaction())
+            .add(await this.program.methods.setFeeToken(this.projectId, new PublicKey(feeToken)).transaction());
+        return await this.program.provider.sendAndConfirm?.(tx, [], { commitment: 'finalized' });
+    }
+    async transferOwnership(newOwner) {
+        const tx = await this.program.methods
+            .transferOwnership(this.projectId, new PublicKey(newOwner))
+            .accountsPartial({
+            authority: this.wallet.publicKey
+        })
+            .rpc();
+        await this.confirmTransaction?.(tx);
+    }
+    async getUsedLeafPDA(leaf) {
+        const [usedLeafPDA] = await this.findProgramAddress([
+            anchor.utils.bytes.utf8.encode('usedLeaf'),
+            Buffer.from(leaf, 'hex')
+        ]);
+        return usedLeafPDA;
+    }
+    async isLeafUsed(leaf) {
+        const usedLeafPDA = await this.getUsedLeafPDA(leaf);
+        const usedLeafInfo = await this.program.account['usedLeaf'].fetch(usedLeafPDA);
+        return usedLeafInfo?.used || false;
+    }
+    async batchFetchClaimed(leafs) {
+        const usedLeafPDAs = await Promise.all(leafs.map((leaf) => this.getUsedLeafPDA(leaf)));
+        const usedLeafInfo = await this.program.account['usedLeaf'].fetchMultiple(usedLeafPDAs);
+        return usedLeafInfo.map((info) => ({
+            result: info?.used || false,
+            status: 'success'
+        }));
+    }
+    async claim({ leaf, proof, index, unlockingAt, amount }) {
+        const config = await this.getContractInfo();
+        const feeCollectorStoragePDA = await this.FeeCollector.getStoragePDA();
+        const feePDA = await this.FeeCollector.getProjectFeePDA(this.programId);
+        const tokenVersion = await fetchTokenVersion(config.token, {
+            clusterOrEndpoint: this.chainId
+        });
+        return this.program.methods
+            .claim(this.projectId, Array.from(Buffer.from(leaf, 'hex')), proof.map((p) => Array.from(Buffer.from(p, 'hex'))), [], {
+            claimableTimestamp: new anchor.BN(unlockingAt),
+            claimableAmount: new anchor.BN(amount),
+            index: new anchor.BN(index)
+        })
+            .accounts({
+            recipient: this.wallet.publicKey,
+            tokenMint: new PublicKey(config.token),
+            feeCollector: this.FeeCollector.programId,
+            feeCollectorStorage: feeCollectorStoragePDA,
+            feeCollectorVault: null,
+            feeTokenMint: null,
+            fee: feePDA,
+            authorityFeeAta: null,
+            tokenProgram: tokenVersion?.programId || TOKEN_PROGRAM_ID,
+            feeTokenProgram: null
+        })
+            .rpc();
+    }
+}
+//# sourceMappingURL=MerkleDistributorClient.js.map

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

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

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

@@ -14,6 +14,7 @@ export declare abstract class SolanaContractClientBase<T extends Idl = Idl> {
     protected wallet: Wallet;
     protected chainId: string;
     constructor(contractInfo: SolanaContractInfo);
+    get programId(): PublicKey;
     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]>;

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

@@ -15,6 +15,9 @@ export class SolanaContractClientBase {
         setProvider(provider);
         this.program = new Program(idl, provider);
     }
+    get programId() {
+        return this.program.programId;
+    }
     getConnection(endpoint) {
         const apiUrl = clusterApiUrl(endpoint ?? 'mainnet-beta');
         const conn = new Connection(apiUrl);

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

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/fee_collector.json`.
  */
 export type FeeCollector = {
-    "address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8";
+    "address": "81oZDfqqbWkPbCx26A1mAwZmEDDZoeyxqmHuVtf4o7KB";
     "metadata": {
         "name": "feeCollector";
         "version": "0.1.0";
@@ -86,6 +86,10 @@ export type FeeCollector = {
                                     101
                                 ];
                             },
+                            {
+                                "kind": "arg";
+                                "path": "distributor";
+                            },
                             {
                                 "kind": "arg";
                                 "path": "projectId";
@@ -174,6 +178,10 @@ export type FeeCollector = {
                     "name": "feeToken";
                     "type": "pubkey";
                 },
+                {
+                    "name": "distributor";
+                    "type": "pubkey";
+                },
                 {
                     "name": "projectId";
                     "type": "string";
@@ -229,6 +237,10 @@ export type FeeCollector = {
                                     101
                                 ];
                             },
+                            {
+                                "kind": "arg";
+                                "path": "distributor";
+                            },
                             {
                                 "kind": "arg";
                                 "path": "projectId";
@@ -238,6 +250,10 @@ export type FeeCollector = {
                 }
             ];
             "args": [
+                {
+                    "name": "distributor";
+                    "type": "pubkey";
+                },
                 {
                     "name": "projectId";
                     "type": "string";
@@ -373,6 +389,10 @@ export type FeeCollector = {
                                     101
                                 ];
                             },
+                            {
+                                "kind": "arg";
+                                "path": "distributor";
+                            },
                             {
                                 "kind": "arg";
                                 "path": "projectId";
@@ -391,6 +411,10 @@ export type FeeCollector = {
                 }
             ];
             "args": [
+                {
+                    "name": "distributor";
+                    "type": "pubkey";
+                },
                 {
                     "name": "projectId";
                     "type": "string";
@@ -533,6 +557,10 @@ export type FeeCollector = {
                                     101
                                 ];
                             },
+                            {
+                                "kind": "arg";
+                                "path": "distributor";
+                            },
                             {
                                 "kind": "arg";
                                 "path": "projectId";
@@ -551,6 +579,10 @@ export type FeeCollector = {
                 }
             ];
             "args": [
+                {
+                    "name": "distributor";
+                    "type": "pubkey";
+                },
                 {
                     "name": "projectId";
                     "type": "string";
@@ -607,6 +639,10 @@ export type FeeCollector = {
                                     101
                                 ];
                             },
+                            {
+                                "kind": "arg";
+                                "path": "distributor";
+                            },
                             {
                                 "kind": "arg";
                                 "path": "projectId";
@@ -625,6 +661,10 @@ export type FeeCollector = {
                 }
             ];
             "args": [
+                {
+                    "name": "distributor";
+                    "type": "pubkey";
+                },
                 {
                     "name": "projectId";
                     "type": "string";
@@ -986,6 +1026,10 @@ export type FeeCollector = {
             "type": {
                 "kind": "struct";
                 "fields": [
+                    {
+                        "name": "distributor";
+                        "type": "pubkey";
+                    },
                     {
                         "name": "bips";
                         "type": "u64";
@@ -1002,6 +1046,10 @@ export type FeeCollector = {
             "type": {
                 "kind": "struct";
                 "fields": [
+                    {
+                        "name": "distributor";
+                        "type": "pubkey";
+                    },
                     {
                         "name": "fixedFee";
                         "type": "u64";

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

@@ -1,5 +1,5 @@
 {
-    "address": "FCAaMMWdkNJnbFvz71rkXtsHPL1voheMHXdKucT3EUd8",
+    "address": "81oZDfqqbWkPbCx26A1mAwZmEDDZoeyxqmHuVtf4o7KB",
     "metadata": {
         "name": "fee_collector",
         "version": "0.1.0",
@@ -63,7 +63,7 @@
                             },
                             {
                                 "kind": "arg",
-                                "path": "fee_token"
+                                "path": "_fee_token"
                             }
                         ]
                     }
@@ -80,6 +80,10 @@
                                     101
                                 ]
                             },
+                            {
+                                "kind": "arg",
+                                "path": "_distributor"
+                            },
                             {
                                 "kind": "arg",
                                 "path": "_project_id"
@@ -103,7 +107,7 @@
                             },
                             {
                                 "kind": "arg",
-                                "path": "fee_token"
+                                "path": "_fee_token"
                             }
                         ],
                         "program": {
@@ -168,6 +172,10 @@
                     "name": "fee_token",
                     "type": "pubkey"
                 },
+                {
+                    "name": "distributor",
+                    "type": "pubkey"
+                },
                 {
                     "name": "project_id",
                     "type": "string"
@@ -223,6 +231,10 @@
                                     101
                                 ]
                             },
+                            {
+                                "kind": "arg",
+                                "path": "_distributor"
+                            },
                             {
                                 "kind": "arg",
                                 "path": "_project_id"
@@ -232,6 +244,10 @@
                 }
             ],
             "args": [
+                {
+                    "name": "distributor",
+                    "type": "pubkey"
+                },
                 {
                     "name": "project_id",
                     "type": "string"
@@ -367,6 +383,10 @@
                                     101
                                 ]
                             },
+                            {
+                                "kind": "arg",
+                                "path": "_distributor"
+                            },
                             {
                                 "kind": "arg",
                                 "path": "_project_id"
@@ -385,6 +405,10 @@
                 }
             ],
             "args": [
+                {
+                    "name": "distributor",
+                    "type": "pubkey"
+                },
                 {
                     "name": "project_id",
                     "type": "string"
@@ -527,6 +551,10 @@
                                     101
                                 ]
                             },
+                            {
+                                "kind": "arg",
+                                "path": "_distributor"
+                            },
                             {
                                 "kind": "arg",
                                 "path": "_project_id"
@@ -545,6 +573,10 @@
                 }
             ],
             "args": [
+                {
+                    "name": "distributor",
+                    "type": "pubkey"
+                },
                 {
                     "name": "project_id",
                     "type": "string"
@@ -601,6 +633,10 @@
                                     101
                                 ]
                             },
+                            {
+                                "kind": "arg",
+                                "path": "_distributor"
+                            },
                             {
                                 "kind": "arg",
                                 "path": "_project_id"
@@ -619,6 +655,10 @@
                 }
             ],
             "args": [
+                {
+                    "name": "distributor",
+                    "type": "pubkey"
+                },
                 {
                     "name": "project_id",
                     "type": "string"
@@ -980,6 +1020,10 @@
             "type": {
                 "kind": "struct",
                 "fields": [
+                    {
+                        "name": "distributor",
+                        "type": "pubkey"
+                    },
                     {
                         "name": "bips",
                         "type": "u64"
@@ -996,6 +1040,10 @@
             "type": {
                 "kind": "struct",
                 "fields": [
+                    {
+                        "name": "distributor",
+                        "type": "pubkey"
+                    },
                     {
                         "name": "fixed_fee",
                         "type": "u64"