@symmetry-hq/temp-v3-sdk 0.0.41 → 0.0.42

package/dist/src/index.d.ts

@@ -1,6 +1,6 @@
 import { Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { getJupTokenLedgerAndSwapInstructions } from './jup';
-import { Basket, FormattedAccumulatedFees, FormattedAddTokenSettings, FormattedAsset, FormattedAutomationSettings, FormattedBasket, FormattedCreatorSettings, FormattedCustomRebalanceSettings, FormattedDepositsSettings, FormattedFeeSettings, FormattedForceRebalanceSettings, FormattedLookupTables, FormattedLpSettings, FormattedMakeDirectSwapSettings, FormattedManagersSettings, FormattedMetadataSettings, FormattedOracle, FormattedOracleAggregator, FormattedOracleSettings, FormattedScheduleSettings, FormattedUpdateWeightsSettings } from './layouts/basket';
+import { Basket, FormattedAccumulatedFees, FormattedAddTokenSettings, FormattedAsset, FormattedAutomationSettings, FormattedBasket, FormattedCreatorSettings, FormattedCustomRebalanceSettings, FormattedDepositsSettings, FormattedFeeSettings, FormattedForceRebalanceSettings, FormattedLookupTables, FormattedLpSettings, FormattedMakeDirectSwapSettings, FormattedManagersSettings, FormattedMetadataSettings, FormattedOracle, FormattedOracleAggregator, FormattedOracleSettings, FormattedScheduleSettings, FormattedUpdateWeightsSettings, WithdrawBasketFees } from './layouts/basket';
 import { FormattedGlobalConfig, GlobalConfig } from './layouts/config';
 import { AddOrEditTokenInput, EditAddTokenSettings, EditAutomationSettings, EditCreatorSettings, EditCustomRebalanceSettings, EditDepositsSettings, EditFeeSettings, EditForceRebalanceSettings, EditLpSettings, EditMakeDirectSwapSettings, EditManagerSettings, EditMetadataSettings, EditScheduleSettings, EditUpdateWeightsSettings, FormattedBounty, FormattedBountySchedule, FormattedIntent, FormattedIntentStatus, FormattedTaskType, Intent, MakeDirectSwapInput, OracleInput, Settings, TaskContext, TaskType, UpdateWeightsInput } from './layouts/intents/intent';
 import { FormattedOraclePrice, FormattedRebalanceAction, FormattedRebalanceIntent, FormattedRebalanceType, FormattedTaskCompletion, FormattedTokenAuction, RebalanceIntent } from './layouts/intents/rebalanceIntent';
@@ -8,6 +8,7 @@ import { FormattedOracleType } from './layouts/oracle';
 import { BasketFilter } from './states/basket';
 import { IntentFilter } from './states/intents/intent';
 import { RebalanceIntentFilter } from './states/intents/rebalanceIntent';
+import { WithdrawBasketFeesFilter } from './states/withdrawBasketFees';
 import { BasketCreationTx, TxPayloadBatchSequence, VersionedTxs, Wallet } from './txUtils';
 export declare class SymmetryCore {
     private sdkParams;
@@ -148,6 +149,56 @@ export declare class SymmetryCore {
      * @returns {Promise<RebalanceIntent[]>} The rebalance intents.
     */
     fetchBasketRebalanceIntents(basketPubkey: string): Promise<RebalanceIntent[]>;
+    /**
+     * Fetches a WithdrawBasketFees account by its public key.
+     * @param {string} withdrawBasketFeesPubkey - The public key of the WithdrawBasketFees account.
+     * @returns {Promise<WithdrawBasketFees>} The WithdrawBasketFees account.
+    */
+    fetchWithdrawBasketFees(withdrawBasketFeesPubkey: string): Promise<WithdrawBasketFees>;
+    /**
+     * Fetches multiple WithdrawBasketFees accounts by their public keys.
+     * @param {string[]} withdrawBasketFeesPubkeys - The public keys of the WithdrawBasketFees accounts.
+     * @returns {Promise<Map<string, WithdrawBasketFees>>} A map of WithdrawBasketFees public keys to WithdrawBasketFees accounts.
+    */
+    fetchMultipleWithdrawBasketFees(withdrawBasketFeesPubkeys: string[]): Promise<Map<string, WithdrawBasketFees>>;
+    /**
+     * Fetches all WithdrawBasketFees accounts with optional filter.
+     * @param {WithdrawBasketFeesFilter} filter - Optional. The filter to apply to the WithdrawBasketFees accounts.
+     * @param {"basket" | "manager" | "creator" | "host" | "symmetry"} filter.type - The type of the filter.
+     * @param {string} filter.pubkey - The public key to filter by.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchAllWithdrawBasketFees(filter?: WithdrawBasketFeesFilter): Promise<WithdrawBasketFees[]>;
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given basket.
+     * @param {string} basketPubkey - The public key of the basket.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchBasketWithdrawBasketFees(basketPubkey: string): Promise<WithdrawBasketFees[]>;
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given manager.
+     * @param {string} managerPubkey - The public key of the manager.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchManagerWithdrawBasketFees(managerPubkey: string): Promise<WithdrawBasketFees[]>;
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given creator.
+     * @param {string} creatorPubkey - The public key of the creator.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchCreatorWithdrawBasketFees(creatorPubkey: string): Promise<WithdrawBasketFees[]>;
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given host.
+     * @param {string} hostPubkey - The public key of the host.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchHostWithdrawBasketFees(hostPubkey: string): Promise<WithdrawBasketFees[]>;
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given symmetry fee collector.
+     * @param {string} symmetryPubkey - The public key of the symmetry fee collector.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchSymmetryWithdrawBasketFees(symmetryPubkey: string): Promise<WithdrawBasketFees[]>;
     createGlobalConfigTx(params: {
         signer: PublicKey;
     }): Promise<TxPayloadBatchSequence>;
@@ -637,18 +688,53 @@ export declare class SymmetryCore {
         amount: number;
     }): Promise<TxPayloadBatchSequence>;
     /**
-     * Claims fees from the basket for host, creator, managers or symmetry fees collector.
+     * Withdraws fees from the basket, initializes WithdrawBasketFees accounts, and claims the fee tokens
+     * for all fee types that the claimer is authorized to claim (symmetry, creator, host, or manager fees).
+     *
+     * This function automatically determines which fee types the claimer can claim based on:
+     * - Symmetry fees: if claimer equals globalConfig.symmetryFeeCollector
+     * - Creator fees: if claimer equals basket.settings.creator
+     * - Host fees: if claimer equals basket.settings.host
+     * - Manager fees: if claimer is in basket.settings.managers.managers
+     *
      * Returns TxPayloadBatchSequence ready for signAndSendTxPayloadBatchSequence.
      *
-     * @param {Object} params - The parameters for the claim basket fees.
+     * Batch layout:
+     * - batch 0: One transaction per claimable fee type, each containing a withdrawFeesIx instruction.
+     *   All transactions in this batch can run in parallel. These create and populate the WithdrawBasketFees accounts.
+     * - batch 1: Multiple transactions for claiming fee tokens, automatically batched based on account limits.
+     *   All transactions in this batch can run in parallel. These transfer tokens from WithdrawBasketFees accounts to claimers.
+     *
+     * Note: If not all tokens are claimed in batch 1 (e.g., due to account limits or errors),
+     * use claimTokenFeesFromBasketTx to claim the remaining tokens.
+     *
+     * @param {Object} params - The parameters for withdrawing and claiming basket fees.
      * @param {string} params.claimer - The public key of the claimer.
      * @param {string} params.basket - The public key of the basket.
      * @returns {Promise<TxPayloadBatchSequence>} The transaction payload batch sequence.
      */
-    claimBasketFeesTx(params: {
+    withdrawBasketFeesTx(params: {
         claimer: string;
         basket: string;
     }): Promise<TxPayloadBatchSequence>;
+    /**
+     * Claims fee tokens from a WithdrawBasketFees account.
+     *
+     * This function transfers accumulated fee tokens from the WithdrawBasketFees account
+     * to the claimers (owners) based on their weights. The tokens are automatically batched
+     * into multiple transactions if needed to respect Solana's account limit (30 accounts per transaction).
+     *
+     * Returns TxPayloadBatchSequence ready for signAndSendTxPayloadBatchSequence.
+     *
+     * @param {Object} params - The parameters for claiming basket fees.
+     * @param {string} params.claimer - The public key of the claimer.
+     * @param {string} params.basket - The public key of the basket.
+     * @returns {Promise<TxPayloadBatchSequence>} The transaction payload batch sequence.
+     */
+    claimTokenFeesFromBasketTx(params: {
+        claimer: string;
+        withdrawBasketFees: string;
+    }): Promise<TxPayloadBatchSequence>;
     /**
      * Rewrites lookup tables for the basket. (Used when the basket lookup tables are full)
      *

package/dist/src/index.js

@@ -42,6 +42,7 @@ const basket_1 = require("./states/basket");
 const config_1 = require("./states/config");
 const intent_2 = require("./states/intents/intent");
 const rebalanceIntent_3 = require("./states/intents/rebalanceIntent");
+const withdrawBasketFees_1 = require("./states/withdrawBasketFees");
 const pythOracle_1 = require("./states/oracles/pythOracle");
 const txUtils_1 = require("./txUtils");
 class SymmetryCore {
@@ -287,6 +288,88 @@ class SymmetryCore {
             return yield (0, rebalanceIntent_3.fetchRebalanceIntents)(this.sdkParams.connection, { type: "basket", pubkey: basketPubkey });
         });
     }
+    /**
+     * Fetches a WithdrawBasketFees account by its public key.
+     * @param {string} withdrawBasketFeesPubkey - The public key of the WithdrawBasketFees account.
+     * @returns {Promise<WithdrawBasketFees>} The WithdrawBasketFees account.
+    */
+    fetchWithdrawBasketFees(withdrawBasketFeesPubkey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, withdrawBasketFees_1.fetchWithdrawBasketFees)(this.sdkParams.connection, new web3_js_1.PublicKey(withdrawBasketFeesPubkey));
+        });
+    }
+    /**
+     * Fetches multiple WithdrawBasketFees accounts by their public keys.
+     * @param {string[]} withdrawBasketFeesPubkeys - The public keys of the WithdrawBasketFees accounts.
+     * @returns {Promise<Map<string, WithdrawBasketFees>>} A map of WithdrawBasketFees public keys to WithdrawBasketFees accounts.
+    */
+    fetchMultipleWithdrawBasketFees(withdrawBasketFeesPubkeys) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, withdrawBasketFees_1.fetchWithdrawBasketFeesMultiple)(this.sdkParams.connection, withdrawBasketFeesPubkeys.map(key => new web3_js_1.PublicKey(key)));
+        });
+    }
+    /**
+     * Fetches all WithdrawBasketFees accounts with optional filter.
+     * @param {WithdrawBasketFeesFilter} filter - Optional. The filter to apply to the WithdrawBasketFees accounts.
+     * @param {"basket" | "manager" | "creator" | "host" | "symmetry"} filter.type - The type of the filter.
+     * @param {string} filter.pubkey - The public key to filter by.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchAllWithdrawBasketFees(filter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, withdrawBasketFees_1.fetchWithdrawBasketFeesList)(this.sdkParams.connection, filter);
+        });
+    }
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given basket.
+     * @param {string} basketPubkey - The public key of the basket.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchBasketWithdrawBasketFees(basketPubkey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, withdrawBasketFees_1.fetchWithdrawBasketFeesList)(this.sdkParams.connection, { type: "basket", pubkey: basketPubkey });
+        });
+    }
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given manager.
+     * @param {string} managerPubkey - The public key of the manager.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchManagerWithdrawBasketFees(managerPubkey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, withdrawBasketFees_1.fetchWithdrawBasketFeesList)(this.sdkParams.connection, { type: "manager", pubkey: managerPubkey });
+        });
+    }
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given creator.
+     * @param {string} creatorPubkey - The public key of the creator.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchCreatorWithdrawBasketFees(creatorPubkey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, withdrawBasketFees_1.fetchWithdrawBasketFeesList)(this.sdkParams.connection, { type: "creator", pubkey: creatorPubkey });
+        });
+    }
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given host.
+     * @param {string} hostPubkey - The public key of the host.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchHostWithdrawBasketFees(hostPubkey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, withdrawBasketFees_1.fetchWithdrawBasketFeesList)(this.sdkParams.connection, { type: "host", pubkey: hostPubkey });
+        });
+    }
+    /**
+     * Fetches all WithdrawBasketFees accounts for a given symmetry fee collector.
+     * @param {string} symmetryPubkey - The public key of the symmetry fee collector.
+     * @returns {Promise<WithdrawBasketFees[]>} The WithdrawBasketFees accounts.
+    */
+    fetchSymmetryWithdrawBasketFees(symmetryPubkey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, withdrawBasketFees_1.fetchWithdrawBasketFeesList)(this.sdkParams.connection, { type: "symmetry", pubkey: symmetryPubkey });
+        });
+    }
     createGlobalConfigTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let ix = (0, admin_1.createGlobalConfigIx)({ admin: params.signer });
@@ -1690,57 +1773,120 @@ class SymmetryCore {
         });
     }
     /**
-     * Claims fees from the basket for host, creator, managers or symmetry fees collector.
+     * Withdraws fees from the basket, initializes WithdrawBasketFees accounts, and claims the fee tokens
+     * for all fee types that the claimer is authorized to claim (symmetry, creator, host, or manager fees).
+     *
+     * This function automatically determines which fee types the claimer can claim based on:
+     * - Symmetry fees: if claimer equals globalConfig.symmetryFeeCollector
+     * - Creator fees: if claimer equals basket.settings.creator
+     * - Host fees: if claimer equals basket.settings.host
+     * - Manager fees: if claimer is in basket.settings.managers.managers
+     *
      * Returns TxPayloadBatchSequence ready for signAndSendTxPayloadBatchSequence.
      *
-     * @param {Object} params - The parameters for the claim basket fees.
+     * Batch layout:
+     * - batch 0: One transaction per claimable fee type, each containing a withdrawFeesIx instruction.
+     *   All transactions in this batch can run in parallel. These create and populate the WithdrawBasketFees accounts.
+     * - batch 1: Multiple transactions for claiming fee tokens, automatically batched based on account limits.
+     *   All transactions in this batch can run in parallel. These transfer tokens from WithdrawBasketFees accounts to claimers.
+     *
+     * Note: If not all tokens are claimed in batch 1 (e.g., due to account limits or errors),
+     * use claimTokenFeesFromBasketTx to claim the remaining tokens.
+     *
+     * @param {Object} params - The parameters for withdrawing and claiming basket fees.
      * @param {string} params.claimer - The public key of the claimer.
      * @param {string} params.basket - The public key of the basket.
      * @returns {Promise<TxPayloadBatchSequence>} The transaction payload batch sequence.
      */
-    claimBasketFeesTx(params) {
+    withdrawBasketFeesTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let claimer = new web3_js_1.PublicKey(params.claimer);
             let basket = yield this.fetchBasket(params.basket);
             let globalConfig = yield this.fetchGlobalConfig();
-            let ixs = [];
-            if (claimer.equals(globalConfig.symmetryFeeCollector))
-                ixs.push((0, claimFees_1.claimFeesIx)({
-                    claimer: claimer,
-                    basketTokenMint: basket.mint,
-                    feeType: 0,
-                    managers: [],
-                }));
-            if (claimer.equals(basket.settings.creator))
-                ixs.push((0, claimFees_1.claimFeesIx)({
-                    claimer: claimer,
-                    basketTokenMint: basket.mint,
-                    feeType: 1,
-                    managers: [],
-                }));
-            if (claimer.equals(basket.settings.host))
-                ixs.push((0, claimFees_1.claimFeesIx)({
-                    claimer: claimer,
-                    basketTokenMint: basket.mint,
-                    feeType: 2,
-                    managers: [],
-                }));
-            if (basket.settings.managers.managers.find(manager => manager.equals(claimer)))
-                ixs.push((0, claimFees_1.claimFeesIx)({
-                    claimer: claimer,
+            let claimableFeeTypes = [];
+            let owners = [];
+            if (claimer.equals(globalConfig.symmetryFeeCollector)) {
+                claimableFeeTypes.push(0);
+                owners.push([globalConfig.symmetryFeeCollector]);
+            }
+            if (claimer.equals(basket.settings.creator)) {
+                claimableFeeTypes.push(1);
+                owners.push([basket.settings.creator]);
+            }
+            if (claimer.equals(basket.settings.host)) {
+                claimableFeeTypes.push(2);
+                owners.push([basket.settings.host]);
+            }
+            if (basket.settings.managers.managers.find(manager => manager.equals(claimer))) {
+                claimableFeeTypes.push(3);
+                owners.push(basket.settings.managers.managers);
+            }
+            let withdrawFeesIxs = [];
+            let claimTokenFeesFromBasketIxs = [];
+            claimableFeeTypes.forEach((feeType, index) => {
+                withdrawFeesIxs.push((0, claimFees_1.withdrawFeesIx)({
+                    claimer,
                     basketTokenMint: basket.mint,
-                    feeType: 3,
-                    managers: basket.settings.managers.managers,
+                    feeType: feeType,
                 }));
-            let txBatchData = { batches: [[{
-                            payer: claimer,
-                            instructions: [
-                                ...ixs,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
-                            ],
-                            lookupTables: [],
-                        }]] };
+                claimTokenFeesFromBasketIxs.push(...(0, claimFees_1.claimFeeTokensFromBasketIxs)(claimer, basket.ownAddress, (0, pda_1.getWithdrawBasketFeesPda)(basket.ownAddress, feeType), claimer, owners[index], basket.composition.map(composition => composition.mint)));
+            });
+            let txBatchData = { batches: [
+                    withdrawFeesIxs.map(ix => ({
+                        payer: claimer,
+                        instructions: [
+                            ix,
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                        ],
+                        lookupTables: [],
+                    })),
+                    claimTokenFeesFromBasketIxs.map(ix => ({
+                        payer: claimer,
+                        instructions: [
+                            ix,
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                        ],
+                        lookupTables: [],
+                    })),
+                ] };
+            let versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
+            let txPayloadBatchSequence = (0, txUtils_1.prepareTxPayloadBatchSequence)(txBatchData, versionedTxs);
+            return txPayloadBatchSequence;
+        });
+    }
+    /**
+     * Claims fee tokens from a WithdrawBasketFees account.
+     *
+     * This function transfers accumulated fee tokens from the WithdrawBasketFees account
+     * to the claimers (owners) based on their weights. The tokens are automatically batched
+     * into multiple transactions if needed to respect Solana's account limit (30 accounts per transaction).
+     *
+     * Returns TxPayloadBatchSequence ready for signAndSendTxPayloadBatchSequence.
+     *
+     * @param {Object} params - The parameters for claiming basket fees.
+     * @param {string} params.claimer - The public key of the claimer.
+     * @param {string} params.basket - The public key of the basket.
+     * @returns {Promise<TxPayloadBatchSequence>} The transaction payload batch sequence.
+     */
+    claimTokenFeesFromBasketTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let claimer = new web3_js_1.PublicKey(params.claimer);
+            let withdrawBasketFees = yield this.fetchWithdrawBasketFees(params.withdrawBasketFees);
+            let claimTokenFeesFromBasketIxs = (0, claimFees_1.claimFeeTokensFromBasketIxs)(claimer, withdrawBasketFees.basket, withdrawBasketFees.ownAddress, withdrawBasketFees.rentPayer, withdrawBasketFees.owners, withdrawBasketFees.accumulatedTokens);
+            // Create batches: all claim instructions can run in parallel
+            let txBatchData = { batches: [
+                    claimTokenFeesFromBasketIxs.map(ix => ({
+                        payer: claimer,
+                        instructions: [
+                            ix,
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                        ],
+                        lookupTables: [],
+                    }))
+                ] };
             let versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
             let txPayloadBatchSequence = (0, txUtils_1.prepareTxPayloadBatchSequence)(txBatchData, versionedTxs);
             return txPayloadBatchSequence;

package/dist/src/instructions/management/claimFees.d.ts

@@ -1,7 +1,15 @@
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
-export declare function claimFeesIx(params: {
+export declare function withdrawFeesIx(params: {
     claimer: PublicKey;
     basketTokenMint: PublicKey;
     feeType: number;
-    managers: PublicKey[];
 }): TransactionInstruction;
+export declare function claimFeeTokensFromBasketIx(params: {
+    signer: PublicKey;
+    basket: PublicKey;
+    withdrawBasketFees: PublicKey;
+    rentPayer: PublicKey;
+    owners: PublicKey[];
+    tokenMints: PublicKey[];
+}): TransactionInstruction;
+export declare function claimFeeTokensFromBasketIxs(signer: PublicKey, basket: PublicKey, withdrawBasketFees: PublicKey, rentPayer: PublicKey, owners: PublicKey[], tokenMints: PublicKey[]): TransactionInstruction[];

package/dist/src/instructions/management/claimFees.js

@@ -1,44 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.claimFeesIx = claimFeesIx;
+exports.withdrawFeesIx = withdrawFeesIx;
+exports.claimFeeTokensFromBasketIx = claimFeeTokensFromBasketIx;
+exports.claimFeeTokensFromBasketIxs = claimFeeTokensFromBasketIxs;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("../../constants");
 const pda_1 = require("../pda");
-const CLAIM_FEES_DISCRIMINATOR = Buffer.from([97, 50, 216, 3, 144, 118, 13, 164]);
-function claimFeesIx(params) {
-    let { claimer, basketTokenMint, feeType, managers } = params;
-    managers = managers.filter(manager => !manager.equals(web3_js_1.PublicKey.default));
+const WITHDRAW_FEES_DISCRIMINATOR = Buffer.from([97, 50, 216, 3, 144, 118, 13, 164]);
+// TODO: Get the actual discriminator from the program
+// This is typically the first 8 bytes of sha256("global:claim_fee_tokens_from_basket")
+const CLAIM_FEE_TOKENS_FROM_BASKET_DISCRIMINATOR = Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]);
+function withdrawFeesIx(params) {
+    let { claimer, basketTokenMint, feeType } = params;
     let basket = (0, pda_1.getBasketState)(basketTokenMint);
+    let withdrawBasketFees = (0, pda_1.getWithdrawBasketFeesPda)(basket, feeType);
     let basketFeesWallet = (0, pda_1.getBasketFeesPda)(basket);
     let basketFeesTokenAccount = (0, pda_1.getAta)(basketFeesWallet, basketTokenMint);
     let globalConfig = (0, pda_1.getGlobalConfigPda)();
-    const discriminator = CLAIM_FEES_DISCRIMINATOR;
-    const args = Buffer.from([params.feeType]);
+    const discriminator = WITHDRAW_FEES_DISCRIMINATOR;
+    const args = Buffer.from([feeType]);
     const data = Buffer.concat([discriminator, args]);
     const keys = [
         { pubkey: claimer, isWritable: true, isSigner: true },
         { pubkey: basket, isWritable: true, isSigner: false },
-        { pubkey: basketTokenMint, isWritable: false, isSigner: false },
+        { pubkey: withdrawBasketFees, isWritable: true, isSigner: false },
+        { pubkey: basketTokenMint, isWritable: true, isSigner: false },
         { pubkey: basketFeesWallet, isWritable: true, isSigner: false },
         { pubkey: basketFeesTokenAccount, isWritable: true, isSigner: false },
-        { pubkey: globalConfig, isWritable: true, isSigner: false },
+        { pubkey: globalConfig, isWritable: false, isSigner: false },
+        { pubkey: web3_js_1.SystemProgram.programId, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
+    ];
+    return new web3_js_1.TransactionInstruction({
+        keys,
+        programId: constants_1.BASKETS_V3_PROGRAM_ID,
+        data,
+    });
+}
+function claimFeeTokensFromBasketIx(params) {
+    let { signer, basket, withdrawBasketFees, rentPayer, owners, tokenMints } = params;
+    let numOwners = owners.length;
+    const discriminator = CLAIM_FEE_TOKENS_FROM_BASKET_DISCRIMINATOR;
+    const args = Buffer.from([numOwners]);
+    const data = Buffer.concat([discriminator, args]);
+    const keys = [
+        { pubkey: signer, isWritable: true, isSigner: true },
+        { pubkey: basket, isWritable: true, isSigner: false },
+        { pubkey: withdrawBasketFees, isWritable: true, isSigner: false },
+        { pubkey: rentPayer, isWritable: true, isSigner: false },
         { pubkey: web3_js_1.SystemProgram.programId, isWritable: false, isSigner: false },
         { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
         { pubkey: spl_token_1.TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
-        { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isWritable: false, isSigner: false }
+        { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
     ];
-    // remaining accounts
-    if (feeType === 0 || feeType === 1 || feeType === 2) {
-        const claimerATA = (0, pda_1.getAta)(claimer, basketTokenMint);
-        keys.push({ pubkey: claimerATA, isWritable: true, isSigner: false });
-    }
-    if (feeType === 3) {
-        managers.forEach((managerPubkey) => {
-            const managerATA = (0, pda_1.getAta)(managerPubkey, basketTokenMint);
-            keys.push({ pubkey: managerPubkey, isWritable: true, isSigner: false });
-            keys.push({ pubkey: managerATA, isWritable: true, isSigner: false });
-        });
+    // Remaining accounts: for each token: (mint, basketAta, claimer1Ata, claimer2Ata, ...)
+    for (let i = 0; i < tokenMints.length; i++) {
+        const mint = tokenMints[i];
+        const basketAta = (0, pda_1.getAta)(basket, mint);
+        const claimerATAs = owners.map(owner => (0, pda_1.getAta)(owner, mint));
+        keys.push({ pubkey: mint, isWritable: false, isSigner: false });
+        keys.push({ pubkey: basketAta, isWritable: true, isSigner: false });
+        for (let j = 0; j < numOwners; j++) {
+            keys.push({ pubkey: claimerATAs[j], isWritable: true, isSigner: false });
+        }
     }
     return new web3_js_1.TransactionInstruction({
         keys,
@@ -46,3 +72,26 @@ function claimFeesIx(params) {
         data,
     });
 }
+function claimFeeTokensFromBasketIxs(signer, basket, withdrawBasketFees, rentPayer, owners, tokenMints) {
+    if (owners.length === 0 || tokenMints.length === 0)
+        return [];
+    // Account limit: 8 fixed accounts + (owners + 2) * number_of_mints <= 30
+    // So: (owners + 2) * number_of_mints <= 24
+    // Max tokens per tx: Math.floor(24 / (owners.length + 2))
+    const accountsPerToken = owners.length + 2; // mint, basketAta, and one account per owner
+    const maxRemainingAccounts = 24; // 30 - 8 fixed accounts
+    const maxTokensPerTx = Math.floor(maxRemainingAccounts / accountsPerToken);
+    let ixs = [];
+    for (let i = 0; i < tokenMints.length; i += maxTokensPerTx) {
+        const batchTokenMints = tokenMints.slice(i, i + maxTokensPerTx);
+        ixs.push(claimFeeTokensFromBasketIx({
+            signer: signer,
+            basket: basket,
+            withdrawBasketFees: withdrawBasketFees,
+            rentPayer: rentPayer,
+            owners: owners,
+            tokenMints: batchTokenMints,
+        }));
+    }
+    return ixs;
+}

package/dist/src/instructions/pda.d.ts

@@ -1,6 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const GLOBAL_CONFIG_SEED: Buffer;
 export declare const BASKET_FEES_SEED: Buffer;
+export declare const WITHDRAW_BASKET_FEES_SEED: Buffer;
 export declare const BASKET_SEED: Buffer;
 export declare const MINT_SEED: Buffer;
 export declare const RENT_PAYER_SEED: Buffer;
@@ -12,6 +13,7 @@ export declare function getBasketTokenMintPda(basketId: number): PublicKey;
 export declare function getBasketState(mint: PublicKey): PublicKey;
 export declare function getBountyVaultPda(): PublicKey;
 export declare function getBasketFeesPda(basket: PublicKey): PublicKey;
+export declare function getWithdrawBasketFeesPda(basket: PublicKey, feeType: number): PublicKey;
 export declare function getGlobalConfigPda(): PublicKey;
 export declare function getRentPayerPda(): PublicKey;
 export declare function getIntentPda(basket: PublicKey, intentSeedArray: Uint8Array, editType: number): PublicKey;

package/dist/src/instructions/pda.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REBALANCE_INTENT_SEED = exports.BOUNTY_VAULT_SEED = exports.RENT_PAYER_SEED = exports.MINT_SEED = exports.BASKET_SEED = exports.BASKET_FEES_SEED = exports.GLOBAL_CONFIG_SEED = void 0;
+exports.REBALANCE_INTENT_SEED = exports.BOUNTY_VAULT_SEED = exports.RENT_PAYER_SEED = exports.MINT_SEED = exports.BASKET_SEED = exports.WITHDRAW_BASKET_FEES_SEED = exports.BASKET_FEES_SEED = exports.GLOBAL_CONFIG_SEED = void 0;
 exports.serializeString = serializeString;
 exports.getRandomSeed = getRandomSeed;
 exports.getBasketTokenMintPda = getBasketTokenMintPda;
 exports.getBasketState = getBasketState;
 exports.getBountyVaultPda = getBountyVaultPda;
 exports.getBasketFeesPda = getBasketFeesPda;
+exports.getWithdrawBasketFeesPda = getWithdrawBasketFeesPda;
 exports.getGlobalConfigPda = getGlobalConfigPda;
 exports.getRentPayerPda = getRentPayerPda;
 exports.getIntentPda = getIntentPda;
@@ -23,6 +24,7 @@ const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("../constants");
 exports.GLOBAL_CONFIG_SEED = Buffer.from("global_config");
 exports.BASKET_FEES_SEED = Buffer.from("basket_fees");
+exports.WITHDRAW_BASKET_FEES_SEED = Buffer.from("withdraw_basket_fees");
 exports.BASKET_SEED = Buffer.from("basket");
 exports.MINT_SEED = Buffer.from("mint");
 exports.RENT_PAYER_SEED = Buffer.from("rent_payer");
@@ -67,6 +69,13 @@ function getBasketFeesPda(basket) {
         basket.toBuffer()
     ], constants_1.BASKETS_V3_PROGRAM_ID)[0];
 }
+function getWithdrawBasketFeesPda(basket, feeType) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        exports.WITHDRAW_BASKET_FEES_SEED,
+        basket.toBuffer(),
+        Buffer.from([feeType]) // u8, not u64
+    ], constants_1.BASKETS_V3_PROGRAM_ID)[0];
+}
 function getGlobalConfigPda() {
     return web3_js_1.PublicKey.findProgramAddressSync([
         exports.GLOBAL_CONFIG_SEED

package/dist/src/layouts/basket.d.ts

@@ -132,6 +132,26 @@ export interface BasketFees {
     managersFees: BN;
 }
 export declare const BasketFeesLayout: any;
+export interface FormattedWithdrawBasketFees {
+    pubkey: string;
+    basket: string;
+    rent_payer: string;
+    owners: string[];
+    owners_weights: number[];
+    accumulated_tokens: string[];
+    accumulated_fees: number[];
+}
+export interface WithdrawBasketFees {
+    basket: PublicKey;
+    rentPayer: PublicKey;
+    owners: PublicKey[];
+    ownersWeights: number[];
+    accumulatedTokens: PublicKey[];
+    accumulatedFees: BN[];
+    ownAddress?: PublicKey;
+    formatted?: FormattedWithdrawBasketFees;
+}
+export declare const WithdrawBasketFeesLayout: any;
 export interface LookupTables {
     active: PublicKey[];
     temp: PublicKey[];

package/dist/src/layouts/basket.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasketLayout = exports.AssetLayout = exports.LookupTablesLayout = exports.BasketFeesLayout = exports.BASKET_TYPES_STRINGS = void 0;
+exports.BasketLayout = exports.AssetLayout = exports.LookupTablesLayout = exports.WithdrawBasketFeesLayout = exports.BasketFeesLayout = exports.BASKET_TYPES_STRINGS = void 0;
 const borsh_1 = require("@coral-xyz/borsh");
 const oracle_1 = require("./oracle");
 const config_1 = require("./config");
@@ -16,6 +16,14 @@ exports.BasketFeesLayout = (0, borsh_1.struct)([
     (0, borsh_1.u64)("hostFees"),
     (0, borsh_1.u64)("managersFees"),
 ]);
+exports.WithdrawBasketFeesLayout = (0, borsh_1.struct)([
+    (0, borsh_1.publicKey)('basket'),
+    (0, borsh_1.publicKey)('rentPayer'),
+    (0, borsh_1.array)((0, borsh_1.publicKey)(), constants_1.MAX_MANAGERS_PER_BASKET, 'owners'),
+    (0, borsh_1.array)((0, borsh_1.u16)(), constants_1.MAX_MANAGERS_PER_BASKET, 'ownersWeights'),
+    (0, borsh_1.array)((0, borsh_1.publicKey)(), constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET, 'accumulatedTokens'),
+    (0, borsh_1.array)((0, borsh_1.u64)(), constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET, 'accumulatedFees'),
+]);
 ;
 exports.LookupTablesLayout = (0, borsh_1.struct)([
     (0, borsh_1.array)((0, borsh_1.publicKey)(), 2, "active"),

package/dist/src/states/intents/rebalanceIntent.js

@@ -212,9 +212,9 @@ function fetchRebalanceIntents(connection, filter) {
         let rebalanceIntents = accounts.map(account => {
             let rebalanceIntent = rebalanceIntent_1.RebalanceIntentLayout.decode(account.account.data.slice(8));
             rebalanceIntent.ownAddress = account.pubkey;
+            rebalanceIntent = addFieldsToRebalanceIntent(rebalanceIntent);
             return rebalanceIntent;
         });
-        rebalanceIntents = rebalanceIntents.map(rebalanceIntent => addFieldsToRebalanceIntent(rebalanceIntent));
         return rebalanceIntents;
     });
 }