@nosana/kit 1.0.8 → 1.0.10

package/dist/programs/MerkleDistributorProgram.d.ts

@@ -98,4 +98,18 @@ export declare class MerkleDistributorProgram extends BaseProgram {
         target: ClaimTarget;
         claimant?: KeyPairSigner;
     }): Promise<ReturnType<typeof programClient.getNewClaimInstruction>>;
+    /**
+     * Clawback tokens from a merkle distributor.
+     * This function creates a clawback instruction to transfer tokens from the distributor's token vault to the clawback receiver.
+     *
+     * @param params Parameters for clawback
+     * @param params.distributor The address of the merkle distributor
+     * @param params.claimant Optional claimant signer. If not provided, uses the wallet.
+     * @returns The clawback instruction
+     * @throws Error if wallet is not set and claimant is not provided
+     */
+    clawback(params: {
+        distributor: Address;
+        claimant?: KeyPairSigner;
+    }): Promise<ReturnType<typeof programClient.getClawbackInstruction>>;
 }

package/dist/programs/MerkleDistributorProgram.js

@@ -293,4 +293,45 @@ export class MerkleDistributorProgram extends BaseProgram {
             throw err;
         }
     }
+    /**
+     * Clawback tokens from a merkle distributor.
+     * This function creates a clawback instruction to transfer tokens from the distributor's token vault to the clawback receiver.
+     *
+     * @param params Parameters for clawback
+     * @param params.distributor The address of the merkle distributor
+     * @param params.claimant Optional claimant signer. If not provided, uses the wallet.
+     * @returns The clawback instruction
+     * @throws Error if wallet is not set and claimant is not provided
+     */
+    async clawback(params) {
+        // Determine claimant signer
+        let claimantSigner;
+        if (params.claimant) {
+            claimantSigner = params.claimant;
+        }
+        else {
+            if (!this.sdk.wallet) {
+                throw new Error('Wallet not set. Please set a wallet or provide a claimant signer.');
+            }
+            claimantSigner = this.sdk.wallet;
+        }
+        try {
+            // Get the distributor account to find tokenVault and clawbackReceiver
+            const distributorAccount = await this.client.fetchMerkleDistributor(this.sdk.solana.rpc, params.distributor);
+            // Create clawback instruction
+            const clawbackInstruction = this.client.getClawbackInstruction({
+                distributor: params.distributor,
+                from: distributorAccount.data.tokenVault,
+                to: distributorAccount.data.clawbackReceiver,
+                claimant: claimantSigner,
+                tokenProgram: TOKEN_PROGRAM_ADDRESS,
+                systemProgram: SYSTEM_PROGRAM_ADDRESS,
+            }, { programAddress: this.getProgramId() });
+            return clawbackInstruction;
+        }
+        catch (err) {
+            this.sdk.logger.error(`Failed to create clawback instruction: ${err}`);
+            throw err;
+        }
+    }
 }

package/dist/services/SolanaService.js

@@ -17,7 +17,29 @@ export class SolanaService {
         const addressEncoder = getAddressEncoder();
         const [pda] = await getProgramDerivedAddress({
             programAddress: programId,
-            seeds: seeds.map((seed) => (typeof seed !== 'string' ? addressEncoder.encode(seed) : seed)),
+            seeds: seeds.map((seed) => {
+                // Address is a branded string type, so typeof will return 'string'
+                // We need to encode Address types to bytes for PDA seeds
+                // Try to encode if it looks like an address (base58, 32-44 chars), otherwise pass as-is
+                if (typeof seed === 'string') {
+                    // Check if it's likely an address (base58 encoded addresses are 32-44 chars)
+                    // Short strings like 'ClaimStatus' should be passed as-is
+                    if (seed.length >= 32 && seed.length <= 44) {
+                        try {
+                            // Try to encode as Address - if it's a valid address, this will work
+                            return addressEncoder.encode(seed);
+                        }
+                        catch {
+                            // If encoding fails, it's not a valid address, pass as-is (e.g., 'ClaimStatus')
+                            return seed;
+                        }
+                    }
+                    // Short strings pass as-is
+                    return seed;
+                }
+                // Non-string types should be encoded
+                return addressEncoder.encode(seed);
+            }),
         });
         return pda;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nosana/kit",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Nosana KIT",
   "type": "module",
   "main": "dist/index.js",