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

package/dist/src/index.d.ts

@@ -1,5 +1,4 @@
-import { BN } from '@coral-xyz/anchor';
-import { Connection, PublicKey, TransactionSignature } from '@solana/web3.js';
+import { Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { Basket } from './layouts/basket';
 import { FormattedGlobalConfig, GlobalConfig } from './layouts/config';
 import { OracleInput, EditAddTokenSettings, EditAutomationSettings, EditCreatorSettings, EditCustomRebalanceSettings, EditDepositsSettings, EditFeeSettings, EditForceRebalanceSettings, EditLpSettings, EditMakeDirectSwapSettings, EditManagerSettings, EditMetadataSettings, EditScheduleSettings, EditUpdateWeightsSettings, Intent, MakeDirectSwapInput, Settings, TaskContext, TaskType, UpdateWeightsInput, FormattedIntentStatus, FormattedTaskType, FormattedIntent, FormattedBounty, FormattedBountySchedule, AddOrEditTokenInput } from './layouts/intents/intent';
@@ -80,11 +79,12 @@ export declare class SymmetryCore {
     editSwapDelayTx(context: TaskContext, settings: EditMakeDirectSwapSettings): Promise<TxPayloadBatchSequence>;
     addOrEditTokenTx(context: TaskContext, settings: AddOrEditTokenInput): Promise<TxPayloadBatchSequence>;
     updateWeightsTx(context: TaskContext, settings: UpdateWeightsInput): Promise<TxPayloadBatchSequence>;
-    makeDirectSwapTx(context: TaskContext, settings: MakeDirectSwapInput): Promise<TxPayloadBatchSequence>;
+    makeDirectSwapTx(context: TaskContext, settings: MakeDirectSwapInput, jup_swap_ix?: TransactionInstruction): Promise<TxPayloadBatchSequence>;
     openBasketIntentTx(params: {
         context: TaskContext;
         type: TaskType;
         settings: Settings;
+        jup_swap_ix?: TransactionInstruction;
     }): Promise<TxPayloadBatchSequence>;
     executeBasketIntentTx(params: {
         intent: string;
@@ -118,32 +118,39 @@ export declare class SymmetryCore {
         min_bounty_amount?: number;
         max_bounty_amount?: number;
     }): Promise<TxPayloadBatchSequence>;
+    startPriceUpdatesTx(params: {
+        keeper: string;
+        basket: string;
+        rebalance_intent: string;
+    }): Promise<TxPayloadBatchSequence>;
     updateTokenPricesTx(params: {
-        keeper: PublicKey;
-        rebalanceIntent: RebalanceIntent;
-        basket: Basket;
+        keeper: string;
+        basket: string;
+        rebalance_intent: string;
     }): Promise<TxPayloadBatchSequence>;
-    executeSwap(params: {
-        keeper: PublicKey;
-        rebalanceIntent: RebalanceIntent;
-        mintFrom: PublicKey;
-        mintTo: PublicKey;
-        amountIn: BN;
-        amountOut: BN;
-        mode: number;
+    flashSwapTx(params: {
+        keeper: string;
+        basket: string;
+        rebalance_intent?: string;
+        intent?: string;
+        mint_in: string;
+        mint_out: string;
+        amount_in: number;
+        amount_out: number;
+        mode?: number;
+        jup_swap_ix?: TransactionInstruction;
     }): Promise<TxPayloadBatchSequence>;
     mintTx(params: {
-        keeper: PublicKey;
-        buyer: PublicKey;
-        basket: PublicKey;
+        keeper: string;
+        rebalance_intent: string;
     }): Promise<TxPayloadBatchSequence>;
     redeemTokensTx(params: {
-        keeper: PublicKey;
-        rebalanceIntent: RebalanceIntent;
+        keeper: string;
+        rebalance_intent: string;
     }): Promise<TxPayloadBatchSequence>;
     claimBountyTx(params: {
-        keeper: PublicKey;
-        rebalanceIntent: RebalanceIntent;
+        keeper: string;
+        rebalance_intent: string;
     }): Promise<TxPayloadBatchSequence>;
     signAndSendVersionedTxs(params: {
         versionedTxs: VersionedTxs;

package/dist/src/index.js

@@ -20,7 +20,6 @@ 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");
 const edit_1 = require("./instructions/management/edit");
@@ -37,6 +36,7 @@ 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");
 exports.COMPUTE_UNITS = 1000000;
 exports.PRIORITY_FEE = 100000;
 exports.JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
@@ -342,9 +342,9 @@ class SymmetryCore {
             return this.openBasketIntentTx({ type: intent_1.TaskType.UpdateWeights, context, settings });
         });
     }
-    makeDirectSwapTx(context, settings) {
+    makeDirectSwapTx(context, settings, jup_swap_ix) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.openBasketIntentTx({ type: intent_1.TaskType.MakeDirectSwap, context, settings });
+            return this.openBasketIntentTx({ type: intent_1.TaskType.MakeDirectSwap, context, settings, jup_swap_ix: jup_swap_ix });
         });
     }
     openBasketIntentTx(params) {
@@ -394,7 +394,15 @@ class SymmetryCore {
                 editType: editType,
                 editData: editData,
             });
-            ixs.push(openBasketIntentIx);
+            let txBatchData = { batches: [[{
+                            payer: manager,
+                            instructions: [
+                                openBasketIntentIx,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        }]] };
             // Only execute in the same transaction when there is no delay and no scheduled activation.
             if (modificationDelay.eq(new anchor_1.BN(0)) && activationTimestamp.eq(new anchor_1.BN(0))) {
                 let executeBasketIntentIx = (0, edit_1.executeEditBasketIntentIx)({
@@ -406,17 +414,52 @@ class SymmetryCore {
                     keeper: manager,
                     basketMint: basket.mint,
                 });
-                ixs.push(executeBasketIntentIx);
-            }
-            let txBatchData = { batches: [[{
+                if (editType == intent_1.TaskType.MakeDirectSwap && params.jup_swap_ix) {
+                    let flashParams = {
+                        keeper: manager,
+                        basket: basket.ownAddress,
+                        rebalanceIntent: undefined,
+                        intent: intent,
+                        mintIn: new web3_js_1.PublicKey(editData.make_direct_swap.from_token_mint),
+                        mintOut: new web3_js_1.PublicKey(editData.make_direct_swap.to_token_mint),
+                        amountIn: new anchor_1.BN(editData.make_direct_swap.amount_from),
+                        amountOut: new anchor_1.BN(editData.make_direct_swap.amount_to),
+                        mode: undefined,
+                    };
+                    let ixWithdraw = (0, flashSwap_1.flashWithdrawIx)(flashParams);
+                    let ixDeposit = (0, flashSwap_1.flashDepositIx)(flashParams);
+                    txBatchData.batches.push([{
                             payer: manager,
                             instructions: [
-                                ...ixs,
+                                (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(manager, (0, pda_1.getAta)(manager, flashParams.mintIn), manager, flashParams.mintIn),
+                                (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(manager, (0, pda_1.getAta)(manager, flashParams.mintOut), manager, flashParams.mintOut),
+                                ixWithdraw,
+                                params.jup_swap_ix,
+                                ixDeposit,
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [],
-                        }]] };
+                        }]);
+                    txBatchData.batches.push([{
+                            payer: manager,
+                            instructions: [
+                                executeBasketIntentIx,
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                            ],
+                            lookupTables: [],
+                        }]);
+                }
+                else {
+                    txBatchData.batches[0][0].instructions = [
+                        openBasketIntentIx,
+                        executeBasketIntentIx,
+                        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),
+                        web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
+                    ];
+                }
+            }
             let versionedTxs = yield (0, txUtils_1.prepareVersionedTxs)(this.sdkParams.connection, txBatchData);
             let txPayloadBatchSequence = (0, txUtils_1.prepareTxPayloadBatchSequence)(txBatchData, versionedTxs);
             return txPayloadBatchSequence;
@@ -482,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),
@@ -494,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,
@@ -511,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,
@@ -536,7 +577,7 @@ class SymmetryCore {
                         }],
                     (0, deposit_1.depositTokensIx)({
                         owner: buyer,
-                        basket: basket,
+                        basket: basket.ownAddress,
                         contributions: contributions,
                     }).map(ix => {
                         return {
@@ -554,11 +595,11 @@ class SymmetryCore {
                             instructions: [
                                 (0, deposit_1.lockDepositsIx)({
                                     owner: buyer,
-                                    basket: basket,
+                                    basket: basket.ownAddress,
                                 }),
-                                executionStartTime ? (0, priceUpdate_1.startPriceUpdatesIx)({
+                                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 }),
@@ -660,7 +701,7 @@ class SymmetryCore {
                     [{
                             payer: seller,
                             instructions: [
-                                executionStartTime ? (0, priceUpdate_1.startPriceUpdatesIx)({
+                                executionStartTime == 0 ? (0, priceUpdate_1.startPriceUpdatesIx)({
                                     keeper: seller,
                                     basket: basket,
                                     rebalanceIntent: rebalanceIntent,
@@ -676,9 +717,35 @@ class SymmetryCore {
             return txPayloadBatchSequence;
         });
     }
+    startPriceUpdatesTx(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let keeper = new web3_js_1.PublicKey(params.keeper);
+            let basket = new web3_js_1.PublicKey(params.basket);
+            let rebalanceIntent = new web3_js_1.PublicKey(params.rebalance_intent);
+            let txBatchData = { batches: [[{
+                            payer: keeper,
+                            instructions: [
+                                (0, priceUpdate_1.startPriceUpdatesIx)({
+                                    keeper: keeper,
+                                    basket: basket,
+                                    rebalanceIntent: rebalanceIntent,
+                                }),
+                                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;
+            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;
             for (let batchStart = 0; batchStart < basket.numTokens; batchStart += batchSize) {
@@ -702,14 +769,16 @@ 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: rebalanceIntent.basket, //@ts-ignore
-                    rebalanceIntent: rebalanceIntent.ownAddress,
+                    basket: basket.ownAddress,
+                    rebalanceIntent: rebalanceIntent,
                     lookupTable0: basket.lookupTables.active[0],
                     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 => ({
@@ -726,25 +795,46 @@ class SymmetryCore {
             return txPayloadBatchSequence;
         });
     }
-    executeSwap(params) {
+    flashSwapTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { keeper, rebalanceIntent, mintFrom, mintTo, amountIn, amountOut, mode } = params;
-            let ix = (0, rebalanceSwap_1.rebalanceSwapIx)({
+            let keeper = new web3_js_1.PublicKey(params.keeper);
+            let basket = new web3_js_1.PublicKey(params.basket);
+            let rebalanceIntent = params.rebalance_intent ? new web3_js_1.PublicKey(params.rebalance_intent) : undefined;
+            let intent = params.intent ? new web3_js_1.PublicKey(params.intent) : undefined;
+            let mintIn = new web3_js_1.PublicKey(params.mint_in);
+            let mintOut = new web3_js_1.PublicKey(params.mint_out);
+            let amountIn = new anchor_1.BN(params.amount_in);
+            let amountOut = new anchor_1.BN(params.amount_out);
+            let mode = params.mode ? params.mode : 0;
+            let flashParams = {
                 keeper: keeper,
-                basket: rebalanceIntent.basket,
-                mintFrom: mintFrom,
-                mintTo: mintTo,
+                basket: basket,
+                rebalanceIntent: rebalanceIntent,
+                intent: intent,
+                mintIn: mintIn,
+                mintOut: mintOut,
                 amountIn: amountIn,
                 amountOut: amountOut,
                 mode: mode,
-            });
+            };
+            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: [
-                                ix,
-                                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);
@@ -754,14 +844,16 @@ class SymmetryCore {
     }
     mintTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { keeper, buyer, basket } = params;
-            const basketAi = yield this.sdkParams.connection.getAccountInfo(basket);
-            let mint = basket_1.BasketLayout.decode(basketAi === null || basketAi === void 0 ? void 0 : basketAi.data.slice(8)).mint;
+            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,
-                basketTokenMint: mint,
-                buyer: buyer,
+                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,
@@ -779,7 +871,8 @@ class SymmetryCore {
     }
     redeemTokensTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { keeper, rebalanceIntent } = params;
+            let keeper = new web3_js_1.PublicKey(params.keeper);
+            let rebalanceIntent = yield this.fetchRebalanceIntent(params.rebalance_intent);
             let batchSize = 7;
             let ixs = [];
             for (let batchStart = 0; batchStart < rebalanceIntent.tokens.length; batchStart += batchSize) {
@@ -812,7 +905,8 @@ class SymmetryCore {
     }
     claimBountyTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { keeper, rebalanceIntent } = params;
+            let keeper = new web3_js_1.PublicKey(params.keeper);
+            let rebalanceIntent = yield this.fetchRebalanceIntent(params.rebalance_intent);
             let keepersArray = [];
             if (!rebalanceIntent.startPriceUpdateTask.completedBy.equals(web3_js_1.PublicKey.default))
                 keepersArray.push(rebalanceIntent.startPriceUpdateTask.completedBy);

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

@@ -0,0 +1,21 @@
+import { BN } from '@coral-xyz/anchor';
+import { PublicKey, TransactionInstruction } from '@solana/web3.js';
+export declare function flashWithdrawIx(params: {
+    keeper: PublicKey;
+    basket: PublicKey;
+    rebalanceIntent?: PublicKey;
+    intent?: PublicKey;
+    mintIn: PublicKey;
+    mintOut: PublicKey;
+    amountIn: BN;
+    amountOut: BN;
+    mode?: number;
+}): TransactionInstruction;
+export declare function flashDepositIx(params: {
+    keeper: PublicKey;
+    basket: PublicKey;
+    rebalanceIntent?: PublicKey;
+    intent?: PublicKey;
+    mintIn: PublicKey;
+    mintOut: PublicKey;
+}): TransactionInstruction;

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

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.flashWithdrawIx = flashWithdrawIx;
+exports.flashDepositIx = flashDepositIx;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("../../constants");
+const pda_1 = require("../pda");
+const 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);
+    let basketInATA = (0, pda_1.getAta)(basket, mintIn);
+    let basketOutATA = (0, pda_1.getAta)(basket, mintOut);
+    const keys = [
+        { pubkey: params.keeper, isWritable: true, isSigner: true },
+        { pubkey: params.basket, isWritable: true, 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 },
+        { pubkey: keeperToATA, isWritable: true, isSigner: false },
+        { pubkey: basketInATA, isWritable: true, isSigner: false },
+        { pubkey: basketOutATA, isWritable: true, isSigner: false },
+        { pubkey: (0, pda_1.getGlobalConfigPda)(), isWritable: false, isSigner: false },
+        { pubkey: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
+    ];
+    const discriminator = FLASH_WITHDRAW_DISCRIMINATOR;
+    const amountInBuffer = Buffer.from(amountIn.toArray("le", 8));
+    const amountOutBuffer = Buffer.from(amountOut.toArray("le", 8));
+    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,
+        programId: constants_1.BASKETS_V3_PROGRAM_ID,
+        data,
+    });
+}
+function flashDepositIx(params) {
+    const { keeper, basket, mintIn, mintOut } = params;
+    let keeperFromATA = (0, pda_1.getAta)(keeper, mintIn);
+    let keeperToATA = (0, pda_1.getAta)(keeper, mintOut);
+    let basketInATA = (0, pda_1.getAta)(basket, mintIn);
+    let basketOutATA = (0, pda_1.getAta)(basket, mintOut);
+    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: params.mintIn, isWritable: false, isSigner: false },
+        { pubkey: params.mintOut, isWritable: false, isSigner: false },
+        { pubkey: keeperFromATA, isWritable: true, isSigner: false },
+        { pubkey: keeperToATA, isWritable: true, isSigner: false },
+        { pubkey: basketInATA, isWritable: true, isSigner: false },
+        { pubkey: basketOutATA, isWritable: true, isSigner: false },
+        { pubkey: (0, pda_1.getGlobalConfigPda)(), isWritable: false, isSigner: false },
+        { pubkey: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: spl_token_1.TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
+    ];
+    const discriminator = FLASH_DEPOSIT_DISCRIMINATOR;
+    const data = Buffer.concat([discriminator]);
+    return new web3_js_1.TransactionInstruction({
+        keys,
+        programId: constants_1.BASKETS_V3_PROGRAM_ID,
+        data,
+    });
+}

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);