@carrot-protocol/clend-rpc 0.1.26-p-withdraw-dev-e12dfc4 → 0.1.27-group-refactor1-dev-5488543

package/dist/rpc.js

@@ -12,13 +12,12 @@ const utils_1 = require("./utils");
 const addresses_1 = require("./addresses");
 const state_1 = require("./state");
 const clend_common_1 = require("@carrot-protocol/clend-common");
-const jupiterUtils_1 = require("./jupiterUtils");
-const api_1 = require("@jup-ag/api");
+const swapper_1 = require("./swapper");
 const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
 const events_1 = require("./events");
 const marginfi_1 = require("./integrations/marginfi");
 class ClendClient {
-    constructor(connection, wallet, skipPreflight, cuFeeInMicroLamports, jupiterUtils, dryRun, mintOracleMapping) {
+    constructor(connection, wallet, skipPreflight, cuFeeInMicroLamports, defaultSwapper, dryRun, mintOracleMapping) {
         this.provider = new anchor_1.AnchorProvider(connection, wallet, {
             commitment: "processed",
             skipPreflight,
@@ -26,7 +25,7 @@ class ClendClient {
         this.connection = connection;
         this.instructions = new instructions_1.Instructions(this.provider);
         this.events = new events_1.ClendEvents(connection);
-        this.jupiterUtils = jupiterUtils || new jupiterUtils_1.JupiterUtils();
+        this.swapper = defaultSwapper || new swapper_1.JupiterSwapper();
         this.dryRun = dryRun || false;
         this.cuFeeInMicroLamports = cuFeeInMicroLamports;
         this.mintOracleMapping = mintOracleMapping || state_1.DEFAULT_ORACLE_MAP;
@@ -34,16 +33,25 @@ class ClendClient {
     address() {
         return this.provider.wallet.publicKey;
     }
-    /**
-     * Get Jupiter price for a token pair
-     */
-    async getJupiterPrice(mint) {
-        return this.jupiterUtils.getJupiterPrice(mint);
+    // determine type of oracle then fetch price from mint
+    // TODO: do it better than this hack
+    async getOraclePrice(mint) {
+        try {
+            return await this.getPythOraclePrice(mint);
+        }
+        catch (e) {
+            try {
+                return await this.getSBOraclePrice(mint);
+            }
+            catch (sbError) {
+                throw sbError;
+            }
+        }
     }
     /**
      * Get pyth oracle price for a token
      */
-    async getOraclePrice(mint) {
+    async getPythOraclePrice(mint) {
         const oracle = this.getOracle(mint);
         // get oracle account info
         const oracleAccountInfo = await this.connection.getAccountInfo(oracle, {
@@ -62,9 +70,34 @@ class ClendClient {
         // get ema price
         const emaPrice = new anchor_1.BN(oracleData.priceMessage.emaPrice);
         // return price
-        return (emaPrice.toNumber() *
-            Math.pow(10, Number(oracleData.priceMessage.exponent)));
+        return (0, utils_1.calculatePriceUi)(emaPrice.toNumber(), oracleData.priceMessage.exponent);
     }
+    async getSBOraclePrice(mint) {
+        const oracle = this.getOracle(mint);
+        // Fetch the raw account info.
+        const feedAccountInfo = await this.connection.getAccountInfo(oracle, "processed");
+        if (feedAccountInfo === null) {
+            throw new Error(`Feed account ${oracle.toString()} not found.`);
+        }
+        // Use our manual parser instead of the Anchor coder.
+        const pullFeedAccountData = (0, utils_1.parsePullFeedAccountData)(feedAccountInfo.data);
+        if (!pullFeedAccountData ||
+            !pullFeedAccountData.submissions ||
+            pullFeedAccountData.submissions.length === 0) {
+            throw new Error(`No valid submissions found for feed ${oracle.toString()}.`);
+        }
+        // The latest submission will be the first element after sorting.
+        const latestSubmission = pullFeedAccountData.submissions[0];
+        // The 'value' is a BN (BigNumber), so we convert it to a standard JavaScript number.
+        // Be aware of potential precision loss if the number is larger than Number.MAX_SAFE_INTEGER.
+        const price = new decimal_js_1.default(latestSubmission.value.toString());
+        // The exponent for Switchboard v2/v3 feeds is typically -18, but you should
+        // confirm this for the specific feed you are using.
+        const exponent = -18;
+        const priceDecimal = (0, utils_1.calculatePriceUiDecimal)(price, exponent);
+        return priceDecimal;
+    }
+    // find oracle for a mint from in memory cache
     getOracle(mint) {
         const oracleStr = this.mintOracleMapping.get(mint.toString());
         if (!oracleStr) {
@@ -72,18 +105,6 @@ class ClendClient {
         }
         return new anchor_1.web3.PublicKey(oracleStr);
     }
-    /**
-     * Get Jupiter quote for a swap
-     */
-    async getJupiterQuote(inputMint, outputMint, inputMintDecimals, outputMintDecimals, inputAmountLamports, slippageBps, swapMode) {
-        return this.jupiterUtils.getJupiterQuote(inputMint, outputMint, inputMintDecimals, outputMintDecimals, inputAmountLamports, slippageBps, swapMode);
-    }
-    /**
-     * Get Jupiter swap instructions
-     */
-    async getJupiterSwap(payer, inputs, quote) {
-        return this.jupiterUtils.getJupiterSwap(payer, inputs, quote);
-    }
     async send(ixns, additionalSigners = [], additionalLuts = []) {
         const cuPriorityFeeIx = anchor_1.web3.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: this.cuFeeInMicroLamports,
@@ -176,11 +197,11 @@ class ClendClient {
         return this.send([initIx]);
     }
     // Bank Operations
-    async addBank(clendGroup, bankMint, pythOracle, pythOracleFeedId, bankConfig, interestRateConfig) {
+    async addBank(clendGroup, bankMint, oracleSetupArgs, bankConfig, interestRateConfig) {
         const tokenProgram = (0, utils_1.getTokenProgramForMint)(bankMint);
         const feeStateAccountData = await this.getFeeState();
         const globalFeeWallet = feeStateAccountData.globalFeeWallet;
-        const { bank, ixns } = await this.instructions.addBank(clendGroup, this.address(), globalFeeWallet, bankMint, tokenProgram, pythOracle, pythOracleFeedId, bankConfig, interestRateConfig);
+        const { bank, ixns } = await this.instructions.addBank(clendGroup, this.address(), globalFeeWallet, bankMint, tokenProgram, oracleSetupArgs, bankConfig, interestRateConfig);
         const txSig = await this.send(ixns);
         return { bank, txSig };
     }
@@ -511,9 +532,10 @@ class ClendClient {
         const ix = await this.instructions.resetBankFees(bankData.group, this.address(), bank);
         return this.send([ix]);
     }
-    async liquidateClendAccountWithFlashLoan(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, marginfiLiabFlashLoanBank, liquidatorMarginfiAccount, additionalIxnCount) {
+    async liquidateClendAccountWithFlashLoan(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, marginfiLiabFlashLoanBank, liquidatorMarginfiAccount, additionalIxnCount, // used to calculate the end flash loan index
+    swapperOverride) {
         // create instructions
-        const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps);
+        const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride);
         if (!result) {
             return;
         }
@@ -546,8 +568,8 @@ class ClendClient {
         ];
         return this.send(ixns, [], luts);
     }
-    async liquidateClendAccount(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps) {
-        const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps);
+    async liquidateClendAccount(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride) {
+        const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride);
         if (!result) {
             return;
         }
@@ -572,7 +594,12 @@ class ClendClient {
      * Must be <= 0.
      * returns: instructions, luts, deposit amount (libaility token)
      */
-    async getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps) {
+    async getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride) {
+        let activeSwapper = this.swapper;
+        // override swapper if provided
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         utils_1.logger.info("Starting liquidation calculation", {
             liquidatee: liquidateeClendAccount.authority.toString(),
             liquidator: liquidatorClendAccount.authority.toString(),
@@ -691,30 +718,32 @@ class ClendClient {
         // just withdraw the liquidated amount
         // balance for the asset
         const withdrawAssetIx = await this.instructions.withdraw(assetBankData.group, liquidatorClendAccount.key, liquidatorClendAccount.authority, assetBankData.key, liquidatorAssetAta, assetTokenProgram, finalAssetAmount, false, remainingAccounts);
-        // create jupiter swap asset for debt
-        const swapQuote = await this.getJupiterQuote(assetBankData.mint, liabBankData.mint, assetBankData.mintDecimals, liabBankData.mintDecimals, new decimal_js_1.default(finalAssetAmount.toString()), // Swap asset received from liquidation
-        slippageBps, api_1.SwapMode.ExactIn);
-        const outAmountMin = new anchor_1.BN(swapQuote.quoteResponse.otherAmountThreshold);
+        // get a swap quote
+        const swapQuote = await activeSwapper.getQuote({
+            payer: liquidatorClendAccount.authority,
+            inputMint: assetBankData.mint,
+            inputMintDecimals: assetBankData.mintDecimals,
+            outputMint: liabBankData.mint,
+            outputMintDecimals: liabBankData.mintDecimals,
+            inputAmount: finalAssetAmount,
+            slippageBps,
+            swapMode: "ExactIn",
+        });
+        const outAmountMin = swapQuote.otherAmountThreshold;
         utils_1.logger.debug("liquidateClendAccount: Jupiter swapQuote for total amount", {
-            inAmount: swapQuote.quoteResponse.inAmount,
-            outAmount: swapQuote.quoteResponse.outAmount,
+            inAmount: swapQuote.inAmount.toString(10),
+            outAmount: swapQuote.outAmount.toString(10),
             outAmountMin: outAmountMin.toString(10),
-            priceImpactPct: swapQuote.quoteResponse.priceImpactPct,
         });
         // 5. Get Swap Instructions from Jupiter
-        const swapInputs = {
-            inputAmountLamports: new decimal_js_1.default(finalAssetAmount.toString()),
-            inputMint: assetBankData.mint,
-            outputMint: liabBankData.mint,
-        };
-        const jupiterSwapIxs = await this.getJupiterSwap(this.address(), swapInputs, swapQuote);
+        const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
         const ixns = [
             depositIx, // deposit liability mint into liquidator clend account
             liquidationIx, // liquidate liquidatee clend account
             withdrawAssetIx, // withdraw liquidated asset from liquidator clend account
-            ...jupiterSwapIxs.swapIxs, // swap liquidated asset for liability mint
+            ...swapIxns.ixns, // swap liquidated asset for liability mint
         ];
-        return { ixns, luts: jupiterSwapIxs.lookupTables, depositAmount };
+        return { ixns, luts: swapIxns.luts, depositAmount };
     }
     async configureBankInterestRate(bank, interestRateConfig) {
         const bankData = await this.getBank(bank);
@@ -748,28 +777,28 @@ class ClendClient {
     }
     async configureBankOracle(bank, pythOracle, pythOracleFeed) {
         const bankData = await this.getBank(bank);
-        const ix = await this.instructions.configureBankOracle(bankData.group, this.address(), bank, pythOracle, pythOracleFeed);
+        const ix = await this.instructions.configureBankPythOracle(bankData.group, this.address(), bank, pythOracle, pythOracleFeed);
         return this.send([ix]);
     }
     async setBankOperationalState(clendGroup, bank, operationalState) {
         const ix = await this.instructions.setBankOperationalState(clendGroup, this.address(), bank, operationalState);
         return this.send([ix]);
     }
-    async depositLeverage(clendGroup, clendAccount, selectedMint, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps) {
+    async depositLeverage(clendGroup, clendAccount, selectedMint, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps, swapperOverride) {
         let ixns = [];
         let luts = [];
         let additionalSigners = [];
         switch (selectedMint.toString()) {
             case collateralMint.toString():
                 const collateralParams = await this.getDepositLeverageFromCollateralParams(clendGroup, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps);
-                const { ixns: collateralIxns, luts: collateralLuts, additionalSigners: collateralAdditionalSigners, } = await this.getDepositLeverageFromCollateralIxns(clendGroup, this.address(), clendAccount, collateralMint, debtMint, collateralParams.collateralBankData.mintDecimals, collateralParams.debtBankData.mintDecimals, collateralParams.borrowAmount, depositAmount, slippageBps, 0);
+                const { ixns: collateralIxns, luts: collateralLuts, additionalSigners: collateralAdditionalSigners, } = await this.getDepositLeverageFromCollateralIxns(clendGroup, this.address(), clendAccount, collateralMint, debtMint, collateralParams.collateralBankData.mintDecimals, collateralParams.debtBankData.mintDecimals, collateralParams.borrowAmount, depositAmount, slippageBps, 0, swapperOverride);
                 ixns = collateralIxns;
                 luts = collateralLuts;
                 additionalSigners = collateralAdditionalSigners;
                 break;
             case debtMint.toString():
-                const debtParams = await this.getDepositLeverageFromDebtParams(clendGroup, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps);
-                const { ixns: debtIxns, luts: debtLuts, additionalSigners: debtAdditionalSigners, } = await this.getDepositLeverageFromDebtIxns(clendGroup, this.address(), clendAccount, collateralMint, debtMint, debtParams.debtBankData.mintDecimals, debtParams.collateralBankData.mintDecimals, depositAmount, debtParams.borrowAmount, slippageBps, 0);
+                const debtParams = await this.getDepositLeverageFromDebtParams(clendGroup, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps, swapperOverride);
+                const { ixns: debtIxns, luts: debtLuts, additionalSigners: debtAdditionalSigners, } = await this.getDepositLeverageFromDebtIxns(clendGroup, this.address(), clendAccount, collateralMint, debtMint, debtParams.debtBankData.mintDecimals, debtParams.collateralBankData.mintDecimals, depositAmount, debtParams.borrowAmount, slippageBps, 0, swapperOverride);
                 ixns = debtIxns;
                 luts = debtLuts;
                 additionalSigners = debtAdditionalSigners;
@@ -781,7 +810,13 @@ class ClendClient {
     }
     async getDepositLeverageFromDebtIxns(clendGroup, user, clendAccount, collateralMint, // e.g., JLP
     debtMint, // e.g., USDC
-    debtMintDecimals, collateralMintDecimals, initialUserDebtContributionForSwap, finalLoopBorrowAmount, slippageBps, additionalIxnCount) {
+    debtMintDecimals, collateralMintDecimals, initialUserDebtContributionForSwap, finalLoopBorrowAmount, slippageBps, additionalIxnCount, // For JIT liquidity, etc.
+    swapperOverride) {
+        // override swapper if provided
+        let activeSwapper = this.swapper;
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         const collateralTokenProgram = (0, utils_1.getTokenProgramForMint)(collateralMint);
         const debtTokenProgram = (0, utils_1.getTokenProgramForMint)(debtMint);
         const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
@@ -820,31 +855,31 @@ class ClendClient {
         // 2. Calculate Total Debt Token for Swap
         const totalDebtTokenForSwap = initialUserDebtContributionForSwap.add(finalLoopBorrowAmount);
         // 3. Get Jupiter Quote for the TOTAL debt token amount
-        const swapMode = api_1.SwapMode.ExactIn;
-        const swapQuote = await this.getJupiterQuote(debtMint, // Input: Total Debt Token (USDC)
-        collateralMint, // Output: Collateral Token (JLP)
-        debtMintDecimals, collateralMintDecimals, new decimal_js_1.default(totalDebtTokenForSwap.toString()), // Swap the combined amount
-        slippageBps, swapMode);
+        const swapMode = "ExactIn";
+        const swapQuote = await activeSwapper.getQuote({
+            payer: user,
+            inputMint: debtMint,
+            inputMintDecimals: debtMintDecimals,
+            outputMint: collateralMint,
+            outputMintDecimals: collateralMintDecimals,
+            inputAmount: totalDebtTokenForSwap,
+            slippageBps,
+            swapMode,
+        });
         utils_1.logger.debug("getDepositLeverageFromDebtIxns: Jupiter swapQuote for total amount", {
-            inAmount: swapQuote.quoteResponse.inAmount, // Should match totalDebtTokenForSwap
-            outAmount: swapQuote.quoteResponse.outAmount, // This is the gross JLP output
-            otherAmountThreshold: swapQuote.quoteResponse.otherAmountThreshold, // Min JLP
-            priceImpactPct: swapQuote.quoteResponse.priceImpactPct,
+            inAmount: swapQuote.inAmount, // Should match totalDebtTokenForSwap
+            outAmount: swapQuote.outAmount, // This is the gross JLP output
+            otherAmountThreshold: swapQuote.otherAmountThreshold, // Min JLP
         });
         // Ensure the expectedCollateralOutAmount (passed in) is consistent with the quote's minimum
         // This serves as a sanity check; the instruction should use the quote's threshold.
         // deposit up to amount == true as well
-        const optimisticCollateralFromQuote = new anchor_1.BN(swapQuote.quoteResponse.outAmount);
+        const optimisticCollateralFromQuote = new anchor_1.BN(swapQuote.outAmount);
         // 4. Get User ATAs
         const userDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, user, true, debtTokenProgram);
         const userCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, user, true, collateralTokenProgram);
         // 5. Get Swap Instructions from Jupiter
-        const swapInputs = {
-            inputAmountLamports: new decimal_js_1.default(totalDebtTokenForSwap.toString()),
-            inputMint: debtMint,
-            outputMint: collateralMint,
-        };
-        const jupiterSwapIxs = await this.getJupiterSwap(user, swapInputs, swapQuote);
+        const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
         // 6. Create Clend Protocol Instructions
         const borrowIx = await this.instructions.borrow(clendGroup, clendAccount, // clendAccount is guaranteed to be non-null here
         user, debtBank, userDebtAta, // Borrow into user's ATA
@@ -858,7 +893,7 @@ class ClendClient {
         // Order: Borrow additional debt, then swap combined debt, then deposit resulting collateral
         const ixnsWithoutFlashLoan = [
             borrowIx,
-            ...jupiterSwapIxs.swapIxs,
+            ...swapIxns.ixns,
             depositIx,
         ];
         // 8. Wrap in Flash Loan
@@ -883,21 +918,41 @@ class ClendClient {
             ...ixnsWithoutFlashLoan,
             endFlashLoanIx,
         ];
-        return { ixns, luts: jupiterSwapIxs.lookupTables, additionalSigners };
+        return {
+            clendAccount,
+            ixns,
+            luts: swapIxns.luts,
+            additionalSigners,
+        };
     }
-    async getDepositLeverageFromCollateralIxns(clendGroup, user, clendAccount, collateralMint, debtMint, debtMintDecimals, collateralMintDecimals, borrowAmount, depositAmount, slippageBps, additionalIxnCount) {
+    async getDepositLeverageFromCollateralIxns(clendGroup, user, clendAccount, collateralMint, debtMint, debtMintDecimals, collateralMintDecimals, borrowAmount, depositAmount, slippageBps, additionalIxnCount, // used to correctly offset the flash loan index
+    swapperOverride) {
+        // override swapper if provided
+        let activeSwapper = this.swapper;
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         // Get token programs
         const collateralTokenProgram = (0, utils_1.getTokenProgramForMint)(collateralMint);
         const debtTokenProgram = (0, utils_1.getTokenProgramForMint)(debtMint);
         const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
         const collateralBank = (0, addresses_1.getBankPda)(clendGroup, collateralMint);
         // Get Jupiter quote for swapping debt token to collateral token
-        const swapMode = api_1.SwapMode.ExactIn;
-        const swapQuote = await this.getJupiterQuote(debtMint, collateralMint, debtMintDecimals, collateralMintDecimals, new decimal_js_1.default(borrowAmount.toString()), slippageBps, swapMode);
+        const swapMode = "ExactIn";
+        const swapQuote = await activeSwapper.getQuote({
+            payer: user,
+            inputMint: debtMint,
+            inputMintDecimals: debtMintDecimals,
+            outputMint: collateralMint,
+            outputMintDecimals: collateralMintDecimals,
+            inputAmount: borrowAmount,
+            slippageBps,
+            swapMode,
+        });
         utils_1.logger.debug("depositLeverage swapQuote", {
-            inAmount: swapQuote.quoteResponse.inAmount,
-            outAmount: swapQuote.quoteResponse.outAmount,
-            priceImpactPct: swapQuote.quoteResponse.priceImpactPct,
+            inAmount: swapQuote.inAmount.toString(10),
+            outAmount: swapQuote.outAmount.toString(10),
+            otherAmountThreshold: swapQuote.otherAmountThreshold.toString(10),
         });
         let activeBanks = [];
         const additionalSigners = [];
@@ -936,14 +991,9 @@ class ClendClient {
         }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
         // Get swap instructions
-        const swapInputs = {
-            inputAmountLamports: new decimal_js_1.default(borrowAmount.toString()),
-            inputMint: debtMint,
-            outputMint: collateralMint,
-        };
-        const swapIxs = await this.getJupiterSwap(user, swapInputs, swapQuote);
+        const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
         // Calculate additional collateral from swap
-        const additionalCollateralAmount = new anchor_1.BN(swapQuote.quoteResponse.outAmount);
+        const additionalCollateralAmount = swapQuote.outAmount;
         const totalCollateralAmount = depositAmount.add(additionalCollateralAmount);
         const userDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, user, true, debtTokenProgram);
         const userCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, user, true, collateralTokenProgram);
@@ -955,7 +1005,7 @@ class ClendClient {
         // add lending and swap instructions
         const ixnsWithoutFlashLoan = [
             borrowIx,
-            ...swapIxs.swapIxs,
+            ...swapIxns.ixns,
             depositIx,
         ];
         // If the clend account is being created, we need to add 1 to the endIndex
@@ -979,7 +1029,12 @@ class ClendClient {
             ...ixnsWithoutFlashLoan,
             endFlashLoanIx,
         ];
-        return { ixns, luts: swapIxs.lookupTables, additionalSigners };
+        return {
+            clendAccount,
+            ixns,
+            luts: swapIxns.luts,
+            additionalSigners,
+        };
     }
     async getDepositLeverageFromCollateralParams(clendGroup, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps) {
         // Get decimals
@@ -1052,7 +1107,12 @@ class ClendClient {
     async getDepositLeverageFromDebtParams(clendGroup, collateralMint, // The asset being leveraged (e.g., JLP)
     debtMint, // The asset provided initially by the user (e.g., USDC)
     initialUserDebtContributionForSwap, // User's initial DEBT token for the swap
-    targetLeverage, slippageBps) {
+    targetLeverage, slippageBps, swapperOverride) {
+        // override swapper if provided
+        let activeSwapper = this.swapper;
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         // 1. Get decimals and bank data
         const collateralDecimals = (0, utils_1.getTokenDecimalsForMint)(collateralMint);
         const debtDecimals = (0, utils_1.getTokenDecimalsForMint)(debtMint);
@@ -1083,12 +1143,18 @@ class ClendClient {
         // This is the user's initial contribution + what's borrowed from the protocol
         const totalDebtTokenForSwap = initialUserDebtContributionForSwap.add(finalLoopBorrowAmount);
         // 7. Calculate Expected COLLATERAL Output from swapping the total DEBT token amount
-        const swapQuote = await this.getJupiterQuote(debtMint, // Input: Total DEBT token (user's initial + borrowed from loop)
-        collateralMint, // Output: COLLATERAL token
-        debtDecimals, collateralDecimals, new decimal_js_1.default(totalDebtTokenForSwap.toString()), // Use the sum for the swap
-        slippageBps, api_1.SwapMode.ExactIn);
+        const swapQuote = await activeSwapper.getQuote({
+            payer: anchor_1.web3.PublicKey.default, // doesnt matter right now
+            inputMint: debtMint,
+            inputMintDecimals: debtDecimals,
+            outputMint: collateralMint,
+            outputMintDecimals: collateralDecimals,
+            inputAmount: totalDebtTokenForSwap,
+            slippageBps,
+            swapMode: "ExactIn",
+        });
         // Use the minimum amount threshold from the quote for safety in the final deposit instruction
-        const expectedCollateralOutAmount = new anchor_1.BN(swapQuote.quoteResponse.otherAmountThreshold);
+        const expectedCollateralOutAmount = new anchor_1.BN(swapQuote.otherAmountThreshold);
         // --- Logging ---
         const finalLoopBorrowAmountUi = (0, clend_common_1.amountToUi)(finalLoopBorrowAmount, debtDecimals);
         const totalDebtTokenForSwapUi = (0, clend_common_1.amountToUi)(totalDebtTokenForSwap, debtDecimals);
@@ -1117,19 +1183,19 @@ class ClendClient {
             collateralBankData,
         };
     }
-    async withdrawLeverage(clendGroup, clendAccount, selectedMint, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps) {
+    async withdrawLeverage(clendGroup, clendAccount, selectedMint, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps, swapperOverride) {
         let ixns = [];
         let luts = [];
         switch (selectedMint.toString()) {
             case collateralMint.toString():
-                const collateralParams = await this.getNetWithdrawLeverageCollateralParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps);
-                const { ixns: collateralIxns, luts: collateralLuts } = await this.getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralParams.collateralBankData.mintDecimals, collateralParams.debtBankData.mintDecimals, withdrawAll, collateralParams.debtToRepay, collateralParams.collateralToWithdraw, slippageBps, 0);
+                const collateralParams = await this.getNetWithdrawLeverageCollateralParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps, swapperOverride);
+                const { ixns: collateralIxns, luts: collateralLuts } = await this.getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralParams.collateralBankData.mintDecimals, collateralParams.debtBankData.mintDecimals, withdrawAll, collateralParams.debtToRepay, collateralParams.collateralToWithdraw, slippageBps, 0, swapperOverride);
                 ixns = collateralIxns;
                 luts = collateralLuts;
                 break;
             case debtMint.toString():
-                const debtParams = await this.getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps);
-                const { ixns: debtIxns, luts: debtLuts } = await this.getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, debtParams.collateralBankData.mintDecimals, debtParams.debtBankData.mintDecimals, withdrawAll, debtParams.debtToRepay, debtParams.collateralToWithdraw, withdrawAmount, slippageBps, 0);
+                const debtParams = await this.getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps, swapperOverride);
+                const { ixns: debtIxns, luts: debtLuts } = await this.getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, debtParams.collateralBankData.mintDecimals, debtParams.debtBankData.mintDecimals, withdrawAll, debtParams.debtToRepay, debtParams.collateralToWithdraw, withdrawAmount, slippageBps, 0, swapperOverride);
                 ixns = debtIxns;
                 luts = debtLuts;
                 break;
@@ -1139,7 +1205,12 @@ class ClendClient {
         // Send transaction
         return this.send(ixns, [], luts);
     }
-    async getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount) {
+    async getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride) {
+        // override swapper if provided
+        let activeSwapper = this.swapper;
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
         const collateralBank = (0, addresses_1.getBankPda)(clendGroup, collateralMint);
         // Get remaining accounts for flash loan
@@ -1155,10 +1226,19 @@ class ClendClient {
         }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
         // Get Jupiter quote for swapping collateral to debt token (ExactOut mode)
-        const swapMode = api_1.SwapMode.ExactOut;
-        const swapQuote = await this.getJupiterQuote(collateralMint, debtMint, collateralDecimals, debtDecimals, new decimal_js_1.default(debtToRepay.toString()), slippageBps, swapMode);
+        const swapMode = "ExactOut";
+        const swapQuote = await activeSwapper.getQuote({
+            payer: clendAccountData.authority,
+            inputMint: collateralMint,
+            inputMintDecimals: collateralDecimals,
+            outputMint: debtMint,
+            outputMintDecimals: debtDecimals,
+            inputAmount: debtToRepay,
+            slippageBps,
+            swapMode,
+        });
         // set collateralToSwap to the inAmount from the swap quote
-        const collateralToSwap = swapQuote.quoteResponse.inAmount;
+        const collateralToSwap = swapQuote.inAmount;
         utils_1.logger.debug("withdrawLeverage collateralToSwap", {
             collateralToSwap,
         });
@@ -1171,7 +1251,7 @@ class ClendClient {
         utils_1.logger.debug("withdrawLeverage swapInputs", {
             swapInputs,
         });
-        const swapIxs = await this.getJupiterSwap(clendAccountData.authority, swapInputs, swapQuote);
+        const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
         utils_1.logger.info(`swapIxns fetched`);
         const collateralTokenProgram = (0, utils_1.getTokenProgramForMint)(collateralMint);
         const debtTokenProgram = (0, utils_1.getTokenProgramForMint)(debtMint);
@@ -1187,7 +1267,7 @@ class ClendClient {
         // Assemble all instructions without flash loan
         const ixnsWithoutFlashLoan = [
             withdrawIx,
-            ...swapIxs.swapIxs,
+            ...swapIxns.ixns,
             repayIx,
         ];
         utils_1.logger.info(`ixnsWithoutFlashLoan set`);
@@ -1201,9 +1281,14 @@ class ClendClient {
             ...ixnsWithoutFlashLoan,
             endFlashLoanIx,
         ];
-        return { ixns: instructions, luts: swapIxs.lookupTables };
+        return { ixns: instructions, luts: swapIxns.luts };
     }
-    async getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, desiredNetDebtToReceive, slippageBps, additionalIxnCount) {
+    async getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, desiredNetDebtToReceive, slippageBps, additionalIxnCount, swapperOverride) {
+        // override swapper if provided
+        let activeSwapper = this.swapper;
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
         const collateralBank = (0, addresses_1.getBankPda)(clendGroup, collateralMint);
         const clendAccountData = await this.getClendAccount(clendAccount);
@@ -1221,24 +1306,26 @@ class ClendClient {
         // 1. Determine Total USDC Needed from the Swap
         // This is the amount needed to repay Clend's debt AND give the user their desired net withdrawal.
         const totalDebtToReceive = debtToRepay.add(desiredNetDebtToReceive);
-        const swapMode = api_1.SwapMode.ExactIn;
-        const swapQuote = await this.getJupiterQuote(collateralMint, debtMint, collateralDecimals, debtDecimals, new decimal_js_1.default(collateralToWithdraw.toString()), // amount to swap
-        slippageBps, swapMode);
-        const minUsdcReceivedFromSwap_BN = new anchor_1.BN(swapQuote.quoteResponse.otherAmountThreshold);
+        const swapMode = "ExactIn";
+        const swapQuote = await activeSwapper.getQuote({
+            payer: clendAccountData.authority,
+            inputMint: collateralMint,
+            inputMintDecimals: collateralDecimals,
+            outputMint: debtMint,
+            outputMintDecimals: debtDecimals,
+            inputAmount: collateralToWithdraw,
+            slippageBps,
+            swapMode,
+        });
+        const minUsdcReceivedFromSwap_BN = new anchor_1.BN(swapQuote.otherAmountThreshold);
         utils_1.logger.debug("getWithdrawLeverageDebtIxns: collateral and debt details", {
             debtToRepay: debtToRepay.toString(),
             desiredNetDebtToReceive: desiredNetDebtToReceive.toString(),
             totalDebtToReceive: totalDebtToReceive.toString(),
             minUsdcReceivedFromSwap_BN: minUsdcReceivedFromSwap_BN.toString(),
         });
-        // 3. Get Swap Instructions from Jupiter
-        // The input for the swap is the total JLP we are withdrawing from Clend.
-        const swapInputs = {
-            inputAmountLamports: new decimal_js_1.default(collateralToWithdraw.toString()),
-            inputMint: collateralMint,
-            outputMint: debtMint,
-        };
-        const jupiterSwapIxs = await this.getJupiterSwap(clendAccountData.authority, swapInputs, swapQuote);
+        // 3. Get Swap Instructions from swapper
+        const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
         utils_1.logger.info(`swapIxns fetched for ReceiveDebtToken`);
         // --- ATAs and Clend Instructions (largely similar structure) ---
         const collateralTokenProgram = (0, utils_1.getTokenProgramForMint)(collateralMint);
@@ -1256,9 +1343,9 @@ class ClendClient {
         // Assemble instructions
         const ixnsWithoutFlashLoan = [
             withdrawIx,
-            ...jupiterSwapIxs.swapIxs, // Swap all withdrawn JLP to USDC
+            ...swapIxns.ixns, // Swap all withdrawn collateral to debt
             repayIx, // Repay the debt portion
-        ]; // User is left with the remaining USDC in their ATA
+        ]; // User is left with the remaining debt in their ATA
         // Flash Loan Wrapping (same as before)
         const cuIxns = 2;
         const endIndex = new anchor_1.BN(cuIxns + ixnsWithoutFlashLoan.length + 1 + additionalIxnCount);
@@ -1268,11 +1355,16 @@ class ClendClient {
             ...ixnsWithoutFlashLoan,
             endFlashLoanIx,
         ];
-        return { ixns: instructions, luts: jupiterSwapIxs.lookupTables };
+        return { ixns: instructions, luts: swapIxns.luts };
     }
     // caller will receive desiredNetWithdraw, the position will be adjusted accordingly
     // receive the collateral mint
-    async getNetWithdrawLeverageCollateralParams(clendGroup, clendAccount, collateralMint, debtMint, desiredNetWithdraw, withdrawAll, slippageBps) {
+    async getNetWithdrawLeverageCollateralParams(clendGroup, clendAccount, collateralMint, debtMint, desiredNetWithdraw, withdrawAll, slippageBps, swapperOverride) {
+        // override swapper if provided
+        let activeSwapper = this.swapper;
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         utils_1.logger.info("getNetWithdrawParams", {
             desiredNetWithdraw: desiredNetWithdraw.toString(),
             withdrawAll,
@@ -1360,11 +1452,17 @@ class ClendClient {
             // --- Step 6: Get a Jupiter Quote for the Swap ---
             // Query Jupiter for an EXACT_OUT swap to find out exactly how much collateral
             // is needed to get the final amount of debt we need to repay.
-            const swapQuote = await this.getJupiterQuote(collateralMint, // From JLP
-            debtMint, // To USDC
-            collateralDecimals, debtDecimals, new decimal_js_1.default(debtToRepay.toString()), // We need this exact amount of USDC
-            slippageBps, api_1.SwapMode.ExactOut);
-            const collateralNeededForSwap = new anchor_1.BN(swapQuote.quoteResponse.inAmount);
+            const swapQuote = await activeSwapper.getQuote({
+                payer: clendAccountData.authority,
+                inputMint: collateralMint,
+                inputMintDecimals: collateralDecimals,
+                outputMint: debtMint,
+                outputMintDecimals: debtDecimals,
+                inputAmount: debtToRepay,
+                slippageBps,
+                swapMode: "ExactOut",
+            });
+            const collateralNeededForSwap = new anchor_1.BN(swapQuote.inAmount);
             // --- Step 7: Calculate the Final Total Collateral to Withdraw ---
             // This is the sum of what the user gets (desiredNetWithdraw) and what the swap needs.
             collateralToWithdraw = desiredNetWithdraw.add(collateralNeededForSwap);
@@ -1386,7 +1484,12 @@ class ClendClient {
     }
     // caller will receive desiredNetWithdraw, the position will be adjusted accordingly
     // receive the debt mint
-    async getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, desiredNetWithdraw, withdrawAll, slippageBps) {
+    async getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, desiredNetWithdraw, withdrawAll, slippageBps, swapperOverride) {
+        // override swapper if provided
+        let activeSwapper = this.swapper;
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         utils_1.logger.info("getNetWithdrawDebtParams", {
             desiredNetWithdraw: desiredNetWithdraw.toString(),
             withdrawAll,
@@ -1466,9 +1569,18 @@ class ClendClient {
             // The total value we need to get from selling JLP is the debt we must repay
             const totalDebtNeededFromSwap = debtToRepay.add(desiredNetWithdraw);
             // Now, find how much collateral is needed to produce this swap via swap
-            const swapQuote = await this.getJupiterQuote(collateralMint, debtMint, collateralDecimals, debtDecimals, new decimal_js_1.default(totalDebtNeededFromSwap.toString()), slippageBps, api_1.SwapMode.ExactOut);
-            // The answer from Jupiter is the total collateral we must withdraw.
-            collateralToWithdraw = new anchor_1.BN(swapQuote.quoteResponse.inAmount);
+            const swapQuote = await activeSwapper.getQuote({
+                payer: clendAccountData.authority,
+                inputMint: collateralMint,
+                inputMintDecimals: collateralDecimals,
+                outputMint: debtMint,
+                outputMintDecimals: debtDecimals,
+                inputAmount: totalDebtNeededFromSwap,
+                slippageBps,
+                swapMode: "ExactOut",
+            });
+            // The answer from swapper is the total collateral we must withdraw.
+            collateralToWithdraw = swapQuote.inAmount;
             // --- Step 4: Final Sanity Check ---
             if (collateralToWithdraw.gt(collateralAmount)) {
                 throw new Error("Total required collateral for withdrawal and swap exceeds the available balance.");
@@ -1485,9 +1597,9 @@ class ClendClient {
             debtBankData,
         };
     }
-    async adjustLeverage(clendGroup, clendAccount, collateralMint, debtMint, targetLeverage, slippageBps) {
+    async adjustLeverage(clendGroup, clendAccount, collateralMint, debtMint, targetLeverage, slippageBps, swapperOverride) {
         const params = await this.getAdjustLeverageParams(clendGroup, clendAccount, collateralMint, debtMint, targetLeverage, slippageBps);
-        const { ixns, luts } = await this.getAdjustLeverageIxns(clendGroup, clendAccount, this.address(), params.debtBankData, params.collateralBankData, params.isIncrease, params.finalDebtDeltaUi, params.finalCollateralDeltaUi, slippageBps, 0);
+        const { ixns, luts } = await this.getAdjustLeverageIxns(clendGroup, clendAccount, this.address(), params.debtBankData, params.collateralBankData, params.isIncrease, params.finalDebtDeltaUi, params.finalCollateralDeltaUi, slippageBps, 0, swapperOverride);
         // Send transaction
         return this.send(ixns, [], luts);
     }
@@ -1695,7 +1807,12 @@ class ClendClient {
      */
     async getAdjustLeverageIxns(clendGroup, clendAccount, user, debtBankData, collateralBankData, isIncrease, finalDebtDeltaUi, // Use the final adjusted value from getAdjustLeverageParams
     finalCollateralDeltaUi, // Use the final adjusted value from getAdjustLeverageParams
-    slippageBps, additionalIxnCount) {
+    slippageBps, additionalIxnCount, swapperOverride) {
+        // override swapper if provided
+        let activeSwapper = this.swapper;
+        if (swapperOverride) {
+            activeSwapper = swapperOverride;
+        }
         const clendAccountData = await this.getClendAccount(clendAccount);
         if (!clendAccountData) {
             throw new Error(`Clend account not found: ${clendAccount.toString()}`);
@@ -1730,34 +1847,37 @@ class ClendClient {
                 additionalDebtAmount: additionalDebtAmount.toString(),
             });
             // Get Jupiter quote for swapping debt token to collateral token (ExactIn)
-            const swapMode = api_1.SwapMode.ExactIn;
-            const swapQuote = await this.getJupiterQuote(debtBankData.mint, collateralBankData.mint, debtBankData.mintDecimals, collateralBankData.mintDecimals, new decimal_js_1.default(additionalDebtAmount.toString()), // Input is the final amount to borrow
-            slippageBps, swapMode);
+            const swapMode = "ExactIn";
+            const swapQuote = await activeSwapper.getQuote({
+                payer: user,
+                inputMint: debtBankData.mint,
+                inputMintDecimals: debtBankData.mintDecimals,
+                outputMint: collateralBankData.mint,
+                outputMintDecimals: collateralBankData.mintDecimals,
+                inputAmount: additionalDebtAmount,
+                slippageBps,
+                swapMode,
+            });
             utils_1.logger.debug("swapQuote calculated (Increase)", {
-                inAmount: swapQuote.quoteResponse.inAmount,
-                outAmount: swapQuote.quoteResponse.outAmount,
-                priceImpactPct: swapQuote.quoteResponse.priceImpactPct,
+                inAmount: swapQuote.inAmount.toString(),
+                outAmount: swapQuote.outAmount.toString(),
+                otherAmountThreshold: swapQuote.otherAmountThreshold.toString(),
             });
             // Get swap instructions
-            const swapInputs = {
-                inputAmountLamports: new decimal_js_1.default(additionalDebtAmount.toString()),
-                inputMint: debtBankData.mint,
-                outputMint: collateralBankData.mint,
-            };
-            const swapIxs = await this.getJupiterSwap(user, swapInputs, swapQuote);
+            const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
             // Borrow the final adjusted debt amount
             const borrowIx = await this.instructions.borrow(clendGroup, clendAccount, user, debtBankData.key, userDebtAta, debtTokenProgram, additionalDebtAmount, // Use final adjusted amount
             remainingAccounts);
             // Calculate additional collateral expected from swap (based on quote)
-            const additionalCollateralAmount = new anchor_1.BN(swapQuote.quoteResponse.outAmount);
+            const additionalCollateralAmount = swapQuote.outAmount;
             utils_1.logger.debug("additionalCollateralAmount expected from swap", {
                 additionalCollateralAmount: additionalCollateralAmount.toString(),
             });
             // Deposit additional collateral received from swap
             const depositIx = await this.instructions.deposit(clendGroup, clendAccount, user, collateralBankData.key, userCollateralAta, collateralTokenProgram, additionalCollateralAmount, // Deposit what the swap provides
             true, remainingAccounts);
-            instructions.push(borrowIx, ...swapIxs.swapIxs, depositIx);
-            swapLookupTables = swapIxs.lookupTables;
+            instructions.push(borrowIx, ...swapIxns.ixns, depositIx);
+            swapLookupTables = swapIxns.luts;
         }
         else {
             // Decreasing Leverage
@@ -1772,22 +1892,24 @@ class ClendClient {
             });
             // Get Jupiter quote for swapping collateral token to debt token (ExactOut)
             // Target the final buffered debt repayment amount
-            const swapMode = api_1.SwapMode.ExactOut;
-            const swapQuote = await this.getJupiterQuote(collateralBankData.mint, debtBankData.mint, collateralBankData.mintDecimals, debtBankData.mintDecimals, new decimal_js_1.default(finalDebtToRepayBN.toString()), // Target output amount
-            slippageBps, swapMode);
-            const estimatedCollateralInput = swapQuote.quoteResponse.inAmount;
+            const swapMode = "ExactOut";
+            const swapQuote = await activeSwapper.getQuote({
+                payer: clendAccountData.authority,
+                inputMint: collateralBankData.mint,
+                inputMintDecimals: collateralBankData.mintDecimals,
+                outputMint: debtBankData.mint,
+                outputMintDecimals: debtBankData.mintDecimals,
+                inputAmount: finalDebtToRepayBN,
+                slippageBps,
+                swapMode,
+            });
+            const estimatedCollateralInput = swapQuote.inAmount;
             utils_1.logger.debug("swapQuote calculated (Decrease)", {
                 targetOutput: finalDebtToRepayBN.toString(),
                 estimatedInput: estimatedCollateralInput,
                 maxInputCalculated: finalCollateralToWithdrawBN.toString(), // Compare Jupiter estimate vs our max calc
-                priceImpactPct: swapQuote.quoteResponse.priceImpactPct,
             });
-            const swapInputs = {
-                inputAmountLamports: new decimal_js_1.default(swapQuote.quoteResponse.inAmount.toString()),
-                inputMint: collateralBankData.mint,
-                outputMint: debtBankData.mint,
-            };
-            const swapIxs = await this.getJupiterSwap(user, swapInputs, swapQuote);
+            const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
             // Withdraw the CALCULATED MAXIMUM collateral needed (includes swap input + buffer)
             const withdrawIx = await this.instructions.withdraw(clendGroup, clendAccount, user, collateralBankData.key, userCollateralAta, collateralTokenProgram, finalCollateralToWithdrawBN, // Use the final adjusted amount from params
             false, // Not withdrawing all
@@ -1796,8 +1918,8 @@ class ClendClient {
             const repayIx = await this.instructions.repay(clendGroup, clendAccount, user, debtBankData.key, userDebtAta, debtTokenProgram, finalDebtToRepayBN, // Use the final adjusted amount from params
             false, // Not repaying all
             remainingAccounts);
-            instructions.push(withdrawIx, ...swapIxs.swapIxs, repayIx);
-            swapLookupTables = swapIxs.lookupTables;
+            instructions.push(withdrawIx, ...swapIxns.ixns, repayIx);
+            swapLookupTables = swapIxns.luts;
         }
         // --- Flash Loan Wrapping ---
         const cuIxns = 2; // Assuming 2 compute budget instructions are added later