@carrot-protocol/clend-rpc 0.1.27-group-refactor1-dev-0a2c078 → 0.1.27-swapper1-dev-0f3d67b

package/dist/rpc.js

@@ -33,25 +33,10 @@ class ClendClient {
     address() {
         return this.provider.wallet.publicKey;
     }
-    // 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 getPythOraclePrice(mint) {
+    async getOraclePrice(mint) {
         const oracle = this.getOracle(mint);
         // get oracle account info
         const oracleAccountInfo = await this.connection.getAccountInfo(oracle, {
@@ -70,34 +55,10 @@ class ClendClient {
         // get ema price
         const emaPrice = new anchor_1.BN(oracleData.priceMessage.emaPrice);
         // return price
-        return (0, utils_1.calculatePriceUi)(emaPrice.toNumber(), oracleData.priceMessage.exponent);
+        return (emaPrice.toNumber() *
+            Math.pow(10, Number(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 = Number(latestSubmission.value);
-        // 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.calculatePriceUi)(price, exponent);
-        return priceDecimal;
-    }
-    // find oracle for a mint from in memory cache
+    // find oracle for a mint
     getOracle(mint) {
         const oracleStr = this.mintOracleMapping.get(mint.toString());
         if (!oracleStr) {
@@ -197,73 +158,14 @@ class ClendClient {
         return this.send([initIx]);
     }
     // Bank Operations
-    async addBank(clendGroup, bankMint, oracleSetupArgs, bankConfig, interestRateConfig) {
+    async addBank(clendGroup, bankMint, pythOracle, pythOracleFeedId, 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, oracleSetupArgs, bankConfig, interestRateConfig);
+        const { bank, ixns } = await this.instructions.addBank(clendGroup, this.address(), globalFeeWallet, bankMint, tokenProgram, pythOracle, pythOracleFeedId, bankConfig, interestRateConfig);
         const txSig = await this.send(ixns);
         return { bank, txSig };
     }
-    async setupBankEmissions(bank, emissionsMint, emissionsMode, emissionsRate, totalEmissions) {
-        // some sanity checks
-        if (totalEmissions.lte(new anchor_1.BN(0))) {
-            throw new Error("totalEmissions must be greater than 0");
-        }
-        if (emissionsRate.lte(new anchor_1.BN(0))) {
-            throw new Error("emissionsRate must be greater than 0");
-        }
-        if (emissionsRate.gt(totalEmissions)) {
-            throw new Error("emissionsRate must be less than totalEmissions");
-        }
-        const bankData = await this.getBank(bank);
-        if (!bankData.emissionsMint.equals(anchor_1.web3.PublicKey.default)) {
-            throw new Error("bank already has emissions mint set");
-        }
-        // fetch token program from chain
-        const emissionsMintTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, emissionsMint);
-        const ixns = await this.instructions.setupBankEmissions(bankData.group, this.address(), bank, emissionsMint, emissionsMintTokenProgram, emissionsMode, emissionsRate, totalEmissions);
-        const txSig = await this.send(ixns);
-        return txSig;
-    }
-    async updateBankEmissions(bank, emissionsMode, emissionsRate, additionalEmissions) {
-        // some sanity checks
-        if (additionalEmissions !== null && additionalEmissions.lte(new anchor_1.BN(0))) {
-            throw new Error("additionalEmissions must be greater than 0");
-        }
-        if (emissionsRate !== null && emissionsRate.lte(new anchor_1.BN(0))) {
-            throw new Error("emissionsRate must be greater than 0");
-        }
-        if (emissionsRate !== null &&
-            additionalEmissions !== null &&
-            emissionsRate.gt(additionalEmissions)) {
-            throw new Error("emissionsRate must be less than additionalEmissions");
-        }
-        const bankData = await this.getBank(bank);
-        // with updateBankEmissions you cannot change the emissions mint
-        const emissionsMint = bankData.emissionsMint;
-        if (emissionsMint.equals(anchor_1.web3.PublicKey.default)) {
-            throw new Error("bank does not have emissions mint set, must call setupBankEmissions first");
-        }
-        const emissionsMintTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, emissionsMint);
-        const ix = await this.instructions.updateBankEmissions(bankData.group, this.address(), bank, emissionsMint, emissionsMintTokenProgram, emissionsMode, emissionsRate, additionalEmissions);
-        const txSig = await this.send([ix]);
-        return txSig;
-    }
-    async withdrawEmissions(clendAccount, bank) {
-        const bankData = await this.getBank(bank);
-        const emissionsMint = bankData.emissionsMint;
-        const mintData = await this.connection.getAccountInfo(emissionsMint, {
-            commitment: "processed",
-        });
-        if (mintData === null) {
-            throw new Error(`emissions mint not found: ${emissionsMint.toString()}`);
-        }
-        const emissionsMintTokenProgram = mintData.owner;
-        const ixns = await this.instructions.withdrawEmissions(bankData.group, clendAccount, this.address(), bank, emissionsMint, emissionsMintTokenProgram);
-        const txSig = await this.send(ixns);
-        return txSig;
-    }
     // Account fetching Operations
     async getClendGroup(clendGroup) {
         const accountInfo = await this.connection.getAccountInfo(clendGroup, {
@@ -338,9 +240,9 @@ class ClendClient {
             collectedGroupFeesOutstanding: Number((0, utils_1.wrappedI80F48toBigNumber)(data.collectedGroupFeesOutstanding)),
             lastUpdate: new anchor_1.BN(data.lastUpdate),
             config: bankConfig,
-            flags: (0, state_1.parseBankFlags)(new anchor_1.BN(data.flags)),
+            flags: new anchor_1.BN(data.flags),
             emissionsRate: new anchor_1.BN(data.emissionsRate),
-            emissionsRemaining: new anchor_1.BN((0, utils_1.wrappedI80F48toBigNumber)(data.emissionsRemaining)),
+            emissionsRemaining: (0, utils_1.wrappedI80F48toBigNumber)(data.emissionsRemaining),
             emissionsMint: new anchor_1.web3.PublicKey(data.emissionsMint),
             collectedProgramFeesOutstanding: Number((0, utils_1.wrappedI80F48toBigNumber)(data.collectedProgramFeesOutstanding)),
             assetAmount,
@@ -393,29 +295,21 @@ class ClendClient {
                 const bankData = await this.getBank(bank);
                 const bankMint = bankData.mint;
                 const price = await this.getOraclePrice(bankMint);
-                const assetShares = Number((0, utils_1.wrappedI80F48toBigNumber)(balance.assetShares));
-                const liabilityShares = Number((0, utils_1.wrappedI80F48toBigNumber)(balance.liabilityShares));
-                const lastUpdate = new anchor_1.BN(balance.lastUpdate);
-                const emissionsOutstanding = new anchor_1.BN((0, utils_1.wrappedI80F48toBigNumber)(balance.emissionsOutstanding));
-                // calculate oustanding emissions
-                const emissionsOutstandingAndUnclaimed = (0, utils_1.calculateUnclaimedEmissions)(new anchor_1.BN(assetShares), new anchor_1.BN(liabilityShares), lastUpdate, emissionsOutstanding, bankData.flags, bankData.assetShareValue, bankData.liabilityShareValue, bankData.emissionsRate, bankData.emissionsRemaining, bankData.mintDecimals);
                 const lendingAccountBalance = (0, state_1.newClendAccountBalance)({
                     active,
                     bankPk: bank,
                     bankMint,
                     bankAssetTag: Number(balance.bankAssetTag),
-                    assetShares,
+                    assetShares: Number((0, utils_1.wrappedI80F48toBigNumber)(balance.assetShares)),
                     assetShareValue: Number(bankData.assetShareValue),
                     assetMintDecimals: Number(bankData.mintDecimals),
-                    liabilityShares,
+                    liabilityShares: Number((0, utils_1.wrappedI80F48toBigNumber)(balance.liabilityShares)),
                     liabilityShareValue: Number(bankData.liabilityShareValue),
                     liabilityMintDecimals: Number(bankData.mintDecimals),
                     lastUpdate: new anchor_1.BN(balance.lastUpdate),
                     assetWeightMaint: Number(bankData.config.assetWeightMaint),
                     liabilityWeightMaint: Number(bankData.config.liabilityWeightMaint),
                     price,
-                    emissionsOutstanding,
-                    emissionsOutstandingAndUnclaimed,
                 });
                 balances.push(lendingAccountBalance);
                 healthFactorWeightedAssetArgs.push(lendingAccountBalance.assetWeightedMaintValue);
@@ -501,6 +395,13 @@ class ClendClient {
         // get required remaining accounts based on account balance
         const clendAccountData = await this.getClendAccount(clendAccount);
         let clendAccountActiveBanks = (0, utils_1.getClendAccountActiveBanks)(clendAccountData);
+        //// If withdrawAll is true, remove the target bank from activeBanks
+        //// as we wont have a remaining balance after the withdraw operation
+        //if (withdrawAll === true) {
+        //  clendAccountActiveBanks = clendAccountActiveBanks.filter(
+        //    (b) => !b.equals(bank),
+        //  );
+        //}
         // fetch all active banks
         const activeBankData = [];
         for (const bank of clendAccountActiveBanks) {
@@ -535,7 +436,7 @@ class ClendClient {
         const ix = await this.instructions.borrow(clendGroup, clendAccount, this.address(), bank, destinationTokenAccount, tokenProgram, amount, remainingAccounts);
         return this.send([ix]);
     }
-    async repay(clendGroup, clendAccount, mint, amount, repayAll, repayUpToAmount) {
+    async repay(clendGroup, clendAccount, mint, amount, repayAll = null) {
         const bank = (0, addresses_1.getBankPda)(clendGroup, mint);
         // Get bank data to access the liquidityVault and mint
         const bankData = await this.getBank(bank);
@@ -551,7 +452,7 @@ class ClendClient {
             activeBankData.push(bankData);
         }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        const ix = await this.instructions.repay(clendGroup, clendAccount, this.address(), bank, userTokenAccount, tokenProgram, amount, repayAll, repayUpToAmount, remainingAccounts);
+        const ix = await this.instructions.repay(clendGroup, clendAccount, this.address(), bank, userTokenAccount, tokenProgram, amount, repayAll, remainingAccounts);
         return this.send([ix]);
     }
     async editGlobalFeeState(clendGroup, newGlobalFeeWallet, newBankInitFlatSolFee, newProgramFeeFixed, newProgramFeeRate) {
@@ -592,10 +493,9 @@ 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, // used to calculate the end flash loan index
-    swapperOverride) {
+    async liquidateClendAccountWithFlashLoan(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, marginfiLiabFlashLoanBank, liquidatorMarginfiAccount, additionalIxnCount) {
         // create instructions
-        const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride);
+        const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps);
         if (!result) {
             return;
         }
@@ -628,8 +528,8 @@ class ClendClient {
         ];
         return this.send(ixns, [], luts);
     }
-    async liquidateClendAccount(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride) {
-        const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride);
+    async liquidateClendAccount(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps) {
+        const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps);
         if (!result) {
             return;
         }
@@ -654,12 +554,7 @@ class ClendClient {
      * Must be <= 0.
      * returns: instructions, luts, deposit amount (libaility token)
      */
-    async getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride) {
-        let activeSwapper = this.swapper;
-        // override swapper if provided
-        if (swapperOverride) {
-            activeSwapper = swapperOverride;
-        }
+    async getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps) {
         utils_1.logger.info("Starting liquidation calculation", {
             liquidatee: liquidateeClendAccount.authority.toString(),
             liquidator: liquidatorClendAccount.authority.toString(),
@@ -779,8 +674,7 @@ class ClendClient {
         // balance for the asset
         const withdrawAssetIx = await this.instructions.withdraw(assetBankData.group, liquidatorClendAccount.key, liquidatorClendAccount.authority, assetBankData.key, liquidatorAssetAta, assetTokenProgram, finalAssetAmount, false, remainingAccounts);
         // get a swap quote
-        const swapQuote = await activeSwapper.getQuote({
-            payer: liquidatorClendAccount.authority,
+        const swapQuote = await this.swapper.getQuote({
             inputMint: assetBankData.mint,
             inputMintDecimals: assetBankData.mintDecimals,
             outputMint: liabBankData.mint,
@@ -796,7 +690,7 @@ class ClendClient {
             outAmountMin: outAmountMin.toString(10),
         });
         // 5. Get Swap Instructions from Jupiter
-        const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
+        const swapIxns = await this.swapper.getSwapIxns(this.address(), swapQuote);
         const ixns = [
             depositIx, // deposit liability mint into liquidator clend account
             liquidationIx, // liquidate liquidatee clend account
@@ -835,35 +729,30 @@ class ClendClient {
         const ix = await this.instructions.configureBankOracleMaxAge(clendGroup, this.address(), bank, maxAge);
         return this.send([ix]);
     }
-    async configureBankPythOracle(bank, pythOracle, pythOracleFeed) {
+    async configureBankOracle(bank, pythOracle, pythOracleFeed) {
         const bankData = await this.getBank(bank);
-        const ix = await this.instructions.configureBankPythOracle(bankData.group, this.address(), bank, pythOracle, pythOracleFeed);
-        return this.send([ix]);
-    }
-    async configureBankSBOracle(bank, pullFeedAccount) {
-        const bankData = await this.getBank(bank);
-        const ix = await this.instructions.configureBankSwitchboardOracle(bankData.group, this.address(), bank, pullFeedAccount);
+        const ix = await this.instructions.configureBankOracle(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, swapperOverride) {
+    async depositLeverage(clendGroup, clendAccount, selectedMint, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps) {
         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, swapperOverride);
+                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);
                 ixns = collateralIxns;
                 luts = collateralLuts;
                 additionalSigners = collateralAdditionalSigners;
                 break;
             case debtMint.toString():
-                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);
+                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);
                 ixns = debtIxns;
                 luts = debtLuts;
                 additionalSigners = debtAdditionalSigners;
@@ -875,13 +764,7 @@ class ClendClient {
     }
     async getDepositLeverageFromDebtIxns(clendGroup, user, clendAccount, collateralMint, // e.g., JLP
     debtMint, // e.g., USDC
-    debtMintDecimals, collateralMintDecimals, initialUserDebtContributionForSwap, finalLoopBorrowAmount, slippageBps, additionalIxnCount, // For JIT liquidity, etc.
-    swapperOverride) {
-        // override swapper if provided
-        let activeSwapper = this.swapper;
-        if (swapperOverride) {
-            activeSwapper = swapperOverride;
-        }
+    debtMintDecimals, collateralMintDecimals, initialUserDebtContributionForSwap, finalLoopBorrowAmount, slippageBps, additionalIxnCount) {
         const collateralTokenProgram = (0, utils_1.getTokenProgramForMint)(collateralMint);
         const debtTokenProgram = (0, utils_1.getTokenProgramForMint)(debtMint);
         const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
@@ -921,8 +804,7 @@ class ClendClient {
         const totalDebtTokenForSwap = initialUserDebtContributionForSwap.add(finalLoopBorrowAmount);
         // 3. Get Jupiter Quote for the TOTAL debt token amount
         const swapMode = "ExactIn";
-        const swapQuote = await activeSwapper.getQuote({
-            payer: user,
+        const swapQuote = await this.swapper.getQuote({
             inputMint: debtMint,
             inputMintDecimals: debtMintDecimals,
             outputMint: collateralMint,
@@ -944,7 +826,7 @@ class ClendClient {
         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 swapIxns = await activeSwapper.getSwapIxns(swapQuote);
+        const swapIxns = await this.swapper.getSwapIxns(user, 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
@@ -990,13 +872,7 @@ class ClendClient {
             additionalSigners,
         };
     }
-    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;
-        }
+    async getDepositLeverageFromCollateralIxns(clendGroup, user, clendAccount, collateralMint, debtMint, debtMintDecimals, collateralMintDecimals, borrowAmount, depositAmount, slippageBps, additionalIxnCount) {
         // Get token programs
         const collateralTokenProgram = (0, utils_1.getTokenProgramForMint)(collateralMint);
         const debtTokenProgram = (0, utils_1.getTokenProgramForMint)(debtMint);
@@ -1004,8 +880,7 @@ class ClendClient {
         const collateralBank = (0, addresses_1.getBankPda)(clendGroup, collateralMint);
         // Get Jupiter quote for swapping debt token to collateral token
         const swapMode = "ExactIn";
-        const swapQuote = await activeSwapper.getQuote({
-            payer: user,
+        const swapQuote = await this.swapper.getQuote({
             inputMint: debtMint,
             inputMintDecimals: debtMintDecimals,
             outputMint: collateralMint,
@@ -1056,7 +931,7 @@ class ClendClient {
         }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
         // Get swap instructions
-        const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
+        const swapIxns = await this.swapper.getSwapIxns(user, swapQuote);
         // Calculate additional collateral from swap
         const additionalCollateralAmount = swapQuote.outAmount;
         const totalCollateralAmount = depositAmount.add(additionalCollateralAmount);
@@ -1172,12 +1047,7 @@ 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, swapperOverride) {
-        // override swapper if provided
-        let activeSwapper = this.swapper;
-        if (swapperOverride) {
-            activeSwapper = swapperOverride;
-        }
+    targetLeverage, slippageBps) {
         // 1. Get decimals and bank data
         const collateralDecimals = (0, utils_1.getTokenDecimalsForMint)(collateralMint);
         const debtDecimals = (0, utils_1.getTokenDecimalsForMint)(debtMint);
@@ -1208,8 +1078,7 @@ 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 activeSwapper.getQuote({
-            payer: anchor_1.web3.PublicKey.default, // doesnt matter right now
+        const swapQuote = await this.swapper.getQuote({
             inputMint: debtMint,
             inputMintDecimals: debtDecimals,
             outputMint: collateralMint,
@@ -1248,19 +1117,19 @@ class ClendClient {
             collateralBankData,
         };
     }
-    async withdrawLeverage(clendGroup, clendAccount, selectedMint, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps, swapperOverride) {
+    async withdrawLeverage(clendGroup, clendAccount, selectedMint, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps) {
         let ixns = [];
         let luts = [];
         switch (selectedMint.toString()) {
             case collateralMint.toString():
-                const collateralParams = await this.getNetWithdrawLeverageCollateralParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll);
-                const { ixns: collateralIxns, luts: collateralLuts } = await this.getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralParams.collateralBankData.mintDecimals, collateralParams.debtBankData.mintDecimals, withdrawAll, collateralParams.collateralToWithdraw, withdrawAmount, slippageBps, 0, swapperOverride);
+                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);
                 ixns = collateralIxns;
                 luts = collateralLuts;
                 break;
             case debtMint.toString():
-                const debtParams = await this.getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll, swapperOverride);
-                const { ixns: debtIxns, luts: debtLuts } = await this.getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, debtParams.collateralBankData.mintDecimals, debtParams.debtBankData.mintDecimals, withdrawAll, debtParams.debtToRepay, debtParams.collateralToWithdraw, slippageBps, 0, swapperOverride);
+                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);
                 ixns = debtIxns;
                 luts = debtLuts;
                 break;
@@ -1270,98 +1139,71 @@ class ClendClient {
         // Send transaction
         return this.send(ixns, [], luts);
     }
-    async getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride) {
-        // override swapper if provided
-        let activeSwapper = this.swapper;
-        if (swapperOverride) {
-            activeSwapper = swapperOverride;
-        }
+    async getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount) {
         const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
         const collateralBank = (0, addresses_1.getBankPda)(clendGroup, collateralMint);
+        // Get remaining accounts for flash loan
         const clendAccountData = await this.getClendAccount(clendAccount);
         if (!clendAccountData) {
             throw new Error(`Clend account not found: ${clendAccount.toString()}`);
         }
         let activeBanks = (0, utils_1.getClendAccountActiveBanks)(clendAccountData);
-        const activeBankData = await Promise.all(activeBanks.map((bankPk) => this.getBank(bankPk)));
+        const activeBankData = [];
+        for (const bank of activeBanks) {
+            const bankData = await this.getBank(bank);
+            activeBankData.push(bankData);
+        }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        // Get a fresh 'ExactIn' quote for swapping the total collateral to withdraw
-        const swapQuote = await activeSwapper.getQuote({
-            payer: clendAccountData.authority,
+        // Get Jupiter quote for swapping collateral to debt token (ExactOut mode)
+        const swapMode = "ExactOut";
+        const swapQuote = await this.swapper.getQuote({
             inputMint: collateralMint,
             inputMintDecimals: collateralDecimals,
             outputMint: debtMint,
             outputMintDecimals: debtDecimals,
-            inputAmount: collateralToWithdraw, // Use the total collateral to withdraw as the exact input
+            inputAmount: debtToRepay,
             slippageBps,
-            swapMode: "ExactIn",
+            swapMode,
         });
-        // The minimum amount of debt token we are guaranteed to receive from the swap
-        const minDebtReceivedFromSwap = new anchor_1.BN(swapQuote.otherAmountThreshold);
-        // Determine the final amount to repay. It's the lesser of what we need and what we're guaranteed to get.
-        const finalDebtToRepay = anchor_1.BN.min(debtToRepay, minDebtReceivedFromSwap);
-        utils_1.logger.debug("getWithdrawLeverageDebtIxns: swap and repay details", {
-            collateralToWithdraw: collateralToWithdraw.toString(),
-            minDebtReceivedFromSwap: minDebtReceivedFromSwap.toString(),
-            targetDebtToRepay: debtToRepay.toString(),
-            finalDebtToRepay: finalDebtToRepay.toString(),
+        // set collateralToSwap to the inAmount from the swap quote
+        const collateralToSwap = swapQuote.inAmount;
+        utils_1.logger.debug("withdrawLeverage collateralToSwap", {
+            collateralToSwap,
         });
-        // Get Swap Instructions from the swapper
-        const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
-        utils_1.logger.info(`swapIxns fetched for ReceiveDebtToken`);
-        // --- ATAs and Clend Instructions ---
+        // Get swap instructions
+        const swapInputs = {
+            inputAmountLamports: new decimal_js_1.default(collateralToSwap.toString()),
+            inputMint: collateralMint,
+            outputMint: debtMint,
+        };
+        utils_1.logger.debug("withdrawLeverage swapInputs", {
+            swapInputs,
+        });
+        const swapIxns = await this.swapper.getSwapIxns(clendAccountData.authority, swapQuote);
+        utils_1.logger.info(`swapIxns fetched`);
         const collateralTokenProgram = (0, utils_1.getTokenProgramForMint)(collateralMint);
         const debtTokenProgram = (0, utils_1.getTokenProgramForMint)(debtMint);
         const userCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, clendAccountData.authority, true, collateralTokenProgram);
         const userDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, clendAccountData.authority, true, debtTokenProgram);
-        // Create withdraw instruction: Withdraw the total collateral calculated by the params function
+        utils_1.logger.info(`begin crafting ixns`);
+        // Create withdraw instruction
         const withdrawIx = await this.instructions.withdraw(clendGroup, clendAccount, clendAccountData.authority, collateralBank, userCollateralAta, collateralTokenProgram, collateralToWithdraw, withdrawAll, remainingAccounts);
-        // if withdrawAll == true we need to make sure we withdraw emissions from both banks before withdrawing all the bank tokens
-        const emissionsIxns = [];
-        if (withdrawAll) {
-            // get bank data
-            const collateralBankData = activeBankData.find((b) => b.mint.equals(collateralMint));
-            if (!collateralBankData) {
-                throw new Error(`Collateral bank not found: ${collateralMint.toString()}`);
-            }
-            const debtBankData = activeBankData.find((b) => b.mint.equals(debtMint));
-            if (!debtBankData) {
-                throw new Error(`Debt bank not found: ${debtMint.toString()}`);
-            }
-            // collateral bank emissions
-            if (!collateralBankData.emissionsMint.equals(anchor_1.web3.PublicKey.default) &&
-                (collateralBankData.flags === state_1.BankFlags.LendingEmissionsActive ||
-                    collateralBankData.flags ===
-                        state_1.BankFlags.LendingAndBorrowingEmissionsActive)) {
-                const emissionsMint = collateralBankData.emissionsMint;
-                const emissionsMintTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, emissionsMint);
-                const withdrawEmissionsIx = await this.instructions.withdrawEmissions(clendGroup, clendAccount, clendAccountData.authority, collateralBank, emissionsMint, emissionsMintTokenProgram);
-                emissionsIxns.push(...withdrawEmissionsIx);
-            }
-            // debt bank emissions
-            if (!debtBankData.emissionsMint.equals(anchor_1.web3.PublicKey.default) &&
-                (debtBankData.flags === state_1.BankFlags.BorrowEmissionsActive ||
-                    debtBankData.flags === state_1.BankFlags.LendingAndBorrowingEmissionsActive)) {
-                const emissionsMint = debtBankData.emissionsMint;
-                const emissionsMintTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, emissionsMint);
-                const withdrawEmissionsIx = await this.instructions.withdrawEmissions(clendGroup, clendAccount, clendAccountData.authority, debtBank, emissionsMint, emissionsMintTokenProgram);
-                emissionsIxns.push(...withdrawEmissionsIx);
-            }
-        }
-        // Create repay instruction: Repay the debt portion using the guaranteed swap output
-        const repayIx = await this.instructions.repay(clendGroup, clendAccount, clendAccountData.authority, debtBank, userDebtAta, debtTokenProgram, finalDebtToRepay, // Use the slippage-protected amount from the final quote
-        withdrawAll, true, remainingAccounts);
-        // Assemble instructions
+        utils_1.logger.info(`withdrawIx set`);
+        // Create repay instruction
+        const repayIx = await this.instructions.repay(clendGroup, clendAccount, clendAccountData.authority, debtBank, userDebtAta, debtTokenProgram, debtToRepay, withdrawAll, remainingAccounts);
+        utils_1.logger.info(`repayIx set`);
+        // Assemble all instructions without flash loan
         const ixnsWithoutFlashLoan = [
-            ...emissionsIxns,
             withdrawIx,
             ...swapIxns.ixns,
             repayIx,
         ];
-        // Flash Loan Wrapping
+        utils_1.logger.info(`ixnsWithoutFlashLoan set`);
+        // Create flash loan instructions
         const cuIxns = 2;
         const endIndex = new anchor_1.BN(cuIxns + ixnsWithoutFlashLoan.length + 1 + additionalIxnCount);
         const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, clendAccountData.authority, endIndex, remainingAccounts);
+        // Assemble all instructions in the correct order
         const instructions = [
             beginFlashLoanIx,
             ...ixnsWithoutFlashLoan,
@@ -1369,13 +1211,84 @@ class ClendClient {
         ];
         return { ixns: instructions, luts: swapIxns.luts };
     }
-    async getNetWithdrawLeverageCollateralParams(clendGroup, clendAccount, collateralMint, debtMint, desiredNetWithdraw, withdrawAll) {
-        utils_1.logger.info("getNetWithdrawLeverageCollateralParams", {
+    async getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, desiredNetDebtToReceive, slippageBps, additionalIxnCount) {
+        const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
+        const collateralBank = (0, addresses_1.getBankPda)(clendGroup, collateralMint);
+        const clendAccountData = await this.getClendAccount(clendAccount);
+        if (!clendAccountData) {
+            throw new Error(`Clend account not found: ${clendAccount.toString()}`);
+        }
+        let activeBanks = (0, utils_1.getClendAccountActiveBanks)(clendAccountData);
+        //if (withdrawAll) {
+        //  activeBanks = activeBanks.filter(
+        //    (b) => !b.equals(collateralBank) && !b.equals(debtBank),
+        //  );
+        //}
+        const activeBankData = await Promise.all(activeBanks.map((bankPk) => this.getBank(bankPk)));
+        const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
+        // 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 = "ExactIn";
+        const swapQuote = await this.swapper.getQuote({
+            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 swapper
+        const swapIxns = await this.swapper.getSwapIxns(clendAccountData.authority, swapQuote);
+        utils_1.logger.info(`swapIxns fetched for ReceiveDebtToken`);
+        // --- ATAs and Clend Instructions (largely similar structure) ---
+        const collateralTokenProgram = (0, utils_1.getTokenProgramForMint)(collateralMint);
+        const debtTokenProgram = (0, utils_1.getTokenProgramForMint)(debtMint);
+        const userCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, clendAccountData.authority, true, collateralTokenProgram);
+        const userDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, clendAccountData.authority, true, debtTokenProgram);
+        // Create withdraw instruction: Withdraw ALL the JLP calculated by params function
+        const withdrawIx = await this.instructions.withdraw(clendGroup, clendAccount, clendAccountData.authority, collateralBank, userCollateralAta, collateralTokenProgram, collateralToWithdraw, // Withdraw all the JLP needed for the full swap
+        withdrawAll, // This flag is for Clend's internal logic
+        remainingAccounts);
+        // Create repay instruction: Repay the calculated debt portion to Clend
+        const repayIx = await this.instructions.repay(clendGroup, clendAccount, clendAccountData.authority, debtBank, userDebtAta, debtTokenProgram, debtToRepay, // Repay the specified debt amount
+        withdrawAll, // This flag is for Clend's internal logic
+        remainingAccounts);
+        // Assemble instructions
+        const ixnsWithoutFlashLoan = [
+            withdrawIx,
+            ...swapIxns.ixns, // Swap all withdrawn collateral to debt
+            repayIx, // Repay the debt portion
+        ]; // 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);
+        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, clendAccountData.authority, endIndex, remainingAccounts);
+        const instructions = [
+            beginFlashLoanIx,
+            ...ixnsWithoutFlashLoan,
+            endFlashLoanIx,
+        ];
+        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) {
+        utils_1.logger.info("getNetWithdrawParams", {
             desiredNetWithdraw: desiredNetWithdraw.toString(),
             withdrawAll,
         });
+        // if desiredNetWithdraw is zero, throw an error
         if (desiredNetWithdraw.isZero() && !withdrawAll) {
-            throw new Error("Desired net withdrawal is zero for a partial withdraw.");
+            throw new Error("Desired net withdrawal is zero");
         }
         const collateralBank = (0, addresses_1.getBankPda)(clendGroup, collateralMint);
         const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
@@ -1387,6 +1300,7 @@ class ClendClient {
         if (!clendAccountData) {
             throw new Error(`Clend account not found: ${clendAccount.toString()}`);
         }
+        // fetch balances and pricing
         let debtBalance;
         let debtPrice;
         let collateralBalance;
@@ -1405,32 +1319,75 @@ class ClendClient {
             throw new Error("Could not find debt or collateral position in account");
         }
         const collateralAmount = collateralBalance.assetBalance;
-        const debtAmount = debtBalance.liabilityBalance;
+        const collateralAmountUI = collateralBalance.assetBalanceUi;
+        const collateralValue = collateralBalance.assetValue;
         const collateralDecimals = collateralBankData.mintDecimals;
+        const debtAmount = debtBalance.liabilityBalance;
+        const debtAmountUI = debtBalance.liabilityBalanceUi;
+        const debtValue = debtBalance.liabilityValue;
         const debtDecimals = debtBankData.mintDecimals;
+        const desiredNetWithdrawUi = (0, clend_common_1.amountToUi)(desiredNetWithdraw, debtDecimals);
+        utils_1.logger.debug("Current amounts", {
+            desiredNetWithdrawUi,
+            collateralAmount: collateralAmount.toString(),
+            collateralAmountUI,
+            collateralValue,
+            debtAmount: debtAmount.toString(),
+            debtAmountUI,
+            debtValue,
+        });
+        // --- Determine collateral to withdraw and debt to repay ---
         let collateralToWithdraw;
         let debtToRepay;
         if (withdrawAll) {
             utils_1.logger.info("WithdrawAll selected");
             collateralToWithdraw = collateralAmount;
-            debtToRepay = (0, clend_common_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), Math.floor(Date.now() / 1000));
+            debtToRepay = (0, clend_common_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), new Date().getTime() / 1000);
+            utils_1.logger.info(`calculated debt to repay`, {
+                debtToRepayWithInterest: debtToRepay.toString(),
+                debtToRepayRaw: debtAmount.toString(),
+            });
         }
         else {
-            utils_1.logger.info("Calculating partial deleverage amounts");
+            utils_1.logger.info("Calculating partial deleverage for net withdrawal");
+            // 1. Calculate estimated current debt accurately
             const estimatedCurrentDebt = (0, clend_common_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), Math.floor(Date.now() / 1000));
             const estimatedCurrentDebtUi = (0, clend_common_1.amountToUi)(estimatedCurrentDebt, debtDecimals);
             const collateralAmountUI = (0, clend_common_1.amountToUi)(collateralAmount, collateralDecimals);
-            const desiredNetWithdrawUi = (0, clend_common_1.amountToUi)(desiredNetWithdraw, collateralDecimals);
-            const { debtToRepayUi, totalCollateralToWithdrawUi } = (0, clend_common_1.computeWithdrawLeverageAmounts)(collateralAmountUI, estimatedCurrentDebtUi, desiredNetWithdrawUi, collateralPrice, debtPrice);
-            collateralToWithdraw = (0, clend_common_1.uiToAmount)(totalCollateralToWithdrawUi, collateralDecimals);
+            const { debtToRepayUi, totalCollateralToWithdrawUi, newLeverage, currentLeverage, } = (0, clend_common_1.computeWithdrawLeverageAmounts)(collateralAmountUI, estimatedCurrentDebtUi, desiredNetWithdrawUi, collateralPrice, debtPrice);
+            utils_1.logger.info("computeWithdrawLeverageAmounts", {
+                debtToRepayUi,
+                totalCollateralToWithdrawUi,
+                newLeverage,
+                currentLeverage,
+            });
             const baseDebtToRepay = (0, clend_common_1.uiToAmount)(debtToRepayUi, debtDecimals);
+            // --- Step 5: Add Buffers to the Debt Repayment Target ---
+            // This adds a small buffer for interest that might accrue during the transaction's execution time.
             const timeBufferSec = 15;
             debtToRepay = (0, clend_common_1.addInterestAccrualBuffer)(baseDebtToRepay, debtBankData.borrowApy, timeBufferSec);
+            // --- 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.swapper.getQuote({
+                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);
+            // Final sanity check to ensure we don't try to withdraw more than exists.
             if (collateralToWithdraw.gt(collateralAmount)) {
-                throw new Error("Total required collateral for withdrawal exceeds the available balance.");
+                throw new Error("Total required collateral for withdrawal and swap exceeds the available balance. The position may be too leveraged for this withdrawal amount.");
             }
         }
-        utils_1.logger.debug("Final calculated amounts from params function", {
+        utils_1.logger.debug("Final calculated amounts", {
             collateralToWithdraw: collateralToWithdraw.toString(),
             debtToRepay: debtToRepay.toString(),
         });
@@ -1441,85 +1398,9 @@ class ClendClient {
             debtBankData,
         };
     }
-    async getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, collateralToWithdraw, desiredNetCollateralToReceive, 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);
-        if (!clendAccountData) {
-            throw new Error(`Clend account not found: ${clendAccount.toString()}`);
-        }
-        let activeBanks = (0, utils_1.getClendAccountActiveBanks)(clendAccountData);
-        const activeBankData = [];
-        for (const bank of activeBanks) {
-            const bankData = await this.getBank(bank);
-            activeBankData.push(bankData);
-        }
-        const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        // 1. Determine the amount of collateral that needs to be swapped.
-        const collateralToSwap = collateralToWithdraw.sub(desiredNetCollateralToReceive);
-        // Safety check
-        if (collateralToSwap.isNeg() || collateralToSwap.isZero()) {
-            throw new Error(`Invalid calculation: collateral to swap is not positive. Total withdraw: ${collateralToWithdraw}, user receives: ${desiredNetCollateralToReceive}. Collateral to swap: ${collateralToSwap}`);
-        }
-        // 2. Get a fresh 'ExactIn' quote for swapping that collateral amount.
-        const swapQuote = await activeSwapper.getQuote({
-            payer: clendAccountData.authority,
-            inputMint: collateralMint,
-            inputMintDecimals: collateralDecimals,
-            outputMint: debtMint,
-            outputMintDecimals: debtDecimals,
-            inputAmount: collateralToSwap, // This is our exact input
-            slippageBps,
-            swapMode: "ExactIn",
-        });
-        // 3. The final amount to repay is the minimum we are guaranteed to get from the swap.
-        const finalDebtToRepay = new anchor_1.BN(swapQuote.otherAmountThreshold);
-        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);
-        const userCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, clendAccountData.authority, true, collateralTokenProgram);
-        const userDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, clendAccountData.authority, true, debtTokenProgram);
-        utils_1.logger.info(`begin crafting ixns`);
-        const withdrawIx = await this.instructions.withdraw(clendGroup, clendAccount, clendAccountData.authority, collateralBank, userCollateralAta, collateralTokenProgram, collateralToWithdraw, withdrawAll, remainingAccounts);
-        utils_1.logger.info(`withdrawIx set`);
-        const emissionsIxns = [];
-        if (withdrawAll) {
-            // ... (emission logic remains the same)
-        }
-        // Create repay instruction with the amount from the 'ExactIn' swap
-        const repayIx = await this.instructions.repay(clendGroup, clendAccount, clendAccountData.authority, debtBank, userDebtAta, debtTokenProgram, finalDebtToRepay, // Use the slippage-protected amount from the final quote
-        withdrawAll, true, // Use the new repay_up_to_amount flag
-        remainingAccounts);
-        utils_1.logger.info(`repayIx set`);
-        const ixnsWithoutFlashLoan = [
-            ...emissionsIxns,
-            withdrawIx,
-            ...swapIxns.ixns,
-            repayIx,
-        ];
-        utils_1.logger.info(`ixnsWithoutFlashLoan set`);
-        const cuIxns = 2;
-        const endIndex = new anchor_1.BN(cuIxns + ixnsWithoutFlashLoan.length + 1 + additionalIxnCount);
-        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, clendAccountData.authority, endIndex, remainingAccounts);
-        const instructions = [
-            beginFlashLoanIx,
-            ...ixnsWithoutFlashLoan,
-            endFlashLoanIx,
-        ];
-        return { ixns: instructions, luts: swapIxns.luts };
-    }
-    async getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, desiredNetWithdraw, withdrawAll, swapperOverride) {
-        // override swapper if provided
-        let activeSwapper = this.swapper;
-        if (swapperOverride) {
-            activeSwapper = swapperOverride;
-        }
+    // caller will receive desiredNetWithdraw, the position will be adjusted accordingly
+    // receive the debt mint
+    async getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, desiredNetWithdraw, withdrawAll, slippageBps) {
         utils_1.logger.info("getNetWithdrawDebtParams", {
             desiredNetWithdraw: desiredNetWithdraw.toString(),
             withdrawAll,
@@ -1565,31 +1446,52 @@ class ClendClient {
         let debtToRepay;
         if (withdrawAll) {
             utils_1.logger.info("WithdrawAll selected for receiving debt token");
-            collateralToWithdraw = collateralAmount; // All collateral will be swapped
+            collateralToWithdraw = collateralAmount; // All JLP will be swapped
             debtToRepay = (0, clend_common_1.calculateLiabilityInterest)(currentDebtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), Math.floor(Date.now() / 1000));
-            utils_1.logger.info(`calculated debt to repay for withdrawAll`, {
+            utils_1.logger.info(`calculated debt to repay`, {
                 debtToRepayWithInterest: debtToRepay.toString(),
+                debtToRepayRaw: debtAmount.toString(),
             });
         }
         else {
-            utils_1.logger.info("Calculating partial deleverage for receiving debt token with ExactIn logic");
+            utils_1.logger.info("Calculating partial deleverage for receiving debt token");
             // 1. Calculate estimated current debt accurately
             const estimatedCurrentDebt = (0, clend_common_1.calculateLiabilityInterest)(currentDebtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), Math.floor(Date.now() / 1000));
             const estimatedCurrentDebtUi = (0, clend_common_1.amountToUi)(estimatedCurrentDebt, debtDecimals);
             const collateralAmountUI = (0, clend_common_1.amountToUi)(collateralAmount, collateralDecimals);
             const desiredNetWithdrawalOfDebtUi = (0, clend_common_1.amountToUi)(desiredNetWithdraw, debtDecimals);
-            // 2. Convert the desired net debt withdrawal into its collateral-equivalent value
+            // Convert the value of the desired debt withdrawal into an equivalent amount of collateral
+            // This is the "collateral-equivalent" value of the equity being removed.
             const netWithdrawAmountInCollateralUi = (0, clend_common_1.calculateWeightedValue)(desiredNetWithdrawalOfDebtUi, debtPrice, 1) /
                 collateralPrice;
-            // 3. Compute the ideal deleverage amounts
-            const { debtToRepayUi, totalCollateralToWithdrawUi } = (0, clend_common_1.computeWithdrawLeverageAmounts)(collateralAmountUI, estimatedCurrentDebtUi, netWithdrawAmountInCollateralUi, collateralPrice, debtPrice);
-            // 4. Set the total collateral to withdraw based on the calculation
-            collateralToWithdraw = (0, clend_common_1.uiToAmount)(totalCollateralToWithdrawUi, collateralDecimals);
-            // 5. Calculate the base debt to repay and add a buffer for interest accrual
+            const { debtToRepayUi, totalCollateralToWithdrawUi, newLeverage, currentLeverage, } = (0, clend_common_1.computeWithdrawLeverageAmounts)(collateralAmountUI, estimatedCurrentDebtUi, netWithdrawAmountInCollateralUi, collateralPrice, debtPrice);
+            utils_1.logger.info("computeWithdrawLeverageAmounts", {
+                debtToRepayUi,
+                totalCollateralToWithdrawUi,
+                newLeverage,
+                currentLeverage,
+            });
             const baseDebtToRepay = (0, clend_common_1.uiToAmount)(debtToRepayUi, debtDecimals);
+            // --- Step 5: Add Buffers to the Debt Repayment Target ---
+            // This adds a small buffer for interest that might accrue during the transaction's execution time.
             const timeBufferSec = 15;
             debtToRepay = (0, clend_common_1.addInterestAccrualBuffer)(baseDebtToRepay, debtBankData.borrowApy, timeBufferSec);
-            // 6. Final sanity check
+            // --- Step 2: Determine total USDC needed from the swap ---
+            // 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.swapper.getQuote({
+                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.");
             }
@@ -1605,9 +1507,9 @@ class ClendClient {
             debtBankData,
         };
     }
-    async adjustLeverage(clendGroup, clendAccount, collateralMint, debtMint, targetLeverage, slippageBps, swapperOverride) {
+    async adjustLeverage(clendGroup, clendAccount, collateralMint, debtMint, targetLeverage, slippageBps) {
         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, swapperOverride);
+        const { ixns, luts } = await this.getAdjustLeverageIxns(clendGroup, clendAccount, this.address(), params.debtBankData, params.collateralBankData, params.isIncrease, params.finalDebtDeltaUi, params.finalCollateralDeltaUi, slippageBps, 0);
         // Send transaction
         return this.send(ixns, [], luts);
     }
@@ -1751,7 +1653,7 @@ class ClendClient {
                     finalDebtToRepayTargetBN: finalDebtToRepayTargetBN.toString(),
                     finalAdjustedDebtDeltaUi: finalDebtDeltaUi,
                 });
-                // 3. Recalculate Collateral Delta needed for the swap
+                // 3. Recalculate Collateral Delta needed for the swap (ExactOut)
                 const slippageFactor = new decimal_js_1.default(slippageBps).div(10000);
                 if (slippageFactor.gte(1)) {
                     throw new Error("Slippage cannot be 100% or more.");
@@ -1815,12 +1717,7 @@ 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, swapperOverride) {
-        // override swapper if provided
-        let activeSwapper = this.swapper;
-        if (swapperOverride) {
-            activeSwapper = swapperOverride;
-        }
+    slippageBps, additionalIxnCount) {
         const clendAccountData = await this.getClendAccount(clendAccount);
         if (!clendAccountData) {
             throw new Error(`Clend account not found: ${clendAccount.toString()}`);
@@ -1849,60 +1746,90 @@ class ClendClient {
         let swapLookupTables = [];
         if (isIncrease) {
             utils_1.logger.info("Building instructions for increasing leverage");
-            // This logic is already ExactIn and correct. No changes needed.
+            // Use the finalDebtDeltaUi passed in (already adjusted)
             const additionalDebtAmount = (0, clend_common_1.uiToAmount)(finalDebtDeltaUi, debtBankData.mintDecimals);
-            const swapQuote = await activeSwapper.getQuote({
-                payer: user,
+            utils_1.logger.debug("additionalDebtAmount to borrow (final adjusted)", {
+                additionalDebtAmount: additionalDebtAmount.toString(),
+            });
+            // Get Jupiter quote for swapping debt token to collateral token (ExactIn)
+            const swapMode = "ExactIn";
+            const swapQuote = await this.swapper.getQuote({
                 inputMint: debtBankData.mint,
                 inputMintDecimals: debtBankData.mintDecimals,
                 outputMint: collateralBankData.mint,
                 outputMintDecimals: collateralBankData.mintDecimals,
                 inputAmount: additionalDebtAmount,
                 slippageBps,
-                swapMode: "ExactIn",
+                swapMode,
+            });
+            utils_1.logger.debug("swapQuote calculated (Increase)", {
+                inAmount: swapQuote.inAmount.toString(),
+                outAmount: swapQuote.outAmount.toString(),
+                otherAmountThreshold: swapQuote.otherAmountThreshold.toString(),
             });
-            const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
-            const borrowIx = await this.instructions.borrow(clendGroup, clendAccount, user, debtBankData.key, userDebtAta, debtTokenProgram, additionalDebtAmount, remainingAccounts);
+            // Get swap instructions
+            const swapIxns = await this.swapper.getSwapIxns(user, 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 = swapQuote.outAmount;
-            const depositIx = await this.instructions.deposit(clendGroup, clendAccount, user, collateralBankData.key, userCollateralAta, collateralTokenProgram, additionalCollateralAmount, true, remainingAccounts);
+            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, ...swapIxns.ixns, depositIx);
             swapLookupTables = swapIxns.luts;
         }
         else {
-            // --- DECREASING LEVERAGE - NEW ExactIn LOGIC ---
+            // Decreasing Leverage
             utils_1.logger.info("Building instructions for decreasing leverage");
-            // 1. The collateral to withdraw/sell is our exact input for the swap.
-            const collateralToWithdrawBN = (0, clend_common_1.uiToAmount)(finalCollateralDeltaUi, collateralBankData.mintDecimals);
-            // 2. Get a fresh 'ExactIn' quote for swapping that collateral amount.
-            const swapQuote = await activeSwapper.getQuote({
-                payer: clendAccountData.authority,
+            // Use the finalDebtDeltaUi passed in (already includes future buffer)
+            const finalDebtToRepayBN = (0, clend_common_1.uiToAmount)(finalDebtDeltaUi, debtBankData.mintDecimals);
+            // Use the finalCollateralDeltaUi passed in (already includes slippage adjustment for swap)
+            const finalCollateralToWithdrawBN = (0, clend_common_1.uiToAmount)(finalCollateralDeltaUi, collateralBankData.mintDecimals);
+            utils_1.logger.debug("Final amounts for decrease operation (Native)", {
+                finalDebtToRepayBN: finalDebtToRepayBN.toString(),
+                finalCollateralToWithdrawBN: finalCollateralToWithdrawBN.toString(),
+            });
+            // Get Jupiter quote for swapping collateral token to debt token (ExactOut)
+            // Target the final buffered debt repayment amount
+            const swapMode = "ExactOut";
+            const swapQuote = await this.swapper.getQuote({
                 inputMint: collateralBankData.mint,
                 inputMintDecimals: collateralBankData.mintDecimals,
                 outputMint: debtBankData.mint,
                 outputMintDecimals: debtBankData.mintDecimals,
-                inputAmount: collateralToWithdrawBN, // Use the collateral delta as the exact input
+                inputAmount: finalDebtToRepayBN,
                 slippageBps,
-                swapMode: "ExactIn",
+                swapMode,
             });
-            // 3. The final amount to repay is the optimistic amount from the quote,
-            //    as we will use the `repay_up_to_amount` flag on-chain.
-            const finalDebtToRepay = swapQuote.outAmount;
-            const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
-            // Withdraw the calculated collateral needed for the swap
-            const withdrawIx = await this.instructions.withdraw(clendGroup, clendAccount, user, collateralBankData.key, userCollateralAta, collateralTokenProgram, collateralToWithdrawBN, false, // Not withdrawing all
+            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
+            });
+            const swapIxns = await this.swapper.getSwapIxns(user, 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
             remainingAccounts);
-            // Repay the debt with the swap output
-            const repayIx = await this.instructions.repay(clendGroup, clendAccount, user, debtBankData.key, userDebtAta, debtTokenProgram, finalDebtToRepay, // Use optimistic amount
+            // Repay the CALCULATED BUFFERED debt amount
+            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
-            true, // Use the new repay_up_to_amount flag
             remainingAccounts);
             instructions.push(withdrawIx, ...swapIxns.ixns, repayIx);
             swapLookupTables = swapIxns.luts;
         }
         // --- Flash Loan Wrapping ---
-        const cuIxns = 2;
+        const cuIxns = 2; // Assuming 2 compute budget instructions are added later
+        // Calculate end index based on actual instructions generated + potential JIT ixns + flash loan ixns
         const endIndex = new anchor_1.BN(cuIxns + instructions.length + 1 + additionalIxnCount);
         const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, user, endIndex, remainingAccounts);
+        // Create a new array with the flash loan instructions wrapping the existing instructions
         const finalInstructions = [
             beginFlashLoanIx,
             ...instructions,