@carrot-protocol/clend-rpc 0.1.78-handoff-dev-dd084f2 → 0.1.78-handoff-dev-928428e

package/dist/rpc.js

@@ -1497,37 +1497,30 @@ class ClendClient {
     /**
      * Generates instructions for the Handoff Deposit Leverage Flow.
      * Splitting the operation into two phases to bypass CPI restrictions for Squads/Multisigs.
-     *
-     * @param handoffSigner - The ephemeral keypair/signer that will execute the flash loan.
-     * @param jitIxns - Array of JIT liquidity instructions to be injected into the Exec Tx.
-     * @returns
-     * - setupIxns: User signed (Init Account, Deposit Capital, Transfer Auth to Handoff)
-     * - execIxns: Handoff signed (JIT, Flash Loan, Borrow, Swap, Deposit, Return Auth to User)
      */
     async getDepositLeverageHandoffIxns(clendGroup, user, handoffSigner, clendAccount, inputMint, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps, jitIxns = [], swapperOverride) {
         let activeSwapper = swapperOverride || this.swapper;
         const setupIxns = [];
         const execIxns = [];
         const setupSigners = [];
-        // 1. Clend Account Initialization (Setup Tx)
+        // 1. Clend Account Initialization
         if (clendAccount === null) {
             const clendAccountSeed = (0, utils_1.randomU32)();
             const { ix, clendAccount: newAccount } = await this.instructions.initializeClendAccountWithSeed(clendGroup, user, clendAccountSeed);
             setupIxns.push(ix);
             clendAccount = newAccount;
         }
-        // 2. Fetch Banks & Decimals
+        // 2. Fetch Data
         const debtBank = (0, addresses_1.getBankPda)(clendGroup, debtMint);
         const collateralBank = (0, addresses_1.getBankPda)(clendGroup, collateralMint);
         const inputBank = (0, addresses_1.getBankPda)(clendGroup, inputMint);
-        // We fetch these to get decimals and oracle data
         const [debtBankData, collateralBankData] = await this.getBanks([
             debtBank,
             collateralBank,
         ]);
-        // 3. Calculate Leverage Params & Swap Amounts
+        // 3. Calculate Params
         let borrowAmount;
-        // We only deposit what we get from the swap in the loop, so we don't need totalDepositAmount here
+        // NOTE: This logic mimics the "Standard" flow param calculation
         if (inputMint.equals(collateralMint)) {
             const p = await this.getDepositLeverageFromCollateralParams(user, clendGroup, collateralMint, debtMint, depositAmount, targetLeverage, slippageBps, activeSwapper);
             borrowAmount = p.borrowAmount;
@@ -1541,10 +1534,8 @@ class ClendClient {
             borrowAmount = p.borrowAmount;
         }
         // 4. Setup Transaction (User Signed)
-        // A. Deposit initial capital
         const inputTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, inputMint);
         const userInputAta = (0, spl_token_1.getAssociatedTokenAddressSync)(inputMint, user, true, inputTokenProgram);
-        // Fetch input bank data if it wasn't already fetched
         let inputBankData = debtBankData.mint.equals(inputMint)
             ? debtBankData
             : collateralBankData.mint.equals(inputMint)
@@ -1552,78 +1543,56 @@ class ClendClient {
                 : await this.getBank(inputBank);
         const depositIxns = await this.instructions.deposit(clendGroup, clendAccount, user, inputBankData.key, inputBankData.mint, inputBankData.defaultOracle, userInputAta, inputTokenProgram, depositAmount, true);
         setupIxns.push(...depositIxns);
-        // B. Transfer Authority to Handoff Signer
         const transferAuthIx = await this.instructions.setNewAccountAuthority(clendGroup, clendAccount, user, handoffSigner);
         setupIxns.push(transferAuthIx);
         // 5. Execution Transaction (Handoff Signed)
-        // A. Inject JIT Instructions (Pre-Flash Loan)
-        // These happen first to ensure liquidity is available before we try to borrow.
         if (jitIxns.length > 0) {
             execIxns.push(...jitIxns);
         }
-        // B. Prepare Handoff ATAs (Idempotent)
         const liabilityTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, debtMint);
         const assetTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, collateralMint);
         const handoffDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, handoffSigner, true, liabilityTokenProgram);
         const handoffCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, handoffSigner, true, assetTokenProgram);
         execIxns.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(handoffSigner, handoffDebtAta, handoffSigner, debtMint, liabilityTokenProgram), (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(handoffSigner, handoffCollateralAta, handoffSigner, collateralMint, assetTokenProgram));
-        // C. Construct Swap (Debt -> Collateral)
-        // We execute the swap *exactly* as calculated in the params step
+        // --- FIX: Adjust Borrow Amount if Input == Debt ---
+        let effectiveBorrowAmount = borrowAmount;
+        if (inputMint.equals(debtMint)) {
+            // If user deposited Debt token, we must borrow it back out to swap it.
+            // Otherwise it just sits in the account reducing the liability.
+            effectiveBorrowAmount = borrowAmount.add(depositAmount);
+        }
+        // --- Swap Calculation ---
+        // The input to the swap is the TOTAL amount we have in the Handoff ATA.
+        // If input==debt, this is (Borrow + Deposit).
+        // If input==collateral, this is (Borrow). (Deposit is already collateral, stays in account).
+        const swapInputAmount = effectiveBorrowAmount;
         const swapQuote = await activeSwapper.getQuote({
             payer: handoffSigner,
             inputMint: debtMint,
             inputMintDecimals: debtBankData.mintDecimals,
             outputMint: collateralMint,
             outputMintDecimals: collateralBankData.mintDecimals,
-            inputAmount: borrowAmount,
+            inputAmount: swapInputAmount,
             slippageBps,
             swapMode: "ExactIn",
         });
-        // Use the quote output for the deposit amount to ensure strict consistency
         const collateralToDeposit = new anchor_1.BN(swapQuote.outAmount);
         const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
-        // D. Construct Active Banks List for Remaining Accounts
         const activeBankList = [debtBankData, collateralBankData];
         if (!inputMint.equals(debtMint) && !inputMint.equals(collateralMint)) {
             activeBankList.push(inputBankData);
         }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankList);
-        // E. Build Loop Instructions
-        // 1. Borrow Debt (to Handoff ATA)
-        const borrowIx = await this.instructions.borrow(clendGroup, clendAccount, handoffSigner, // Signer is Handoff
-        debtBankData.key, debtMint, handoffDebtAta, liabilityTokenProgram, borrowAmount, remainingAccounts);
-        // 2. Deposit Collateral (from Handoff ATA)
-        const loopDepositIx = await this.instructions.deposit(clendGroup, clendAccount, handoffSigner, // Signer is Handoff
-        collateralBankData.key, collateralMint, collateralBankData.defaultOracle, handoffCollateralAta, assetTokenProgram, collateralToDeposit, true);
-        // F. Wrap in Flash Loan
+        const borrowIx = await this.instructions.borrow(clendGroup, clendAccount, handoffSigner, debtBankData.key, debtMint, handoffDebtAta, liabilityTokenProgram, effectiveBorrowAmount, // <--- Use adjusted amount
+        remainingAccounts);
+        const loopDepositIx = await this.instructions.deposit(clendGroup, clendAccount, handoffSigner, collateralBankData.key, collateralMint, collateralBankData.defaultOracle, handoffCollateralAta, assetTokenProgram, collateralToDeposit, true);
         const innerIxns = [...borrowIx, ...swapIxns.ixns, ...loopDepositIx];
-        // Calculate End Index for Flash Loan
-        // The index passed to StartFlashLoan is relative to the *entire* transaction instructions array.
-        //
-        // Preamble Instructions (Caller adds these):
-        // 1. Jito Tip (1)
-        // 2. Compute Budget Limit (1)
-        // 3. Compute Unit Price (1)
-        // Total Caller Preamble = 3
-        //
-        // Instructions added inside this function BEFORE StartFlashLoan:
-        // 1. JIT Instructions (jitIxns.length)
-        // 2. Create Handoff ATAs (2)
-        //
-        // Total Instructions before StartFlashLoan = 3 + jitIxns.length + 2
-        // StartFlashLoan Index = 5 + jitIxns.length
-        // Inner Instructions Start Index = 6 + jitIxns.length
-        // EndFlashLoan Index = StartFlashLoan Index + 1 + Inner Length
-        const callerPreambleCount = 3; // JitoTip + SetCuLimit + SetCuPrice
-        const localPreambleCount = jitIxns.length + 2; // JIT + CreateATAs(2)
-        // The instruction index for EndFlashLoan
-        // StartFlash is the *next* instruction we push after preamble
+        const callerPreambleCount = 3;
+        const localPreambleCount = jitIxns.length + 2;
         const startIndex = callerPreambleCount + localPreambleCount;
-        // endIndex = startIndex + 1 (StartFlash itself) + innerIxns.length
         const endIndex = new anchor_1.BN(startIndex + 1 + innerIxns.length);
         const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, handoffSigner, endIndex, (0, utils_1.getClendAccountRemainingAccounts)(activeBankList));
         execIxns.push(beginFlashLoanIx, ...innerIxns, endFlashLoanIx);
-        // G. Return Authority to User
         const returnAuthIx = await this.instructions.setNewAccountAuthority(clendGroup, clendAccount, handoffSigner, user);
         execIxns.push(returnAuthIx);
         return {
@@ -2051,13 +2020,13 @@ class ClendClient {
         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, collateralParams.debtToRepay, slippageBps, 0, swapperOverride);
+                const { ixns: collateralIxns, luts: collateralLuts } = await this.getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, this.address(), collateralMint, debtMint, collateralParams.collateralBankData.mintDecimals, collateralParams.debtBankData.mintDecimals, withdrawAll, collateralParams.collateralToWithdraw, withdrawAmount, collateralParams.debtToRepay, slippageBps, 0, swapperOverride);
                 ixns = collateralIxns;
                 luts = collateralLuts;
                 break;
             case debtMint.toString():
                 const debtParams = await this.getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll);
-                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 { ixns: debtIxns, luts: debtLuts } = await this.getWithdrawLeverageDebtIxns(clendGroup, clendAccount, this.address(), collateralMint, debtMint, debtParams.collateralBankData.mintDecimals, debtParams.debtBankData.mintDecimals, withdrawAll, debtParams.debtToRepay, debtParams.collateralToWithdraw, slippageBps, 0, swapperOverride);
                 ixns = debtIxns;
                 luts = debtLuts;
                 break;
@@ -2067,7 +2036,7 @@ class ClendClient {
         // Send transaction
         return this.send(ixns, [], luts);
     }
-    async getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride) {
+    async getWithdrawLeverageDebtIxns(clendGroup, clendAccount, authority, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride) {
         // override swapper if provided
         let activeSwapper = this.swapper;
         if (swapperOverride) {
@@ -2084,7 +2053,7 @@ class ClendClient {
         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,
+            payer: authority,
             inputMint: collateralMint,
             inputMintDecimals: collateralDecimals,
             outputMint: debtMint,
@@ -2109,10 +2078,10 @@ class ClendClient {
         // --- ATAs and Clend Instructions ---
         const collateralTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, collateralMint);
         const debtTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, 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);
+        const userCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, authority, true, collateralTokenProgram);
+        const userDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, authority, true, debtTokenProgram);
         // Create withdraw instruction: Withdraw the total collateral calculated by the params function
-        const withdrawIxns = await this.instructions.withdraw(clendGroup, clendAccount, clendAccountData.authority, collateralBank, collateralMint, userCollateralAta, collateralTokenProgram, collateralToWithdraw, withdrawAll, remainingAccounts);
+        const withdrawIxns = await this.instructions.withdraw(clendGroup, clendAccount, authority, collateralBank, collateralMint, 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) {
@@ -2132,7 +2101,7 @@ class ClendClient {
                         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);
+                const withdrawEmissionsIx = await this.instructions.withdrawEmissions(clendGroup, clendAccount, authority, collateralBank, emissionsMint, emissionsMintTokenProgram);
                 emissionsIxns.push(...withdrawEmissionsIx);
             }
             // debt bank emissions
@@ -2141,12 +2110,12 @@ class ClendClient {
                     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);
+                const withdrawEmissionsIx = await this.instructions.withdrawEmissions(clendGroup, clendAccount, authority, debtBank, emissionsMint, emissionsMintTokenProgram);
                 emissionsIxns.push(...withdrawEmissionsIx);
             }
         }
         // Create repay instruction: Repay the debt portion using the guaranteed swap output
-        const repayIxns = await this.instructions.repay(clendGroup, clendAccount, clendAccountData.authority, debtBank, debtMint, userDebtAta, debtTokenProgram, finalDebtToRepay, // Use the slippage-protected amount from the final quote
+        const repayIxns = await this.instructions.repay(clendGroup, clendAccount, authority, debtBank, debtMint, userDebtAta, debtTokenProgram, finalDebtToRepay, // Use the slippage-protected amount from the final quote
         withdrawAll, true, remainingAccounts);
         // Assemble instructions
         const ixnsWithoutFlashLoan = [
@@ -2159,7 +2128,7 @@ class ClendClient {
         const cuIxns = 2;
         const endIndex = new anchor_1.BN(cuIxns + ixnsWithoutFlashLoan.length + 1 + additionalIxnCount);
         const remainingAccountsForFlashLoan = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, clendAccountData.authority, endIndex, remainingAccountsForFlashLoan);
+        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, authority, endIndex, remainingAccountsForFlashLoan);
         const instructions = [
             beginFlashLoanIx,
             ...ixnsWithoutFlashLoan,
@@ -2241,7 +2210,7 @@ class ClendClient {
             debtBankData,
         };
     }
-    async getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, collateralToWithdraw, desiredNetCollateralToReceive, debtToRepay, slippageBps, additionalIxnCount, swapperOverride) {
+    async getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, authority, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, collateralToWithdraw, desiredNetCollateralToReceive, debtToRepay, slippageBps, additionalIxnCount, swapperOverride) {
         // override swapper if provided
         let activeSwapper = this.swapper;
         if (swapperOverride) {
@@ -2265,7 +2234,7 @@ class ClendClient {
         let collateralToSwap = collateralToWithdraw.sub(desiredNetCollateralToReceive);
         // again for partial withdraws
         let swapQuote = await activeSwapper.getQuote({
-            payer: clendAccountData.authority,
+            payer: authority,
             inputMint: collateralMint,
             inputMintDecimals: collateralDecimals,
             outputMint: debtMint,
@@ -2278,7 +2247,7 @@ class ClendClient {
             // Step 1: Get the current price via a nominal 1-token quote.
             const oneToken = (0, clend_common_1.uiToAmount)(1, collateralDecimals);
             const nominalQuote = await activeSwapper.getQuote({
-                payer: clendAccountData.authority,
+                payer: authority,
                 inputMint: collateralMint,
                 inputMintDecimals: collateralDecimals,
                 outputMint: debtMint,
@@ -2295,7 +2264,7 @@ class ClendClient {
             collateralToSwap = (0, clend_common_1.adjustAmountForSlippage)(collateralToSwap_ideal, slippageBps);
             // Step 4 (Final Quote): Get the real quote for the buffered amount.
             swapQuote = await activeSwapper.getQuote({
-                payer: clendAccountData.authority,
+                payer: authority,
                 inputMint: collateralMint,
                 inputMintDecimals: collateralDecimals,
                 outputMint: debtMint,
@@ -2316,10 +2285,10 @@ class ClendClient {
         utils_1.logger.info(`swapIxns fetched`);
         const collateralTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, collateralMint);
         const debtTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, 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);
+        const userCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, authority, true, collateralTokenProgram);
+        const userDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, authority, true, debtTokenProgram);
         utils_1.logger.info(`begin crafting ixns`);
-        const withdrawIxns = await this.instructions.withdraw(clendGroup, clendAccount, clendAccountData.authority, collateralBank, collateralMint, userCollateralAta, collateralTokenProgram, collateralToWithdraw, withdrawAll, remainingAccounts);
+        const withdrawIxns = await this.instructions.withdraw(clendGroup, clendAccount, authority, collateralBank, collateralMint, userCollateralAta, collateralTokenProgram, collateralToWithdraw, withdrawAll, remainingAccounts);
         utils_1.logger.info(`withdrawIx set`);
         // if withdrawAll == true we need to make sure we withdraw emissions from both banks before withdrawing all the bank tokens
         const emissionsIxns = [];
@@ -2340,7 +2309,7 @@ class ClendClient {
                         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);
+                const withdrawEmissionsIx = await this.instructions.withdrawEmissions(clendGroup, clendAccount, authority, collateralBank, emissionsMint, emissionsMintTokenProgram);
                 emissionsIxns.push(...withdrawEmissionsIx);
             }
             // debt bank emissions
@@ -2349,12 +2318,12 @@ class ClendClient {
                     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);
+                const withdrawEmissionsIx = await this.instructions.withdrawEmissions(clendGroup, clendAccount, authority, debtBank, emissionsMint, emissionsMintTokenProgram);
                 emissionsIxns.push(...withdrawEmissionsIx);
             }
         }
         // Create repay instruction with the amount from the 'ExactIn' swap
-        const repayIxns = await this.instructions.repay(clendGroup, clendAccount, clendAccountData.authority, debtBank, debtMint, userDebtAta, debtTokenProgram, finalDebtToRepay, withdrawAll, true, remainingAccounts);
+        const repayIxns = await this.instructions.repay(clendGroup, clendAccount, authority, debtBank, debtMint, userDebtAta, debtTokenProgram, finalDebtToRepay, withdrawAll, true, remainingAccounts);
         utils_1.logger.info(`repayIx set`);
         const ixnsWithoutFlashLoan = [
             ...emissionsIxns,
@@ -2569,7 +2538,7 @@ class ClendClient {
             fundingBankData,
         };
     }
-    async getWithdrawLeverageFundingIxns(clendGroup, clendAccount, collateralMint, debtMint, fundingMint, collateralDecimals, debtDecimals, fundingDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride) {
+    async getWithdrawLeverageFundingIxns(clendGroup, clendAccount, authority, collateralMint, debtMint, fundingMint, collateralDecimals, debtDecimals, fundingDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride) {
         let activeSwapper = this.swapper;
         if (swapperOverride)
             activeSwapper = swapperOverride;
@@ -2579,7 +2548,6 @@ class ClendClient {
         if (!clendAccountData) {
             throw new Error(`Clend account not found: ${clendAccount.toString()}`);
         }
-        const authority = clendAccountData.authority;
         const activeBanks = (0, utils_1.getClendAccountActiveBanks)(clendAccountData);
         const activeBankData = await Promise.all(activeBanks.map((bankPk) => this.getBank(bankPk)));
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
@@ -2753,6 +2721,135 @@ class ClendClient {
         }
         return { ixns: instructions, luts: dedupedLuts };
     }
+    async getWithdrawLeverageHandoffIxns(clendGroup, clendAccount, user, handoffSigner, outputMint, collateralMint, debtMint, withdrawAmount, withdrawAll, slippageBps, swapperOverride) {
+        // 1. Calculate Params & Identify Flow Type
+        let debtToRepay;
+        let collateralToWithdraw;
+        let debtBankData;
+        let collateralBankData;
+        let flowType;
+        let outputDecimals;
+        if (outputMint.equals(collateralMint)) {
+            flowType = "collateral";
+            const p = await this.getNetWithdrawLeverageCollateralParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll);
+            debtToRepay = p.debtToRepay;
+            collateralToWithdraw = p.collateralToWithdraw;
+            debtBankData = p.debtBankData;
+            collateralBankData = p.collateralBankData;
+            outputDecimals = collateralBankData.mintDecimals;
+        }
+        else if (outputMint.equals(debtMint)) {
+            flowType = "debt";
+            const p = await this.getNetWithdrawLeverageDebtParams(clendGroup, clendAccount, collateralMint, debtMint, withdrawAmount, withdrawAll);
+            debtToRepay = p.debtToRepay;
+            collateralToWithdraw = p.collateralToWithdraw;
+            debtBankData = p.debtBankData;
+            collateralBankData = p.collateralBankData;
+            outputDecimals = debtBankData.mintDecimals;
+        }
+        else {
+            flowType = "funding";
+            const fundingMintDecimals = await (0, utils_1.getTokenDecimalsForMintFromRpc)(this.connection, outputMint);
+            const p = await this.getNetWithdrawLeverageFundingParams(clendGroup, clendAccount, collateralMint, debtMint, outputMint, withdrawAmount, withdrawAll);
+            debtToRepay = p.debtToRepay;
+            collateralToWithdraw = p.collateralToWithdraw;
+            debtBankData = p.debtBankData;
+            collateralBankData = p.collateralBankData;
+            outputDecimals = fundingMintDecimals;
+        }
+        // 2. Setup Transaction (User Signed)
+        const setupIxns = [
+            await this.instructions.setNewAccountAuthority(clendGroup, clendAccount, user, handoffSigner),
+        ];
+        // 3. Execution Transaction (Handoff Signed)
+        const execIxns = [];
+        // A. Create Handoff ATAs
+        // We need ATAs for Collateral and Debt (for the loop) and Output (to receive funds).
+        const debtTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, debtMint);
+        const collateralTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, collateralMint);
+        const outputTokenProgram = await (0, utils_1.getTokenProgramForMintFromRpc)(this.connection, outputMint);
+        const handoffDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, handoffSigner, true, debtTokenProgram);
+        const handoffCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, handoffSigner, true, collateralTokenProgram);
+        //execIxns.push(
+        //  createAssociatedTokenAccountIdempotentInstruction(
+        //    handoffSigner,
+        //    handoffDebtAta,
+        //    handoffSigner,
+        //    debtMint,
+        //    debtTokenProgram,
+        //  ),
+        //  createAssociatedTokenAccountIdempotentInstruction(
+        //    handoffSigner,
+        //    handoffCollateralAta,
+        //    handoffSigner,
+        //    collateralMint,
+        //    collateralTokenProgram,
+        //  ),
+        //);
+        // If output is different from debt/collateral, create that ATA too
+        let handoffOutputAta = handoffCollateralAta; // Default fallback
+        if (flowType === "funding") {
+            handoffOutputAta = (0, spl_token_1.getAssociatedTokenAddressSync)(outputMint, handoffSigner, true, outputTokenProgram);
+            //execIxns.push(
+            //  createAssociatedTokenAccountIdempotentInstruction(
+            //    handoffSigner,
+            //    handoffOutputAta,
+            //    handoffSigner,
+            //    outputMint,
+            //    outputTokenProgram,
+            //  ),
+            //);
+        }
+        else if (flowType === "debt") {
+            handoffOutputAta = handoffDebtAta;
+        }
+        // B. Calculate Flash Loan Offset
+        const additionalIxnCount = execIxns.length + 1;
+        // C. Generate Inner Withdraw Logic
+        let logicResult;
+        if (flowType === "collateral") {
+            logicResult = await this.getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, handoffSigner, collateralMint, debtMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, withdrawAll, collateralToWithdraw, withdrawAmount, debtToRepay, slippageBps, additionalIxnCount, swapperOverride);
+        }
+        else if (flowType === "debt") {
+            logicResult = await this.getWithdrawLeverageDebtIxns(clendGroup, clendAccount, handoffSigner, collateralMint, debtMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride);
+        }
+        else {
+            const fundingMintDecimals = outputDecimals;
+            logicResult = await this.getWithdrawLeverageFundingIxns(clendGroup, clendAccount, handoffSigner, collateralMint, debtMint, outputMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, fundingMintDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride);
+        }
+        execIxns.push(...logicResult.ixns);
+        // D. Final Transfer: Handoff -> User
+        // We simply transfer the calculated `withdrawAmount` back to the user.
+        // If there is dust remaining (e.g. from favorable slippage), it stays in the ephemeral signer.
+        // Ensure User ATA exists
+        const userOutputAta = (0, spl_token_1.getAssociatedTokenAddressSync)(outputMint, user, true, outputTokenProgram);
+        // 1. Calculate 99.7% of the amount (0.3% reduction)
+        // We multiply by 997 and divide by 1000 to avoid floating point issues
+        const safeTransferAmount = withdrawAmount
+            .mul(new anchor_1.BN(997))
+            .div(new anchor_1.BN(1000));
+        utils_1.logger.info(`Adjusted transfer amount (0.1% buffer)`, {
+            original: withdrawAmount.toString(),
+            adjusted: safeTransferAmount.toString(),
+        });
+        // 2. Use the adjusted amount in your Instruction #12
+        const transferIx = (0, spl_token_1.createTransferCheckedInstruction)(handoffOutputAta, // source (handoff)
+        outputMint, // mint
+        userOutputAta, // destination (user)
+        handoffSigner, // owner
+        BigInt(safeTransferAmount.toString()), // adjusted amount
+        outputDecimals, // decimals
+        [], outputTokenProgram);
+        execIxns.push(transferIx);
+        // E. Return Authority
+        const returnAuthIx = await this.instructions.setNewAccountAuthority(clendGroup, clendAccount, handoffSigner, user);
+        execIxns.push(returnAuthIx);
+        return {
+            setupIxns,
+            execIxns,
+            luts: logicResult.luts,
+        };
+    }
     async getWithdrawToTargetLeverageCollateralParams(clendGroup, clendAccount, collateralMint, debtMint, desiredOutputAmount, // user-facing COLLATERAL amount
     targetLeverage) {
         utils_1.logger.info("getWithdrawToTargetLeverageCollateralParams", {
@@ -3167,7 +3264,7 @@ class ClendClient {
             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,
+                payer: user,
                 inputMint: collateralBankData.mint,
                 inputMintDecimals: collateralBankData.mintDecimals,
                 outputMint: debtBankData.mint,
@@ -3203,6 +3300,86 @@ class ClendClient {
         ];
         return { ixns: finalInstructions, luts: swapLookupTables };
     }
+    async getAdjustLeverageHandoffIxns(clendGroup, clendAccount, user, handoffSigner, collateralMint, debtMint, targetLeverage, slippageBps, jitIxns = [], swapperOverride) {
+        // 1. Calculate Params using existing logic
+        // We pass the Handoff Signer as the user here just for param calculation context if needed,
+        // though getAdjustLeverageParams mainly checks on-chain state.
+        const params = await this.getAdjustLeverageParams(clendGroup, clendAccount, collateralMint, debtMint, targetLeverage, slippageBps);
+        utils_1.logger.debug("AdjustLeverageParams", params);
+        const { debtBankData, collateralBankData, isIncrease, finalDebtDeltaUi, finalCollateralDeltaUi, } = params;
+        // 2. Setup Transaction (User Signed)
+        // Just transfer authority to the Handoff Signer
+        const transferAuthIx = await this.instructions.setNewAccountAuthority(clendGroup, clendAccount, user, handoffSigner);
+        const setupIxns = [transferAuthIx];
+        // 3. Execution Transaction (Handoff Signed)
+        const execIxns = [];
+        // A. Inject JIT Instructions (Only for Increase Leverage)
+        // JIT fetches liquidity *before* we borrow.
+        if (isIncrease && jitIxns.length > 0) {
+            execIxns.push(...jitIxns);
+        }
+        // B. Create Handoff ATAs
+        // The Handoff signer needs ATAs to hold funds temporarily during the Swap/FlashLoan.
+        //const debtTokenProgram = await getTokenProgramForMintFromRpc(
+        //  this.connection,
+        //  debtMint,
+        //);
+        //const collateralTokenProgram = await getTokenProgramForMintFromRpc(
+        //  this.connection,
+        //  collateralMint,
+        //);
+        //const handoffDebtAta = getAssociatedTokenAddressSync(
+        //  debtMint,
+        //  handoffSigner,
+        //  true,
+        //  debtTokenProgram,
+        //);
+        //const handoffCollateralAta = getAssociatedTokenAddressSync(
+        //  collateralMint,
+        //  handoffSigner,
+        //  true,
+        //  collateralTokenProgram,
+        //);
+        //const createHandoffDebtAtaIx =
+        //  createAssociatedTokenAccountIdempotentInstruction(
+        //    handoffSigner,
+        //    handoffDebtAta,
+        //    handoffSigner,
+        //    debtMint,
+        //    debtTokenProgram,
+        //  );
+        //const createHandoffCollateralAtaIx =
+        //  createAssociatedTokenAccountIdempotentInstruction(
+        //    handoffSigner,
+        //    handoffCollateralAta,
+        //    handoffSigner,
+        //    collateralMint,
+        //    collateralTokenProgram,
+        //  );
+        //execIxns.push(createHandoffDebtAtaIx, createHandoffCollateralAtaIx);
+        // C. Calculate Flash Loan Index Offset
+        // The inner logic (getAdjustLeverageIxns) needs to know exactly where the Flash Loan instruction starts
+        // relative to the *entire* bundle to calculate the EndFlashLoan index correctly.
+        // Preamble: JitoTip(1) + ComputeLimit(1) + ComputePrice(1) = 3
+        // Local Preamble: JIT Instructions + 2 ATA Creations
+        const callerPreamble = 1;
+        const additionalIxnCount = callerPreamble + jitIxns.length; // +2 for the ATAs added above
+        // D. Generate Inner Logic
+        // We pass `handoffSigner` as the `user` so the inner logic builds instructions utilizing the Handoff's ATAs/Auth.
+        const { ixns: leverageIxns, luts } = await this.getAdjustLeverageIxns(clendGroup, clendAccount, handoffSigner, // <--- Handoff is the actor here
+        debtBankData, collateralBankData, isIncrease, finalDebtDeltaUi, finalCollateralDeltaUi, slippageBps, additionalIxnCount, // <--- Pass the calculated offset
+        swapperOverride);
+        execIxns.push(...leverageIxns);
+        // E. Return Authority to User
+        // This must happen after the flash loan is closed (which is inside leverageIxns)
+        const returnAuthIx = await this.instructions.setNewAccountAuthority(clendGroup, clendAccount, handoffSigner, user);
+        execIxns.push(returnAuthIx);
+        return {
+            setupIxns,
+            execIxns,
+            luts,
+        };
+    }
     async handleBankruptcy(clendAccount, bank) {
         const bankState = await this.getBank(bank);
         if (!bankState) {
@@ -3225,9 +3402,19 @@ class ClendClient {
         if (!clendAccountState) {
             throw new Error(`Clend account not found: ${clendAccount.toString()}`);
         }
+        console.log("Clend account state: ", clendAccountState);
         const ix = await this.instructions.setNewAccountAuthority(clendAccountState.group, clendAccount, clendAccountState.authority, newAuthority);
         return this.send([ix]);
     }
+    async takeoverAccount(clendAccount, newAuthority) {
+        const clendAccountState = await this.getClendAccount(clendAccount);
+        if (!clendAccountState) {
+            throw new Error(`Clend account not found: ${clendAccount.toString()}`);
+        }
+        const groupState = await this.getClendGroup(clendAccountState.group);
+        const ix = await this.instructions.takeoverAccount(clendAccountState.group, groupState.admin, clendAccount, newAuthority);
+        return this.send([ix]);
+    }
     async getAccountsForAuthority(group, authority) {
         const accounts = await this.instructions.program.account.clendAccount.all([
             {