@symmetry-hq/temp-v3-sdk 0.0.33 → 0.0.34

package/dist/src/constants.d.ts

@@ -9,6 +9,7 @@ export declare const PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT: PublicKey;
 export declare const PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT: PublicKey;
 export declare const INTENT_TASK_DATA_SIZE = 600;
 export declare const MAX_MANAGERS_PER_BASKET = 10;
+export declare const MAX_TRANSFER_TOKENS = 10;
 export declare const X64: Decimal;
 export declare const HUNDRED_PERCENT_BPS = 10000;
 export declare const WSOL_DECIMALS = 9;

package/dist/src/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_EXTRA_DATA_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = exports.MAX_SUPPORTED_TOKENS_PER_BASKET = exports.USDC_DECIMALS = exports.WSOL_DECIMALS = exports.HUNDRED_PERCENT_BPS = exports.X64 = exports.MAX_MANAGERS_PER_BASKET = exports.INTENT_TASK_DATA_SIZE = exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = exports.MINTS = exports.RENT_SYSVAR_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.METADATA_PROGRAM_ID = exports.BASKETS_V3_PROGRAM_ID = void 0;
+exports.MAX_EXTRA_DATA_PER_ORACLE = exports.MAX_ORACLES_PER_TOKEN = exports.MAX_SUPPORTED_TOKENS_PER_BASKET = exports.USDC_DECIMALS = exports.WSOL_DECIMALS = exports.HUNDRED_PERCENT_BPS = exports.X64 = exports.MAX_TRANSFER_TOKENS = exports.MAX_MANAGERS_PER_BASKET = exports.INTENT_TASK_DATA_SIZE = exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = exports.MINTS = exports.RENT_SYSVAR_ID = exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = exports.METADATA_PROGRAM_ID = exports.BASKETS_V3_PROGRAM_ID = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 exports.BASKETS_V3_PROGRAM_ID = new web3_js_1.PublicKey("BASKT7aKd8n7ibpUbwLP3Wiyxyi3yoiXsxBk4Hpumate");
@@ -24,6 +24,7 @@ exports.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT = new web3_js_1.PublicKey("7UVimffxr9
 exports.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT = new web3_js_1.PublicKey("Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX");
 exports.INTENT_TASK_DATA_SIZE = 600;
 exports.MAX_MANAGERS_PER_BASKET = 10;
+exports.MAX_TRANSFER_TOKENS = 10;
 exports.X64 = new decimal_js_1.default(2).pow(new decimal_js_1.default(64));
 exports.HUNDRED_PERCENT_BPS = 10000;
 exports.WSOL_DECIMALS = 9;

package/dist/src/index.d.ts

@@ -84,6 +84,8 @@ export declare class SymmetryCore {
         context: TaskContext;
         type: TaskType;
         settings: Settings;
+        min_bounty_per_task?: number;
+        max_bounty_per_task?: number;
         jup_swap_ix?: TransactionInstruction;
     }): Promise<TxPayloadBatchSequence>;
     executeBasketIntentTx(params: {
@@ -94,6 +96,10 @@ export declare class SymmetryCore {
         intent: string;
         manager: string;
     }): Promise<TxPayloadBatchSequence>;
+    cancelRebalanceIntentTx(params: {
+        keeper: string;
+        rebalance_intent: string;
+    }): Promise<TxPayloadBatchSequence>;
     buyBasketTx(params: {
         buyer: string;
         basket_mint: string;
@@ -138,6 +144,7 @@ export declare class SymmetryCore {
         amount_in: number;
         amount_out: number;
         mode?: number;
+        jup_token_ledger_ix?: TransactionInstruction;
         jup_swap_ix?: TransactionInstruction;
     }): Promise<TxPayloadBatchSequence>;
     mintTx(params: {

package/dist/src/index.js

@@ -26,17 +26,17 @@ const edit_1 = require("./instructions/management/edit");
 const pda_1 = require("./instructions/pda");
 const deposit_1 = require("./instructions/user/deposit");
 const withdraw_1 = require("./instructions/user/withdraw");
-const basket_1 = require("./layouts/basket");
 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_2 = require("./layouts/intents/rebalanceIntent");
-const basket_2 = require("./states/basket");
+const basket_1 = require("./states/basket");
 const intent_2 = require("./states/intents/intent");
 const rebalanceIntent_3 = require("./states/intents/rebalanceIntent");
 const txUtils_1 = require("./txUtils");
 const config_1 = require("./states/config");
 const flashSwap_1 = require("./instructions/automation/flashSwap");
+const constants_1 = require("./constants");
 exports.COMPUTE_UNITS = 1000000;
 exports.PRIORITY_FEE = 100000;
 exports.JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
@@ -63,32 +63,32 @@ class SymmetryCore {
     }
     fetchBasket(basketPubkey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, basket_2.fetchBasket)(this.sdkParams.connection, new web3_js_1.PublicKey(basketPubkey));
+            return yield (0, basket_1.fetchBasket)(this.sdkParams.connection, new web3_js_1.PublicKey(basketPubkey));
         });
     }
     fetchMultipleBaskets(basketPubkeys) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, basket_2.fetchBaskektsMultiple)(this.sdkParams.connection, basketPubkeys.map(key => new web3_js_1.PublicKey(key)));
+            return yield (0, basket_1.fetchBaskektsMultiple)(this.sdkParams.connection, basketPubkeys.map(key => new web3_js_1.PublicKey(key)));
         });
     }
     fetchAllBaskets(basketFilter) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, basket_2.fetchBaskets)(this.sdkParams.connection, basketFilter);
+            return yield (0, basket_1.fetchBaskets)(this.sdkParams.connection, basketFilter);
         });
     }
     fetchCreatedBaskets(creatorPubkey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, basket_2.fetchBaskets)(this.sdkParams.connection, { type: "creator", pubkey: creatorPubkey });
+            return yield (0, basket_1.fetchBaskets)(this.sdkParams.connection, { type: "creator", pubkey: creatorPubkey });
         });
     }
     fetchHostedBaskets(hostPubkey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, basket_2.fetchBaskets)(this.sdkParams.connection, { type: "host", pubkey: hostPubkey });
+            return yield (0, basket_1.fetchBaskets)(this.sdkParams.connection, { type: "host", pubkey: hostPubkey });
         });
     }
     fetchManagedBaskets(managerPubkey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, basket_2.fetchBaskets)(this.sdkParams.connection, { type: "manager", pubkey: managerPubkey });
+            return yield (0, basket_1.fetchBaskets)(this.sdkParams.connection, { type: "manager", pubkey: managerPubkey });
         });
     }
     deriveBasketsByMints(mints) {
@@ -115,7 +115,7 @@ class SymmetryCore {
                 }
                 return res;
             }).filter(mint => mint !== null);
-            const basketsMap = yield (0, basket_2.fetchBaskektsMultiple)(this.sdkParams.connection, basketPubkeys);
+            const basketsMap = yield (0, basket_1.fetchBaskektsMultiple)(this.sdkParams.connection, basketPubkeys);
             let mintsMap = new Map();
             for (let basket of basketsMap.values()) {
                 mintsMap.set(basket.mint.toBase58(), basket);
@@ -125,7 +125,7 @@ class SymmetryCore {
     }
     loadBasketPrice(basket) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, basket_2.loadBasketPrice)(basket, this.sdkParams.connection);
+            return yield (0, basket_1.loadBasketPrice)(basket, this.sdkParams.connection);
         });
     }
     fetchIntent(intentPubkey) {
@@ -349,7 +349,7 @@ class SymmetryCore {
     }
     openBasketIntentTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c;
             let basket = yield this.fetchBasket(params.context.basket);
             let manager = new web3_js_1.PublicKey(params.context.manager);
             let useBounty = params.context.use_bounty == false ? false : true;
@@ -377,13 +377,22 @@ class SymmetryCore {
                     default: return new anchor_1.BN(0);
                 }
             })();
+            let globalConfig = yield this.fetchGlobalConfig();
+            let bountyWsolAmount = 0;
+            if (globalConfig.bountyMint.equals(constants_1.MINTS["mainnet"].WSOL)) {
+                let boundBounty = parseInt(globalConfig.bountyBondAmount.toString());
+                let maxBountyPerTask = parseInt(globalConfig.bountyPerTask.maxBounty.toString());
+                if ((_b = params === null || params === void 0 ? void 0 : params.max_bounty_per_task) !== null && _b !== void 0 ? _b : 0 > maxBountyPerTask)
+                    maxBountyPerTask = (_c = params === null || params === void 0 ? void 0 : params.max_bounty_per_task) !== null && _c !== void 0 ? _c : 0;
+                bountyWsolAmount = maxBountyPerTask + boundBounty;
+            }
+            let wsolIxs = yield (0, txUtils_1.wrapWsolIxs)(this.sdkParams.connection, manager, bountyWsolAmount);
             let intentSeedArray = web3_js_1.Keypair.generate().publicKey.toBytes();
             if (editType === intent_1.TaskType.AddToken) {
                 let tokenMint = new web3_js_1.PublicKey(editData.token_mint);
                 intentSeedArray = tokenMint.toBytes();
             }
             let intent = (0, pda_1.getIntentPda)(basket.ownAddress, intentSeedArray, editType);
-            let ixs = [];
             let openBasketIntentIx = (0, edit_1.createEditBasketIntentIx)({
                 manager: manager,
                 basket: basket,
@@ -397,6 +406,7 @@ class SymmetryCore {
             let txBatchData = { batches: [[{
                             payer: manager,
                             instructions: [
+                                ...wsolIxs,
                                 openBasketIntentIx,
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
@@ -453,6 +463,7 @@ class SymmetryCore {
                 }
                 else {
                     txBatchData.batches[0][0].instructions = [
+                        ...wsolIxs,
                         openBasketIntentIx,
                         executeBasketIntentIx,
                         web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
@@ -523,9 +534,32 @@ class SymmetryCore {
             return txPayloadBatchSequence;
         });
     }
+    cancelRebalanceIntentTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let keeper = new web3_js_1.PublicKey(params.keeper);
+            let intent = yield this.fetchRebalanceIntent(params.rebalance_intent);
+            let ix = (0, rebalanceIntent_1.cancelRebalanceIx)({
+                keeper: keeper,
+                basket: intent.basket,
+                rebalanceIntent: intent.ownAddress,
+            });
+            let txBatchData = { batches: [[{
+                            payer: keeper,
+                            instructions: [
+                                ix,
+                                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;
+        });
+    }
     buyBasketTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             let buyer = new web3_js_1.PublicKey(params.buyer);
             let contributions = params.contributions.map(contribution => ({
                 mint: new web3_js_1.PublicKey(contribution.mint),
@@ -537,18 +571,31 @@ class SymmetryCore {
             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 = yield this.fetchBasket((0, pda_1.getBasketState)(new web3_js_1.PublicKey(params.basket_mint)).toBase58());
+            let globalConfig = yield this.fetchGlobalConfig();
+            let bountyWsolAmount = 0;
+            if (globalConfig.bountyMint.equals(constants_1.MINTS["mainnet"].WSOL)) {
+                let boundBounty = parseInt(globalConfig.bountyBondAmount.toString());
+                let maxBountyPerTask = parseInt(globalConfig.bountyPerTask.maxBounty.toString());
+                let bountyPerPriceUpdateTaskDivisor = parseInt(globalConfig.bountyPerPriceUpdateTaskDivisor.toString());
+                if (maxBountyAmount > maxBountyPerTask)
+                    maxBountyPerTask = maxBountyAmount;
+                bountyWsolAmount = (0, rebalanceIntent_3.computeRebalanceIntentBountyAmount)(rebalanceIntent_2.RebalanceType.Deposit, basket.numTokens, boundBounty, maxBountyPerTask, Math.floor(maxBountyPerTask / bountyPerPriceUpdateTaskDivisor));
+            }
+            let wsolContributionAmount = (_g = (_f = params.contributions.find(contribution => contribution.mint === constants_1.MINTS["mainnet"].WSOL.toBase58())) === null || _f === void 0 ? void 0 : _f.amount) !== null && _g !== void 0 ? _g : 0;
+            let wsolIxs = yield (0, txUtils_1.wrapWsolIxs)(this.sdkParams.connection, buyer, bountyWsolAmount + wsolContributionAmount);
             const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, buyer);
             let rentPayer = (0, pda_1.getRentPayerPda)();
             let renPayerAi = yield this.sdkParams.connection.getAccountInfo(rentPayer);
             let rebalanceIntentRentPayer = buyer;
             // TODO: check actual lamports required for rent
-            if ((_f = renPayerAi === null || renPayerAi === void 0 ? void 0 : renPayerAi.lamports) !== null && _f !== void 0 ? _f : 0 > 0)
+            if ((_h = renPayerAi === null || renPayerAi === void 0 ? void 0 : renPayerAi.lamports) !== null && _h !== void 0 ? _h : 0 > 0)
                 rebalanceIntentRentPayer = rentPayer;
             let bountyMint = basket.settings.bountyMint;
             let txBatchData = { batches: [
                     [{
                             payer: buyer,
                             instructions: [
+                                ...wsolIxs,
                                 (0, rebalanceIntent_1.createRebalanceIntentIx)({
                                     signer: buyer,
                                     owner: buyer,
@@ -615,7 +662,7 @@ class SymmetryCore {
     }
     sellBasketTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f;
             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);
@@ -625,32 +672,41 @@ class SymmetryCore {
             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, seller);
+            const basket = yield this.fetchBasket((0, pda_1.getBasketState)(basketMint).toBase58());
+            let globalConfig = yield this.fetchGlobalConfig();
+            let bountyWsolAmount = 0;
+            if (globalConfig.bountyMint.equals(constants_1.MINTS["mainnet"].WSOL)) {
+                let boundBounty = parseInt(globalConfig.bountyBondAmount.toString());
+                let maxBountyPerTask = parseInt(globalConfig.bountyPerTask.maxBounty.toString());
+                let bountyPerPriceUpdateTaskDivisor = parseInt(globalConfig.bountyPerPriceUpdateTaskDivisor.toString());
+                if (maxBountyAmount > maxBountyPerTask)
+                    maxBountyPerTask = maxBountyAmount;
+                bountyWsolAmount = (0, rebalanceIntent_3.computeRebalanceIntentBountyAmount)(rebalanceIntent_2.RebalanceType.Deposit, basket.numTokens, boundBounty, maxBountyPerTask, Math.floor(maxBountyPerTask / bountyPerPriceUpdateTaskDivisor));
+            }
+            let wsolIxs = yield (0, txUtils_1.wrapWsolIxs)(this.sdkParams.connection, seller, bountyWsolAmount);
+            const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, seller);
             let rentPayer = (0, pda_1.getRentPayerPda)();
-            let accountInfos = yield (0, txUtils_1.getMultipleAccountsInfoBatched)(this.sdkParams.connection, [rentPayer, basket]);
+            let rentPayerAi = yield this.sdkParams.connection.getAccountInfo(rentPayer);
             let rebalanceIntentRentPayer = seller;
             // TODO: check actual lamports required for rent
-            if (((_g = (_f = accountInfos.get(rentPayer.toBase58())) === null || _f === void 0 ? void 0 : _f.lamports) !== null && _g !== void 0 ? _g : 0) > 0)
+            if ((_f = rentPayerAi === null || rentPayerAi === void 0 ? void 0 : rentPayerAi.lamports) !== null && _f !== void 0 ? _f : 0 > 0)
                 rebalanceIntentRentPayer = rentPayer;
-            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.settings.bountyMint;
-            ;
+            let bountyMint = basket.settings.bountyMint;
             let keepAllTokensFlag = 1;
-            for (let i = 0; i < basketState.numTokens; i++) {
-                if (!keepTokens.includes(basketState.composition[i].mint.toBase58())) {
+            for (let i = 0; i < basket.numTokens; i++) {
+                if (!keepTokens.includes(basket.composition[i].mint.toBase58())) {
                     keepAllTokensFlag = 0;
                     break;
                 }
             }
-            let tokenMintsHash = (0, basket_2.computeTokenMintsHash)(basketState.composition.slice(0, basketState.numTokens)
+            let tokenMintsHash = (0, basket_1.computeTokenMintsHash)(basket.composition.slice(0, basket.numTokens)
                 .map(asset => asset.mint.toBase58()));
             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.toBase58() === mint) {
+                    for (let i = 0; i < basket.numTokens; i++) {
+                        if (basket.composition[i].mint.toBase58() === mint) {
                             tokenIndex = i;
                             break;
                         }
@@ -661,23 +717,24 @@ class SymmetryCore {
                     keepTokensBitmask = keepTokensBitmask.or(new anchor_1.BN(1).shln(tokenIndex));
                 }
             }
-            const basketRebalanceIntent = basketState.settings.activeRebalance > 0
-                ? (0, pda_1.getRebalanceIntentPda)(basket, basket)
+            const basketRebalanceIntent = basket.settings.activeRebalance.gt(new anchor_1.BN(0))
+                ? (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, basket.ownAddress)
                 : undefined;
             let txBatchData = { batches: [
                     [{
                             payer: seller,
                             instructions: [
+                                ...wsolIxs,
                                 (0, rebalanceIntent_1.createRebalanceIntentIx)({
                                     signer: seller,
                                     owner: seller,
-                                    basket: basket,
+                                    basket: basket.ownAddress,
                                 }),
                                 (0, rebalanceIntent_1.resizeRebalanceIntentIx)(rebalanceIntent),
                                 (0, rebalanceIntent_1.initRebalanceIntentIx)({
                                     signer: seller,
                                     owner: seller,
-                                    basket,
+                                    basket: basket.ownAddress,
                                     basketTokenMint: basketMint,
                                     rebalanceIntentRentPayer: rebalanceIntentRentPayer,
                                     bountyMint: bountyMint,
@@ -703,7 +760,7 @@ class SymmetryCore {
                             instructions: [
                                 executionStartTime == 0 ? (0, priceUpdate_1.startPriceUpdatesIx)({
                                     keeper: seller,
-                                    basket: basket,
+                                    basket: basket.ownAddress,
                                     rebalanceIntent: rebalanceIntent,
                                 }) : web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
@@ -819,16 +876,20 @@ class SymmetryCore {
             };
             let ixWithdraw = (0, flashSwap_1.flashWithdrawIx)(flashParams);
             let ixDeposit = (0, flashSwap_1.flashDepositIx)(flashParams);
-            let ixs = [
+            let ixs = [];
+            ixs.concat([
                 (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(keeper, (0, pda_1.getAta)(keeper, mintIn), keeper, mintIn),
                 (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(keeper, (0, pda_1.getAta)(keeper, mintOut), keeper, mintOut),
-                ixWithdraw,
-            ];
+            ]);
+            if (params.jup_token_ledger_ix) {
+                ixs.push(params.jup_token_ledger_ix);
+            }
+            ixs.push(ixWithdraw);
             if (params.jup_swap_ix) {
                 ixs.push(params.jup_swap_ix);
             }
+            ixs.push(ixDeposit);
             ixs = ixs.concat([
-                ixDeposit,
                 web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
             ]);

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

@@ -28,5 +28,5 @@ export declare function initRebalanceIntentIx(params: {
 export declare function cancelRebalanceIx(params: {
     keeper: PublicKey;
     basket: PublicKey;
-    owner: PublicKey;
+    rebalanceIntent: PublicKey;
 }): TransactionInstruction;

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

@@ -77,7 +77,7 @@ function initRebalanceIntentIx(params) {
         { pubkey: basket, isSigner: false, isWritable: true },
         { pubkey: rebalanceIntent, isSigner: false, isWritable: true },
         { pubkey: rentPayerPda, isSigner: false, isWritable: true },
-        { pubkey: basketTokenMint, isSigner: false, isWritable: false },
+        { pubkey: basketTokenMint, isSigner: false, isWritable: true },
         { pubkey: signerBasketAta, isSigner: false, isWritable: true },
         { pubkey: globalConfig, isSigner: false, isWritable: false },
         { pubkey: bountyMint, isSigner: false, isWritable: false },
@@ -98,8 +98,7 @@ function initRebalanceIntentIx(params) {
     });
 }
 function cancelRebalanceIx(params) {
-    const { keeper, basket, owner } = params;
-    const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, owner);
+    const { keeper, basket, rebalanceIntent } = params;
     const globalConfig = (0, pda_1.getGlobalConfigPda)();
     const keys = [
         { pubkey: keeper, isSigner: true, isWritable: true },

package/dist/src/instructions/user/withdraw.d.ts

@@ -1,15 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
 import { TransactionInstruction } from "@solana/web3.js";
-export declare function createWithdrawStateIx(params: {
-    seller: PublicKey;
-    basket: PublicKey;
-    basketTokenMint: PublicKey;
-    withdrawAmount: number;
-    rebalanceSlippageBps: number;
-    perTradeRebalanceSlippageBps: number;
-    executionStartTime: number;
-    bountyMint: PublicKey;
-}): TransactionInstruction;
 export declare function redeemTokensIx(params: {
     keeper: PublicKey;
     basket: PublicKey;

package/dist/src/instructions/user/withdraw.js

@@ -1,56 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWithdrawStateIx = createWithdrawStateIx;
 exports.redeemTokensIx = redeemTokensIx;
 const constants_1 = require("../../constants");
 const spl_token_1 = require("@solana/spl-token");
-const anchor_1 = require("@coral-xyz/anchor");
 const pda_1 = require("../pda");
 const web3_js_1 = require("@solana/web3.js");
 const web3_js_2 = require("@solana/web3.js");
-const CREATE_WITHDRAW_STATE_DISCRIMINATOR = Buffer.from([161, 45, 253, 59, 110, 240, 65, 3]);
 const REDEEM_TOKENS_DISCRIMINATOR = Buffer.from([83, 49, 112, 2, 105, 193, 106, 126]);
-function createWithdrawStateIx(params) {
-    const { seller, basket, basketTokenMint, withdrawAmount, rebalanceSlippageBps, perTradeRebalanceSlippageBps, executionStartTime, bountyMint, } = params;
-    let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, seller);
-    let rentPayerPda = (0, pda_1.getRentPayerPda)();
-    let globalConfig = (0, pda_1.getGlobalConfigPda)();
-    let bountyVault = (0, pda_1.getBountyVaultPda)();
-    let sellerBasketAta = (0, pda_1.getAta)(seller, basketTokenMint);
-    let sellerBountyAta = (0, pda_1.getAta)(seller, bountyMint);
-    let bountyVaultAta = (0, pda_1.getAta)(bountyVault, bountyMint);
-    let basketRebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, basket);
-    const data = Buffer.concat([
-        CREATE_WITHDRAW_STATE_DISCRIMINATOR,
-        Buffer.from(new anchor_1.BN(withdrawAmount).toArray("le", 8)),
-        Buffer.from(new anchor_1.BN(rebalanceSlippageBps).toArray("le", 2)),
-        Buffer.from(new anchor_1.BN(perTradeRebalanceSlippageBps).toArray("le", 2)),
-        Buffer.from(new anchor_1.BN(executionStartTime).toArray("le", 8)),
-    ]);
-    const keys = [
-        { pubkey: seller, isSigner: true, isWritable: true },
-        { pubkey: basket, isSigner: false, isWritable: true },
-        { pubkey: basketRebalanceIntent, isSigner: false, isWritable: true },
-        { pubkey: rebalanceIntent, isSigner: false, isWritable: true },
-        { pubkey: rentPayerPda, isSigner: false, isWritable: true },
-        { pubkey: basketTokenMint, isSigner: false, isWritable: false },
-        { pubkey: sellerBasketAta, isSigner: false, isWritable: true },
-        { pubkey: globalConfig, isSigner: false, isWritable: false },
-        { pubkey: bountyMint, isSigner: false, isWritable: false },
-        { pubkey: sellerBountyAta, isSigner: false, isWritable: true },
-        { pubkey: bountyVault, isSigner: false, isWritable: true },
-        { pubkey: bountyVaultAta, isSigner: false, isWritable: true },
-        { pubkey: web3_js_2.SystemProgram.programId, isSigner: false, isWritable: false },
-        { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-        { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-        { pubkey: rebalanceIntent, isSigner: false, isWritable: false } // remaining accounts
-    ];
-    return new web3_js_1.TransactionInstruction({
-        keys,
-        programId: constants_1.BASKETS_V3_PROGRAM_ID,
-        data,
-    });
-}
 function redeemTokensIx(params) {
     const { keeper, basket, owner, } = params;
     let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, owner);

package/dist/src/states/intents/rebalanceIntent.d.ts

@@ -1,5 +1,6 @@
 import { Connection, PublicKey } from "@solana/web3.js";
-import { RebalanceIntent } from "../../layouts/intents/rebalanceIntent";
+import { RebalanceIntent, RebalanceType } from "../../layouts/intents/rebalanceIntent";
+export declare function computeRebalanceIntentBountyAmount(rebalance_type: RebalanceType, num_tokens: number, bounty_bond: number, bounty_per_task: number, bounty_per_price_update_task_max: number): number;
 export declare function addFieldsToRebalanceIntent(rebalanceIntent: RebalanceIntent): RebalanceIntent;
 export declare function fetchRebalanceIntent(connection: Connection, rebalanceIntentAddress: PublicKey): Promise<RebalanceIntent>;
 export declare function fetchRebalanceIntentsMultiple(connection: Connection, rebalanceIntentAddresses: PublicKey[]): Promise<Map<string, RebalanceIntent>>;

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

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.computeRebalanceIntentBountyAmount = computeRebalanceIntentBountyAmount;
 exports.addFieldsToRebalanceIntent = addFieldsToRebalanceIntent;
 exports.fetchRebalanceIntent = fetchRebalanceIntent;
 exports.fetchRebalanceIntentsMultiple = fetchRebalanceIntentsMultiple;
@@ -18,6 +19,28 @@ const rebalanceIntent_1 = require("../../layouts/intents/rebalanceIntent");
 const constants_1 = require("../../constants");
 const fraction_1 = require("../../layouts/fraction");
 const txUtils_1 = require("../../txUtils");
+function computeRebalanceIntentBountyAmount(rebalance_type, num_tokens, bounty_bond, bounty_per_task, bounty_per_price_update_task_max) {
+    let num_tasks = 0;
+    num_tasks += 1; // StartPriceUpdates;
+    num_tasks += 1; // FinishPriceUpdates;
+    num_tasks += 1; // CancelRebalance;
+    if (rebalance_type == rebalanceIntent_1.RebalanceType.Deposit) {
+        num_tasks += 1; // MintBasket;
+    }
+    if (rebalance_type == rebalanceIntent_1.RebalanceType.Deposit || rebalance_type == rebalanceIntent_1.RebalanceType.Withdraw) {
+        num_tasks += num_tokens; // TokenSettlement;
+    }
+    else {
+        num_tasks += 1; // AuctionCreation;
+    }
+    let claim_bounty_tasks = (num_tasks + constants_1.MAX_TRANSFER_TOKENS - 1) / constants_1.MAX_TRANSFER_TOKENS;
+    let price_update_tasks = num_tokens;
+    let tasks = num_tasks + claim_bounty_tasks;
+    let bounty_total = bounty_per_price_update_task_max * price_update_tasks +
+        bounty_per_task * tasks +
+        bounty_bond;
+    return bounty_total;
+}
 function addFieldsToRebalanceIntent(rebalanceIntent) {
     let numTokens = constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET;
     while (numTokens > 0 && rebalanceIntent.tokens[numTokens - 1].mint.equals(web3_js_1.PublicKey.default))

package/dist/src/txUtils.d.ts

@@ -1,5 +1,4 @@
-import { AccountInfo } from '@solana/web3.js';
-import { Transaction } from '@solana/web3.js';
+import { AccountInfo, Transaction } from '@solana/web3.js';
 import { AddressLookupTableAccount, Connection, Keypair, PublicKey, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
 export declare const COMPUTE_UNITS = 1000000;
 type TransactionSignature = string;
@@ -10,6 +9,7 @@ export interface Wallet {
     /** Keypair of the configured payer (Node only) */
     payer?: Keypair;
 }
+export declare function wrapWsolIxs(connection: Connection, wallet: PublicKey, amount: number): Promise<TransactionInstruction[]>;
 export interface TxData {
     payer: PublicKey;
     instructions: TransactionInstruction[];

package/dist/src/txUtils.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COMPUTE_UNITS = void 0;
+exports.wrapWsolIxs = wrapWsolIxs;
 exports.prepareTxPayloadBatchSequence = prepareTxPayloadBatchSequence;
 exports.delay = delay;
 exports.getMultipleAccountsInfoBatched = getMultipleAccountsInfoBatched;
@@ -23,7 +24,36 @@ exports.signVersionedTxs = signVersionedTxs;
 exports.signTxPayloadBatchSequence = signTxPayloadBatchSequence;
 exports.sendTxPayloadBatchSequence = sendTxPayloadBatchSequence;
 const web3_js_1 = require("@solana/web3.js");
+const web3_js_2 = require("@solana/web3.js");
+const pda_1 = require("./instructions/pda");
+const constants_1 = require("./constants");
+const spl_token_1 = require("@solana/spl-token");
 exports.COMPUTE_UNITS = 1000000;
+function wrapWsolIxs(connection, wallet, amount) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (amount == 0)
+            return [];
+        let wsolIxs = [];
+        let wsolAta = (0, pda_1.getAta)(wallet, constants_1.MINTS["mainnet"].WSOL);
+        let wsolBalance = 0;
+        let accountExists = false;
+        try {
+            let info = yield connection.getTokenAccountBalance(wsolAta);
+            wsolBalance = parseInt(info.value.amount);
+            accountExists = wsolBalance >= 0;
+        }
+        catch (_a) { }
+        if (!accountExists)
+            wsolIxs.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(wallet, wsolAta, wallet, constants_1.MINTS["mainnet"].WSOL));
+        if (wsolBalance < amount)
+            wsolIxs.push(web3_js_1.SystemProgram.transfer({
+                fromPubkey: wallet,
+                toPubkey: wsolAta,
+                lamports: amount - wsolBalance,
+            }), (0, spl_token_1.createSyncNativeInstruction)(wsolAta));
+        return wsolIxs;
+    });
+}
 function prepareTxPayloadBatchSequence(txBatchData, versionedTxs) {
     return {
         batches: txBatchData.batches.map((txDatas, i) => {
@@ -87,10 +117,10 @@ function getAddressLookupTableAccounts(connection, keys) {
         let addressLookupTableAccounts = new Map();
         for (const key of keys) {
             const accountInfo = addressLookupTableAccountInfos.get(key.toBase58());
-            if (!key.equals(web3_js_1.PublicKey.default) && accountInfo) {
-                const addressLookupTableAccount = new web3_js_1.AddressLookupTableAccount({
-                    key: new web3_js_1.PublicKey(key),
-                    state: web3_js_1.AddressLookupTableAccount.deserialize(accountInfo.data),
+            if (!key.equals(web3_js_2.PublicKey.default) && accountInfo) {
+                const addressLookupTableAccount = new web3_js_2.AddressLookupTableAccount({
+                    key: new web3_js_2.PublicKey(key),
+                    state: web3_js_2.AddressLookupTableAccount.deserialize(accountInfo.data),
                 });
                 addressLookupTableAccounts.set(key.toBase58(), addressLookupTableAccount);
             }
@@ -120,12 +150,12 @@ function getMultipleAddressLookupTableAccounts(connection, batches) {
     });
 }
 function compileVersionedTransaction(blockhash, addressLookupTableAccounts, payerPubkey, ixs) {
-    const txMessage = new web3_js_1.TransactionMessage({
+    const txMessage = new web3_js_2.TransactionMessage({
         payerKey: payerPubkey,
         recentBlockhash: blockhash,
         instructions: ixs,
     });
-    let versionedTx = new web3_js_1.VersionedTransaction(txMessage.compileToV0Message(addressLookupTableAccounts));
+    let versionedTx = new web3_js_2.VersionedTransaction(txMessage.compileToV0Message(addressLookupTableAccounts));
     try {
         let tt = versionedTx.serialize().length;
         if (tt > 1232) {
@@ -249,7 +279,7 @@ function signTxPayloadBatchSequence(wallet, txPayloadBatchSequence) {
         let txs = [];
         for (const batch of txPayloadBatchSequence.batches)
             for (const tx of batch.transactions)
-                txs.push(web3_js_1.VersionedTransaction.deserialize(Buffer.from(tx.tx_b64, 'base64')));
+                txs.push(web3_js_2.VersionedTransaction.deserialize(Buffer.from(tx.tx_b64, 'base64')));
         txs = yield wallet.signAllTransactions(txs);
         let pointer = 0;
         for (let batchIndex = 0; batchIndex < txPayloadBatchSequence.batches.length; batchIndex++)
@@ -267,7 +297,7 @@ function sendTxPayloadBatchSequence(connection_1, txPayloadBatchSequence_1) {
         for (const batch of txPayloadBatchSequence.batches) {
             let batchTxs = [];
             for (const tx of batch.transactions)
-                batchTxs.push(web3_js_1.VersionedTransaction.deserialize(Buffer.from(tx.tx_b64, 'base64')));
+                batchTxs.push(web3_js_2.VersionedTransaction.deserialize(Buffer.from(tx.tx_b64, 'base64')));
             txs.push(batchTxs);
         }
         return yield sendVersionedTxs(connection, {