@carrot-protocol/clend-vaults-rpc 0.0.30-execution-fee1-dev-c23f9d0 → 0.0.30-execution-fee1-dev-e23928b

package/dist/rpc.js

@@ -16,13 +16,14 @@ const utils_1 = require("./utils");
 const cache_1 = require("./cache");
 const clend_rpc_2 = require("@carrot-protocol/clend-rpc");
 const utils_2 = require("./utils");
+const addresses_1 = require("./addresses");
 class ClendVaultsClient {
-    constructor(provider, skipPreflight = false, jupApiKey) {
+    constructor(provider, skipPreflight = false, swapperConfig) {
         this.connection = provider.connection;
         this.program = new program_1.ClendVaultsProgram(provider);
         this.skipPreflight = skipPreflight;
         this.clendClient = new clend_rpc_1.ClendClient(provider.connection, provider.wallet, skipPreflight, 0);
-        this.swapper = new swapper_1.ClendVaultsJupSwapper(this.program, jupApiKey);
+        this.swapper = new swapper_1.ClendVaultsJupSwapper(this.program, swapperConfig?.jupApiKey, swapperConfig?.excludeDexes);
         this.vaultCache = new cache_1.Cache();
     }
     address() {
@@ -59,12 +60,13 @@ class ClendVaultsClient {
         const clendAccountStates = await this.clendClient.getClendAccounts(vault.clendAccounts.map((ca) => ca.address));
         // calculate equity for each clend account
         for (const clendAccountState of clendAccountStates) {
-            const lendingAccountEquity = (0, math_1.calculateLendingAccountEquity)(clendAccountState.lendingAccount.balances);
+            const { equity, leverage } = (0, math_1.calculateLendingAccountEquityAndLeverage)(clendAccountState.lendingAccount.balances);
             clendAccountEquity.push({
                 address: clendAccountState.key,
-                equity: lendingAccountEquity,
+                equity,
+                leverage,
             });
-            vaultEquity += lendingAccountEquity;
+            vaultEquity += equity;
         }
         // calculate equity for each reserve
         const reserveEquity = [];
@@ -74,11 +76,17 @@ class ClendVaultsClient {
             reserveEquity.push({ address: asset.reserve.address, equity: rEquity });
             vaultEquity += rEquity;
         }
+        const sharesSupplyUi = (0, math_1.amountToUi)(vault.sharesSupply, vault.sharesDecimals);
+        const adjustedSharesSupplyUi = (0, math_1.amountToUi)(vault.adjustedSharesSupply, vault.sharesDecimals);
+        const preFeeNav = (0, math_1.calculateVaultNav)(vaultEquity, sharesSupplyUi);
+        const postFeeNav = (0, math_1.calculateVaultNav)(vaultEquity, adjustedSharesSupplyUi);
         return {
             address: vault.address,
             vaultEquity,
-            clendAccountEquity,
-            reserveEquity,
+            preFeeNav,
+            postFeeNav,
+            clendAccounts: clendAccountEquity,
+            reserves: reserveEquity,
         };
     }
     async initVault(sharesMint, managementFeeBps) {
@@ -128,29 +136,55 @@ class ClendVaultsClient {
         const txSig = await this.send([ix]);
         return txSig;
     }
-    async issue(vault, assetMint, amount, minAmountOut) {
-        const ixns = await this.prepareIssueIxns(this.address(), vault, assetMint, amount, minAmountOut);
-        const txSig = await this.send(ixns);
+    async issue(vault, assetMint, amount, minAmountOut, vaultManager) {
+        const ixns = await this.prepareIssueIxns(this.address(), vault, assetMint, amount, minAmountOut, 2);
+        const additionalSigners = vaultManager ? [vaultManager] : [];
+        const txSig = await this.send(ixns, additionalSigners);
         return txSig;
     }
-    async prepareIssueIxns(user, vault, assetMint, amount, minAmountOut) {
+    async prepareIssueIxns(user, vault, assetMint, amount, minAmountOut, additionalIxnCount) {
         // get vault and asset data
         const vaultState = await this.getVault(vault);
         const assetData = vaultState.assets.find((a) => a.mint.address.equals(assetMint));
         const remainingAccounts = await buildEquityRemainingAccounts(vaultState, this.clendClient);
-        const ixns = await this.program.issue(vault, vaultState.sharesMint, user, assetMint, assetData.oracle.address, amount, minAmountOut, assetData.mint.tokenProgram, spl_token_1.TOKEN_2022_PROGRAM_ID, remainingAccounts);
+        const { issueStartIxns, issueEndIxns } = await this.program.issue(vault, vaultState.sharesMint, user, assetMint, assetData.oracle.address, amount, minAmountOut, assetData.mint.tokenProgram, spl_token_1.TOKEN_2022_PROGRAM_ID, remainingAccounts);
+        const endSessionIxIndex = additionalIxnCount +
+            1 + // userSessionStartIx
+            issueStartIxns.length +
+            issueEndIxns.length;
+        const { startIx: userSessionStartIx, endIx: userSessionEndIx } = await this.program.userSession(vault, vaultState.manager, user, "issue", endSessionIxIndex);
+        const ixns = [
+            userSessionStartIx,
+            ...issueStartIxns,
+            ...issueEndIxns,
+            userSessionEndIx,
+        ];
         return ixns;
     }
-    async redeem(vault, assetMint, sharesAmount, minAmountOut) {
-        const ixns = await this.prepareRedeemIxns(this.address(), vault, assetMint, sharesAmount, minAmountOut);
-        const txSig = await this.send(ixns);
+    async redeem(vault, assetMint, sharesAmount, minAmountOut, vaultManager, additionalIxnCount = 0) {
+        let vaultManagerKey = this.address();
+        if (vaultManager) {
+            vaultManagerKey = vaultManager.publicKey;
+        }
+        const redeemIxns = await this.prepareRedeemIxns(this.address(), vault, assetMint, sharesAmount, minAmountOut);
+        const endIndex = redeemIxns.length + additionalIxnCount + 1; // start session;
+        const { startIx: userSessionStartIx, endIx: userSessionEndIx } = await this.program.userSession(vault, vaultManagerKey, this.address(), "redeem", endIndex);
+        const ixns = [
+            userSessionStartIx,
+            ...redeemIxns,
+            userSessionEndIx,
+        ];
+        const additionalSigners = vaultManager ? [vaultManager] : [];
+        const txSig = await this.send(ixns, additionalSigners);
         return txSig;
     }
     async prepareRedeemIxns(user, vault, assetMint, amount, minAmountOut) {
         const vaultState = await this.getVault(vault);
         const assetData = vaultState.assets.find((a) => a.mint.address.equals(assetMint));
         const remainingAccounts = await buildEquityRemainingAccounts(vaultState, this.clendClient);
-        return this.program.redeem(vault, vaultState.sharesMint, user, assetMint, assetData.oracle.address, amount, minAmountOut, assetData.mint.tokenProgram, spl_token_1.TOKEN_2022_PROGRAM_ID, remainingAccounts);
+        const redeemIxns = await this.program.redeem(vault, vaultState.sharesMint, user, assetMint, assetData.oracle.address, amount, minAmountOut, assetData.mint.tokenProgram, spl_token_1.TOKEN_2022_PROGRAM_ID, remainingAccounts);
+        const ixns = [...redeemIxns];
+        return ixns;
     }
     async clendAccountDeposit(vault, clendAccount, assetMint, amount) {
         // fetch clend account data
@@ -219,7 +253,7 @@ class ClendVaultsClient {
         }
         const activeBankData = await this.clendClient.getBanks(clendAccountActiveBanks);
         const ra = (0, clend_rpc_1.getClendAccountRemainingAccounts)(activeBankData);
-        const ixns = await this.program.clendAccountBorrow(vault, this.address(), clendAccountData.group, clendAccount, assetMint, assetData.mint.tokenProgram, amount, ra);
+        const ixns = await this.program.clendAccountBorrow(vault, this.address(), clendAccountData.group, clendAccount, assetMint, assetData.oracle.address, assetData.mint.tokenProgram, null, amount, ra);
         const txSig = await this.send(ixns);
         return txSig;
     }
@@ -409,9 +443,9 @@ class ClendVaultsClient {
         if (isIncrease && finalDebtDeltaUi > 0) {
             // how much debt is actually borrowable in UI terms
             const availableDebtUiRaw = (0, math_1.amountToUi)(debtBankData.availableSupply, debtDecimals);
-            // leave a tiny buffer so we don't try to consume the very last lamport
-            const MIN_REMAINING_UI = 0.01; // e.g. 1 cent of USDC
-            const maxUsableDebtUi = Math.max(0, availableDebtUiRaw - MIN_REMAINING_UI);
+            // calculate the max usable debt based on the target pool utilization
+            const targetUtilFactor = 0.85; // target pool utilization is 85%
+            const maxUsableDebtUi = availableDebtUiRaw * targetUtilFactor;
             if (maxUsableDebtUi <= 0) {
                 // error if there's literally no debt available to borrow
                 throw new Error("Not enough debt available to adjust leverage");
@@ -501,9 +535,13 @@ class ClendVaultsClient {
                 slippageBps,
                 swapMode: "ExactIn",
             });
-            const swapIxns = await this.swapper.getSwapIxns(swapQuote);
+            const swapIxns = await this.swapper.getSwapIxns(swapQuote, null);
             const debtTokenProgram = await (0, clend_rpc_1.getTokenProgramForMintFromRpc)(this.program.program.provider.connection, debtBankData.mint);
-            const borrowIxns = await this.program.clendAccountBorrow(vault, vaultManager, clendAccountState.group, clendAccount, debtBankData.mint, debtTokenProgram, additionalDebtAmount, remainingAccounts);
+            const debtVaultAssetState = vaultState.assets.find((a) => a.mint.address.equals(debtBankData.mint));
+            if (!debtVaultAssetState) {
+                throw new Error(`Vault asset not found: ${debtBankData.mint.toString()}`);
+            }
+            const borrowIxns = await this.program.clendAccountBorrow(vault, vaultManager, clendAccountState.group, clendAccount, debtBankData.mint, debtVaultAssetState.oracle.address, debtTokenProgram, null, additionalDebtAmount, remainingAccounts);
             const additionalCollateralAmount = swapQuote.outAmount;
             const depositIxns = await this.program.clendAccountDeposit(vault, vaultManager, clendAccountState.group, clendAccount, collateralBankData.mint, collateralTokenProgram, additionalCollateralAmount, userCollateralAta, remainingAccounts);
             instructions.push(...borrowIxns, ...swapIxns.ixns, ...depositIxns);
@@ -526,7 +564,7 @@ class ClendVaultsClient {
             // 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 this.swapper.getSwapIxns(swapQuote);
+            const swapIxns = await this.swapper.getSwapIxns(swapQuote, null);
             // Withdraw the calculated collateral needed for the swap
             const withdrawIxns = await this.program.clendAccountWithdraw(vault, vaultManager, clendAccountState.group, clendAccount, collateralBankData.mint, collateralTokenProgram, collateralToWithdrawBN, remainingAccounts);
             // Repay the debt with the swap output
@@ -549,18 +587,19 @@ class ClendVaultsClient {
     // create instructions for redeeming shares
     // however this will pull from a clend account balance
     // the equity value of the shares desired for redemption
-    async prepareRedeemFromClendAccountIxns(user, vault, clendAccount, outputAssetMint, collateralMint, debtMint, totalSharesToRedeem, sharesToRedeemFromClendAccount, slippageBps) {
+    async prepareRedeemFromClendAccountIxns(user, vault, clendAccount, outputAssetMint, collateralMint, debtMint, totalSharesToRedeem, sharesToRedeemFromClendAccount, slippageBps, targetLeverage, additionalIxnCount = 0) {
+        if (targetLeverage <= 1.0) {
+            throw new Error("Target leverage must be greater than 1.0");
+        }
         const vaultState = await this.getVault(vault);
         const outputAssetState = vaultState.assets.find((a) => a.mint.address.equals(outputAssetMint));
         if (!outputAssetState) {
             throw new Error(`output asset mint ${outputAssetMint.toString()} not found in vault ${vault.toString()}`);
         }
         const vaultEquity = await this.getVaultEquity(vaultState);
-        const sharesSupplyUi = (0, math_1.amountToUi)(vaultState.sharesSupply, vaultState.sharesDecimals);
         const sharesToRedeemFromClendAccountUi = (0, math_1.amountToUi)(sharesToRedeemFromClendAccount, vaultState.sharesDecimals);
-        const vaultNav = (0, math_1.calculateVaultNav)(vaultEquity.vaultEquity, sharesSupplyUi);
-        // TODO: will need to add fees to this
-        const desiredOutputAmount = (0, math_1.convertSharesToAsset)(vaultNav, sharesToRedeemFromClendAccountUi, outputAssetState.mint.decimals, outputAssetState.oracle.priceUi);
+        const vaultNavPostFee = vaultEquity.postFeeNav;
+        const desiredOutputAmount = (0, math_1.convertSharesToAsset)(vaultNavPostFee, sharesToRedeemFromClendAccountUi, outputAssetState.mint.decimals, outputAssetState.oracle.priceUi);
         // check if clend account is listed in vault config
         const clendAccountIsValid = vaultState.clendAccounts.some((c) => c.address.equals(clendAccount));
         if (!clendAccountIsValid) {
@@ -571,11 +610,6 @@ class ClendVaultsClient {
         if (!clendAccountState) {
             throw new Error(`error fetching clend account state: ${clendAccount.toString()}`);
         }
-        // we need to know how many ixns will go before the leverage ixns
-        // this is for the flash loan index positioning
-        let prependedIxCount = 0;
-        let cuIxCount = 0; // TODO: in the clend libs we already account for this
-        prependedIxCount += cuIxCount;
         // get the redemption ixns
         // these are run after the withdraw leverage ixns
         const redeemIxns = await this.prepareRedeemIxns(user, vault, outputAssetMint, totalSharesToRedeem, new anchor_1.BN(0));
@@ -586,22 +620,26 @@ class ClendVaultsClient {
         let debtBankData;
         let collateralBankData;
         switch (outputAssetMint.toString()) {
-            case collateralMint.toString():
-                // get params for withdraw leverage
-                const { debtToRepay: debtToRepayCollateral, collateralToWithdraw: collateralToWithdrawCollateral, debtBankData: debtBankDataCollateral, collateralBankData: collateralBankDataCollateral, } = await this.clendClient.getNetWithdrawLeverageCollateralParams(clendAccountState.group, clendAccount, collateralMint, debtMint, desiredOutputAmount, false);
+            case collateralMint.toString(): {
+                // withdraw-to-target-leverage for collateral output
+                const { debtToRepay: debtToRepayCollateral, collateralToWithdraw: collateralToWithdrawCollateral, debtBankData: debtBankDataCollateral, collateralBankData: collateralBankDataCollateral, } = await this.clendClient.getWithdrawToTargetLeverageCollateralParams(clendAccountState.group, clendAccount, collateralMint, debtMint, desiredOutputAmount, // user-facing collateral amount
+                targetLeverage);
                 debtToRepay = debtToRepayCollateral;
                 collateralToWithdraw = collateralToWithdrawCollateral;
                 debtBankData = debtBankDataCollateral;
                 collateralBankData = collateralBankDataCollateral;
                 break;
-            case debtMint.toString():
-                // get params for withdraw leverage
-                const { debtToRepay: debtToRepayDebt, collateralToWithdraw: collateralToWithdrawDebt, debtBankData: debtBankDataDebt, collateralBankData: collateralBankDataDebt, } = await this.clendClient.getNetWithdrawLeverageDebtParams(clendAccountState.group, clendAccount, collateralMint, debtMint, desiredOutputAmount, false);
+            }
+            case debtMint.toString(): {
+                // withdraw-to-target-leverage for debt output
+                const { debtToRepay: debtToRepayDebt, collateralToWithdraw: collateralToWithdrawDebt, debtBankData: debtBankDataDebt, collateralBankData: collateralBankDataDebt, } = await this.clendClient.getWithdrawToTargetLeverageDebtParams(clendAccountState.group, clendAccount, collateralMint, debtMint, desiredOutputAmount, // user-facing debt amount
+                targetLeverage);
                 debtToRepay = debtToRepayDebt;
                 collateralToWithdraw = collateralToWithdrawDebt;
                 debtBankData = debtBankDataDebt;
                 collateralBankData = collateralBankDataDebt;
                 break;
+            }
             default:
                 throw new Error(`invalid output token mint: ${outputAssetMint.toString()}`);
         }
@@ -609,22 +647,118 @@ class ClendVaultsClient {
         let ixns = [];
         let luts = [];
         switch (outputAssetMint.toString()) {
-            case collateralMint.toString():
-                const { ixns: collateralIxns, luts: collateralLuts } = await this.getWithdrawLeverageCollateralIxns(vault, vaultState.manager, user, clendAccountState.group, clendAccount, collateralMint, debtMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, false, collateralToWithdraw, desiredOutputAmount, debtToRepay, slippageBps, prependedIxCount);
+            case collateralMint.toString(): {
+                const { ixns: collateralIxns, luts: collateralLuts } = await this.getWithdrawLeverageCollateralIxns(vault, vaultState.manager, user, clendAccountState.group, clendAccount, collateralMint, debtMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, false, collateralToWithdraw, desiredOutputAmount, debtToRepay, slippageBps, additionalIxnCount);
                 ixns = collateralIxns;
                 luts = collateralLuts;
                 break;
-            case debtMint.toString():
-                const { ixns: debtIxns, luts: debtLuts } = await this.getWithdrawLeverageDebtIxns(vault, vaultState.manager, user, clendAccountState.group, clendAccount, collateralMint, debtMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, false, debtToRepay, collateralToWithdraw, slippageBps, prependedIxCount);
+            }
+            case debtMint.toString(): {
+                const { ixns: debtIxns, luts: debtLuts } = await this.getWithdrawLeverageDebtIxns(vault, vaultState.manager, user, clendAccountState.group, clendAccount, collateralMint, debtMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, false, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount);
                 ixns = debtIxns;
                 luts = debtLuts;
                 break;
+            }
             default:
                 throw new Error(`invalid output token mint: ${outputAssetMint.toString()}`);
         }
-        const allIxns = [...ixns, ...redeemIxns];
+        const endSessionIxIndex = ixns.length +
+            additionalIxnCount +
+            1 + // userSessionStartIx
+            redeemIxns.length;
+        const { startIx: userSessionStartIx, endIx: userSessionEndIx } = await this.program.userSession(vault, vaultState.manager, user, "redeem", endSessionIxIndex);
+        const allIxns = [
+            userSessionStartIx,
+            ...ixns,
+            ...redeemIxns,
+            userSessionEndIx,
+        ];
         return { ixns: allIxns, luts };
     }
+    /**
+     * Prepare instructions for issuing into a vault *and* depositing into a CLend account
+     * to reach a target leverage.
+     *
+     * Order:
+     *  1) userSessionStart
+     *  2) issueStart (pull tokens from user into vault)
+     *  3) CLend deposit leverage ixns (move vault funds into CLend account at target leverage)
+     *  4) issueEnd (mint vault shares to user)
+     *  5) userSessionEnd
+     */
+    async prepareIssueIntoClendAccountIxns(user, vault, clendAccount, inputAssetMint, // what user is depositing into the vault
+    collateralMint, // CLend collateral mint
+    debtMint, // CLend debt mint
+    inputAmount, slippageBps, targetLeverage, additionalIxnCount = 0) {
+        if (targetLeverage <= 1.0) {
+            throw new Error("Target leverage must be greater than 1.0");
+        }
+        const vaultState = await this.getVault(vault);
+        // Make sure the input asset is part of the vault config
+        const assetData = vaultState.assets.find((a) => a.mint.address.equals(inputAssetMint));
+        if (!assetData) {
+            throw new Error(`input asset mint ${inputAssetMint.toString()} not found in vault ${vault.toString()}`);
+        }
+        // check if clend account is listed in vault config
+        const clendAccountIsValid = vaultState.clendAccounts.some((c) => c.address.equals(clendAccount));
+        if (!clendAccountIsValid) {
+            throw new Error(`Clend account ${clendAccount.toString()} not found in vault ${vault.toString()} config`);
+        }
+        // fetch clend account state
+        const clendAccountState = await this.clendClient.getClendAccount(clendAccount);
+        if (!clendAccountState) {
+            throw new Error(`error fetching clend account state: ${clendAccount.toString()}`);
+        }
+        // ----- 1) Build issue start/end (but don't wrap in userSession yet) -----
+        const remainingAccounts = await buildEquityRemainingAccounts(vaultState, this.clendClient);
+        const { issueStartIxns, issueEndIxns } = await this.program.issue(vault, vaultState.sharesMint, user, inputAssetMint, assetData.oracle.address, inputAmount, new anchor_1.BN(0), // minAmountOut: can be wired to slippage if you want
+        assetData.mint.tokenProgram, spl_token_1.TOKEN_2022_PROGRAM_ID, remainingAccounts);
+        // ----- 2) Build CLend deposit-leverage ixns into `clendAccount` -----
+        // We'll collect CLend ixns + lookup tables here
+        let clendIxns = [];
+        let clendLuts = [];
+        const clendGroup = clendAccountState.group;
+        switch (inputAssetMint.toString()) {
+            case collateralMint.toString(): {
+                // User deposits collateral token into the vault; we then lever it up as collateral.
+                const { borrowAmount, totalDepositAmount: _totalDepositAmount, debtBankData, collateralBankData, } = await this.clendClient.getDepositLeverageFromCollateralParams(user, clendGroup, collateralMint, debtMint, inputAmount, targetLeverage, slippageBps);
+                const { ixns, luts } = await this.getDepositLeverageCollateralIxns(vault, vaultState.manager, user, clendGroup, clendAccount, collateralMint, debtMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, borrowAmount, inputAmount, slippageBps, issueStartIxns.length + additionalIxnCount + 1);
+                clendIxns = ixns;
+                clendLuts = luts;
+                break;
+            }
+            case debtMint.toString(): {
+                // User deposits debt token (e.g. USDC) into the vault; we swap+lever into collateral.
+                const { borrowAmount, totalDepositAmount, debtBankData, collateralBankData, } = await this.clendClient.getDepositLeverageFromDebtParams(user, clendGroup, collateralMint, debtMint, inputAmount, // initialUserDebtContributionForSwap
+                targetLeverage, slippageBps);
+                const { ixns, luts } = await this.getDepositLeverageDebtIxns(vault, vaultState.manager, user, clendGroup, clendAccount, collateralMint, debtMint, collateralBankData.mintDecimals, debtBankData.mintDecimals, inputAmount, borrowAmount, slippageBps, issueStartIxns.length + additionalIxnCount + 1);
+                clendIxns = ixns;
+                clendLuts = luts;
+                break;
+            }
+            default:
+                throw new Error(`input asset mint ${inputAssetMint.toString()} is not equal to collateralMint or debtMint`);
+        }
+        // ----- 3) Build userSessionStart / userSessionEnd around everything -----
+        const endSessionIxIndex = additionalIxnCount +
+            1 + // userSessionStartIx
+            issueStartIxns.length +
+            clendIxns.length +
+            issueEndIxns.length;
+        const { startIx: userSessionStartIx, endIx: userSessionEndIx } = await this.program.userSession(vault, vaultState.manager, user, "issue", endSessionIxIndex);
+        // ----- 4) Stitch everything together in the required order -----
+        const ixns = [
+            userSessionStartIx,
+            ...issueStartIxns,
+            ...clendIxns,
+            ...issueEndIxns,
+            userSessionEndIx,
+        ];
+        return {
+            ixns,
+            luts: clendLuts,
+        };
+    }
     async getWithdrawLeverageCollateralIxns(vault, vaultManager, user, clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, collateralToWithdraw, desiredNetCollateralToReceive, debtToRepay, slippageBps, additionalIxnCount) {
         const clendAccountData = await this.clendClient.getClendAccount(clendAccount);
         if (!clendAccountData) {
@@ -665,11 +799,7 @@ class ClendVaultsClient {
             const debtToRepayUi = new decimal_js_1.Decimal((0, math_1.amountToUi)(debtToRepay, debtDecimals).toString());
             const collateralToSwapUi_ideal = debtToRepayUi.div(outAmountUi);
             const collateralToSwap_ideal = (0, math_1.uiToAmount)(collateralToSwapUi_ideal.toNumber(), collateralDecimals);
-            collateralToSwap = collateralToSwap_ideal;
-            //collateralToSwap = adjustAmountForSlippage(
-            //  collateralToSwap_ideal,
-            //  slippageBps,
-            //);
+            collateralToSwap = (0, math_1.adjustAmountForSlippage)(collateralToSwap_ideal, slippageBps);
             // Step 4 (Final Quote): Get the real quote for the buffered amount.
             swapQuote = await this.swapper.getQuote(vault, {
                 payer: vaultManager,
@@ -689,7 +819,7 @@ class ClendVaultsClient {
         }
         // 3. The final amount to repay is the minimum we are guaranteed to get from the swap.
         const finalDebtToRepay = swapQuote.outAmount;
-        const swapIxns = await this.swapper.getSwapIxns(swapQuote);
+        const swapIxns = await this.swapper.getSwapIxns(swapQuote, user);
         const { tokenProgram: collateralTokenProgram } = await (0, state_1.getMintState)(collateralMint, this.connection);
         const { tokenProgram: debtTokenProgram } = await (0, state_1.getMintState)(debtMint, this.connection);
         const withdrawIx = await this.program.clendAccountWithdraw(vault, vaultManager, clendGroup, clendAccount, collateralMint, collateralTokenProgram, collateralToWithdraw, remainingAccounts);
@@ -757,8 +887,7 @@ class ClendVaultsClient {
             ...swapIxns.ixns,
             ...repayIx,
         ];
-        const cuIxns = 2;
-        const endIndex = (0, utils_1.parseBN)(cuIxns + ixnsWithoutFlashLoan.length + 1 + additionalIxnCount);
+        const endIndex = (0, utils_1.parseBN)(ixnsWithoutFlashLoan.length + 1 + additionalIxnCount + 1);
         const remainingAccountsForFlashLoan = (0, clend_rpc_1.getClendAccountRemainingAccounts)(activeBankData);
         const { beginFlashLoanIx, endFlashLoanIx } = await this.clendClient.instructions.createFlashLoanInstructions(clendAccount, user, endIndex, remainingAccountsForFlashLoan);
         const instructions = [
@@ -792,7 +921,7 @@ class ClendVaultsClient {
         // 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);
         // Get Swap Instructions from the swapper
-        const swapIxns = await this.swapper.getSwapIxns(swapQuote);
+        const swapIxns = await this.swapper.getSwapIxns(swapQuote, user);
         // --- ATAs and Clend Instructions ---
         const { tokenProgram: collateralTokenProgram } = await (0, state_1.getMintState)(collateralMint, this.connection);
         const { tokenProgram: debtTokenProgram } = await (0, state_1.getMintState)(debtMint, this.connection);
@@ -865,8 +994,7 @@ class ClendVaultsClient {
             ...repayIx,
         ];
         // Flash Loan Wrapping
-        const cuIxns = 2;
-        const endIndex = (0, utils_1.parseBN)(cuIxns + ixnsWithoutFlashLoan.length + 1 + additionalIxnCount);
+        const endIndex = (0, utils_1.parseBN)(ixnsWithoutFlashLoan.length + 1 + additionalIxnCount + 1);
         const remainingAccountsForFlashLoan = (0, clend_rpc_1.getClendAccountRemainingAccounts)(activeBankData);
         const { beginFlashLoanIx, endFlashLoanIx } = await this.clendClient.instructions.createFlashLoanInstructions(clendAccount, user, endIndex, remainingAccountsForFlashLoan);
         const instructions = [
@@ -876,11 +1004,163 @@ class ClendVaultsClient {
         ];
         return { ixns: instructions, luts: swapIxns.luts };
     }
+    async getDepositLeverageCollateralIxns(vault, vaultManager, user, clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, borrowAmount, // protocol debt we want to borrow (from params fn)
+    depositAmount, // user's collateral already in the vault (issueStart)
+    slippageBps, additionalIxnCount) {
+        const vaultState = await this.getVault(vault);
+        const debtAssetState = vaultState.assets.find((a) => a.mint.address.equals(debtMint));
+        if (!debtAssetState) {
+            throw new Error(`Debt asset not found: ${debtMint.toString()}`);
+        }
+        const collateralAssetState = vaultState.assets.find((a) => a.mint.address.equals(collateralMint));
+        if (!collateralAssetState) {
+            throw new Error(`Collateral asset not found: ${collateralMint.toString()}`);
+        }
+        // 1. Load clend account + banks
+        const clendAccountData = await this.clendClient.getClendAccount(clendAccount);
+        if (!clendAccountData) {
+            throw new Error(`Clend account not found: ${clendAccount.toString()}`);
+        }
+        let activeBanks = (0, clend_rpc_1.getClendAccountActiveBanks)(clendAccountData);
+        // if collateral or debt bank not active, add them
+        const debtBankPk = (0, clend_rpc_1.getBankPda)(clendGroup, debtMint);
+        const collateralBankPk = (0, clend_rpc_1.getBankPda)(clendGroup, collateralMint);
+        const debtBankExists = activeBanks.some((b) => b.equals(debtBankPk));
+        if (!debtBankExists) {
+            activeBanks.push(debtBankPk);
+        }
+        const collateralBankExists = activeBanks.some((b) => b.equals(collateralBankPk));
+        if (!collateralBankExists) {
+            activeBanks.push(collateralBankPk);
+        }
+        const activeBankData = await this.clendClient.getBanks(activeBanks);
+        const remainingAccounts = (0, clend_rpc_1.getClendAccountRemainingAccounts)(activeBankData);
+        // 2. Quote swap: debt -> collateral for the borrowed amount
+        const swapQuote = await this.swapper.getQuote(vault, {
+            payer: vaultManager,
+            inputMint: debtMint,
+            inputMintDecimals: debtDecimals,
+            outputMint: collateralMint,
+            outputMintDecimals: collateralDecimals,
+            inputAmount: borrowAmount,
+            slippageBps,
+            swapMode: "ExactIn",
+        });
+        const swapIxns = await this.swapper.getSwapIxns(swapQuote, user);
+        const additionalCollateralFromSwap = swapQuote.outAmount;
+        const totalCollateralToDeposit = depositAmount.add(additionalCollateralFromSwap);
+        // 3. Token programs
+        const { tokenProgram: collateralTokenProgram } = await (0, state_1.getMintState)(collateralMint, this.connection);
+        const { tokenProgram: debtTokenProgram } = await (0, state_1.getMintState)(debtMint, this.connection);
+        const userSession = (0, addresses_1.getUserSessionPda)(vault, user);
+        // 4. Borrow & Deposit instructions (vault-aware)
+        const borrowIxns = await this.program.clendAccountBorrow(vault, vaultManager, clendGroup, clendAccount, debtMint, debtAssetState.oracle.address, debtTokenProgram, userSession, borrowAmount, remainingAccounts);
+        const collateralBankData = activeBankData.find((b) => b.mint.equals(collateralMint));
+        if (!collateralBankData) {
+            throw new Error(`Collateral bank not found: ${collateralMint.toString()}`);
+        }
+        const depositIxns = await this.program.clendAccountDeposit(vault, vaultManager, clendGroup, clendAccount, collateralMint, collateralTokenProgram, totalCollateralToDeposit, collateralAssetState.reserve.address, remainingAccounts);
+        // 5. Assemble inner ixns (no flash loan yet)
+        const ixnsWithoutFlashLoan = [
+            ...borrowIxns,
+            ...swapIxns.ixns,
+            ...depositIxns,
+        ];
+        // 6. Flash loan wrapping (same pattern as withdraw helpers)
+        const endIndex = (0, utils_1.parseBN)(1 + // begin flash loan
+            ixnsWithoutFlashLoan.length +
+            additionalIxnCount);
+        const remainingAccountsForFlashLoan = (0, clend_rpc_1.getClendAccountRemainingAccounts)(activeBankData);
+        const { beginFlashLoanIx, endFlashLoanIx } = await this.clendClient.instructions.createFlashLoanInstructions(clendAccount, user, endIndex, remainingAccountsForFlashLoan);
+        const instructions = [
+            beginFlashLoanIx,
+            ...ixnsWithoutFlashLoan,
+            endFlashLoanIx,
+        ];
+        return { ixns: instructions, luts: swapIxns.luts };
+    }
+    async getDepositLeverageDebtIxns(vault, vaultManager, user, clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, initialUserDebtContributionForSwap, // user deposit already in vault
+    finalLoopBorrowAmount, // protocol borrow (from params fn)
+    slippageBps, additionalIxnCount) {
+        const vaultState = await this.getVault(vault);
+        const debtAssetState = vaultState.assets.find((a) => a.mint.address.equals(debtMint));
+        if (!debtAssetState) {
+            throw new Error(`Debt asset not found: ${debtMint.toString()}`);
+        }
+        const collateralAssetState = vaultState.assets.find((a) => a.mint.address.equals(collateralMint));
+        if (!collateralAssetState) {
+            throw new Error(`Collateral asset not found: ${collateralMint.toString()}`);
+        }
+        // 1. Load clend account + banks
+        const clendAccountData = await this.clendClient.getClendAccount(clendAccount);
+        if (!clendAccountData) {
+            throw new Error(`Clend account not found: ${clendAccount.toString()}`);
+        }
+        let activeBanks = (0, clend_rpc_1.getClendAccountActiveBanks)(clendAccountData);
+        // if collateral or debt bank not active, add them
+        const collateralBankPk = (0, clend_rpc_1.getBankPda)(clendGroup, collateralMint);
+        const debtBankPk = (0, clend_rpc_1.getBankPda)(clendGroup, debtMint);
+        const collateralBankExists = activeBanks.some((b) => b.equals(collateralBankPk));
+        if (!collateralBankExists) {
+            activeBanks.push(collateralBankPk);
+        }
+        const debtBankExists = activeBanks.some((b) => b.equals(debtBankPk));
+        if (!debtBankExists) {
+            activeBanks.push(debtBankPk);
+        }
+        const activeBankData = await this.clendClient.getBanks(activeBanks);
+        const remainingAccounts = (0, clend_rpc_1.getClendAccountRemainingAccounts)(activeBankData);
+        // 2. Total debt to swap = user contribution + protocol borrow
+        const totalDebtTokenForSwap = initialUserDebtContributionForSwap.add(finalLoopBorrowAmount);
+        // Jupiter quote: debt -> collateral for TOTAL debt
+        const swapQuote = await this.swapper.getQuote(vault, {
+            payer: vaultManager,
+            inputMint: debtMint,
+            inputMintDecimals: debtDecimals,
+            outputMint: collateralMint,
+            outputMintDecimals: collateralDecimals,
+            inputAmount: totalDebtTokenForSwap,
+            slippageBps,
+            swapMode: "ExactIn",
+        });
+        const swapIxns = await this.swapper.getSwapIxns(swapQuote, user);
+        const optimisticCollateralFromQuote = new anchor_1.BN(swapQuote.outAmount);
+        // 3. Token programs
+        const { tokenProgram: collateralTokenProgram } = await (0, state_1.getMintState)(collateralMint, this.connection);
+        const { tokenProgram: debtTokenProgram } = await (0, state_1.getMintState)(debtMint, this.connection);
+        const userSession = (0, addresses_1.getUserSessionPda)(vault, user);
+        // 4. Borrow & Deposit (vault-aware)
+        const borrowIxns = await this.program.clendAccountBorrow(vault, vaultManager, clendGroup, clendAccount, debtMint, debtAssetState.oracle.address, debtTokenProgram, userSession, finalLoopBorrowAmount, remainingAccounts);
+        const collateralBankData = activeBankData.find((b) => b.mint.equals(collateralMint));
+        if (!collateralBankData) {
+            throw new Error(`Collateral bank not found: ${collateralMint.toString()}`);
+        }
+        const depositIxns = await this.program.clendAccountDeposit(vault, vaultManager, clendGroup, clendAccount, collateralMint, collateralTokenProgram, optimisticCollateralFromQuote, collateralAssetState.reserve.address, remainingAccounts);
+        // 5. Inner ixns (same order as clend-protocol: borrow -> swap -> deposit)
+        const ixnsWithoutFlashLoan = [
+            ...borrowIxns,
+            ...swapIxns.ixns,
+            ...depositIxns,
+        ];
+        // 6. Flash loan wrapping (same pattern as withdraw)
+        const endIndex = (0, utils_1.parseBN)(1 + // begin flash loan
+            ixnsWithoutFlashLoan.length +
+            additionalIxnCount);
+        const remainingAccountsForFlashLoan = (0, clend_rpc_1.getClendAccountRemainingAccounts)(activeBankData);
+        const { beginFlashLoanIx, endFlashLoanIx } = await this.clendClient.instructions.createFlashLoanInstructions(clendAccount, user, endIndex, remainingAccountsForFlashLoan);
+        const instructions = [
+            beginFlashLoanIx,
+            ...ixnsWithoutFlashLoan,
+            endFlashLoanIx,
+        ];
+        return {
+            ixns: instructions,
+            luts: swapIxns.luts,
+        };
+    }
     async swap(vault, inputMint, outputMint, inAmount) {
-        const { state: inputMintState, tokenProgram: inputMintTokenProgram } = await (0, state_1.getMintState)(inputMint, this.connection);
-        const { state: outputMintState, tokenProgram: outputMintTokenProgram } = await (0, state_1.getMintState)(outputMint, this.connection);
-        const vaultAssetInReserve = (0, spl_token_1.getAssociatedTokenAddressSync)(inputMint, vault, true, inputMintTokenProgram);
-        const vaultAssetOutReserve = (0, spl_token_1.getAssociatedTokenAddressSync)(outputMint, vault, true, outputMintTokenProgram);
+        const { state: inputMintState, tokenProgram: _inputMintTokenProgram } = await (0, state_1.getMintState)(inputMint, this.connection);
+        const { state: outputMintState, tokenProgram: _outputMintTokenProgram } = await (0, state_1.getMintState)(outputMint, this.connection);
         const quote = await this.swapper.getQuote(vault, {
             payer: this.address(),
             inputMint: inputMint,
@@ -891,36 +1171,7 @@ class ClendVaultsClient {
             swapMode: "ExactIn",
             slippageBps: 30,
         });
-        const swapIxns = await this.swapper.getSwapIxns(quote);
-        //const swapIx = swapIxns.ixns[0];
-        ////const swapIx = swapIxns.ixns.find((ix) =>
-        ////  ix.programId.equals(JUPITER_SWAP_PROGRAM_ID),
-        ////);
-        ////if (!swapIx) {
-        ////  throw new Error(
-        ////    `Swap ix not found in swapIxns, programIds: ${JSON.stringify(swapIxns.ixns.map((ix) => ix.programId.toString()))}`,
-        ////  );
-        ////}
-        //const swapRemainingAccounts: web3.AccountMeta[] = swapIx.keys.map(
-        //  (key) => ({
-        //    pubkey: key.pubkey,
-        //    // If the account is the vault PDA, mark it as NOT a signer for the client transaction.
-        //    isSigner: key.pubkey.equals(vault) ? false : key.isSigner,
-        //    isWritable: key.isWritable,
-        //  }),
-        //);
-        //const swapData = swapIx.data;
-        //const ixns = await this.program.swap(
-        //  vault,
-        //  this.address(),
-        //  inputMint,
-        //  outputMint,
-        //  vaultAssetInReserve,
-        //  vaultAssetOutReserve,
-        //  swapData,
-        //  swapRemainingAccounts,
-        //  JUPITER_SWAP_PROGRAM_ID,
-        //);
+        const swapIxns = await this.swapper.getSwapIxns(quote, null);
         const txSig = await this.send(swapIxns.ixns, [], swapIxns.luts);
         return txSig;
     }
@@ -960,7 +1211,7 @@ class ClendVaultsClient {
         // detect if CU budget ixns are needed
         const firstIx = ixns[0];
         if (!firstIx.programId.equals(web3_js_1.ComputeBudgetProgram.programId)) {
-            ixns.unshift(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 600000 }));
+            ixns.unshift(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 900000 }));
             ixns.unshift(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1000 }));
         }
         const { blockhash } = await this.connection.getLatestBlockhash("confirmed");