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

package/dist/src/index.js

@@ -525,9 +525,8 @@ class SymmetryCore {
     }
     buyBasketTx(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 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),
@@ -537,16 +536,15 @@ 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, buyer);
+            const basket = yield this.fetchBasket((0, pda_1.getBasketState)(new web3_js_1.PublicKey(params.basket_mint)).toBase58());
+            const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, buyer);
             let rentPayer = (0, pda_1.getRentPayerPda)();
-            let accountInfos = yield (0, txUtils_1.getMultipleAccountsInfoBatched)(this.sdkParams.connection, [rentPayer, basket]);
+            let renPayerAi = yield this.sdkParams.connection.getAccountInfo(rentPayer);
             let rebalanceIntentRentPayer = buyer;
             // 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 = renPayerAi === null || renPayerAi === void 0 ? void 0 : renPayerAi.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 txBatchData = { batches: [
                     [{
                             payer: buyer,
@@ -554,14 +552,14 @@ class SymmetryCore {
                                 (0, rebalanceIntent_1.createRebalanceIntentIx)({
                                     signer: buyer,
                                     owner: buyer,
-                                    basket: basket,
+                                    basket: basket.ownAddress,
                                 }),
                                 (0, rebalanceIntent_1.resizeRebalanceIntentIx)(rebalanceIntent),
                                 (0, rebalanceIntent_1.initRebalanceIntentIx)({
                                     signer: buyer,
                                     owner: buyer,
-                                    basket,
-                                    basketTokenMint: basketMint,
+                                    basket: basket.ownAddress,
+                                    basketTokenMint: basket.mint,
                                     rebalanceIntentRentPayer: rebalanceIntentRentPayer,
                                     bountyMint: bountyMint,
                                     rebalanceType: rebalanceIntent_2.RebalanceType.Deposit,
@@ -579,7 +577,7 @@ class SymmetryCore {
                         }],
                     (0, deposit_1.depositTokensIx)({
                         owner: buyer,
-                        basket: basket,
+                        basket: basket.ownAddress,
                         contributions: contributions,
                     }).map(ix => {
                         return {
@@ -597,11 +595,11 @@ class SymmetryCore {
                             instructions: [
                                 (0, deposit_1.lockDepositsIx)({
                                     owner: buyer,
-                                    basket: basket,
+                                    basket: basket.ownAddress,
                                 }),
                                 executionStartTime == 0 ? (0, priceUpdate_1.startPriceUpdatesIx)({
                                     keeper: buyer,
-                                    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 }),
@@ -746,6 +744,7 @@ class SymmetryCore {
         return __awaiter(this, void 0, void 0, function* () {
             let keeper = new web3_js_1.PublicKey(params.keeper);
             let rebalanceIntent = new web3_js_1.PublicKey(params.rebalance_intent);
+            let basketRebalanceIntent = (0, pda_1.getRebalanceIntentPda)(new web3_js_1.PublicKey(params.basket), new web3_js_1.PublicKey(params.basket));
             let basket = yield this.fetchBasket(params.basket);
             let ixs = [];
             let batchSize = 7;
@@ -770,6 +769,7 @@ class SymmetryCore {
                 }
                 while (tokenIndices.length < 20)
                     tokenIndices.push(0);
+                // TODO: in last instruction we should include performance fee accounts
                 ixs.push((0, priceUpdate_1.updateTokenPricesIx)({
                     keeper: keeper,
                     basket: basket.ownAddress,
@@ -778,6 +778,7 @@ class SymmetryCore {
                     lookupTable1: basket.lookupTables.active[1],
                     tokenIndices: tokenIndices,
                     additionalOracleAccounts: allKeys,
+                    basketRebalanceIntent: basket.settings.activeRebalance.eq(new anchor_1.BN(0)) ? undefined : basketRebalanceIntent,
                 }));
             }
             let txBatchData = { batches: [ixs.map(ix => ({
@@ -818,17 +819,22 @@ class SymmetryCore {
             };
             let ixWithdraw = (0, flashSwap_1.flashWithdrawIx)(flashParams);
             let ixDeposit = (0, flashSwap_1.flashDepositIx)(flashParams);
+            let ixs = [
+                (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_swap_ix) {
+                ixs.push(params.jup_swap_ix);
+            }
+            ixs = ixs.concat([
+                ixDeposit,
+                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+            ]);
             let txBatchData = { batches: [[{
                             payer: keeper,
-                            instructions: [
-                                (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,
-                                params.jup_swap_ix ? params.jup_swap_ix : web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
-                                ixDeposit,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
-                            ],
+                            instructions: ixs,
                             lookupTables: [],
                         }]] };
             let versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
@@ -841,11 +847,13 @@ class SymmetryCore {
             let keeper = new web3_js_1.PublicKey(params.keeper);
             let rebalanceIntent = yield this.fetchRebalanceIntent(params.rebalance_intent);
             let basket = yield this.fetchBasket(rebalanceIntent.basket.toBase58());
+            let basketRebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, rebalanceIntent.owner);
             let ix = (0, deposit_1.mintBasketIx)({
                 keeper: keeper,
                 basket: basket.ownAddress,
                 basketTokenMint: basket.mint,
                 buyer: rebalanceIntent.owner,
+                basketRebalanceIntent: basket.settings.activeRebalance.eq(new anchor_1.BN(0)) ? undefined : basketRebalanceIntent,
             });
             let txBatchData = { batches: [[{
                             payer: keeper,

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

@@ -9,6 +9,7 @@ const pda_1 = require("../pda");
 const FLASH_WITHDRAW_DISCRIMINATOR = Buffer.from([164, 84, 46, 132, 94, 220, 214, 156]);
 const FLASH_DEPOSIT_DISCRIMINATOR = Buffer.from([21, 4, 89, 84, 131, 84, 128, 21]);
 function flashWithdrawIx(params) {
+    var _a, _b;
     const { keeper, basket, mintIn, mintOut, amountIn, amountOut, mode } = params;
     let keeperFromATA = (0, pda_1.getAta)(keeper, mintIn);
     let keeperToATA = (0, pda_1.getAta)(keeper, mintOut);
@@ -17,8 +18,8 @@ function flashWithdrawIx(params) {
     const keys = [
         { pubkey: params.keeper, isWritable: true, isSigner: true },
         { pubkey: params.basket, isWritable: true, isSigner: false },
-        { pubkey: params.rebalanceIntent ? params.rebalanceIntent : constants_1.BASKETS_V3_PROGRAM_ID, isWritable: params.rebalanceIntent ? true : false, isSigner: false },
-        { pubkey: params.intent ? params.intent : constants_1.BASKETS_V3_PROGRAM_ID, isWritable: params.intent ? true : false, isSigner: false },
+        { pubkey: (_a = params.rebalanceIntent) !== null && _a !== void 0 ? _a : constants_1.BASKETS_V3_PROGRAM_ID, isWritable: params.rebalanceIntent ? true : false, isSigner: false },
+        { pubkey: (_b = params.intent) !== null && _b !== void 0 ? _b : constants_1.BASKETS_V3_PROGRAM_ID, isWritable: params.intent ? true : false, isSigner: false },
         { pubkey: params.mintIn, isWritable: false, isSigner: false },
         { pubkey: params.mintOut, isWritable: false, isSigner: false },
         { pubkey: keeperFromATA, isWritable: true, isSigner: false },
@@ -33,7 +34,7 @@ function flashWithdrawIx(params) {
     const discriminator = FLASH_WITHDRAW_DISCRIMINATOR;
     const amountInBuffer = Buffer.from(amountIn.toArray("le", 8));
     const amountOutBuffer = Buffer.from(amountOut.toArray("le", 8));
-    const modeBuffer = mode ? Buffer.from([mode]) : Buffer.from([]);
+    const modeBuffer = Buffer.from([mode !== null && mode !== void 0 ? mode : 0]);
     const data = Buffer.concat([discriminator, amountInBuffer, amountOutBuffer, modeBuffer]);
     return new web3_js_1.TransactionInstruction({
         keys,

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

@@ -9,6 +9,7 @@ export declare function updateTokenPricesIx(params: {
     keeper: PublicKey;
     basket: PublicKey;
     rebalanceIntent: PublicKey;
+    basketRebalanceIntent?: PublicKey;
     lookupTable0: PublicKey;
     lookupTable1: PublicKey;
     tokenIndices: number[];

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

@@ -16,6 +16,7 @@ function startPriceUpdatesIx(params) {
         { pubkey: params.keeper, isSigner: true, isWritable: true },
         { pubkey: params.basket, isSigner: false, isWritable: true },
         { pubkey: params.rebalanceIntent, isSigner: false, isWritable: true },
+        { pubkey: (0, pda_1.getGlobalConfigPda)(), isSigner: false, isWritable: false },
     ];
     const data = START_PRICE_UPDATES_DISCRIMINATOR;
     return new web3_js_1.TransactionInstruction({
@@ -26,6 +27,7 @@ function startPriceUpdatesIx(params) {
 }
 ;
 function updateTokenPricesIx(params) {
+    var _a;
     let globalConfig = (0, pda_1.getGlobalConfigPda)();
     const tokenIndices = params.tokenIndices.slice(0, 20);
     while (tokenIndices.length < 20) {
@@ -44,6 +46,7 @@ function updateTokenPricesIx(params) {
         { pubkey: constants_1.PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, isSigner: false, isWritable: true },
         { pubkey: params.lookupTable0, isSigner: false, isWritable: true },
         { pubkey: params.lookupTable1, isSigner: false, isWritable: true },
+        { pubkey: (_a = params.basketRebalanceIntent) !== null && _a !== void 0 ? _a : constants_1.BASKETS_V3_PROGRAM_ID, isSigner: false, isWritable: params.basketRebalanceIntent ? true : false },
     ];
     // remaining accounts
     keys.push(...params.additionalOracleAccounts.map((pubkey) => ({ pubkey, isSigner: false, isWritable: false })));

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

@@ -16,4 +16,5 @@ export declare function mintBasketIx(params: {
     basket: PublicKey;
     basketTokenMint: PublicKey;
     buyer: PublicKey;
+    basketRebalanceIntent?: PublicKey;
 }): TransactionInstruction;

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

@@ -64,6 +64,7 @@ function lockDepositsIx(params) {
     });
 }
 function mintBasketIx(params) {
+    var _a;
     const { keeper, basket, basketTokenMint, buyer } = params;
     let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, buyer);
     let basketFees = (0, pda_1.getBasketFeesPda)(basket);
@@ -80,6 +81,7 @@ function mintBasketIx(params) {
         { pubkey: globalConfig, isWritable: false, isSigner: false },
         { pubkey: basketFees, isWritable: true, isSigner: false },
         { pubkey: basketFeesAta, isWritable: true, isSigner: false },
+        { pubkey: (_a = params.basketRebalanceIntent) !== null && _a !== void 0 ? _a : constants_1.BASKETS_V3_PROGRAM_ID, isWritable: params.basketRebalanceIntent ? true : 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 },

package/dist/src/txUtils.js

@@ -166,14 +166,14 @@ function sendVersionedTransaction(connection, tx, blockhash, lastValidBlockHeigh
             blockhash,
             lastValidBlockHeight,
             signature: txId,
-        }, "confirmed").then((res) => confirmation = res);
-        let iterations = 15;
+        }, "confirmed").catch(() => null).then((res) => confirmation = res);
+        let iterations = 10;
         while (confirmation === null && result === null && iterations > 0) {
-            yield delay(2500);
+            yield delay(1000);
             result = yield connection.getTransaction(txId, {
                 commitment: "confirmed",
                 maxSupportedTransactionVersion: 0,
-            });
+            }).catch(() => null);
             if (result && result.meta && ((_a = result.meta) === null || _a === void 0 ? void 0 : _a.err)) {
                 console.log(result.meta.err);
                 throw new Error(txId);
@@ -262,6 +262,7 @@ function signTxPayloadBatchSequence(wallet, txPayloadBatchSequence) {
 }
 function sendTxPayloadBatchSequence(connection_1, txPayloadBatchSequence_1) {
     return __awaiter(this, arguments, void 0, function* (connection, txPayloadBatchSequence, simulateTransactions = false) {
+        var _a, _b;
         let txs = [];
         for (const batch of txPayloadBatchSequence.batches) {
             let batchTxs = [];
@@ -270,7 +271,7 @@ function sendTxPayloadBatchSequence(connection_1, txPayloadBatchSequence_1) {
             txs.push(batchTxs);
         }
         return yield sendVersionedTxs(connection, {
-            blockhash: txPayloadBatchSequence.batches[0].transactions[0].recent_blockhash,
+            blockhash: (_b = (_a = txPayloadBatchSequence.batches[0].transactions[0]) === null || _a === void 0 ? void 0 : _a.recent_blockhash) !== null && _b !== void 0 ? _b : "",
             lastValidBlockHeight: 0,
             batches: txs,
         }, simulateTransactions);

package/dist/test.js

@@ -12,10 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const src_1 = require("./src");
+const pda_1 = require("./src/instructions/pda");
+const constants_1 = require("./src/constants");
 let kp = Array.from(web3_js_1.Keypair.generate().secretKey);
 let connection = new web3_js_1.Connection("https://api.devnet.solana.com");
 function testStates() {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         return;
         let wallet = new anchor_1.Wallet(web3_js_1.Keypair.fromSecretKey(new Uint8Array(kp)));
         console.log(wallet.publicKey.toBase58());
@@ -30,7 +33,13 @@ function testStates() {
         let basket = yield sdk.fetchBasket("GrBFFvtdRL25o7gcRnV1kGvz1Qc7iscUmDp1ZvyBSyUa");
         basket = yield sdk.loadBasketPrice(basket);
         console.log(basket.formatted);
-        return;
+        let allBaskets = yield sdk.fetchAllBaskets();
+        console.log(allBaskets.length);
+        for (let basket of allBaskets) {
+            basket = yield sdk.loadBasketPrice(basket);
+            console.log(basket.ownAddress.toBase58(), (_a = basket.formatted) === null || _a === void 0 ? void 0 : _a.start_price);
+        }
+        // return;
         let tests = {
             createGlobalConfig: false, // TESTED
             editGlobalConfig: false, // TESTED
@@ -49,22 +58,23 @@ function testStates() {
             editAddTokenDelay: false, // NOT TESTED
             editUpdateWeightsDelay: false, // NOT TESTED
             editMakeDirectSwapDelay: false, // NOT TESTED
-            addOrEditToken: false, // NOT TESTED
+            addOrEditToken: false, // TESTED
             updateWeights: false, // NOT TESTED
             makeDirectSwap: false, // NOT TESTED
             executeIntent: false, // NOT TESTED
-            buyBasket: false, // NOT TESTED
-            depositTokens: false, // NOT TESTED
-            lockDeposits: false, // NOT TESTED
+            buyBasket: false, // TESTED
+            depositTokens: false, // TESTED
+            lockDeposits: false, // TESTED
             sellBasket: false, // NOT TESTED
             rebalanceBasket: false, // NOT TESTED
             rebalanceBasketCustom: false, // NOT TESTED
-            startPriceUpdates: false, // NOT TESTED
-            updateTokenPrices: false, // NOT TESTED
+            startPriceUpdates: false, // TESTED
+            updateTokenPrices: false, // TESTED
             updateTokenPricesCustom: false, // NOT TESTED
-            rebalanceSwap: false, // NOT TESTED
-            redeemTokens: false, // NOT TESTED
-            claimBounty: false, // NOT TESTED
+            rebalanceSwap: false, // TESTED
+            mintBasket: false, // TESTED
+            redeemTokens: false, // TESTED
+            claimBounty: false, // TESTED
         };
         if (tests.createBasket) {
             let createBasketTx = yield sdk.createBasketTx({
@@ -243,14 +253,14 @@ function testStates() {
                 active: true,
                 min_oracles_thresh: 1,
                 min_conf_bps: 100,
-                conf_thresh_bps: 100,
+                conf_thresh_bps: 200,
                 conf_multiplier: 1,
                 oracles: [
                     {
                         oracle_type: "pyth",
                         account_lut_id: 0,
                         account_lut_index: 0,
-                        account: "So11111111111111111111111111111111111111112",
+                        account: constants_1.PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT.toBase58(),
                         num_required_accounts: 1,
                         weight: 100,
                         is_required: true,
@@ -258,7 +268,7 @@ function testStates() {
                         volatility_thresh_bps: 100,
                         max_slippage_bps: 100,
                         min_liquidity: 100,
-                        staleness_thresh: 100,
+                        staleness_thresh: 10000,
                         staleness_conf_rate_bps: 100,
                         token_decimals: 9,
                         twap_seconds_ago: 100,
@@ -305,6 +315,71 @@ function testStates() {
             let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
             console.log(res);
         }
+        if (tests.buyBasket) {
+            let tx = yield sdk.buyBasketTx({
+                buyer: wallet.publicKey.toBase58(),
+                basket_mint: basket.mint.toBase58(),
+                contributions: [
+                    { mint: "So11111111111111111111111111111111111111112", amount: 0 },
+                    { mint: "USDCoctVLVnvTXBEuP9s8hntucdJokbo17RwHuNXemT", amount: 20000000 },
+                ],
+            });
+            let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+            console.log(res);
+        }
+        if (tests.updateTokenPrices) {
+            let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, wallet.publicKey);
+            let tx = yield sdk.updateTokenPricesTx({
+                keeper: wallet.publicKey.toBase58(),
+                basket: basket.ownAddress.toBase58(),
+                rebalance_intent: rebalanceIntent.toBase58(),
+            });
+            let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+            console.log(res);
+        }
+        if (tests.rebalanceSwap) {
+            let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, wallet.publicKey);
+            let tx = yield sdk.flashSwapTx({
+                keeper: wallet.publicKey.toBase58(),
+                basket: basket.ownAddress.toBase58(),
+                rebalance_intent: rebalanceIntent.toBase58(),
+                mint_in: "So11111111111111111111111111111111111111112",
+                mint_out: "USDCoctVLVnvTXBEuP9s8hntucdJokbo17RwHuNXemT",
+                amount_in: 50000000,
+                amount_out: 1000000,
+                mode: 2,
+            });
+            let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+            console.log(res);
+        }
+        if (tests.mintBasket) {
+            let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, wallet.publicKey);
+            let tx = yield sdk.mintTx({
+                keeper: wallet.publicKey.toBase58(),
+                rebalance_intent: rebalanceIntent.toBase58(),
+            });
+            let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+            console.log(res);
+            return;
+        }
+        if (tests.redeemTokens) {
+            let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, wallet.publicKey);
+            let tx = yield sdk.redeemTokensTx({
+                keeper: wallet.publicKey.toBase58(),
+                rebalance_intent: rebalanceIntent.toBase58(),
+            });
+            let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+            console.log(res);
+        }
+        if (tests.claimBounty) {
+            let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket.ownAddress, wallet.publicKey);
+            let tx = yield sdk.claimBountyTx({
+                keeper: wallet.publicKey.toBase58(),
+                rebalance_intent: rebalanceIntent.toBase58(),
+            });
+            let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+            console.log(res);
+        }
         if (tests.editGlobalConfig) {
             let editGlobalConfigTx = yield sdk.editGlobalConfigTx({
                 signer: wallet.publicKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symmetry-hq/temp-v3-sdk",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "description": "Symmetry Baskets V3 SDK",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/src/index.ts

@@ -1,7 +1,7 @@
 import Decimal from 'decimal.js';
 
 import { BN } from '@coral-xyz/anchor';
-import { createAssociatedTokenAccountIdempotentInstruction, createAssociatedTokenAccountInstruction } from '@solana/spl-token';
+import { createAssociatedTokenAccountIdempotentInstruction, createAssociatedTokenAccountInstruction, createSyncNativeInstruction } from '@solana/spl-token';
 import {
     ComputeBudgetProgram, Connection, Keypair, PublicKey, TransactionInstruction,
     TransactionSignature
@@ -571,7 +571,6 @@ export class SymmetryCore {
         max_bounty_amount?: number,
     }): Promise<TxPayloadBatchSequence> {
         let buyer = new PublicKey(params.buyer);
-        let basketMint = new PublicKey(params.basket_mint);
         let contributions = params.contributions.map(contribution => ({
             mint: new PublicKey(contribution.mint),
             amount: new BN(contribution.amount),
@@ -582,22 +581,18 @@ export class SymmetryCore {
         let minBountyAmount = params.min_bounty_amount ?? 0;
         let maxBountyAmount = params.max_bounty_amount ?? 0;
 
-        const basket = getBasketState(basketMint);
-        const rebalanceIntent = getRebalanceIntentPda(basket, buyer);
+        const basket = await this.fetchBasket(getBasketState(new PublicKey(params.basket_mint)).toBase58());
+        const rebalanceIntent = getRebalanceIntentPda(basket.ownAddress, buyer);
 
         let rentPayer = getRentPayerPda();
 
-        let accountInfos = await getMultipleAccountsInfoBatched(
-            this.sdkParams.connection,
-            [rentPayer, basket]
-        );
+        let renPayerAi = await this.sdkParams.connection.getAccountInfo(rentPayer);
 
         let rebalanceIntentRentPayer = buyer;
         // TODO: check actual lamports required for rent
-        if ((accountInfos.get(rentPayer.toBase58())?.lamports ?? 0) > 0)
+        if (renPayerAi?.lamports ?? 0 > 0)
             rebalanceIntentRentPayer = rentPayer;
-        let basketState: Basket = BasketLayout.decode(accountInfos.get(basket.toBase58())?.data.slice(8) ?? Buffer.alloc(0));
-        let bountyMint = basketState.settings.bountyMint;
+        let bountyMint = basket.settings.bountyMint;
 
         let txBatchData: TxBatchData = {batches: [
             [{
@@ -606,14 +601,14 @@ export class SymmetryCore {
                     createRebalanceIntentIx({
                         signer: buyer,
                         owner: buyer,
-                        basket: basket,
+                        basket: basket.ownAddress,
                     }),
                     resizeRebalanceIntentIx(rebalanceIntent),
                     initRebalanceIntentIx({
                         signer: buyer,
                         owner: buyer,
-                        basket,
-                        basketTokenMint: basketMint,
+                        basket: basket.ownAddress,
+                        basketTokenMint: basket.mint,
                         rebalanceIntentRentPayer: rebalanceIntentRentPayer,
                         bountyMint: bountyMint,
                         rebalanceType: RebalanceType.Deposit,
@@ -631,7 +626,7 @@ export class SymmetryCore {
             }],
             depositTokensIx({
                 owner: buyer,
-                basket: basket,
+                basket: basket.ownAddress,
                 contributions: contributions,
             }).map(ix => {
                 return {
@@ -649,11 +644,11 @@ export class SymmetryCore {
                 instructions: [
                     lockDepositsIx({
                         owner: buyer,
-                        basket: basket,
+                        basket: basket.ownAddress,
                     }),
                     executionStartTime == 0 ? startPriceUpdatesIx({
                         keeper: buyer,
-                        basket: basket,
+                        basket: basket.ownAddress,
                         rebalanceIntent: rebalanceIntent,
                     }) : ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
                     ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
@@ -827,6 +822,7 @@ export class SymmetryCore {
     }): Promise<TxPayloadBatchSequence> {
         let keeper = new PublicKey(params.keeper);
         let rebalanceIntent = new PublicKey(params.rebalance_intent);
+        let basketRebalanceIntent = getRebalanceIntentPda(new PublicKey(params.basket), new PublicKey(params.basket));
         let basket = await this.fetchBasket(params.basket);
         let ixs: TransactionInstruction[] = [];
         let batchSize = 7;
@@ -848,6 +844,7 @@ export class SymmetryCore {
                 }
             }
             while (tokenIndices.length < 20) tokenIndices.push(0);
+            // TODO: in last instruction we should include performance fee accounts
             ixs.push(
                 updateTokenPricesIx({
                     keeper: keeper,
@@ -857,6 +854,7 @@ export class SymmetryCore {
                     lookupTable1: basket.lookupTables.active[1],
                     tokenIndices: tokenIndices,
                     additionalOracleAccounts: allKeys,
+                    basketRebalanceIntent: basket.settings.activeRebalance.eq(new BN(0)) ? undefined : basketRebalanceIntent,
                 }),
             );
         }
@@ -908,17 +906,22 @@ export class SymmetryCore {
         };
         let ixWithdraw = flashWithdrawIx(flashParams);
         let ixDeposit = flashDepositIx(flashParams);
+        let ixs: TransactionInstruction[] = [
+            createAssociatedTokenAccountIdempotentInstruction(keeper, getAta(keeper, mintIn), keeper, mintIn),
+            createAssociatedTokenAccountIdempotentInstruction(keeper, getAta(keeper, mintOut), keeper, mintOut),
+            ixWithdraw,
+        ];
+        if (params.jup_swap_ix) {
+            ixs.push(params.jup_swap_ix);
+        }
+        ixs = ixs.concat([
+            ixDeposit,
+            ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
+            ComputeBudgetProgram.setComputeUnitPrice({microLamports: this.sdkParams.priorityFee}),
+        ]);
         let txBatchData: TxBatchData = {batches: [[{
             payer: keeper,
-            instructions: [
-                createAssociatedTokenAccountIdempotentInstruction(keeper, getAta(keeper, mintIn), keeper, mintIn),
-                createAssociatedTokenAccountIdempotentInstruction(keeper, getAta(keeper, mintOut), keeper, mintOut),
-                ixWithdraw,
-                params.jup_swap_ix ? params.jup_swap_ix : ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
-                ixDeposit,
-                ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
-                ComputeBudgetProgram.setComputeUnitPrice({microLamports: this.sdkParams.priorityFee}),
-            ],
+            instructions: ixs,
             lookupTables: [],
         }]]};
         let versionedTxs = await prepareVersionedTxs(this.sdkParams.connection, txBatchData);
@@ -933,11 +936,13 @@ export class SymmetryCore {
         let keeper = new PublicKey(params.keeper);
         let rebalanceIntent = await this.fetchRebalanceIntent(params.rebalance_intent);
         let basket = await this.fetchBasket(rebalanceIntent.basket.toBase58());
+        let basketRebalanceIntent = getRebalanceIntentPda(basket.ownAddress, rebalanceIntent.owner);
         let ix = mintBasketIx({
             keeper: keeper,
             basket: basket.ownAddress,
             basketTokenMint: basket.mint,
             buyer: rebalanceIntent.owner,
+            basketRebalanceIntent: basket.settings.activeRebalance.eq(new BN(0)) ? undefined : basketRebalanceIntent,
         });
         let txBatchData: TxBatchData = {batches: [[{
             payer: keeper,

package/src/instructions/automation/flashSwap.ts

@@ -30,8 +30,8 @@ export function flashWithdrawIx(params: {
     const keys = [
         { pubkey: params.keeper, isWritable: true, isSigner: true },
         { pubkey: params.basket, isWritable: true, isSigner: false },
-        { pubkey: params.rebalanceIntent ? params.rebalanceIntent : BASKETS_V3_PROGRAM_ID, isWritable: params.rebalanceIntent ? true : false, isSigner: false },
-        { pubkey: params.intent ? params.intent : BASKETS_V3_PROGRAM_ID, isWritable: params.intent ? true : false, isSigner: false },
+        { pubkey: params.rebalanceIntent ?? BASKETS_V3_PROGRAM_ID, isWritable: params.rebalanceIntent ? true : false, isSigner: false },
+        { pubkey: params.intent ?? BASKETS_V3_PROGRAM_ID, isWritable: params.intent ? true : false, isSigner: false },
         { pubkey: params.mintIn, isWritable: false, isSigner: false },
         { pubkey: params.mintOut, isWritable: false, isSigner: false },
         { pubkey: keeperFromATA, isWritable: true, isSigner: false },
@@ -48,7 +48,7 @@ export function flashWithdrawIx(params: {
     
     const amountInBuffer = Buffer.from(amountIn.toArray("le", 8));
     const amountOutBuffer = Buffer.from(amountOut.toArray("le", 8));
-    const modeBuffer = mode ? Buffer.from([mode]) : Buffer.from([]);
+    const modeBuffer = Buffer.from([mode ?? 0]);
 
     const data = Buffer.concat([discriminator, amountInBuffer, amountOutBuffer, modeBuffer]);
 

package/src/instructions/automation/priceUpdate.ts

@@ -22,6 +22,7 @@ export function startPriceUpdatesIx(params: {
         { pubkey: params.keeper, isSigner: true, isWritable: true },
         { pubkey: params.basket, isSigner: false, isWritable: true },
         { pubkey: params.rebalanceIntent, isSigner: false, isWritable: true },
+        { pubkey: getGlobalConfigPda(), isSigner: false, isWritable: false },
     ];
 
     const data = START_PRICE_UPDATES_DISCRIMINATOR;
@@ -39,6 +40,7 @@ export function updateTokenPricesIx(params: {
     keeper: PublicKey,
     basket: PublicKey,
     rebalanceIntent: PublicKey,
+    basketRebalanceIntent?: PublicKey,
     lookupTable0: PublicKey,
     lookupTable1: PublicKey,
     tokenIndices: number[], // length 20
@@ -67,6 +69,7 @@ export function updateTokenPricesIx(params: {
         { pubkey: PYTHNET_CUSTODY_PRICE_USDC_ACCOUNT, isSigner: false, isWritable: true },
         { pubkey: params.lookupTable0, isSigner: false, isWritable: true },
         { pubkey: params.lookupTable1, isSigner: false, isWritable: true },
+        { pubkey: params.basketRebalanceIntent ?? BASKETS_V3_PROGRAM_ID, isSigner: false, isWritable: params.basketRebalanceIntent ? true : false },
     ];
 
     // remaining accounts

package/src/instructions/user/deposit.ts

@@ -100,6 +100,7 @@ export function mintBasketIx(params: {
     basket: PublicKey;
     basketTokenMint: PublicKey;
     buyer: PublicKey;
+    basketRebalanceIntent?: PublicKey;
 }): TransactionInstruction {
 
     const { keeper, basket, basketTokenMint, buyer } = params;
@@ -122,6 +123,7 @@ export function mintBasketIx(params: {
         { pubkey: globalConfig, isWritable: false, isSigner: false },
         { pubkey: basketFees, isWritable: true, isSigner: false },
         { pubkey: basketFeesAta, isWritable: true, isSigner: false },
+        { pubkey: params.basketRebalanceIntent ?? BASKETS_V3_PROGRAM_ID, isWritable: params.basketRebalanceIntent ? true : false, isSigner: false },
         { pubkey: TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
         { pubkey: TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
         { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },

package/src/txUtils.ts

@@ -236,15 +236,15 @@ export async function sendVersionedTransaction(
         blockhash,
         lastValidBlockHeight,
         signature: txId,
-    }, "confirmed").then((res) => confirmation = res);
+    }, "confirmed").catch(() => null).then((res) => confirmation = res);
 
-    let iterations = 15; 
+    let iterations = 10;
     while (confirmation === null && result === null && iterations > 0) {
-        await delay(2500);
+        await delay(1000);
         result = await connection.getTransaction(txId, {
             commitment: "confirmed",
             maxSupportedTransactionVersion: 0,
-        });
+        }).catch(() => null);
         if (result && result.meta && result.meta?.err) {
             console.log(result.meta.err);
             throw new Error(txId);
@@ -376,7 +376,7 @@ export async function sendTxPayloadBatchSequence(
         txs.push(batchTxs);
     }
     return await sendVersionedTxs(connection, {
-        blockhash: txPayloadBatchSequence.batches[0].transactions[0].recent_blockhash,
+        blockhash: txPayloadBatchSequence.batches[0].transactions[0]?.recent_blockhash ?? "",
         lastValidBlockHeight: 0,
         batches: txs,
     }, simulateTransactions);

package/test.ts

@@ -4,6 +4,8 @@ import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 import { SymmetryCore, TaskContext } from "./src";
 import { AddOrEditTokenInput, UpdateWeightsInput, MakeDirectSwapInput } from "./src";
 import { EditCreatorSettings, EditManagerSettings, EditFeeSettings, EditScheduleSettings, EditAutomationSettings, EditLpSettings, EditMetadataSettings, EditDepositsSettings, EditForceRebalanceSettings, EditCustomRebalanceSettings, EditAddTokenSettings, EditUpdateWeightsSettings, EditMakeDirectSwapSettings } from "./src";
+import { getRebalanceIntentPda } from "./src/instructions/pda";
+import { PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT } from "./src/constants";
 
 
 let kp = Array.from(Keypair.generate().secretKey);
@@ -29,7 +31,13 @@ async function testStates() {
     let basket = await sdk.fetchBasket("GrBFFvtdRL25o7gcRnV1kGvz1Qc7iscUmDp1ZvyBSyUa");
     basket = await sdk.loadBasketPrice(basket);
     console.log(basket.formatted);
-    return;
+    let allBaskets = await sdk.fetchAllBaskets();
+    console.log(allBaskets.length);
+    for (let basket of allBaskets) {
+        basket = await sdk.loadBasketPrice(basket);
+        console.log(basket.ownAddress.toBase58(), basket.formatted?.start_price);
+    }
+    // return;
 
     let tests = {
 
@@ -53,29 +61,31 @@ async function testStates() {
         editUpdateWeightsDelay: false,      // NOT TESTED
         editMakeDirectSwapDelay: false,     // NOT TESTED
     
-        addOrEditToken: false,              // NOT TESTED
+        addOrEditToken: false,              // TESTED
         updateWeights: false,               // NOT TESTED
         makeDirectSwap: false,              // NOT TESTED
 
         executeIntent: false,               // NOT TESTED
 
-        buyBasket: false,                   // NOT TESTED
-        depositTokens: false,               // NOT TESTED
-        lockDeposits: false,                // NOT TESTED
+        buyBasket: false,                   // TESTED
+        depositTokens: false,               // TESTED
+        lockDeposits: false,                // TESTED
 
         sellBasket: false,                  // NOT TESTED
 
         rebalanceBasket: false,             // NOT TESTED
         rebalanceBasketCustom: false,       // NOT TESTED
 
-        startPriceUpdates: false,           // NOT TESTED
-        updateTokenPrices: false,           // NOT TESTED
+        startPriceUpdates: false,           // TESTED
+        updateTokenPrices: false,           // TESTED
         updateTokenPricesCustom: false,     // NOT TESTED
 
-        rebalanceSwap: false,               // NOT TESTED
+        rebalanceSwap: false,               // TESTED
+
+        mintBasket: false,                  // TESTED
 
-        redeemTokens: false,                // NOT TESTED
-        claimBounty: false,                 // NOT TESTED
+        redeemTokens: false,                // TESTED
+        claimBounty: false,                 // TESTED
     }
 
     if (tests.createBasket) {
@@ -270,14 +280,14 @@ async function testStates() {
             active: true,
             min_oracles_thresh: 1,
             min_conf_bps: 100,
-            conf_thresh_bps: 100,
+            conf_thresh_bps: 200,
             conf_multiplier: 1,
             oracles: [
                 {
                     oracle_type: "pyth",
                     account_lut_id: 0,
                     account_lut_index: 0,
-                    account: "So11111111111111111111111111111111111111112",
+                    account: PYTHNET_CUSTODY_PRICE_WSOL_ACCOUNT.toBase58(),
                     num_required_accounts: 1,
                     weight: 100,
                     is_required: true,
@@ -285,7 +295,7 @@ async function testStates() {
                     volatility_thresh_bps: 100,
                     max_slippage_bps: 100,
                     min_liquidity: 100,
-                    staleness_thresh: 100,
+                    staleness_thresh: 10000,
                     staleness_conf_rate_bps: 100,
                     token_decimals: 9,
                     twap_seconds_ago: 100,
@@ -335,6 +345,76 @@ async function testStates() {
         console.log(res);
     }
 
+    if (tests.buyBasket) {
+        let tx = await sdk.buyBasketTx({
+            buyer: wallet.publicKey.toBase58(),
+            basket_mint: basket.mint.toBase58(),
+            contributions: [
+                {mint: "So11111111111111111111111111111111111111112", amount: 0},
+                {mint: "USDCoctVLVnvTXBEuP9s8hntucdJokbo17RwHuNXemT", amount: 20000000},
+            ],
+        });
+        let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+        console.log(res);
+    }
+
+    if (tests.updateTokenPrices) {
+        let rebalanceIntent = getRebalanceIntentPda(basket.ownAddress, wallet.publicKey);
+        let tx = await sdk.updateTokenPricesTx({
+            keeper: wallet.publicKey.toBase58(),
+            basket: basket.ownAddress.toBase58(),
+            rebalance_intent: rebalanceIntent.toBase58(),
+        });
+        let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+        console.log(res);
+    }
+
+    if (tests.rebalanceSwap) {
+        let rebalanceIntent = getRebalanceIntentPda(basket.ownAddress, wallet.publicKey);
+        let tx = await sdk.flashSwapTx({
+            keeper: wallet.publicKey.toBase58(),
+            basket: basket.ownAddress.toBase58(),
+            rebalance_intent: rebalanceIntent.toBase58(),
+            mint_in: "So11111111111111111111111111111111111111112",
+            mint_out: "USDCoctVLVnvTXBEuP9s8hntucdJokbo17RwHuNXemT",
+            amount_in: 50000000,
+            amount_out: 1000000,
+            mode: 2,
+        });
+        let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+        console.log(res);
+    }
+
+    if (tests.mintBasket) {
+        let rebalanceIntent = getRebalanceIntentPda(basket.ownAddress, wallet.publicKey);
+        let tx = await sdk.mintTx({
+            keeper: wallet.publicKey.toBase58(),
+            rebalance_intent: rebalanceIntent.toBase58(),
+        });
+        let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+        console.log(res);
+        return;
+    }
+
+    if (tests.redeemTokens) {
+        let rebalanceIntent = getRebalanceIntentPda(basket.ownAddress, wallet.publicKey);
+        let tx = await sdk.redeemTokensTx({
+            keeper: wallet.publicKey.toBase58(),
+            rebalance_intent: rebalanceIntent.toBase58(),
+        });
+        let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+        console.log(res);
+    }
+
+    if (tests.claimBounty) {
+        let rebalanceIntent = getRebalanceIntentPda(basket.ownAddress, wallet.publicKey);
+        let tx = await sdk.claimBountyTx({
+            keeper: wallet.publicKey.toBase58(),
+            rebalance_intent: rebalanceIntent.toBase58(),
+        });
+        let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+        console.log(res);
+    }
 
     if (tests.editGlobalConfig) {
         let editGlobalConfigTx = await sdk.editGlobalConfigTx({