@carrot-protocol/clend-rpc 0.1.45-fl-signer1-dev-9b2343b → 0.1.46-support-sol-dev-a4e5ebf

package/dist/rpc.js

@@ -110,7 +110,7 @@ class ClendClient {
             microLamports: this.cuFeeInMicroLamports,
         });
         const cuLimitIx = anchor_1.web3.ComputeBudgetProgram.setComputeUnitLimit({
-            units: 500000,
+            units: 800000,
         });
         const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash({
             commitment: "confirmed",
@@ -528,8 +528,8 @@ class ClendClient {
         const tokenProgram = (0, utils_1.getTokenProgramForMint)(bankData.mint);
         // Derive the associated token account for the signer
         const signerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, this.address(), true, tokenProgram);
-        const ix = await this.instructions.deposit(group, clendAccount, this.address(), bank, bankData.mint, bankData.defaultOracle, signerTokenAccount, tokenProgram, amount, false);
-        return this.send([ix]);
+        const ixns = await this.instructions.deposit(group, clendAccount, this.address(), bank, bankData.mint, bankData.defaultOracle, signerTokenAccount, tokenProgram, amount, false);
+        return this.send(ixns);
     }
     async withdraw(clendAccount, mint, amount, withdrawAll = null) {
         const clendAccountData = await this.getClendAccount(clendAccount);
@@ -551,8 +551,8 @@ class ClendClient {
             activeBankData.push(bankData);
         }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        const ix = await this.instructions.withdraw(group, clendAccount, this.address(), bank, mint, destinationTokenAccount, tokenProgram, amount, withdrawAll, remainingAccounts);
-        return this.send([ix]);
+        const ixns = await this.instructions.withdraw(group, clendAccount, this.address(), bank, mint, destinationTokenAccount, tokenProgram, amount, withdrawAll, remainingAccounts);
+        return this.send(ixns);
     }
     async borrow(clendAccount, mint, amount) {
         const clendAccountData = await this.getClendAccount(clendAccount);
@@ -579,8 +579,8 @@ class ClendClient {
             activeBankData.push(bankData);
         }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        const ix = await this.instructions.borrow(clendAccountData.group, clendAccount, this.address(), bank, bankData.mint, destinationTokenAccount, tokenProgram, amount, remainingAccounts);
-        return this.send([createDestinationTokenAccountIx, ix]);
+        const ixns = await this.instructions.borrow(clendAccountData.group, clendAccount, this.address(), bank, bankData.mint, destinationTokenAccount, tokenProgram, amount, remainingAccounts);
+        return this.send([createDestinationTokenAccountIx, ...ixns]);
     }
     async repay(clendAccount, mint, amount, repayAll, repayUpToAmount) {
         const clendAccountData = await this.getClendAccount(clendAccount);
@@ -601,8 +601,8 @@ class ClendClient {
             activeBankData.push(bankData);
         }
         const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        const ix = await this.instructions.repay(clendAccountData.group, clendAccount, this.address(), bank, bankData.mint, userTokenAccount, tokenProgram, amount, repayAll, repayUpToAmount, remainingAccounts);
-        return this.send([ix]);
+        const ixns = await this.instructions.repay(clendAccountData.group, clendAccount, this.address(), bank, bankData.mint, userTokenAccount, tokenProgram, amount, repayAll, repayUpToAmount, remainingAccounts);
+        return this.send(ixns);
     }
     async editGlobalFeeState(groups, newGlobalFeeWallet, newBankInitFlatSolFee, newProgramFeeFixed, newProgramFeeRate) {
         const currentFeeState = await this.getFeeState();
@@ -655,7 +655,7 @@ class ClendClient {
         return this.send([ix]);
     }
     async liquidateClendAccountWithFlashLoan(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, marginfiLiabFlashLoanBank, liquidatorMarginfiAccount, additionalIxnCount, // used to calculate the end flash loan index
-    swapperOverride) {
+    swapperOverride, additionalLuts = []) {
         // create instructions
         const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride);
         if (!result) {
@@ -688,15 +688,15 @@ class ClendClient {
             repayIx,
             endFlashLoanIx,
         ];
-        return this.send(ixns, [], luts);
+        return this.send(ixns, [], [...luts, ...additionalLuts]);
     }
-    async liquidateClendAccount(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride) {
+    async liquidateClendAccount(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride, additionalLuts = []) {
         const result = await this.getLiquidateClendAccountIxns(liquidatorClendAccount, liquidateeClendAccount, assetBankData, liabBankData, targetOnChainMaintenanceHealthValue, slippageBps, swapperOverride);
         if (!result) {
             return;
         }
         const { ixns, luts, depositAmount: _depositAmount } = result;
-        return this.send(ixns, [], luts);
+        return this.send(ixns, [], [...luts, ...additionalLuts]);
     }
     /**
      * Creates instructions to liquidate an unhealthy Clend account.
@@ -820,10 +820,6 @@ class ClendClient {
         });
         const liabilityMintTokenProgram = (0, utils_1.getTokenProgramForMint)(liabBankData.mint);
         const assetTokenProgram = (0, utils_1.getTokenProgramForMint)(assetBankData.mint);
-        const remainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)([
-            liabBankData,
-            assetBankData,
-        ]);
         const liquidatorLiabilityAta = (0, spl_token_1.getAssociatedTokenAddressSync)(liabBankData.mint, liquidatorClendAccount.authority, true, liabilityMintTokenProgram);
         // calcualte amount of liability tokens to deposit into the liquidator clend account
         const calculatedAssetAmountValue = (0, clend_common_1.calculateWeightedValue)(calculatedAssetAmountUi, assetPrice, 1);
@@ -831,15 +827,19 @@ class ClendClient {
         utils_1.logger.info(`liability token deposit amount calculated`, {
             depositAmount: depositAmount.toString(10),
         });
-        const depositIx = await this.instructions.deposit(liabBankData.group, liquidatorClendAccount.key, liquidatorClendAccount.authority, liabBankData.key, liabBankData.mint, liabBankData.defaultOracle, liquidatorLiabilityAta, liabilityMintTokenProgram, depositAmount, true);
-        const liquidationRemainingAccounts = (0, utils_1.getLiquidateClendAccountRemainingAccounts)(liquidateeClendAccount, liquidatorClendAccount, liabBankData.mint, liabilityMintTokenProgram, assetBankData.mint, this.mintOracleMapping);
+        const depositIxns = await this.instructions.deposit(liabBankData.group, liquidatorClendAccount.key, liquidatorClendAccount.authority, liabBankData.key, liabBankData.mint, liabBankData.defaultOracle, liquidatorLiabilityAta, liabilityMintTokenProgram, depositAmount, true);
+        const liquidationRemainingAccounts = (0, utils_1.getLiquidateClendAccountRemainingAccounts)(liquidateeClendAccount, liquidatorClendAccount, liabBankData.mint, liabilityMintTokenProgram, assetBankData.mint, this.mintOracleMapping, liabBankData.key);
         // create liquidation instruction
         const liquidationIx = await this.instructions.liquidateClendAccount(assetBankData.group, liquidatorClendAccount.authority, assetBankData.key, liabBankData.key, liquidatorClendAccount.key, liquidateeClendAccount.key, liabilityMintTokenProgram, liquidationRemainingAccounts, finalAssetAmount);
         const liquidatorAssetAta = (0, spl_token_1.getAssociatedTokenAddressSync)(assetBankData.mint, liquidatorClendAccount.authority, true, assetTokenProgram);
+        const withdrawRemainingAccounts = (0, utils_1.getClendAccountRemainingAccounts)([
+            assetBankData,
+            liabBankData,
+        ]);
         // careful not to withdraw everything we need to keep an "active"
         // just withdraw the liquidated amount
         // balance for the asset
-        const withdrawAssetIx = await this.instructions.withdraw(assetBankData.group, liquidatorClendAccount.key, liquidatorClendAccount.authority, assetBankData.key, assetBankData.mint, liquidatorAssetAta, assetTokenProgram, finalAssetAmount, false, remainingAccounts);
+        const withdrawAssetIxns = await this.instructions.withdraw(assetBankData.group, liquidatorClendAccount.key, liquidatorClendAccount.authority, assetBankData.key, assetBankData.mint, liquidatorAssetAta, assetTokenProgram, finalAssetAmount, false, withdrawRemainingAccounts);
         // get a swap quote
         const swapQuote = await activeSwapper.getQuote({
             payer: liquidatorClendAccount.authority,
@@ -860,9 +860,9 @@ class ClendClient {
         // 5. Get Swap Instructions from Jupiter
         const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
         const ixns = [
-            depositIx, // deposit liability mint into liquidator clend account
+            ...depositIxns, // deposit liability mint into liquidator clend account
             liquidationIx, // liquidate liquidatee clend account
-            withdrawAssetIx, // withdraw liquidated asset from liquidator clend account
+            ...withdrawAssetIxns, // withdraw liquidated asset from liquidator clend account
             ...swapIxns.ixns, // swap liquidated asset for liability mint
         ];
         return { ixns, luts: swapIxns.luts, depositAmount };
@@ -936,7 +936,7 @@ class ClendClient {
         return this.send(ixns, additionalSigners, luts);
     }
     async getDepositLeverageFromDebtIxns(clendGroup, user, clendAccount, collateralMint, debtMint, debtMintDecimals, collateralMintDecimals, initialUserDebtContributionForSwap, finalLoopBorrowAmount, slippageBps, additionalIxnCount, // For JIT liquidity, etc.
-    swapperOverride, flashLoanSignerOverride) {
+    swapperOverride) {
         // override swapper if provided
         let activeSwapper = this.swapper;
         if (swapperOverride) {
@@ -1009,7 +1009,7 @@ class ClendClient {
         // 5. Get Swap Instructions from Jupiter
         const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
         // 6. Create Clend Protocol Instructions
-        const borrowIx = await this.instructions.borrow(clendGroup, clendAccount, // clendAccount is guaranteed to be non-null here
+        const borrowIxns = await this.instructions.borrow(clendGroup, clendAccount, // clendAccount is guaranteed to be non-null here
         user, debtBank, debtMint, userDebtAta, // Borrow into user's ATA
         debtTokenProgram, finalLoopBorrowAmount, // Borrow only the protocol's contribution
         remainingAccounts);
@@ -1023,15 +1023,15 @@ class ClendClient {
         if (!collateralBankData) {
             throw new Error(`Collateral bank not found: ${collateralBank.toString()}`);
         }
-        const depositIx = await this.instructions.deposit(clendGroup, clendAccount, user, collateralBank, collateralMint, collateralBankData.defaultOracle, userCollateralAta, // Deposit from user's JLP ATA (which received swap output)
+        const depositIxns = await this.instructions.deposit(clendGroup, clendAccount, user, collateralBank, collateralMint, collateralBankData.defaultOracle, userCollateralAta, // Deposit from user's JLP ATA (which received swap output)
         collateralTokenProgram, optimisticCollateralFromQuote, // Deposit the optimistic amount from the quote
         true);
         // 7. Assemble instructions for the flash loan
         // Order: Borrow additional debt, then swap combined debt, then deposit resulting collateral
         const ixnsWithoutFlashLoan = [
-            borrowIx,
+            ...borrowIxns,
             ...swapIxns.ixns,
-            depositIx,
+            ...depositIxns,
         ];
         // 8. Wrap in Flash Loan
         const { addInitClendAccountIncrement, initClendAccountIxns } = initClendAccountIx
@@ -1048,9 +1048,7 @@ class ClendClient {
             startFlashLoanIncrement +
             additionalIxnCount);
         const remainingAccountsForFlashLoan = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        // used for clend accounts which are owned by PDAs
-        const flashLoanSigner = flashLoanSignerOverride || user;
-        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, flashLoanSigner, endIndex, remainingAccountsForFlashLoan);
+        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, user, endIndex, remainingAccountsForFlashLoan);
         // Final instruction sequence
         const ixns = [
             ...initClendAccountIxns,
@@ -1066,7 +1064,7 @@ class ClendClient {
         };
     }
     async getDepositLeverageFromCollateralIxns(clendGroup, user, clendAccount, collateralMint, debtMint, debtMintDecimals, collateralMintDecimals, borrowAmount, depositAmount, slippageBps, additionalIxnCount, // used to correctly offset the flash loan index
-    swapperOverride, flashLoanSignerOverride) {
+    swapperOverride) {
         // override swapper if provided
         let activeSwapper = this.swapper;
         if (swapperOverride) {
@@ -1139,18 +1137,18 @@ class ClendClient {
         const userDebtAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtMint, user, true, debtTokenProgram);
         const userCollateralAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralMint, user, true, collateralTokenProgram);
         // Create transaction instructions in correct order
-        const borrowIx = await this.instructions.borrow(clendGroup, clendAccount, user, debtBank, debtMint, userDebtAta, debtTokenProgram, borrowAmount, remainingAccounts);
+        const borrowIxns = await this.instructions.borrow(clendGroup, clendAccount, user, debtBank, debtMint, userDebtAta, debtTokenProgram, borrowAmount, remainingAccounts);
         const collateralBankData = activeBankData.find((bank) => bank.key.equals(collateralBank));
         if (!collateralBankData) {
             throw new Error(`Collateral bank not found: ${collateralBank.toString()}`);
         }
-        const depositIx = await this.instructions.deposit(clendGroup, clendAccount, user, collateralBank, collateralMint, collateralBankData.defaultOracle, userCollateralAta, collateralTokenProgram, totalCollateralAmount, // this is optimistic amount from the quote
+        const depositIxns = await this.instructions.deposit(clendGroup, clendAccount, user, collateralBank, collateralMint, collateralBankData.defaultOracle, userCollateralAta, collateralTokenProgram, totalCollateralAmount, // this is optimistic amount from the quote
         true);
         // add lending and swap instructions
         const ixnsWithoutFlashLoan = [
-            borrowIx,
+            ...borrowIxns,
             ...swapIxns.ixns,
-            depositIx,
+            ...depositIxns,
         ];
         // If the clend account is being created, we need to add 1 to the endIndex
         const { addInitClendAccountIncrement, initClendAccountIxns } = initClendAccountIx
@@ -1167,8 +1165,6 @@ class ClendClient {
             startFlashLoanIncrement +
             additionalIxnCount);
         const remainingAccountsForFlashLoan = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        // used for clend accounts which are owned by PDAs
-        const flashLoanSigner = flashLoanSignerOverride || user;
         const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, user, endIndex, remainingAccountsForFlashLoan);
         const ixns = [
             ...initClendAccountIxns,
@@ -1373,7 +1369,7 @@ class ClendClient {
         // Send transaction
         return this.send(ixns, [], luts);
     }
-    async getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride, flashLoanSignerOverride) {
+    async getWithdrawLeverageDebtIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, debtToRepay, collateralToWithdraw, slippageBps, additionalIxnCount, swapperOverride) {
         // override swapper if provided
         let activeSwapper = this.swapper;
         if (swapperOverride) {
@@ -1418,7 +1414,7 @@ class ClendClient {
         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
-        const withdrawIx = await this.instructions.withdraw(clendGroup, clendAccount, clendAccountData.authority, collateralBank, collateralMint, userCollateralAta, collateralTokenProgram, collateralToWithdraw, withdrawAll, remainingAccounts);
+        const withdrawIxns = await this.instructions.withdraw(clendGroup, clendAccount, clendAccountData.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) {
@@ -1452,22 +1448,20 @@ class ClendClient {
             }
         }
         // Create repay instruction: Repay the debt portion using the guaranteed swap output
-        const repayIx = 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, clendAccountData.authority, debtBank, debtMint, userDebtAta, debtTokenProgram, finalDebtToRepay, // Use the slippage-protected amount from the final quote
         withdrawAll, true, remainingAccounts);
         // Assemble instructions
         const ixnsWithoutFlashLoan = [
             ...emissionsIxns,
-            withdrawIx,
+            ...withdrawIxns,
             ...swapIxns.ixns,
-            repayIx,
+            ...repayIxns,
         ];
         // Flash Loan Wrapping
         const cuIxns = 2;
         const endIndex = new anchor_1.BN(cuIxns + ixnsWithoutFlashLoan.length + 1 + additionalIxnCount);
         const remainingAccountsForFlashLoan = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        // used for clend accounts which are owned by PDAs
-        const flashLoanSigner = flashLoanSignerOverride || clendAccountData.authority;
-        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, flashLoanSigner, endIndex, remainingAccountsForFlashLoan);
+        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, clendAccountData.authority, endIndex, remainingAccountsForFlashLoan);
         const instructions = [
             beginFlashLoanIx,
             ...ixnsWithoutFlashLoan,
@@ -1548,7 +1542,7 @@ class ClendClient {
             debtBankData,
         };
     }
-    async getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, collateralToWithdraw, desiredNetCollateralToReceive, debtToRepay, slippageBps, additionalIxnCount, swapperOverride, flashLoanSignerOverride) {
+    async getWithdrawLeverageCollateralIxns(clendGroup, clendAccount, collateralMint, debtMint, collateralDecimals, debtDecimals, withdrawAll, collateralToWithdraw, desiredNetCollateralToReceive, debtToRepay, slippageBps, additionalIxnCount, swapperOverride) {
         // override swapper if provided
         let activeSwapper = this.swapper;
         if (swapperOverride) {
@@ -1630,7 +1624,7 @@ class ClendClient {
         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, collateralMint, userCollateralAta, collateralTokenProgram, collateralToWithdraw, withdrawAll, remainingAccounts);
+        const withdrawIxns = await this.instructions.withdraw(clendGroup, clendAccount, clendAccountData.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 = [];
@@ -1665,21 +1659,19 @@ class ClendClient {
             }
         }
         // Create repay instruction with the amount from the 'ExactIn' swap
-        const repayIx = await this.instructions.repay(clendGroup, clendAccount, clendAccountData.authority, debtBank, debtMint, userDebtAta, debtTokenProgram, finalDebtToRepay, withdrawAll, true, remainingAccounts);
+        const repayIxns = await this.instructions.repay(clendGroup, clendAccount, clendAccountData.authority, debtBank, debtMint, userDebtAta, debtTokenProgram, finalDebtToRepay, withdrawAll, true, remainingAccounts);
         utils_1.logger.info(`repayIx set`);
         const ixnsWithoutFlashLoan = [
             ...emissionsIxns,
-            withdrawIx,
+            ...withdrawIxns,
             ...swapIxns.ixns,
-            repayIx,
+            ...repayIxns,
         ];
         utils_1.logger.info(`ixnsWithoutFlashLoan set`);
         const cuIxns = 2;
         const endIndex = new anchor_1.BN(cuIxns + ixnsWithoutFlashLoan.length + 1 + additionalIxnCount);
         const remainingAccountsForFlashLoan = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        // used for clend accounts which are owned by PDAs
-        const flashLoanSigner = flashLoanSignerOverride || clendAccountData.authority;
-        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, flashLoanSigner, endIndex, remainingAccountsForFlashLoan);
+        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, clendAccountData.authority, endIndex, remainingAccountsForFlashLoan);
         const instructions = [
             beginFlashLoanIx,
             ...ixnsWithoutFlashLoan,
@@ -1984,7 +1976,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, flashLoanSignerOverride) {
+    slippageBps, additionalIxnCount, swapperOverride) {
         // override swapper if provided
         let activeSwapper = this.swapper;
         if (swapperOverride) {
@@ -2031,10 +2023,10 @@ class ClendClient {
                 swapMode: "ExactIn",
             });
             const swapIxns = await activeSwapper.getSwapIxns(swapQuote);
-            const borrowIx = await this.instructions.borrow(clendGroup, clendAccount, user, debtBankData.key, debtBankData.mint, userDebtAta, debtTokenProgram, additionalDebtAmount, remainingAccounts);
+            const borrowIxns = await this.instructions.borrow(clendGroup, clendAccount, user, debtBankData.key, debtBankData.mint, userDebtAta, debtTokenProgram, additionalDebtAmount, remainingAccounts);
             const additionalCollateralAmount = swapQuote.outAmount;
-            const depositIx = await this.instructions.deposit(clendGroup, clendAccount, user, collateralBankData.key, collateralBankData.mint, collateralBankData.defaultOracle, userCollateralAta, collateralTokenProgram, additionalCollateralAmount, true);
-            instructions.push(borrowIx, ...swapIxns.ixns, depositIx);
+            const depositIxns = await this.instructions.deposit(clendGroup, clendAccount, user, collateralBankData.key, collateralBankData.mint, collateralBankData.defaultOracle, userCollateralAta, collateralTokenProgram, additionalCollateralAmount, true);
+            instructions.push(...borrowIxns, ...swapIxns.ixns, ...depositIxns);
             swapLookupTables = swapIxns.luts;
         }
         else {
@@ -2058,23 +2050,21 @@ class ClendClient {
             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, collateralBankData.mint, userCollateralAta, collateralTokenProgram, collateralToWithdrawBN, false, // Not withdrawing all
+            const withdrawIxns = await this.instructions.withdraw(clendGroup, clendAccount, user, collateralBankData.key, collateralBankData.mint, userCollateralAta, collateralTokenProgram, collateralToWithdrawBN, false, // Not withdrawing all
             remainingAccounts);
             // Repay the debt with the swap output
-            const repayIx = await this.instructions.repay(clendGroup, clendAccount, user, debtBankData.key, debtBankData.mint, userDebtAta, debtTokenProgram, finalDebtToRepay, // Use optimistic amount
+            const repayIxns = await this.instructions.repay(clendGroup, clendAccount, user, debtBankData.key, debtBankData.mint, userDebtAta, debtTokenProgram, finalDebtToRepay, // Use optimistic amount
             false, // Not repaying all
             true, // Use the new repay_up_to_amount flag
             remainingAccounts);
-            instructions.push(withdrawIx, ...swapIxns.ixns, repayIx);
+            instructions.push(...withdrawIxns, ...swapIxns.ixns, ...repayIxns);
             swapLookupTables = swapIxns.luts;
         }
         // --- Flash Loan Wrapping ---
         const cuIxns = 2;
         const endIndex = new anchor_1.BN(cuIxns + instructions.length + 1 + additionalIxnCount);
         const remainingAccountsForFlashLoan = (0, utils_1.getClendAccountRemainingAccounts)(activeBankData);
-        // used for clend accounts which are owned by PDAs
-        const flashLoanSigner = flashLoanSignerOverride || clendAccountData.authority;
-        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, flashLoanSigner, endIndex, remainingAccountsForFlashLoan);
+        const { beginFlashLoanIx, endFlashLoanIx } = await this.instructions.createFlashLoanInstructions(clendAccount, user, endIndex, remainingAccountsForFlashLoan);
         const finalInstructions = [
             beginFlashLoanIx,
             ...instructions,