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

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;
@@ -556,7 +599,7 @@ class SymmetryCore {
                                     owner: buyer,
                                     basket: basket,
                                 }),
-                                executionStartTime ? (0, priceUpdate_1.startPriceUpdatesIx)({
+                                executionStartTime == 0 ? (0, priceUpdate_1.startPriceUpdatesIx)({
                                     keeper: buyer,
                                     basket: basket,
                                     rebalanceIntent: rebalanceIntent,
@@ -660,7 +703,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 +719,34 @@ 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 basket = yield this.fetchBasket(params.basket);
             let ixs = [];
             let batchSize = 7;
             for (let batchStart = 0; batchStart < basket.numTokens; batchStart += batchSize) {
@@ -704,8 +772,8 @@ class SymmetryCore {
                     tokenIndices.push(0);
                 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,
@@ -726,22 +794,38 @@ 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 txBatchData = { batches: [[{
                             payer: keeper,
                             instructions: [
-                                ix,
+                                (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 }),
                             ],
@@ -754,14 +838,14 @@ 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 ix = (0, deposit_1.mintBasketIx)({
                 keeper: keeper,
-                basket: basket,
-                basketTokenMint: mint,
-                buyer: buyer,
+                basket: basket.ownAddress,
+                basketTokenMint: basket.mint,
+                buyer: rebalanceIntent.owner,
             });
             let txBatchData = { batches: [[{
                             payer: keeper,
@@ -779,7 +863,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 +897,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,73 @@
+"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) {
+    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: 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_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 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symmetry-hq/temp-v3-sdk",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "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 { createAssociatedTokenAccountInstruction } from '@solana/spl-token';
+import { createAssociatedTokenAccountIdempotentInstruction, createAssociatedTokenAccountInstruction } from '@solana/spl-token';
 import {
     ComputeBudgetProgram, Connection, Keypair, PublicKey, TransactionInstruction,
     TransactionSignature
@@ -65,6 +65,8 @@ import {
 } from './txUtils';
 import { FormattedOracleType } from './layouts/oracle';
 import { fetchGlobalConfig } from './states/config';
+import { flashDepositIx, flashWithdrawIx } from './instructions/automation/flashSwap';
+
 export const COMPUTE_UNITS = 1_000_000;
 export const PRIORITY_FEE = 100_000;
 export const JUPITER_API_KEY = "https://quote-api.jup.ag/v6/";
@@ -366,14 +368,15 @@ export class SymmetryCore {
     async updateWeightsTx(context: TaskContext, settings: UpdateWeightsInput): Promise<TxPayloadBatchSequence> {
         return this.openBasketIntentTx({ type: TaskType.UpdateWeights, context, settings });
     }
-    async makeDirectSwapTx(context: TaskContext, settings: MakeDirectSwapInput): Promise<TxPayloadBatchSequence> {
-        return this.openBasketIntentTx({ type: TaskType.MakeDirectSwap, context, settings });
+    async makeDirectSwapTx(context: TaskContext, settings: MakeDirectSwapInput, jup_swap_ix?: TransactionInstruction): Promise<TxPayloadBatchSequence> {
+        return this.openBasketIntentTx({ type: TaskType.MakeDirectSwap, context, settings, jup_swap_ix: jup_swap_ix });
     }
 
     async openBasketIntentTx(params: {
         context: TaskContext,
         type: TaskType,
         settings: Settings,
+        jup_swap_ix?: TransactionInstruction,
     }): Promise<TxPayloadBatchSequence> {
         let basket = await this.fetchBasket(params.context.basket);
         let manager = new PublicKey(params.context.manager);
@@ -421,7 +424,15 @@ export class SymmetryCore {
             editType: editType,
             editData: editData,
         });
-        ixs.push(openBasketIntentIx);
+        let txBatchData: TxBatchData = {batches: [[{
+            payer: manager,
+            instructions: [
+                openBasketIntentIx,
+                ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
+                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 BN(0)) && activationTimestamp.eq(new BN(0))) {
@@ -434,18 +445,52 @@ export class SymmetryCore {
                 keeper: manager,
                 basketMint: basket.mint,
             });
-            ixs.push(executeBasketIntentIx);
+            if (editType == TaskType.MakeDirectSwap && params.jup_swap_ix) {
+                let flashParams = {
+                    keeper: manager,
+                    basket: basket.ownAddress,
+                    rebalanceIntent: undefined,
+                    intent: intent,
+                    mintIn: new PublicKey((editData as MakeDirectSwapInput).make_direct_swap.from_token_mint),
+                    mintOut: new PublicKey((editData as MakeDirectSwapInput).make_direct_swap.to_token_mint),
+                    amountIn: new BN((editData as MakeDirectSwapInput).make_direct_swap.amount_from),
+                    amountOut: new BN((editData as MakeDirectSwapInput).make_direct_swap.amount_to),
+                    mode: undefined,
+                }
+                let ixWithdraw = flashWithdrawIx(flashParams);
+                let ixDeposit = flashDepositIx(flashParams);
+                txBatchData.batches.push([{
+                    payer: manager,
+                    instructions: [
+                        createAssociatedTokenAccountIdempotentInstruction(manager, getAta(manager, flashParams.mintIn), manager, flashParams.mintIn),
+                        createAssociatedTokenAccountIdempotentInstruction(manager, getAta(manager, flashParams.mintOut), manager, flashParams.mintOut),
+                        ixWithdraw,
+                        params.jup_swap_ix,
+                        ixDeposit,
+                        ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
+                        ComputeBudgetProgram.setComputeUnitPrice({microLamports: this.sdkParams.priorityFee}),
+                    ],
+                    lookupTables: [],
+                }]);
+                txBatchData.batches.push([{
+                    payer: manager,
+                    instructions: [
+                        executeBasketIntentIx,
+                        ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
+                        ComputeBudgetProgram.setComputeUnitPrice({microLamports: this.sdkParams.priorityFee}),
+                    ],
+                    lookupTables: [],
+                }]);
+            } else {
+                txBatchData.batches[0][0].instructions = [
+                    openBasketIntentIx,
+                    executeBasketIntentIx,
+                    ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
+                    ComputeBudgetProgram.setComputeUnitPrice({microLamports: this.sdkParams.priorityFee}),
+                ];
+            }
         }
 
-        let txBatchData: TxBatchData = {batches: [[{
-            payer: manager,
-            instructions: [
-                ...ixs,
-                ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
-                ComputeBudgetProgram.setComputeUnitPrice({microLamports: this.sdkParams.priorityFee}),
-            ],
-            lookupTables: [],
-        }]]};
         let versionedTxs = await prepareVersionedTxs(this.sdkParams.connection, txBatchData);
         let txPayloadBatchSequence = prepareTxPayloadBatchSequence(txBatchData, versionedTxs);
         return txPayloadBatchSequence;
@@ -606,7 +651,7 @@ export class SymmetryCore {
                         owner: buyer,
                         basket: basket,
                     }),
-                    executionStartTime ? startPriceUpdatesIx({
+                    executionStartTime == 0 ? startPriceUpdatesIx({
                         keeper: buyer,
                         basket: basket,
                         rebalanceIntent: rebalanceIntent,
@@ -732,7 +777,7 @@ export class SymmetryCore {
             [{
                 payer: seller,
                 instructions: [
-                    executionStartTime ? startPriceUpdatesIx({
+                    executionStartTime == 0 ? startPriceUpdatesIx({
                         keeper: seller,
                         basket: basket,
                         rebalanceIntent: rebalanceIntent,
@@ -748,14 +793,41 @@ export class SymmetryCore {
         let txPayloadBatchSequence = prepareTxPayloadBatchSequence(txBatchData, versionedTxs);
         return txPayloadBatchSequence;
     }
-    
+
+    async startPriceUpdatesTx(params: {
+        keeper: string,
+        basket: string,
+        rebalance_intent: string,
+    }): Promise<TxPayloadBatchSequence> {
+        let keeper = new PublicKey(params.keeper);
+        let basket = new PublicKey(params.basket);
+        let rebalanceIntent = new PublicKey(params.rebalance_intent);
+        let txBatchData: TxBatchData = {batches: [[{
+            payer: keeper,
+            instructions: [
+                startPriceUpdatesIx({
+                    keeper: keeper,
+                    basket: basket,
+                    rebalanceIntent: rebalanceIntent,
+                }),
+                ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),
+                ComputeBudgetProgram.setComputeUnitPrice({microLamports: this.sdkParams.priorityFee}),
+            ],
+            lookupTables: [],
+        }]]};
+        let versionedTxs = await prepareVersionedTxs(this.sdkParams.connection, txBatchData);
+        let txPayloadBatchSequence = prepareTxPayloadBatchSequence(txBatchData, versionedTxs);
+        return txPayloadBatchSequence;
+    }
 
     async updateTokenPricesTx(params: {
-        keeper: PublicKey,
-        rebalanceIntent: RebalanceIntent,
-        basket: Basket,
+        keeper: string,
+        basket: string,
+        rebalance_intent: string,
     }): Promise<TxPayloadBatchSequence> {
-        let { keeper, rebalanceIntent, basket } = params;
+        let keeper = new PublicKey(params.keeper);
+        let rebalanceIntent = new PublicKey(params.rebalance_intent);
+        let basket = await this.fetchBasket(params.basket);
         let ixs: TransactionInstruction[] = [];
         let batchSize = 7;
         for (let batchStart = 0; batchStart < basket.numTokens; batchStart += batchSize) {
@@ -779,8 +851,8 @@ export class SymmetryCore {
             ixs.push(
                 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,
@@ -802,29 +874,48 @@ export class SymmetryCore {
         return txPayloadBatchSequence;
     }
 
-    async executeSwap(params: {
-        keeper: PublicKey,
-        rebalanceIntent: RebalanceIntent,
-        mintFrom: PublicKey,
-        mintTo: PublicKey,
-        amountIn: BN,
-        amountOut: BN,
-        mode: number,
+    async 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> {
-        let { keeper, rebalanceIntent, mintFrom, mintTo, amountIn, amountOut, mode } = params;
-        let ix = rebalanceSwapIx({
+        let keeper = new PublicKey(params.keeper);
+        let basket = new PublicKey(params.basket);
+        let rebalanceIntent = params.rebalance_intent ? new PublicKey(params.rebalance_intent) : undefined;
+        let intent = params.intent ? new PublicKey(params.intent) : undefined;
+        let mintIn = new PublicKey(params.mint_in);
+        let mintOut = new PublicKey(params.mint_out);
+        let amountIn = new BN(params.amount_in);
+        let amountOut = new 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 = flashWithdrawIx(flashParams);
+        let ixDeposit = flashDepositIx(flashParams);
         let txBatchData: TxBatchData = {batches: [[{
             payer: keeper,
             instructions: [
-                ix,
+                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}),
             ],
@@ -836,18 +927,17 @@ export class SymmetryCore {
     }
 
     async mintTx(params: {
-        keeper: PublicKey,
-        buyer: PublicKey,
-        basket: PublicKey,
+        keeper: string,
+        rebalance_intent: string,
     }): Promise<TxPayloadBatchSequence> {
-        let { keeper, buyer, basket } = params;
-        const basketAi = await this.sdkParams.connection.getAccountInfo(basket);
-        let mint = BasketLayout.decode(basketAi?.data.slice(8)).mint;
+        let keeper = new PublicKey(params.keeper);
+        let rebalanceIntent = await this.fetchRebalanceIntent(params.rebalance_intent);
+        let basket = await this.fetchBasket(rebalanceIntent.basket.toBase58());
         let ix = mintBasketIx({
             keeper: keeper,
-            basket: basket,
-            basketTokenMint: mint,
-            buyer: buyer,
+            basket: basket.ownAddress,
+            basketTokenMint: basket.mint,
+            buyer: rebalanceIntent.owner,
         });
         let txBatchData: TxBatchData = {batches: [[{
             payer: keeper,
@@ -864,10 +954,11 @@ export class SymmetryCore {
     }
 
     async redeemTokensTx(params: {
-        keeper: PublicKey,
-        rebalanceIntent: RebalanceIntent,
+        keeper: string,
+        rebalance_intent: string,
     }): Promise<TxPayloadBatchSequence> {
-        let { keeper, rebalanceIntent } = params;
+        let keeper = new PublicKey(params.keeper);
+        let rebalanceIntent = await this.fetchRebalanceIntent(params.rebalance_intent);
         let batchSize = 7;
         let ixs: TransactionInstruction[] = [];
         for (let batchStart = 0; batchStart < rebalanceIntent.tokens.length; batchStart += batchSize) {
@@ -901,10 +992,11 @@ export class SymmetryCore {
     }
 
     async claimBountyTx(params: {
-        keeper: PublicKey,
-        rebalanceIntent: RebalanceIntent,
+        keeper: string,
+        rebalance_intent: string,
     }): Promise<TxPayloadBatchSequence> {
-        let { keeper, rebalanceIntent } = params;
+        let keeper = new PublicKey(params.keeper);
+        let rebalanceIntent = await this.fetchRebalanceIntent(params.rebalance_intent);
         let keepersArray: PublicKey[] = [];
         if (!rebalanceIntent.startPriceUpdateTask.completedBy.equals(PublicKey.default))
             keepersArray.push(rebalanceIntent.startPriceUpdateTask.completedBy);

package/src/instructions/automation/flashSwap.ts

@@ -0,0 +1,104 @@
+import { BN } from '@coral-xyz/anchor';
+import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY, TransactionInstruction } from '@solana/web3.js';
+
+import { BASKETS_V3_PROGRAM_ID } from '../../constants';
+import { getAta, getGlobalConfigPda } from '../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]);
+
+export function flashWithdrawIx(params: {
+    keeper: PublicKey;
+    basket: PublicKey;
+    rebalanceIntent?: PublicKey;
+    intent?: PublicKey;
+    mintIn: PublicKey;
+    mintOut: PublicKey;
+    amountIn: BN;
+    amountOut: BN;
+    mode?: number;
+}): TransactionInstruction {
+
+    const { keeper, basket, mintIn, mintOut, amountIn, amountOut, mode } = params;
+
+    let keeperFromATA = getAta(keeper, mintIn);
+    let keeperToATA = getAta(keeper, mintOut);
+    let basketInATA = getAta(basket, mintIn);
+    let basketOutATA = getAta(basket, mintOut);
+
+    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.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: getGlobalConfigPda(), isWritable: false, isSigner: false },
+        { pubkey: SYSVAR_INSTRUCTIONS_PUBKEY, isWritable: false, isSigner: false },
+        { pubkey: TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: 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 = mode ? Buffer.from([mode]) : Buffer.from([]);
+
+    const data = Buffer.concat([discriminator, amountInBuffer, amountOutBuffer, modeBuffer]);
+
+    return new TransactionInstruction({
+        keys,
+        programId: BASKETS_V3_PROGRAM_ID,
+        data,
+    });
+}
+
+export function flashDepositIx(params: {
+    keeper: PublicKey;
+    basket: PublicKey;
+    rebalanceIntent?: PublicKey;
+    intent?: PublicKey;
+    mintIn: PublicKey;
+    mintOut: PublicKey;
+}): TransactionInstruction {
+    const { keeper, basket, mintIn, mintOut } = params;
+
+    let keeperFromATA = getAta(keeper, mintIn);
+    let keeperToATA = getAta(keeper, mintOut);
+    let basketInATA = getAta(basket, mintIn);
+    let basketOutATA = getAta(basket, mintOut);
+
+    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.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: getGlobalConfigPda(), isWritable: false, isSigner: false },
+        { pubkey: SYSVAR_INSTRUCTIONS_PUBKEY, isWritable: false, isSigner: false },
+        { pubkey: TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
+        { pubkey: TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
+    ];
+
+    const discriminator = FLASH_DEPOSIT_DISCRIMINATOR;
+    
+
+    const data = Buffer.concat([discriminator]);
+
+    return new TransactionInstruction({
+        keys,
+        programId: BASKETS_V3_PROGRAM_ID,
+        data,
+    });
+}