@symmetry-hq/temp-v3-sdk 0.0.16 → 0.0.17

package/dist/src/index.d.ts

@@ -1,8 +1,9 @@
 import { BN } from '@coral-xyz/anchor';
 import { Connection, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { Basket, FormattedBasket } from './layouts/basket';
+import { Basket } from './layouts/basket';
 import { GlobalConfig } from './layouts/config';
-import { FormattedCreatorSettings, FormattedManagersSettings, FormattedFeeSettings, FormattedScheduleSettings, FormattedAutomationSettings, FormattedLpSettings, FormattedMetadataSettings, FormattedDepositsSettings, FormattedForceRebalanceSettings, FormattedCustomRebalanceSettings, FormattedAddTokenSettings, FormattedUpdateWeightsSettings, FormattedMakeDirectSwapSettings, TaskContext, Settings, AddTokenInput, UpdateWeightsInput, MakeDirectSwapInput, TaskType, Intent } from './layouts/intents/intent';
+import { AddTokenInput, OracleInput, EditAddTokenSettings, EditAutomationSettings, EditCreatorSettings, EditCustomRebalanceSettings, EditDepositsSettings, EditFeeSettings, EditForceRebalanceSettings, EditLpSettings, EditMakeDirectSwapSettings, EditManagerSettings, EditMetadataSettings, EditScheduleSettings, EditUpdateWeightsSettings, Intent, MakeDirectSwapInput, Settings, TaskContext, TaskType, UpdateWeightsInput } from './layouts/intents/intent';
+import { FormattedCreatorSettings, FormattedManagersSettings, FormattedFeeSettings, FormattedScheduleSettings, FormattedAutomationSettings, FormattedLpSettings, FormattedMetadataSettings, FormattedDepositsSettings, FormattedForceRebalanceSettings, FormattedCustomRebalanceSettings, FormattedAddTokenSettings, FormattedUpdateWeightsSettings, FormattedMakeDirectSwapSettings, FormattedAccumulatedFees, FormattedLookupTables, FormattedAsset, FormattedOracleSettings, FormattedOracleAggregator, FormattedOracle, FormattedBasket } from './layouts/basket';
 import { RebalanceIntent } from './layouts/intents/rebalanceIntent';
 import { BasketFilter } from './states/basket';
 import { IntentFilter } from './states/intents/intent';
@@ -45,26 +46,27 @@ export declare class SymmetryCore {
         name: string;
         symbol: string;
         metadata_uri: string;
-        host_pubkey: string;
-        host_deposit_fee_bps: number;
-        host_withdraw_fee_bps: number;
-        host_management_fee_bps: number;
-        host_performance_fee_bps: number;
-        priority_fee_lamports: number;
+        host_platform_params?: {
+            host_pubkey: string;
+            host_deposit_fee_bps: number;
+            host_withdraw_fee_bps: number;
+            host_management_fee_bps: number;
+            host_performance_fee_bps: number;
+        };
     }): Promise<TxPayloadBatchSequence>;
-    editCreatorTx(context: TaskContext, settings: FormattedCreatorSettings): Promise<TxPayloadBatchSequence>;
-    editManagersTx(context: TaskContext, settings: FormattedManagersSettings): Promise<TxPayloadBatchSequence>;
-    editScheduleTx(context: TaskContext, settings: FormattedScheduleSettings): Promise<TxPayloadBatchSequence>;
-    editFeesTx(context: TaskContext, settings: FormattedFeeSettings): Promise<TxPayloadBatchSequence>;
-    editAutomationTx(context: TaskContext, settings: FormattedAutomationSettings): Promise<TxPayloadBatchSequence>;
-    editLpTx(context: TaskContext, settings: FormattedLpSettings): Promise<TxPayloadBatchSequence>;
-    editMetadataTx(context: TaskContext, settings: FormattedMetadataSettings): Promise<TxPayloadBatchSequence>;
-    editDepositsTx(context: TaskContext, settings: FormattedDepositsSettings): Promise<TxPayloadBatchSequence>;
-    editForceRebalanceTx(context: TaskContext, settings: FormattedForceRebalanceSettings): Promise<TxPayloadBatchSequence>;
-    editCustomRebalanceTx(context: TaskContext, settings: FormattedCustomRebalanceSettings): Promise<TxPayloadBatchSequence>;
-    editAddTokenDelayTx(context: TaskContext, settings: FormattedAddTokenSettings): Promise<TxPayloadBatchSequence>;
-    editUpdateWeightsDelayTx(context: TaskContext, settings: FormattedUpdateWeightsSettings): Promise<TxPayloadBatchSequence>;
-    editSwapDelayTx(context: TaskContext, settings: FormattedMakeDirectSwapSettings): Promise<TxPayloadBatchSequence>;
+    editCreatorTx(context: TaskContext, settings: EditCreatorSettings): Promise<TxPayloadBatchSequence>;
+    editManagersTx(context: TaskContext, settings: EditManagerSettings): Promise<TxPayloadBatchSequence>;
+    editScheduleTx(context: TaskContext, settings: EditScheduleSettings): Promise<TxPayloadBatchSequence>;
+    editFeesTx(context: TaskContext, settings: EditFeeSettings): Promise<TxPayloadBatchSequence>;
+    editAutomationTx(context: TaskContext, settings: EditAutomationSettings): Promise<TxPayloadBatchSequence>;
+    editLpTx(context: TaskContext, settings: EditLpSettings): Promise<TxPayloadBatchSequence>;
+    editMetadataTx(context: TaskContext, settings: EditMetadataSettings): Promise<TxPayloadBatchSequence>;
+    editDepositsTx(context: TaskContext, settings: EditDepositsSettings): Promise<TxPayloadBatchSequence>;
+    editForceRebalanceTx(context: TaskContext, settings: EditForceRebalanceSettings): Promise<TxPayloadBatchSequence>;
+    editCustomRebalanceTx(context: TaskContext, settings: EditCustomRebalanceSettings): Promise<TxPayloadBatchSequence>;
+    editAddTokenDelayTx(context: TaskContext, settings: EditAddTokenSettings): Promise<TxPayloadBatchSequence>;
+    editUpdateWeightsDelayTx(context: TaskContext, settings: EditUpdateWeightsSettings): Promise<TxPayloadBatchSequence>;
+    editSwapDelayTx(context: TaskContext, settings: EditMakeDirectSwapSettings): Promise<TxPayloadBatchSequence>;
     addTokenTx(context: TaskContext, settings: AddTokenInput): Promise<TxPayloadBatchSequence>;
     updateWeightsTx(context: TaskContext, settings: UpdateWeightsInput): Promise<TxPayloadBatchSequence>;
     makeDirectSwapTx(context: TaskContext, settings: MakeDirectSwapInput): Promise<TxPayloadBatchSequence>;
@@ -78,18 +80,28 @@ export declare class SymmetryCore {
         keeper: PublicKey;
     }): Promise<TxPayloadBatchSequence>;
     buyBasketTx(params: {
-        buyer: PublicKey;
-        basketMint: PublicKey;
+        buyer: string;
+        basket_mint: string;
         contributions: {
-            mint: PublicKey;
+            mint: string;
             amount: number;
         }[];
-        rebalanceSlippageBps?: number;
-        perTradeRebalanceSlippageBps?: number;
-        executionStartTime?: number;
-        minBountyAmount?: number;
-        maxBountyAmount?: number;
-        priorityFee?: number;
+        rebalance_slippage_bps?: number;
+        per_trade_rebalance_slippage_bps?: number;
+        execution_start_time?: number;
+        min_bounty_amount?: number;
+        max_bounty_amount?: number;
+    }): Promise<TxPayloadBatchSequence>;
+    sellBasketTx(params: {
+        seller: string;
+        basket_mint: string;
+        withdraw_amount: number;
+        keep_tokens: string[];
+        rebalance_slippage_bps?: number;
+        per_trade_rebalance_slippage_bps?: number;
+        execution_start_time?: number;
+        min_bounty_amount?: number;
+        max_bounty_amount?: number;
     }): Promise<TxPayloadBatchSequence>;
     updateTokenPricesTx(params: {
         keeper: PublicKey;
@@ -127,5 +139,6 @@ export declare class SymmetryCore {
         wallet: Wallet;
     }): Promise<TransactionSignature[][]>;
 }
-export { Basket, FormattedBasket, BasketFilter, Intent, IntentFilter, RebalanceIntent, RebalanceIntentFilter };
-export { FormattedCreatorSettings, FormattedManagersSettings, FormattedFeeSettings, FormattedScheduleSettings, FormattedAutomationSettings, FormattedLpSettings, FormattedMetadataSettings, FormattedDepositsSettings, FormattedForceRebalanceSettings, FormattedCustomRebalanceSettings, FormattedAddTokenSettings, FormattedUpdateWeightsSettings, FormattedMakeDirectSwapSettings, AddTokenInput, UpdateWeightsInput, MakeDirectSwapInput, Settings, TaskContext, TaskType, };
+export { Basket, BasketFilter, Intent, IntentFilter, RebalanceIntent, RebalanceIntentFilter };
+export { FormattedCreatorSettings, FormattedManagersSettings, FormattedFeeSettings, FormattedScheduleSettings, FormattedAutomationSettings, FormattedLpSettings, FormattedMetadataSettings, FormattedDepositsSettings, FormattedForceRebalanceSettings, FormattedCustomRebalanceSettings, FormattedAddTokenSettings, FormattedUpdateWeightsSettings, FormattedMakeDirectSwapSettings, FormattedAccumulatedFees, FormattedLookupTables, FormattedAsset, FormattedOracleSettings, FormattedOracleAggregator, FormattedOracle, FormattedBasket, };
+export { EditCreatorSettings, EditManagerSettings, EditFeeSettings, EditScheduleSettings, EditAutomationSettings, EditLpSettings, EditMetadataSettings, EditDepositsSettings, EditForceRebalanceSettings, EditCustomRebalanceSettings, EditAddTokenSettings, EditUpdateWeightsSettings, EditMakeDirectSwapSettings, AddTokenInput, OracleInput, UpdateWeightsInput, MakeDirectSwapInput, Settings, TaskContext, TaskType, };

package/dist/src/index.js

@@ -13,11 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskType = exports.SymmetryCore = exports.MAX_JUPITER_ACCOUNTS = exports.JUPITER_API_KEY = exports.PRIORITY_FEE = exports.COMPUTE_UNITS = void 0;
+const crypto_1 = require("crypto");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const anchor_1 = require("@coral-xyz/anchor");
+const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const claimBounty_1 = require("./instructions/automation/claimBounty");
 const priceUpdate_1 = require("./instructions/automation/priceUpdate");
+const rebalanceIntent_1 = require("./instructions/automation/rebalanceIntent");
 const rebalanceSwap_1 = require("./instructions/automation/rebalanceSwap");
 const admin_1 = require("./instructions/management/admin");
 const createBasket_1 = require("./instructions/management/createBasket");
@@ -30,13 +33,11 @@ const config_1 = require("./layouts/config");
 const fraction_1 = require("./layouts/fraction");
 const intent_1 = require("./layouts/intents/intent");
 Object.defineProperty(exports, "TaskType", { enumerable: true, get: function () { return intent_1.TaskType; } });
-const rebalanceIntent_1 = require("./layouts/intents/rebalanceIntent");
+const rebalanceIntent_2 = require("./layouts/intents/rebalanceIntent");
 const basket_2 = require("./states/basket");
 const intent_2 = require("./states/intents/intent");
-const rebalanceIntent_2 = require("./states/intents/rebalanceIntent");
+const rebalanceIntent_3 = require("./states/intents/rebalanceIntent");
 const txUtils_1 = require("./txUtils");
-const spl_token_1 = require("@solana/spl-token");
-const rebalanceIntent_3 = require("./instructions/automation/rebalanceIntent");
 exports.COMPUTE_UNITS = 1000000;
 exports.PRIORITY_FEE = 100000;
 exports.JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
@@ -134,7 +135,7 @@ class SymmetryCore {
     }
     fetchAllRebalanceIntents(filters) {
         return __awaiter(this, void 0, void 0, function* () {
-            const rebalanceIntents = yield (0, rebalanceIntent_2.fetchRebalanceIntents)(this.sdkParams.connection, filters);
+            const rebalanceIntents = yield (0, rebalanceIntent_3.fetchRebalanceIntents)(this.sdkParams.connection, filters);
             return rebalanceIntents;
         });
     }
@@ -174,14 +175,14 @@ class SymmetryCore {
     }
     createBasketTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const creator = new web3_js_1.PublicKey(params.creator);
-            const host = new web3_js_1.PublicKey(params.host_pubkey);
+            const host = new web3_js_1.PublicKey((_b = (_a = params.host_platform_params) === null || _a === void 0 ? void 0 : _a.host_pubkey) !== null && _b !== void 0 ? _b : params.creator);
             const hostFees = {
-                hostDepositFeeBps: params.host_deposit_fee_bps,
-                hostWithdrawalFeeBps: params.host_withdraw_fee_bps,
-                hostManagementFeeBps: params.host_management_fee_bps,
-                hostPerformanceFeeBps: params.host_performance_fee_bps,
+                hostDepositFeeBps: (_d = (_c = params.host_platform_params) === null || _c === void 0 ? void 0 : _c.host_deposit_fee_bps) !== null && _d !== void 0 ? _d : 0,
+                hostWithdrawalFeeBps: (_f = (_e = params.host_platform_params) === null || _e === void 0 ? void 0 : _e.host_withdraw_fee_bps) !== null && _f !== void 0 ? _f : 0,
+                hostManagementFeeBps: (_h = (_g = params.host_platform_params) === null || _g === void 0 ? void 0 : _g.host_management_fee_bps) !== null && _h !== void 0 ? _h : 0,
+                hostPerformanceFeeBps: (_k = (_j = params.host_platform_params) === null || _j === void 0 ? void 0 : _j.host_performance_fee_bps) !== null && _k !== void 0 ? _k : 0,
             };
             const metadataParams = {
                 name: params.name,
@@ -190,7 +191,7 @@ class SymmetryCore {
             };
             const startPrice = (0, fraction_1.decimalToFraction)(new decimal_js_1.default(parseFloat(params.start_price) / 10 ** 6));
             let globalConfigData = yield this.sdkParams.connection.getAccountInfo((0, pda_1.getGlobalConfigPda)());
-            let globalConfig = config_1.GlobalConfigLayout.decode((_a = globalConfigData === null || globalConfigData === void 0 ? void 0 : globalConfigData.data.slice(8)) !== null && _a !== void 0 ? _a : Buffer.alloc(0));
+            let globalConfig = config_1.GlobalConfigLayout.decode((_l = globalConfigData === null || globalConfigData === void 0 ? void 0 : globalConfigData.data.slice(8)) !== null && _l !== void 0 ? _l : Buffer.alloc(0));
             let basketId = parseInt(globalConfig.totalNumberOfBaskets.toString());
             let mint = (0, pda_1.getBasketTokenMintPda)(basketId);
             let basket = (0, pda_1.getBasketState)(mint);
@@ -414,48 +415,46 @@ class SymmetryCore {
     }
     buyBasketTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            let { buyer, basketMint, contributions, rebalanceSlippageBps, perTradeRebalanceSlippageBps, executionStartTime, minBountyAmount, maxBountyAmount, priorityFee, } = params;
-            if (!rebalanceSlippageBps)
-                rebalanceSlippageBps = 100;
-            if (!perTradeRebalanceSlippageBps)
-                perTradeRebalanceSlippageBps = 100;
-            if (!executionStartTime)
-                executionStartTime = 0;
-            if (!minBountyAmount)
-                minBountyAmount = 0;
-            if (!maxBountyAmount)
-                maxBountyAmount = 0;
-            if (!priorityFee)
-                priorityFee = this.sdkParams.priorityFee;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            let buyer = new web3_js_1.PublicKey(params.buyer);
+            let basketMint = new web3_js_1.PublicKey(params.basket_mint);
+            let contributions = params.contributions.map(contribution => ({
+                mint: new web3_js_1.PublicKey(contribution.mint),
+                amount: new anchor_1.BN(contribution.amount),
+            }));
+            let rebalanceSlippageBps = (_a = params.rebalance_slippage_bps) !== null && _a !== void 0 ? _a : 100;
+            let perTradeRebalanceSlippageBps = (_b = params.per_trade_rebalance_slippage_bps) !== null && _b !== void 0 ? _b : 100;
+            let executionStartTime = (_c = params.execution_start_time) !== null && _c !== void 0 ? _c : 0;
+            let minBountyAmount = (_d = params.min_bounty_amount) !== null && _d !== void 0 ? _d : 0;
+            let maxBountyAmount = (_e = params.max_bounty_amount) !== null && _e !== void 0 ? _e : 0;
             const basket = (0, pda_1.getBasketState)(basketMint);
             const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, buyer);
             let rentPayer = (0, pda_1.getRentPayerPda)();
             let accountInfos = yield (0, txUtils_1.getMultipleAccountsInfoBatched)(this.sdkParams.connection, [rentPayer, basket]);
             let rebalanceIntentRentPayer = buyer;
             // TODO: check actual lamports required for rent
-            if (((_b = (_a = accountInfos.get(rentPayer.toBase58())) === null || _a === void 0 ? void 0 : _a.lamports) !== null && _b !== void 0 ? _b : 0) > 0)
+            if (((_g = (_f = accountInfos.get(rentPayer.toBase58())) === null || _f === void 0 ? void 0 : _f.lamports) !== null && _g !== void 0 ? _g : 0) > 0)
                 rebalanceIntentRentPayer = rentPayer;
-            let basketState = basket_1.BasketLayout.decode((_d = (_c = accountInfos.get(basket.toBase58())) === null || _c === void 0 ? void 0 : _c.data.slice(8)) !== null && _d !== void 0 ? _d : Buffer.alloc(0));
+            let basketState = basket_1.BasketLayout.decode((_j = (_h = accountInfos.get(basket.toBase58())) === null || _h === void 0 ? void 0 : _h.data.slice(8)) !== null && _j !== void 0 ? _j : Buffer.alloc(0));
             let bountyMint = basketState.bountyMint;
             let txBatchData = { batches: [
                     [{
                             payer: buyer,
                             instructions: [
-                                (0, rebalanceIntent_3.createRebalanceIntentIx)({
+                                (0, rebalanceIntent_1.createRebalanceIntentIx)({
                                     signer: buyer,
                                     owner: buyer,
                                     basket: basket,
                                 }),
-                                (0, rebalanceIntent_3.resizeRebalanceIntentIx)(rebalanceIntent),
-                                (0, rebalanceIntent_3.initRebalanceIntentIx)({
+                                (0, rebalanceIntent_1.resizeRebalanceIntentIx)(rebalanceIntent),
+                                (0, rebalanceIntent_1.initRebalanceIntentIx)({
                                     signer: buyer,
                                     owner: buyer,
                                     basket,
                                     basketTokenMint: basketMint,
                                     rebalanceIntentRentPayer: rebalanceIntentRentPayer,
                                     bountyMint: bountyMint,
-                                    rebalanceType: rebalanceIntent_1.RebalanceType.Deposit,
+                                    rebalanceType: rebalanceIntent_2.RebalanceType.Deposit,
                                     basketRebalanceIntent: undefined,
                                     rebalanceSlippageBps: rebalanceSlippageBps,
                                     perTradeRebalanceSlippageBps: perTradeRebalanceSlippageBps,
@@ -506,6 +505,113 @@ class SymmetryCore {
             return txPayloadBatchSequence;
         });
     }
+    sellBasketTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            let seller = new web3_js_1.PublicKey(params.seller);
+            let basketMint = new web3_js_1.PublicKey(params.basket_mint);
+            let withdrawAmount = new anchor_1.BN(params.withdraw_amount);
+            let keepTokens = (_a = params.keep_tokens) === null || _a === void 0 ? void 0 : _a.map(mint => new web3_js_1.PublicKey(mint));
+            let rebalanceSlippageBps = (_b = params.rebalance_slippage_bps) !== null && _b !== void 0 ? _b : 100;
+            let perTradeRebalanceSlippageBps = (_c = params.per_trade_rebalance_slippage_bps) !== null && _c !== void 0 ? _c : 100;
+            let executionStartTime = (_d = params.execution_start_time) !== null && _d !== void 0 ? _d : 0;
+            let minBountyAmount = (_e = params.min_bounty_amount) !== null && _e !== void 0 ? _e : 0;
+            let maxBountyAmount = (_f = params.max_bounty_amount) !== null && _f !== void 0 ? _f : 0;
+            const basket = (0, pda_1.getBasketState)(basketMint);
+            const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, seller);
+            let rentPayer = (0, pda_1.getRentPayerPda)();
+            let accountInfos = yield (0, txUtils_1.getMultipleAccountsInfoBatched)(this.sdkParams.connection, [rentPayer, basket]);
+            let rebalanceIntentRentPayer = seller;
+            // TODO: check actual lamports required for rent
+            if (((_h = (_g = accountInfos.get(rentPayer.toBase58())) === null || _g === void 0 ? void 0 : _g.lamports) !== null && _h !== void 0 ? _h : 0) > 0)
+                rebalanceIntentRentPayer = rentPayer;
+            let basketState = basket_1.BasketLayout.decode((_k = (_j = accountInfos.get(basket.toBase58())) === null || _j === void 0 ? void 0 : _j.data.slice(8)) !== null && _k !== void 0 ? _k : Buffer.alloc(0));
+            let bountyMint = basketState.bountyMint;
+            let keepAllTokensFlag = 1;
+            for (let i = 0; i < basketState.numTokens; i++) {
+                if (!keepTokens.includes(basketState.composition[i].mint.toBase58())) {
+                    keepAllTokensFlag = 0;
+                    break;
+                }
+            }
+            let tokenMintsHash = Buffer.alloc(32);
+            for (let i = 0; i < basketState.numTokens; i++) {
+                tokenMintsHash = (0, crypto_1.createHash)('sha256')
+                    .update(Buffer.concat([tokenMintsHash, basketState.composition[i].mint.toBuffer()]))
+                    .digest();
+            }
+            let keepTokensBitmask = new anchor_1.BN(0);
+            if (keepTokens && keepTokens.length > 0) {
+                for (const mint of keepTokens) {
+                    let tokenIndex = -1;
+                    for (let i = 0; i < basketState.numTokens; i++) {
+                        if (basketState.composition[i].mint.equals(mint)) {
+                            tokenIndex = i;
+                            break;
+                        }
+                    }
+                    if (tokenIndex === -1) {
+                        throw new Error(`Token mint not in basket: ${mint.toBase58()}`);
+                    }
+                    keepTokensBitmask = keepTokensBitmask.or(new anchor_1.BN(1).shln(tokenIndex));
+                }
+            }
+            const basketRebalanceIntent = basketState.settings.activeRebalance > 0
+                ? (0, pda_1.getRebalanceIntentPda)(basket, basket)
+                : undefined;
+            let txBatchData = { batches: [
+                    [{
+                            payer: seller,
+                            instructions: [
+                                (0, rebalanceIntent_1.createRebalanceIntentIx)({
+                                    signer: seller,
+                                    owner: seller,
+                                    basket: basket,
+                                }),
+                                (0, rebalanceIntent_1.resizeRebalanceIntentIx)(rebalanceIntent),
+                                (0, rebalanceIntent_1.initRebalanceIntentIx)({
+                                    signer: seller,
+                                    owner: seller,
+                                    basket,
+                                    basketTokenMint: basketMint,
+                                    rebalanceIntentRentPayer: rebalanceIntentRentPayer,
+                                    bountyMint: bountyMint,
+                                    rebalanceType: rebalanceIntent_2.RebalanceType.Withdraw,
+                                    basketRebalanceIntent: basketRebalanceIntent,
+                                    rebalanceSlippageBps: rebalanceSlippageBps,
+                                    perTradeRebalanceSlippageBps: perTradeRebalanceSlippageBps,
+                                    executionStartTime: executionStartTime,
+                                    minBountyAmount: minBountyAmount,
+                                    maxBountyAmount: maxBountyAmount,
+                                    withdrawParamsBurnAmount: withdrawAmount,
+                                    withdrawParamsTokenMintsHash: Array.from(tokenMintsHash),
+                                    withdrawParamsKeepTokensBitmask: keepTokensBitmask,
+                                    withdrawParamsKeepAllTokens: keepAllTokensFlag,
+                                }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        }],
+                    [{
+                            payer: seller,
+                            instructions: [
+                                executionStartTime ? (0, priceUpdate_1.startPriceUpdatesIx)({
+                                    keeper: seller,
+                                    basket: basket,
+                                    rebalanceIntent: rebalanceIntent,
+                                }) : web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.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;
+        });
+    }
     updateTokenPricesTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let { keeper, rebalanceIntent, basket } = params;

package/dist/src/instructions/automation/rebalanceIntent.d.ts

@@ -1,3 +1,4 @@
+import { BN } from '@coral-xyz/anchor';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
 export declare function createRebalanceIntentIx(params: {
     signer: PublicKey;
@@ -21,7 +22,7 @@ export declare function initRebalanceIntentIx(params: {
     maxBountyAmount: number;
     withdrawParamsBurnAmount?: number;
     withdrawParamsTokenMintsHash?: number[];
-    withdrawParamsKeepTokensBitmask?: number;
+    withdrawParamsKeepTokensBitmask?: BN;
     withdrawParamsKeepAllTokens?: number;
 }): TransactionInstruction;
 export declare function cancelRebalanceIx(params: {

package/dist/src/instructions/automation/rebalanceIntent.js

@@ -47,7 +47,7 @@ function resizeRebalanceIntentIx(rebalanceIntent) {
     });
 }
 function initRebalanceIntentIx(params) {
-    const { signer, owner, basket, basketTokenMint, rebalanceIntentRentPayer, bountyMint, rebalanceType, rebalanceSlippageBps, perTradeRebalanceSlippageBps, executionStartTime, minBountyAmount, maxBountyAmount, withdrawParamsBurnAmount = 0, withdrawParamsTokenMintsHash = new Array(32).fill(0), withdrawParamsKeepTokensBitmask = 0, withdrawParamsKeepAllTokens = 0, basketRebalanceIntent, } = params;
+    const { signer, owner, basket, basketTokenMint, rebalanceIntentRentPayer, bountyMint, rebalanceType, rebalanceSlippageBps, perTradeRebalanceSlippageBps, executionStartTime, minBountyAmount, maxBountyAmount, withdrawParamsBurnAmount = 0, withdrawParamsTokenMintsHash = new Array(32).fill(0), withdrawParamsKeepTokensBitmask = new anchor_1.BN(0), withdrawParamsKeepAllTokens = 0, basketRebalanceIntent, } = params;
     const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, owner);
     const rentPayerPda = (0, pda_1.getRentPayerPda)();
     const globalConfig = (0, pda_1.getGlobalConfigPda)();
@@ -68,7 +68,7 @@ function initRebalanceIntentIx(params) {
         Buffer.from(new anchor_1.BN(maxBountyAmount).toArray("le", 8)),
         Buffer.from(new anchor_1.BN(withdrawParamsBurnAmount).toArray("le", 8)),
         Buffer.from(withdrawParamsTokenMintsHash),
-        Buffer.from(new anchor_1.BN(withdrawParamsKeepTokensBitmask).toArray("le", 16)),
+        Buffer.from(withdrawParamsKeepTokensBitmask.toArray("le", 16)),
         Buffer.from([withdrawParamsKeepAllTokens]),
     ]);
     const keys = [

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

@@ -272,7 +272,7 @@ function createEditBasketIntentIx(params) {
             for (let i = 0; i < addTokenData.oracles.length; i++) {
                 let oracleData = {
                     oracleSettings: {
-                        oracleType: addTokenData.oracles[i].oracle_type,
+                        oracleType: oracle_1.ORACLE_TYPES.indexOf(addTokenData.oracles[i].oracle_type),
                         numRequiredAccounts: addTokenData.oracles[i].num_required_accounts,
                         weight: addTokenData.oracles[i].weight,
                         isRequired: addTokenData.oracles[i].is_required ? 1 : 0,
@@ -322,9 +322,9 @@ function createEditBasketIntentIx(params) {
                 isWritable: true,
                 isSigner: false
             });
-            for (let i = 0; i < addTokenData.oracle_accounts.length; i++) {
+            for (let i = 0; i < addTokenData.oracles.length; i++) {
                 additionalAccounts.push({
-                    pubkey: new web3_js_1.PublicKey(addTokenData.oracle_accounts[i]),
+                    pubkey: new web3_js_1.PublicKey(addTokenData.oracles[i].account),
                     isWritable: false,
                     isSigner: false
                 });

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

@@ -4,7 +4,88 @@ import { OracleAggregator } from './oracle';
 import { OraclePrice } from '../states/oracles/oracle';
 import Decimal from 'decimal.js';
 import { BasketSettings } from './config';
-import { FormattedAddTokenSettings, FormattedAutomationSettings, FormattedCreatorSettings, FormattedCustomRebalanceSettings, FormattedDepositsSettings, FormattedFeeSettings, FormattedForceRebalanceSettings, FormattedLpSettings, FormattedMakeDirectSwapSettings, FormattedManagersSettings, FormattedMetadataSettings, FormattedScheduleSettings, FormattedUpdateWeightsSettings } from './intents/intent';
+import { EditAddTokenSettings, EditAutomationSettings, EditCreatorSettings, EditCustomRebalanceSettings, EditDepositsSettings, EditFeeSettings, EditForceRebalanceSettings, EditLpSettings, EditMakeDirectSwapSettings, EditManagerSettings, EditMetadataSettings, EditScheduleSettings, EditUpdateWeightsSettings, OracleInput } from './intents/intent';
+export interface FormattedAccumulatedFees {
+    symmetry_fees: number;
+    creator_fees: number;
+    host_fees: number;
+    managers_fees: number;
+}
+export interface FormattedLookupTables {
+    active: {
+        pubkey: string;
+        contents: string[];
+    }[];
+    temp: {
+        pubkey: string;
+        contents: string[];
+    }[];
+}
+export interface FormattedOracleSettings extends OracleInput {
+    quote: string;
+    side: string;
+}
+export interface FormattedOracle {
+    oracle_settings: FormattedOracleSettings;
+    accounts_to_load_lut_ids: number[];
+    accounts_to_load_lut_indices: number[];
+}
+export interface FormattedOracleAggregator {
+    num_oracles: number;
+    min_oracles_thresh: number;
+    oracles: FormattedOracle[];
+    min_conf_bps: number;
+    conf_thresh_bps: number;
+    conf_multiplier: number;
+}
+export interface FormattedAsset {
+    mint: string;
+    amount: number;
+    weight: number;
+    active: boolean;
+    oracle_aggregator: FormattedOracleAggregator;
+}
+export interface FormattedCreatorSettings extends EditCreatorSettings {
+}
+export interface FormattedManagersSettings extends EditManagerSettings {
+    updated_at: number;
+}
+export interface FormattedFeeSettings extends EditFeeSettings {
+    host_deposit_fee_bps: number;
+    host_withdraw_fee_bps: number;
+    host_management_fee_bps: number;
+    host_performance_fee_bps: number;
+    updated_at: number;
+}
+export interface FormattedScheduleSettings extends EditScheduleSettings {
+    updated_at: number;
+}
+export interface FormattedAutomationSettings extends EditAutomationSettings {
+    updated_at: number;
+}
+export interface FormattedLpSettings extends EditLpSettings {
+    updated_at: number;
+}
+export interface FormattedMetadataSettings extends EditMetadataSettings {
+    updated_at: number;
+}
+export interface FormattedDepositsSettings extends EditDepositsSettings {
+}
+export interface FormattedForceRebalanceSettings extends EditForceRebalanceSettings {
+    updated_at: number;
+}
+export interface FormattedCustomRebalanceSettings extends EditCustomRebalanceSettings {
+    updated_at: number;
+}
+export interface FormattedAddTokenSettings extends EditAddTokenSettings {
+    updated_at: number;
+}
+export interface FormattedUpdateWeightsSettings extends EditUpdateWeightsSettings {
+    updated_at: number;
+}
+export interface FormattedMakeDirectSwapSettings extends EditMakeDirectSwapSettings {
+    updated_at: number;
+}
 export interface FormattedBasket {
     pubkey: string;
     name: string;
@@ -26,90 +107,21 @@ export interface FormattedBasket {
     active_managements: number;
     last_automation_execution_timestamp: number;
     creator_settings: FormattedCreatorSettings;
-    manager_settings: FormattedManagersSettings & {
-        updated_at: number;
-    };
-    fee_settings: FormattedFeeSettings & {
-        updated_at: number;
-    };
-    schedule_settings: FormattedScheduleSettings & {
-        updated_at: number;
-    };
-    automation_settings: FormattedAutomationSettings & {
-        updated_at: number;
-    };
-    lp_settings: FormattedLpSettings & {
-        updated_at: number;
-    };
-    metadata_settings: FormattedMetadataSettings & {
-        updated_at: number;
-    };
+    manager_settings: FormattedManagersSettings;
+    fee_settings: FormattedFeeSettings;
+    schedule_settings: FormattedScheduleSettings;
+    automation_settings: FormattedAutomationSettings;
+    lp_settings: FormattedLpSettings;
+    metadata_settings: FormattedMetadataSettings;
     deposits_settings: FormattedDepositsSettings;
-    force_rebalance_settings: FormattedForceRebalanceSettings & {
-        updated_at: number;
-    };
-    custom_rebalance_settings: FormattedCustomRebalanceSettings & {
-        updated_at: number;
-    };
-    add_token_settings: FormattedAddTokenSettings & {
-        updated_at: number;
-    };
-    update_weights_settings: FormattedUpdateWeightsSettings & {
-        updated_at: number;
-    };
-    make_direct_swap_settings: FormattedMakeDirectSwapSettings & {
-        updated_at: number;
-    };
-    accumulated_fees: {
-        symmetry_fees: number;
-        creator_fees: number;
-        host_fees: number;
-        managers_fees: number;
-    };
-    lookup_tables: {
-        active: {
-            pubkey: string;
-            contents: string[];
-        }[];
-        temp: {
-            pubkey: string;
-            contents: string[];
-        }[];
-    };
-    composition: {
-        mint: string;
-        amount: number;
-        weight: number;
-        active: boolean;
-        oracle_aggregator: {
-            num_oracles: number;
-            min_oracles_thresh: number;
-            oracles: {
-                oracle_settings: {
-                    oracle_type: string;
-                    num_required_accounts: number;
-                    weight: number;
-                    is_required: boolean;
-                    conf_thresh_bps: number;
-                    volatility_thresh_bps: number;
-                    max_slippage_bps: number;
-                    min_liquidity: number;
-                    staleness_thresh: number;
-                    staleness_conf_rate_bps: number;
-                    token_decimals: number;
-                    twap_seconds_ago: number;
-                    twap_secondary_seconds_ago: number;
-                    quote: string;
-                    side: string;
-                };
-                accounts_to_load_lut_ids: number[];
-                accounts_to_load_lut_indices: number[];
-            }[];
-            min_conf_bps: number;
-            conf_thresh_bps: number;
-            conf_multiplier: number;
-        };
-    }[];
+    force_rebalance_settings: FormattedForceRebalanceSettings;
+    custom_rebalance_settings: FormattedCustomRebalanceSettings;
+    add_token_settings: FormattedAddTokenSettings;
+    update_weights_settings: FormattedUpdateWeightsSettings;
+    make_direct_swap_settings: FormattedMakeDirectSwapSettings;
+    accumulated_fees: FormattedAccumulatedFees;
+    lookup_tables: FormattedLookupTables;
+    composition: FormattedAsset[];
 }
 export interface BasketFees {
     symmetryFees: BN;