@drift-labs/sdk 2.106.0-beta.6 → 2.106.0-beta.8

package/VERSION

@@ -1 +1 @@
-2.106.0-beta.6
+2.106.0-beta.8

package/lib/browser/driftClient.d.ts

@@ -718,6 +718,51 @@ export declare class DriftClient {
     getLiquidatePerpWithFillIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, makerInfos: MakerInfo[], liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
     liquidateSpot(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;
     getLiquidateSpotIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
+    getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }: {
+        jupiterClient: JupiterClient;
+        liabilityMarketIndex: number;
+        assetMarketIndex: number;
+        assetTokenAccount?: PublicKey;
+        liabilityTokenAccount?: PublicKey;
+        swapAmount: BN;
+        slippageBps?: number;
+        swapMode?: SwapMode;
+        onlyDirectRoutes?: boolean;
+        quote?: QuoteResponse;
+        userAccount: UserAccount;
+        userAccountPublicKey: PublicKey;
+        userStatsAccountPublicKey: PublicKey;
+        liquidatorSubAccountId?: number;
+    }): Promise<{
+        ixs: TransactionInstruction[];
+        lookupTables: AddressLookupTableAccount[];
+    }>;
+    /**
+     * Get the drift liquidate_spot_with_swap instructions
+     *
+     * @param liabilityMarketIndex the market index of the token you're buying
+     * @param assetMarketIndex the market index of the token you're selling
+     * @param amountIn the amount of the token to sell
+     * @param assetTokenAccount the token account to move the tokens being sold
+     * @param liabilityTokenAccount the token account to receive the tokens being bought
+     * @param userAccount
+     * @param userAccountPublicKey
+     * @param userStatsAccountPublicKey
+     */
+    getLiquidateSpotWithSwapIx({ liabilityMarketIndex, assetMarketIndex, swapAmount: swapAmount, assetTokenAccount, liabilityTokenAccount, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }: {
+        liabilityMarketIndex: number;
+        assetMarketIndex: number;
+        swapAmount: BN;
+        assetTokenAccount: PublicKey;
+        liabilityTokenAccount: PublicKey;
+        userAccount: UserAccount;
+        userAccountPublicKey: PublicKey;
+        userStatsAccountPublicKey: PublicKey;
+        liquidatorSubAccountId?: number;
+    }): Promise<{
+        beginSwapIx: TransactionInstruction;
+        endSwapIx: TransactionInstruction;
+    }>;
     liquidateBorrowForPerpPnl(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;
     getLiquidateBorrowForPerpPnlIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
     liquidatePerpPnlForDeposit(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, assetMarketIndex: number, maxPnlTransfer: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;

package/lib/browser/driftClient.js

@@ -3820,6 +3820,150 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    async getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }) {
+        const liabilityMarket = this.getSpotMarketAccount(liabilityMarketIndex);
+        const assetMarket = this.getSpotMarketAccount(assetMarketIndex);
+        if (!quote) {
+            const fetchedQuote = await jupiterClient.getQuote({
+                inputMint: assetMarket.mint,
+                outputMint: liabilityMarket.mint,
+                amount: swapAmount,
+                slippageBps,
+                swapMode,
+                onlyDirectRoutes,
+            });
+            quote = fetchedQuote;
+        }
+        if (!quote) {
+            throw new Error("Could not fetch Jupiter's quote. Please try again.");
+        }
+        const amountIn = new anchor_1.BN(quote.inAmount);
+        const transaction = await jupiterClient.getSwap({
+            quote,
+            userPublicKey: this.provider.wallet.publicKey,
+            slippageBps,
+        });
+        const { transactionMessage, lookupTables } = await jupiterClient.getTransactionMessageAndLookupTables({
+            transaction,
+        });
+        const jupiterInstructions = jupiterClient.getJupiterInstructions({
+            transactionMessage,
+            inputMint: assetMarket.mint,
+            outputMint: liabilityMarket.mint,
+        });
+        const preInstructions = [];
+        if (!liabilityTokenAccount) {
+            const tokenProgram = this.getTokenProgramForSpotMarket(liabilityMarket);
+            liabilityTokenAccount = await this.getAssociatedTokenAccount(liabilityMarket.marketIndex, false, tokenProgram);
+            preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(liabilityTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, liabilityMarket.mint, tokenProgram));
+        }
+        if (!assetTokenAccount) {
+            const tokenProgram = this.getTokenProgramForSpotMarket(assetMarket);
+            assetTokenAccount = await this.getAssociatedTokenAccount(assetMarket.marketIndex, false, tokenProgram);
+            preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(assetTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, assetMarket.mint, tokenProgram));
+        }
+        const { beginSwapIx, endSwapIx } = await this.getLiquidateSpotWithSwapIx({
+            liabilityMarketIndex,
+            assetMarketIndex,
+            swapAmount: amountIn,
+            assetTokenAccount,
+            liabilityTokenAccount,
+            userAccount,
+            userAccountPublicKey,
+            userStatsAccountPublicKey,
+            liquidatorSubAccountId,
+        });
+        const ixs = [
+            ...preInstructions,
+            beginSwapIx,
+            ...jupiterInstructions,
+            endSwapIx,
+        ];
+        return { ixs, lookupTables };
+    }
+    /**
+     * Get the drift liquidate_spot_with_swap instructions
+     *
+     * @param liabilityMarketIndex the market index of the token you're buying
+     * @param assetMarketIndex the market index of the token you're selling
+     * @param amountIn the amount of the token to sell
+     * @param assetTokenAccount the token account to move the tokens being sold
+     * @param liabilityTokenAccount the token account to receive the tokens being bought
+     * @param userAccount
+     * @param userAccountPublicKey
+     * @param userStatsAccountPublicKey
+     */
+    async getLiquidateSpotWithSwapIx({ liabilityMarketIndex, assetMarketIndex, swapAmount: swapAmount, assetTokenAccount, liabilityTokenAccount, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }) {
+        const liquidatorAccountPublicKey = await this.getUserAccountPublicKey(liquidatorSubAccountId);
+        const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const userAccounts = [userAccount];
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts,
+            writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
+            readableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
+        });
+        const liabilitySpotMarket = this.getSpotMarketAccount(liabilityMarketIndex);
+        const assetSpotMarket = this.getSpotMarketAccount(assetMarketIndex);
+        const liabilityTokenProgram = this.getTokenProgramForSpotMarket(liabilitySpotMarket);
+        const assetTokenProgram = this.getTokenProgramForSpotMarket(assetSpotMarket);
+        if (!liabilityTokenProgram.equals(assetTokenProgram)) {
+            remainingAccounts.push({
+                pubkey: liabilityTokenProgram,
+                isWritable: false,
+                isSigner: false,
+            });
+        }
+        if (liabilitySpotMarket.tokenProgram === 1 ||
+            assetSpotMarket.tokenProgram === 1) {
+            remainingAccounts.push({
+                pubkey: assetSpotMarket.mint,
+                isWritable: false,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: liabilitySpotMarket.mint,
+                isWritable: false,
+                isSigner: false,
+            });
+        }
+        const beginSwapIx = await this.program.instruction.liquidateSpotWithSwapBegin(assetMarketIndex, liabilityMarketIndex, swapAmount, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                userStats: userStatsAccountPublicKey,
+                liquidator: liquidatorAccountPublicKey,
+                liquidatorStats: liquidatorStatsPublicKey,
+                authority: this.wallet.publicKey,
+                liabilitySpotMarketVault: liabilitySpotMarket.vault,
+                assetSpotMarketVault: assetSpotMarket.vault,
+                assetTokenAccount: assetTokenAccount,
+                liabilityTokenAccount: liabilityTokenAccount,
+                tokenProgram: assetTokenProgram,
+                driftSigner: this.getStateAccount().signer,
+                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            remainingAccounts,
+        });
+        const endSwapIx = await this.program.instruction.liquidateSpotWithSwapEnd(assetMarketIndex, liabilityMarketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                userStats: userStatsAccountPublicKey,
+                liquidator: liquidatorAccountPublicKey,
+                liquidatorStats: liquidatorStatsPublicKey,
+                authority: this.wallet.publicKey,
+                liabilitySpotMarketVault: liabilitySpotMarket.vault,
+                assetSpotMarketVault: assetSpotMarket.vault,
+                assetTokenAccount: assetTokenAccount,
+                liabilityTokenAccount: liabilityTokenAccount,
+                tokenProgram: assetTokenProgram,
+                driftSigner: this.getStateAccount().signer,
+                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            remainingAccounts,
+        });
+        return { beginSwapIx, endSwapIx };
+    }
     async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(perpMarketIndex, slot);

package/lib/browser/idl/drift.json

@@ -2279,6 +2279,176 @@
                 }
             ]
         },
+        {
+            "name": "liquidateSpotWithSwapBegin",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "liquidator",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liquidatorStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liabilitySpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "assetSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liabilityTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "assetTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "instructions",
+                    "isMut": false,
+                    "isSigner": false,
+                    "docs": [
+                        "Instructions Sysvar for instruction introspection"
+                    ]
+                }
+            ],
+            "args": [
+                {
+                    "name": "assetMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "liabilityMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "swapAmount",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "liquidateSpotWithSwapEnd",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "liquidator",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liquidatorStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liabilitySpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "assetSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liabilityTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "assetTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "instructions",
+                    "isMut": false,
+                    "isSigner": false,
+                    "docs": [
+                        "Instructions Sysvar for instruction introspection"
+                    ]
+                }
+            ],
+            "args": [
+                {
+                    "name": "assetMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "liabilityMarketIndex",
+                    "type": "u16"
+                }
+            ]
+        },
         {
             "name": "liquidateBorrowForPerpPnl",
             "accounts": [
@@ -6111,7 +6281,7 @@
                 {
                     "name": "fuelBoostDeposits",
                     "type": {
-                        "option": "u32"
+                        "option": "i32"
                     }
                 },
                 {
@@ -14475,6 +14645,11 @@
             "code": 6307,
             "name": "PythLazerMessagePriceFeedMismatch",
             "msg": "Pyth lazer message does not correspond to correct fed id"
+        },
+        {
+            "code": 6308,
+            "name": "InvalidLiquidateSpotWithSwap",
+            "msg": "InvalidLiquidateSpotWithSwap"
         }
     ]
 }

package/lib/node/driftClient.d.ts

@@ -718,6 +718,51 @@ export declare class DriftClient {
     getLiquidatePerpWithFillIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, makerInfos: MakerInfo[], liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
     liquidateSpot(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;
     getLiquidateSpotIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, assetMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
+    getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }: {
+        jupiterClient: JupiterClient;
+        liabilityMarketIndex: number;
+        assetMarketIndex: number;
+        assetTokenAccount?: PublicKey;
+        liabilityTokenAccount?: PublicKey;
+        swapAmount: BN;
+        slippageBps?: number;
+        swapMode?: SwapMode;
+        onlyDirectRoutes?: boolean;
+        quote?: QuoteResponse;
+        userAccount: UserAccount;
+        userAccountPublicKey: PublicKey;
+        userStatsAccountPublicKey: PublicKey;
+        liquidatorSubAccountId?: number;
+    }): Promise<{
+        ixs: TransactionInstruction[];
+        lookupTables: AddressLookupTableAccount[];
+    }>;
+    /**
+     * Get the drift liquidate_spot_with_swap instructions
+     *
+     * @param liabilityMarketIndex the market index of the token you're buying
+     * @param assetMarketIndex the market index of the token you're selling
+     * @param amountIn the amount of the token to sell
+     * @param assetTokenAccount the token account to move the tokens being sold
+     * @param liabilityTokenAccount the token account to receive the tokens being bought
+     * @param userAccount
+     * @param userAccountPublicKey
+     * @param userStatsAccountPublicKey
+     */
+    getLiquidateSpotWithSwapIx({ liabilityMarketIndex, assetMarketIndex, swapAmount: swapAmount, assetTokenAccount, liabilityTokenAccount, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }: {
+        liabilityMarketIndex: number;
+        assetMarketIndex: number;
+        swapAmount: BN;
+        assetTokenAccount: PublicKey;
+        liabilityTokenAccount: PublicKey;
+        userAccount: UserAccount;
+        userAccountPublicKey: PublicKey;
+        userStatsAccountPublicKey: PublicKey;
+        liquidatorSubAccountId?: number;
+    }): Promise<{
+        beginSwapIx: TransactionInstruction;
+        endSwapIx: TransactionInstruction;
+    }>;
     liquidateBorrowForPerpPnl(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;
     getLiquidateBorrowForPerpPnlIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, liabilityMarketIndex: number, maxLiabilityTransfer: BN, limitPrice?: BN, liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
     liquidatePerpPnlForDeposit(userAccountPublicKey: PublicKey, userAccount: UserAccount, perpMarketIndex: number, assetMarketIndex: number, maxPnlTransfer: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;

package/lib/node/driftClient.js

@@ -3820,6 +3820,150 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    async getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }) {
+        const liabilityMarket = this.getSpotMarketAccount(liabilityMarketIndex);
+        const assetMarket = this.getSpotMarketAccount(assetMarketIndex);
+        if (!quote) {
+            const fetchedQuote = await jupiterClient.getQuote({
+                inputMint: assetMarket.mint,
+                outputMint: liabilityMarket.mint,
+                amount: swapAmount,
+                slippageBps,
+                swapMode,
+                onlyDirectRoutes,
+            });
+            quote = fetchedQuote;
+        }
+        if (!quote) {
+            throw new Error("Could not fetch Jupiter's quote. Please try again.");
+        }
+        const amountIn = new anchor_1.BN(quote.inAmount);
+        const transaction = await jupiterClient.getSwap({
+            quote,
+            userPublicKey: this.provider.wallet.publicKey,
+            slippageBps,
+        });
+        const { transactionMessage, lookupTables } = await jupiterClient.getTransactionMessageAndLookupTables({
+            transaction,
+        });
+        const jupiterInstructions = jupiterClient.getJupiterInstructions({
+            transactionMessage,
+            inputMint: assetMarket.mint,
+            outputMint: liabilityMarket.mint,
+        });
+        const preInstructions = [];
+        if (!liabilityTokenAccount) {
+            const tokenProgram = this.getTokenProgramForSpotMarket(liabilityMarket);
+            liabilityTokenAccount = await this.getAssociatedTokenAccount(liabilityMarket.marketIndex, false, tokenProgram);
+            preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(liabilityTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, liabilityMarket.mint, tokenProgram));
+        }
+        if (!assetTokenAccount) {
+            const tokenProgram = this.getTokenProgramForSpotMarket(assetMarket);
+            assetTokenAccount = await this.getAssociatedTokenAccount(assetMarket.marketIndex, false, tokenProgram);
+            preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(assetTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, assetMarket.mint, tokenProgram));
+        }
+        const { beginSwapIx, endSwapIx } = await this.getLiquidateSpotWithSwapIx({
+            liabilityMarketIndex,
+            assetMarketIndex,
+            swapAmount: amountIn,
+            assetTokenAccount,
+            liabilityTokenAccount,
+            userAccount,
+            userAccountPublicKey,
+            userStatsAccountPublicKey,
+            liquidatorSubAccountId,
+        });
+        const ixs = [
+            ...preInstructions,
+            beginSwapIx,
+            ...jupiterInstructions,
+            endSwapIx,
+        ];
+        return { ixs, lookupTables };
+    }
+    /**
+     * Get the drift liquidate_spot_with_swap instructions
+     *
+     * @param liabilityMarketIndex the market index of the token you're buying
+     * @param assetMarketIndex the market index of the token you're selling
+     * @param amountIn the amount of the token to sell
+     * @param assetTokenAccount the token account to move the tokens being sold
+     * @param liabilityTokenAccount the token account to receive the tokens being bought
+     * @param userAccount
+     * @param userAccountPublicKey
+     * @param userStatsAccountPublicKey
+     */
+    async getLiquidateSpotWithSwapIx({ liabilityMarketIndex, assetMarketIndex, swapAmount: swapAmount, assetTokenAccount, liabilityTokenAccount, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }) {
+        const liquidatorAccountPublicKey = await this.getUserAccountPublicKey(liquidatorSubAccountId);
+        const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const userAccounts = [userAccount];
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts,
+            writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
+            readableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
+        });
+        const liabilitySpotMarket = this.getSpotMarketAccount(liabilityMarketIndex);
+        const assetSpotMarket = this.getSpotMarketAccount(assetMarketIndex);
+        const liabilityTokenProgram = this.getTokenProgramForSpotMarket(liabilitySpotMarket);
+        const assetTokenProgram = this.getTokenProgramForSpotMarket(assetSpotMarket);
+        if (!liabilityTokenProgram.equals(assetTokenProgram)) {
+            remainingAccounts.push({
+                pubkey: liabilityTokenProgram,
+                isWritable: false,
+                isSigner: false,
+            });
+        }
+        if (liabilitySpotMarket.tokenProgram === 1 ||
+            assetSpotMarket.tokenProgram === 1) {
+            remainingAccounts.push({
+                pubkey: assetSpotMarket.mint,
+                isWritable: false,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: liabilitySpotMarket.mint,
+                isWritable: false,
+                isSigner: false,
+            });
+        }
+        const beginSwapIx = await this.program.instruction.liquidateSpotWithSwapBegin(assetMarketIndex, liabilityMarketIndex, swapAmount, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                userStats: userStatsAccountPublicKey,
+                liquidator: liquidatorAccountPublicKey,
+                liquidatorStats: liquidatorStatsPublicKey,
+                authority: this.wallet.publicKey,
+                liabilitySpotMarketVault: liabilitySpotMarket.vault,
+                assetSpotMarketVault: assetSpotMarket.vault,
+                assetTokenAccount: assetTokenAccount,
+                liabilityTokenAccount: liabilityTokenAccount,
+                tokenProgram: assetTokenProgram,
+                driftSigner: this.getStateAccount().signer,
+                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            remainingAccounts,
+        });
+        const endSwapIx = await this.program.instruction.liquidateSpotWithSwapEnd(assetMarketIndex, liabilityMarketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                userStats: userStatsAccountPublicKey,
+                liquidator: liquidatorAccountPublicKey,
+                liquidatorStats: liquidatorStatsPublicKey,
+                authority: this.wallet.publicKey,
+                liabilitySpotMarketVault: liabilitySpotMarket.vault,
+                assetSpotMarketVault: assetSpotMarket.vault,
+                assetTokenAccount: assetTokenAccount,
+                liabilityTokenAccount: liabilityTokenAccount,
+                tokenProgram: assetTokenProgram,
+                driftSigner: this.getStateAccount().signer,
+                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            remainingAccounts,
+        });
+        return { beginSwapIx, endSwapIx };
+    }
     async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(perpMarketIndex, slot);

package/lib/node/idl/drift.json

@@ -2279,6 +2279,176 @@
                 }
             ]
         },
+        {
+            "name": "liquidateSpotWithSwapBegin",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "liquidator",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liquidatorStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liabilitySpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "assetSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liabilityTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "assetTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "instructions",
+                    "isMut": false,
+                    "isSigner": false,
+                    "docs": [
+                        "Instructions Sysvar for instruction introspection"
+                    ]
+                }
+            ],
+            "args": [
+                {
+                    "name": "assetMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "liabilityMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "swapAmount",
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "liquidateSpotWithSwapEnd",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "liquidator",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liquidatorStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liabilitySpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "assetSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liabilityTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "assetTokenAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "instructions",
+                    "isMut": false,
+                    "isSigner": false,
+                    "docs": [
+                        "Instructions Sysvar for instruction introspection"
+                    ]
+                }
+            ],
+            "args": [
+                {
+                    "name": "assetMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "liabilityMarketIndex",
+                    "type": "u16"
+                }
+            ]
+        },
         {
             "name": "liquidateBorrowForPerpPnl",
             "accounts": [
@@ -6111,7 +6281,7 @@
                 {
                     "name": "fuelBoostDeposits",
                     "type": {
-                        "option": "u32"
+                        "option": "i32"
                     }
                 },
                 {
@@ -14475,6 +14645,11 @@
             "code": 6307,
             "name": "PythLazerMessagePriceFeedMismatch",
             "msg": "Pyth lazer message does not correspond to correct fed id"
+        },
+        {
+            "code": 6308,
+            "name": "InvalidLiquidateSpotWithSwap",
+            "msg": "InvalidLiquidateSpotWithSwap"
         }
     ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.106.0-beta.6",
+	"version": "2.106.0-beta.8",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/driftClient.ts

@@ -7219,6 +7219,271 @@ export class DriftClient {
 		);
 	}
 
+	public async getJupiterLiquidateSpotWithSwapIxV6({
+		jupiterClient,
+		liabilityMarketIndex,
+		assetMarketIndex,
+		swapAmount,
+		assetTokenAccount,
+		liabilityTokenAccount,
+		slippageBps,
+		swapMode,
+		onlyDirectRoutes,
+		quote,
+		userAccount,
+		userAccountPublicKey,
+		userStatsAccountPublicKey,
+		liquidatorSubAccountId,
+	}: {
+		jupiterClient: JupiterClient;
+		liabilityMarketIndex: number;
+		assetMarketIndex: number;
+		assetTokenAccount?: PublicKey;
+		liabilityTokenAccount?: PublicKey;
+		swapAmount: BN;
+		slippageBps?: number;
+		swapMode?: SwapMode;
+		onlyDirectRoutes?: boolean;
+		quote?: QuoteResponse;
+		userAccount: UserAccount;
+		userAccountPublicKey: PublicKey;
+		userStatsAccountPublicKey: PublicKey;
+		liquidatorSubAccountId?: number;
+	}): Promise<{
+		ixs: TransactionInstruction[];
+		lookupTables: AddressLookupTableAccount[];
+	}> {
+		const liabilityMarket = this.getSpotMarketAccount(liabilityMarketIndex);
+		const assetMarket = this.getSpotMarketAccount(assetMarketIndex);
+
+		if (!quote) {
+			const fetchedQuote = await jupiterClient.getQuote({
+				inputMint: assetMarket.mint,
+				outputMint: liabilityMarket.mint,
+				amount: swapAmount,
+				slippageBps,
+				swapMode,
+				onlyDirectRoutes,
+			});
+
+			quote = fetchedQuote;
+		}
+
+		if (!quote) {
+			throw new Error("Could not fetch Jupiter's quote. Please try again.");
+		}
+
+		const amountIn = new BN(quote.inAmount);
+
+		const transaction = await jupiterClient.getSwap({
+			quote,
+			userPublicKey: this.provider.wallet.publicKey,
+			slippageBps,
+		});
+
+		const { transactionMessage, lookupTables } =
+			await jupiterClient.getTransactionMessageAndLookupTables({
+				transaction,
+			});
+
+		const jupiterInstructions = jupiterClient.getJupiterInstructions({
+			transactionMessage,
+			inputMint: assetMarket.mint,
+			outputMint: liabilityMarket.mint,
+		});
+
+		const preInstructions = [];
+		if (!liabilityTokenAccount) {
+			const tokenProgram = this.getTokenProgramForSpotMarket(liabilityMarket);
+			liabilityTokenAccount = await this.getAssociatedTokenAccount(
+				liabilityMarket.marketIndex,
+				false,
+				tokenProgram
+			);
+
+			preInstructions.push(
+				this.createAssociatedTokenAccountIdempotentInstruction(
+					liabilityTokenAccount,
+					this.provider.wallet.publicKey,
+					this.provider.wallet.publicKey,
+					liabilityMarket.mint,
+					tokenProgram
+				)
+			);
+		}
+
+		if (!assetTokenAccount) {
+			const tokenProgram = this.getTokenProgramForSpotMarket(assetMarket);
+			assetTokenAccount = await this.getAssociatedTokenAccount(
+				assetMarket.marketIndex,
+				false,
+				tokenProgram
+			);
+
+			preInstructions.push(
+				this.createAssociatedTokenAccountIdempotentInstruction(
+					assetTokenAccount,
+					this.provider.wallet.publicKey,
+					this.provider.wallet.publicKey,
+					assetMarket.mint,
+					tokenProgram
+				)
+			);
+		}
+
+		const { beginSwapIx, endSwapIx } = await this.getLiquidateSpotWithSwapIx({
+			liabilityMarketIndex,
+			assetMarketIndex,
+			swapAmount: amountIn,
+			assetTokenAccount,
+			liabilityTokenAccount,
+			userAccount,
+			userAccountPublicKey,
+			userStatsAccountPublicKey,
+			liquidatorSubAccountId,
+		});
+
+		const ixs = [
+			...preInstructions,
+			beginSwapIx,
+			...jupiterInstructions,
+			endSwapIx,
+		];
+
+		return { ixs, lookupTables };
+	}
+
+	/**
+	 * Get the drift liquidate_spot_with_swap instructions
+	 *
+	 * @param liabilityMarketIndex the market index of the token you're buying
+	 * @param assetMarketIndex the market index of the token you're selling
+	 * @param amountIn the amount of the token to sell
+	 * @param assetTokenAccount the token account to move the tokens being sold
+	 * @param liabilityTokenAccount the token account to receive the tokens being bought
+	 * @param userAccount
+	 * @param userAccountPublicKey
+	 * @param userStatsAccountPublicKey
+	 */
+	public async getLiquidateSpotWithSwapIx({
+		liabilityMarketIndex,
+		assetMarketIndex,
+		swapAmount: swapAmount,
+		assetTokenAccount,
+		liabilityTokenAccount,
+		userAccount,
+		userAccountPublicKey,
+		userStatsAccountPublicKey,
+		liquidatorSubAccountId,
+	}: {
+		liabilityMarketIndex: number;
+		assetMarketIndex: number;
+		swapAmount: BN;
+		assetTokenAccount: PublicKey;
+		liabilityTokenAccount: PublicKey;
+		userAccount: UserAccount;
+		userAccountPublicKey: PublicKey;
+		userStatsAccountPublicKey: PublicKey;
+		liquidatorSubAccountId?: number;
+	}): Promise<{
+		beginSwapIx: TransactionInstruction;
+		endSwapIx: TransactionInstruction;
+	}> {
+		const liquidatorAccountPublicKey = await this.getUserAccountPublicKey(
+			liquidatorSubAccountId
+		);
+		const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+
+		const userAccounts = [userAccount];
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts,
+			writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
+			readableSpotMarketIndexes: [QUOTE_SPOT_MARKET_INDEX],
+		});
+
+		const liabilitySpotMarket = this.getSpotMarketAccount(liabilityMarketIndex);
+		const assetSpotMarket = this.getSpotMarketAccount(assetMarketIndex);
+
+		const liabilityTokenProgram =
+			this.getTokenProgramForSpotMarket(liabilitySpotMarket);
+		const assetTokenProgram =
+			this.getTokenProgramForSpotMarket(assetSpotMarket);
+
+		if (!liabilityTokenProgram.equals(assetTokenProgram)) {
+			remainingAccounts.push({
+				pubkey: liabilityTokenProgram,
+				isWritable: false,
+				isSigner: false,
+			});
+		}
+
+		if (
+			liabilitySpotMarket.tokenProgram === 1 ||
+			assetSpotMarket.tokenProgram === 1
+		) {
+			remainingAccounts.push({
+				pubkey: assetSpotMarket.mint,
+				isWritable: false,
+				isSigner: false,
+			});
+			remainingAccounts.push({
+				pubkey: liabilitySpotMarket.mint,
+				isWritable: false,
+				isSigner: false,
+			});
+		}
+
+		const beginSwapIx =
+			await this.program.instruction.liquidateSpotWithSwapBegin(
+				assetMarketIndex,
+				liabilityMarketIndex,
+				swapAmount,
+				{
+					accounts: {
+						state: await this.getStatePublicKey(),
+						user: userAccountPublicKey,
+						userStats: userStatsAccountPublicKey,
+						liquidator: liquidatorAccountPublicKey,
+						liquidatorStats: liquidatorStatsPublicKey,
+						authority: this.wallet.publicKey,
+						liabilitySpotMarketVault: liabilitySpotMarket.vault,
+						assetSpotMarketVault: assetSpotMarket.vault,
+						assetTokenAccount: assetTokenAccount,
+						liabilityTokenAccount: liabilityTokenAccount,
+						tokenProgram: assetTokenProgram,
+						driftSigner: this.getStateAccount().signer,
+						instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+					},
+					remainingAccounts,
+				}
+			);
+
+		const endSwapIx = await this.program.instruction.liquidateSpotWithSwapEnd(
+			assetMarketIndex,
+			liabilityMarketIndex,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user: userAccountPublicKey,
+					userStats: userStatsAccountPublicKey,
+					liquidator: liquidatorAccountPublicKey,
+					liquidatorStats: liquidatorStatsPublicKey,
+					authority: this.wallet.publicKey,
+					liabilitySpotMarketVault: liabilitySpotMarket.vault,
+					assetSpotMarketVault: assetSpotMarket.vault,
+					assetTokenAccount: assetTokenAccount,
+					liabilityTokenAccount: liabilityTokenAccount,
+					tokenProgram: assetTokenProgram,
+					driftSigner: this.getStateAccount().signer,
+					instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+				},
+				remainingAccounts,
+			}
+		);
+
+		return { beginSwapIx, endSwapIx };
+	}
+
 	public async liquidateBorrowForPerpPnl(
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,

package/src/idl/drift.json

@@ -2279,6 +2279,176 @@
         }
       ]
     },
+    {
+      "name": "liquidateSpotWithSwapBegin",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "liquidator",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "liquidatorStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "liabilitySpotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "assetSpotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "liabilityTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "assetTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "driftSigner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "instructions",
+          "isMut": false,
+          "isSigner": false,
+          "docs": [
+            "Instructions Sysvar for instruction introspection"
+          ]
+        }
+      ],
+      "args": [
+        {
+          "name": "assetMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "liabilityMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "swapAmount",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "liquidateSpotWithSwapEnd",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "liquidator",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "liquidatorStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "liabilitySpotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "assetSpotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "liabilityTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "assetTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "driftSigner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "instructions",
+          "isMut": false,
+          "isSigner": false,
+          "docs": [
+            "Instructions Sysvar for instruction introspection"
+          ]
+        }
+      ],
+      "args": [
+        {
+          "name": "assetMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "liabilityMarketIndex",
+          "type": "u16"
+        }
+      ]
+    },
     {
       "name": "liquidateBorrowForPerpPnl",
       "accounts": [
@@ -6111,7 +6281,7 @@
         {
           "name": "fuelBoostDeposits",
           "type": {
-            "option": "u32"
+            "option": "i32"
           }
         },
         {
@@ -14475,6 +14645,11 @@
       "code": 6307,
       "name": "PythLazerMessagePriceFeedMismatch",
       "msg": "Pyth lazer message does not correspond to correct fed id"
+    },
+    {
+      "code": 6308,
+      "name": "InvalidLiquidateSpotWithSwap",
+      "msg": "InvalidLiquidateSpotWithSwap"
     }
   ]
 }