@kamino-finance/klend-sdk 4.0.2 → 5.0.0

package/dist/leverage/operations.js

@@ -131,9 +131,7 @@ const getDepositWithLeverageSwapInputs = (props) => {
     });
     return {
         swapInputs: {
-            inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(calcs.swapDebtTokenIn, debtReserve.state.liquidity.mintDecimals.toNumber())
-                .ceil()
-                .toNumber(),
+            inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(calcs.swapDebtTokenIn, debtReserve.state.liquidity.mintDecimals.toNumber()).ceil(),
             inputMint: debtTokenMint,
             outputMint: collTokenMint,
         },
@@ -186,8 +184,7 @@ const getDepositWithLeverageIxns = async (props) => {
         initDepositInSol: calcs.initDepositInSol,
     }));
     // 1. Create atas & budget txns
-    let mintsToCreateAtas = [];
-    let mintsToCreateAtasTokenPrograms = [];
+    let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBMint
@@ -199,24 +196,43 @@ const getDepositWithLeverageIxns = async (props) => {
             : strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
                 ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategy.strategy.tokenATokenProgram;
-        mintsToCreateAtas = [collTokenMint, debtTokenMint, collReserve.getCTokenMint(), secondTokenAta];
-        mintsToCreateAtasTokenPrograms = [
-            collReserve.getLiquidityTokenProgram(),
-            debtReserve.getLiquidityTokenProgram(),
-            spl_token_1.TOKEN_PROGRAM_ID,
-            secondTokenTokenProgarm,
+        mintsToCreateAtas = [
+            {
+                mint: collTokenMint,
+                tokenProgram: collReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: debtTokenMint,
+                tokenProgram: debtReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: collReserve.getCTokenMint(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+            {
+                mint: secondTokenAta,
+                tokenProgram: secondTokenTokenProgarm,
+            },
         ];
     }
     else {
-        mintsToCreateAtas = [collTokenMint, debtTokenMint, collReserve.getCTokenMint()];
-        mintsToCreateAtasTokenPrograms = [
-            collReserve.getLiquidityTokenProgram(),
-            debtReserve.getLiquidityTokenProgram(),
-            spl_token_1.TOKEN_PROGRAM_ID,
+        mintsToCreateAtas = [
+            {
+                mint: collTokenMint,
+                tokenProgram: collReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: debtTokenMint,
+                tokenProgram: debtReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: collReserve.getCTokenMint(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
         ];
     }
     const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
-    const { atas: [collTokenAta, debtTokenAta], createAtasIxns, closeAtasIxns, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas, mintsToCreateAtasTokenPrograms);
+    const { atas: [collTokenAta, debtTokenAta], createAtaIxs, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas);
     // TODO: this needs to work the other way around also
     // TODO: marius test this with shorting leverage and with leverage looping
     const fillWsolAtaIxns = [];
@@ -226,7 +242,7 @@ const getDepositWithLeverageIxns = async (props) => {
     // 1. Flash borrow & repay the collateral amount needed for given leverage
     // if user deposits coll, then we borrow the diff, else we borrow the entire amount
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + createAtasIxns.length + fillWsolAtaIxns.length,
+        borrowIxnIndex: budgetIxns.length + createAtaIxs.length + fillWsolAtaIxns.length,
         walletPublicKey: user,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -264,7 +280,7 @@ const getDepositWithLeverageIxns = async (props) => {
     console.log('Expected to swap in', !collIsKtoken ? calcs.swapDebtTokenIn.toNumber().toString() : calcsKtoken.singleSidedDeposit.toNumber().toString(), 'debt for', !collIsKtoken ? calcs.swapCollTokenExpectedOut.toString() : calcsKtoken.requiredCollateral.toNumber().toString(), 'coll');
     const ixns = [
         ...budgetIxns,
-        ...createAtasIxns,
+        ...createAtaIxs,
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
         ...kaminoDepositAndBorrowAction.setupIxs,
@@ -273,7 +289,6 @@ const getDepositWithLeverageIxns = async (props) => {
         ...[kaminoDepositAndBorrowAction.lendingIxs[1]],
         ...kaminoDepositAndBorrowAction.cleanupIxs,
         ...[flashRepayIxn],
-        ...closeAtasIxns,
     ];
     const uniqueAccounts = new utils_1.PublicKeySet([]);
     ixns.forEach((ixn) => {
@@ -287,7 +302,11 @@ const getDepositWithLeverageIxns = async (props) => {
         return {
             ixns: [],
             lookupTablesAddresses: [],
-            swapInputs: { inputAmountLamports: 0, inputMint: web3_js_1.PublicKey.default, outputMint: web3_js_1.PublicKey.default },
+            swapInputs: {
+                inputAmountLamports: new decimal_js_1.default('0'),
+                inputMint: web3_js_1.PublicKey.default,
+                outputMint: web3_js_1.PublicKey.default,
+            },
             totalKlendAccounts: totalKlendAccounts,
         };
     }
@@ -309,13 +328,11 @@ const getDepositWithLeverageIxns = async (props) => {
         expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(connection, debtTokenMint, user, (0, classes_2.numberToLamportsDecimal)(futureBalanceInAta.toDecimalPlaces(debtReserve.stats.decimals), debtReserve.stats.decimals), debtReserve.state.liquidity.mintDecimals.toNumber());
     }
     const swapInputs = {
-        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.swapDebtTokenIn : calcsKtoken.singleSidedDeposit, debtReserve.stats.decimals)
-            .ceil()
-            .toNumber(),
+        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.swapDebtTokenIn : calcsKtoken.singleSidedDeposit, debtReserve.stats.decimals).ceil(),
         inputMint: debtTokenMint,
         outputMint: collTokenMint,
     };
-    const [swapIxns, lookupTablesAddresses] = await depositSwapper(swapInputs.inputAmountLamports, swapInputs.inputMint, swapInputs.outputMint, slippagePct.toNumber(), expectedDebtTokenAtaBalance);
+    const [swapIxns, lookupTablesAddresses] = await depositSwapper(swapInputs.inputAmountLamports.toNumber(), swapInputs.inputMint, swapInputs.outputMint, slippagePct.toNumber(), expectedDebtTokenAtaBalance);
     if (collIsKtoken) {
         if (strategy?.strategy.strategyLookupTable) {
             lookupTablesAddresses.push(strategy?.strategy.strategyLookupTable);
@@ -329,7 +346,7 @@ const getDepositWithLeverageIxns = async (props) => {
         return {
             ixns: [
                 ...budgetIxns,
-                ...createAtasIxns,
+                ...createAtaIxs,
                 ...fillWsolAtaIxns,
                 ...[flashBorrowIxn],
                 ...kaminoDepositAndBorrowAction.setupIxs,
@@ -339,7 +356,6 @@ const getDepositWithLeverageIxns = async (props) => {
                 ...kaminoDepositAndBorrowAction.cleanupIxs,
                 ...swapInstructions,
                 ...[flashRepayIxn],
-                ...closeAtasIxns,
             ],
             lookupTablesAddresses,
             swapInputs,
@@ -350,7 +366,7 @@ const getDepositWithLeverageIxns = async (props) => {
         return {
             ixns: [
                 ...budgetIxns,
-                ...createAtasIxns,
+                ...createAtaIxs,
                 ...fillWsolAtaIxns,
                 ...[flashBorrowIxn],
                 ...swapInstructions,
@@ -360,7 +376,6 @@ const getDepositWithLeverageIxns = async (props) => {
                 ...[kaminoDepositAndBorrowAction.lendingIxs[1]],
                 ...kaminoDepositAndBorrowAction.cleanupIxs,
                 ...[flashRepayIxn],
-                ...closeAtasIxns,
             ],
             lookupTablesAddresses,
             swapInputs,
@@ -399,9 +414,7 @@ const getWithdrawWithLeverageSwapInputs = (props) => {
     const collTokenSwapIn = selectedTokenIsCollToken ? swapAmountIfWithdrawingColl : swapAmountIfWithdrawingDebt;
     return {
         swapInputs: {
-            inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(collTokenSwapIn, collReserve.state.liquidity.mintDecimals.toNumber())
-                .ceil()
-                .toNumber(),
+            inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(collTokenSwapIn, collReserve.state.liquidity.mintDecimals.toNumber()).ceil(),
             inputMint: collTokenMint,
             outputMint: debtTokenMint,
         },
@@ -475,42 +488,59 @@ const getWithdrawWithLeverageIxns = async (props) => {
     const strategy = collIsKtoken ? await kamino?.getStrategyByKTokenMint(collTokenMint) : undefined;
     console.log('Expecting to swap', collTokenSwapIn.toString(), 'coll for', debtTokenExpectedSwapOut.toString(), 'debt');
     // 1. Create atas & budget txns & user metadata
-    let mintsToCreateAtas = [];
-    let mintsToCreateAtasTokenPrograms = [];
+    let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBMint
             : strategy.strategy.tokenAMint;
-        const secondTokenTokenProgarm = strategy?.strategy.tokenAMint.equals(debtTokenMint)
+        const secondTokenTokenProgram = strategy?.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBTokenProgram.equals(web3_js_1.PublicKey.default)
                 ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategy.strategy.tokenBTokenProgram
             : strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
                 ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategy.strategy.tokenATokenProgram;
-        mintsToCreateAtas = [collTokenMint, debtTokenMint, collReserve.getCTokenMint(), secondTokenAta];
-        mintsToCreateAtasTokenPrograms = [
-            collReserve.getLiquidityTokenProgram(),
-            debtReserve.getLiquidityTokenProgram(),
-            spl_token_1.TOKEN_PROGRAM_ID,
-            secondTokenTokenProgarm,
+        mintsToCreateAtas = [
+            {
+                mint: collTokenMint,
+                tokenProgram: collReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: debtTokenMint,
+                tokenProgram: debtReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: collReserve.getCTokenMint(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+            {
+                mint: secondTokenAta,
+                tokenProgram: secondTokenTokenProgram,
+            },
         ];
     }
     else {
-        mintsToCreateAtas = [collTokenMint, debtTokenMint, collReserve.getCTokenMint()];
-        mintsToCreateAtasTokenPrograms = [
-            collReserve.getLiquidityTokenProgram(),
-            debtReserve.getLiquidityTokenProgram(),
-            spl_token_1.TOKEN_PROGRAM_ID,
+        mintsToCreateAtas = [
+            {
+                mint: collTokenMint,
+                tokenProgram: collReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: debtTokenMint,
+                tokenProgram: debtReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: collReserve.getCTokenMint(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
         ];
     }
-    const { atas: [, debtTokenAta], createAtasIxns, closeAtasIxns, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas, mintsToCreateAtasTokenPrograms);
+    const { atas: [, debtTokenAta], createAtaIxs, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas);
     const closeWsolAtaIxns = [];
     if (depositTokenIsSol || debtTokenMint.equals(utils_1.WRAPPED_SOL_MINT)) {
         const wsolAta = (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, user, false);
         closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, user, user, [], spl_token_1.TOKEN_PROGRAM_ID));
     }
-    closeAtasIxns.push(...closeWsolAtaIxns);
     const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
     // TODO: marius test this with shorting leverage and with leverage looping
     // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
@@ -524,7 +554,7 @@ const getWithdrawWithLeverageIxns = async (props) => {
     // We borrow exactly how much we need to repay
     // and repay that + flash amount fee
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + createAtasIxns.length + fillWsolAtaIxns.length,
+        borrowIxnIndex: budgetIxns.length + createAtaIxs.length + fillWsolAtaIxns.length,
         walletPublicKey: user,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -540,7 +570,7 @@ const getWithdrawWithLeverageIxns = async (props) => {
     isClosingPosition, referrer, { includeScopeRefresh: true, scopeFeed: scopeFeed });
     const klendIxns = [
         ...budgetIxns,
-        ...createAtasIxns,
+        ...createAtaIxs,
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
         ...repayAndWithdrawAction.setupIxs,
@@ -549,21 +579,20 @@ const getWithdrawWithLeverageIxns = async (props) => {
         ...[repayAndWithdrawAction.lendingIxs[1]],
         ...repayAndWithdrawAction.cleanupIxs,
         ...[flashRepayIxn],
-        ...closeAtasIxns,
+        ...closeWsolAtaIxns,
     ];
-    const uniqueAccounts = new utils_1.PublicKeySet([]);
-    klendIxns.forEach((ixn) => {
-        ixn.keys.forEach((key) => {
-            uniqueAccounts.add(key.pubkey);
-        });
-    });
-    const totalKlendAccounts = uniqueAccounts.toArray().length;
+    const uniqueAccs = (0, utils_1.uniqueAccounts)(klendIxns);
+    const totalKlendAccounts = uniqueAccs.length;
     // return early to avoid extra swapper calls
     if (getTotalKlendAccountsOnly) {
         return {
             ixns: [],
             lookupTablesAddresses: [],
-            swapInputs: { inputAmountLamports: 0, inputMint: web3_js_1.PublicKey.default, outputMint: web3_js_1.PublicKey.default },
+            swapInputs: {
+                inputAmountLamports: new decimal_js_1.default('0'),
+                inputMint: web3_js_1.PublicKey.default,
+                outputMint: web3_js_1.PublicKey.default,
+            },
             totalKlendAccounts: totalKlendAccounts,
         };
     }
@@ -578,11 +607,11 @@ const getWithdrawWithLeverageIxns = async (props) => {
         withdrawSwapper = swapper;
     }
     const swapInputs = {
-        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(collTokenSwapIn, collReserve.stats.decimals).ceil().toNumber(),
+        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(collTokenSwapIn, collReserve.stats.decimals).ceil(),
         inputMint: collTokenMint,
         outputMint: debtTokenMint,
     };
-    const [swapIxns, lookupTablesAddresses] = await withdrawSwapper(swapInputs.inputAmountLamports, swapInputs.inputMint, swapInputs.outputMint, slippagePct);
+    const [swapIxns, lookupTablesAddresses] = await withdrawSwapper(swapInputs.inputAmountLamports.toNumber(), swapInputs.inputMint, swapInputs.outputMint, slippagePct);
     // TODO MARIUS: remove first instruction that is setBudget ixn
     if (collIsKtoken) {
         if (strategy?.strategy.strategyLookupTable) {
@@ -595,7 +624,7 @@ const getWithdrawWithLeverageIxns = async (props) => {
     const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxns, []);
     const ixns = [
         ...budgetIxns,
-        ...createAtasIxns,
+        ...createAtaIxs,
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
         ...repayAndWithdrawAction.setupIxs,
@@ -605,7 +634,7 @@ const getWithdrawWithLeverageIxns = async (props) => {
         ...repayAndWithdrawAction.cleanupIxs,
         ...swapInstructions,
         ...[flashRepayIxn],
-        ...closeAtasIxns,
+        ...closeWsolAtaIxns,
     ];
     // Send ixns and lookup tables
     return {
@@ -636,9 +665,7 @@ const getAdjustLeverageSwapInputs = (props) => {
             .div(priceDebtToColl);
         return {
             swapInputs: {
-                inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(borrowAmount, debtReserve.state.liquidity.mintDecimals.toNumber())
-                    .ceil()
-                    .toNumber(),
+                inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(borrowAmount, debtReserve.state.liquidity.mintDecimals.toNumber()).ceil(),
                 inputMint: debtTokenMint,
                 outputMint: collTokenMint,
             },
@@ -650,9 +677,7 @@ const getAdjustLeverageSwapInputs = (props) => {
             .mul(1 + slippagePct / 100);
         return {
             swapInputs: {
-                inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(withdrawAmountWithSlippageAndFlashLoanFee, collReserve.state.liquidity.mintDecimals.toNumber())
-                    .ceil()
-                    .toNumber(),
+                inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(withdrawAmountWithSlippageAndFlashLoanFee, collReserve.state.liquidity.mintDecimals.toNumber()).ceil(),
                 inputMint: collTokenMint,
                 outputMint: debtTokenMint,
             },
@@ -672,7 +697,7 @@ const getAdjustLeverageIxns = async (props) => {
             obligation.getDepositByMint(collReserve.getLiquidityMint()) !== undefined)[0];
     const currentLeverage = userObligation.refreshedStats.leverage;
     const isDepositViaLeverage = targetLeverage.gte(new decimal_js_1.default(currentLeverage));
-    let flashLoanFee = new decimal_js_1.default(0);
+    let flashLoanFee;
     if (isDepositViaLeverage) {
         flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
     }
@@ -776,8 +801,7 @@ const getIncreaseLeverageIxns = async (props) => {
     const strategy = collIsKtoken ? await kamino?.getStrategyByKTokenMint(collTokenMint) : undefined;
     // 1. Create atas & budget txns
     const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
-    let mintsToCreateAtas = [];
-    let mintsToCreateAtasTokenPrograms = [];
+    let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBMint
@@ -789,23 +813,42 @@ const getIncreaseLeverageIxns = async (props) => {
             : strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
                 ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategy.strategy.tokenATokenProgram;
-        mintsToCreateAtas = [collTokenMint, debtTokenMint, collReserve.getCTokenMint(), secondTokenAta];
-        mintsToCreateAtasTokenPrograms = [
-            collReserve.getLiquidityTokenProgram(),
-            debtReserve.getLiquidityTokenProgram(),
-            spl_token_1.TOKEN_PROGRAM_ID,
-            secondTokenTokenProgarm,
+        mintsToCreateAtas = [
+            {
+                mint: collTokenMint,
+                tokenProgram: collReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: debtTokenMint,
+                tokenProgram: debtReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: collReserve.getCTokenMint(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+            {
+                mint: secondTokenAta,
+                tokenProgram: secondTokenTokenProgarm,
+            },
         ];
     }
     else {
-        mintsToCreateAtas = [collTokenMint, debtTokenMint, collReserve.getCTokenMint()];
-        mintsToCreateAtasTokenPrograms = [
-            collReserve.getLiquidityTokenProgram(),
-            debtReserve.getLiquidityTokenProgram(),
-            spl_token_1.TOKEN_PROGRAM_ID,
+        mintsToCreateAtas = [
+            {
+                mint: collTokenMint,
+                tokenProgram: collReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: debtTokenMint,
+                tokenProgram: debtReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: collReserve.getCTokenMint(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
         ];
     }
-    const { atas: [collTokenAta, debtTokenAta], createAtasIxns, closeAtasIxns, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas, mintsToCreateAtasTokenPrograms);
+    const { atas: [collTokenAta, debtTokenAta], createAtaIxs, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas);
     // 2. Create borrow flash loan instruction
     // used if coll is Ktoken and we borrow debt token instead
     const amountToFashBorrowDebt = depositAmount
@@ -814,7 +857,7 @@ const getIncreaseLeverageIxns = async (props) => {
         .toDecimalPlaces(debtReserve.stats.decimals, decimal_js_1.default.ROUND_UP);
     // .toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber());
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + createAtasIxns.length, // TODO: how about user metadata ixns
+        borrowIxnIndex: budgetIxns.length + createAtaIxs.length, // TODO: how about user metadata ixns
         walletPublicKey: user,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -851,7 +894,7 @@ const getIncreaseLeverageIxns = async (props) => {
     referrer, currentSlot, { includeScopeRefresh: true, scopeFeed: scopeFeed });
     const klendIxns = [
         ...budgetIxns,
-        ...createAtasIxns,
+        ...createAtaIxs,
         ...[flashBorrowIxn],
         ...depositAction.setupIxs,
         ...depositAction.lendingIxs,
@@ -860,7 +903,6 @@ const getIncreaseLeverageIxns = async (props) => {
         ...borrowAction.lendingIxs,
         ...borrowAction.cleanupIxs,
         ...[flashRepayIxn],
-        ...closeAtasIxns,
     ];
     const uniqueAccounts = new utils_1.PublicKeySet([]);
     klendIxns.forEach((ixn) => {
@@ -874,7 +916,11 @@ const getIncreaseLeverageIxns = async (props) => {
         return {
             ixns: [],
             lookupTablesAddresses: [],
-            swapInputs: { inputAmountLamports: 0, inputMint: web3_js_1.PublicKey.default, outputMint: web3_js_1.PublicKey.default },
+            swapInputs: {
+                inputAmountLamports: new decimal_js_1.default('0'),
+                inputMint: web3_js_1.PublicKey.default,
+                outputMint: web3_js_1.PublicKey.default,
+            },
             totalKlendAccounts: totalKlendAccounts,
         };
     }
@@ -891,18 +937,16 @@ const getIncreaseLeverageIxns = async (props) => {
         depositSwapper = swapper;
     }
     const swapInputs = {
-        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? borrowAmount : amountToFashBorrowDebt, debtReserve.stats.decimals)
-            .ceil()
-            .toNumber(),
+        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? borrowAmount : amountToFashBorrowDebt, debtReserve.stats.decimals).ceil(),
         inputMint: debtTokenMint,
         outputMint: collTokenMint,
     };
-    const [swapIxns, lookupTablesAddresses] = await depositSwapper(swapInputs.inputAmountLamports, swapInputs.inputMint, swapInputs.outputMint, slippagePct, expectedDebtTokenAtaBalance);
+    const [swapIxns, lookupTablesAddresses] = await depositSwapper(swapInputs.inputAmountLamports.toNumber(), swapInputs.inputMint, swapInputs.outputMint, slippagePct, expectedDebtTokenAtaBalance);
     const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxns, []);
     const ixns = !collIsKtoken
         ? [
             ...budgetIxns,
-            ...createAtasIxns,
+            ...createAtaIxs,
             ...[flashBorrowIxn],
             ...depositAction.setupIxs,
             ...depositAction.lendingIxs,
@@ -912,11 +956,10 @@ const getIncreaseLeverageIxns = async (props) => {
             ...borrowAction.cleanupIxs,
             ...swapInstructions,
             ...[flashRepayIxn],
-            ...closeAtasIxns,
         ]
         : [
             ...budgetIxns,
-            ...createAtasIxns,
+            ...createAtaIxs,
             ...[flashBorrowIxn],
             ...swapInstructions,
             ...depositAction.setupIxs,
@@ -926,7 +969,6 @@ const getIncreaseLeverageIxns = async (props) => {
             ...borrowAction.lendingIxs,
             ...borrowAction.cleanupIxs,
             ...[flashRepayIxn],
-            ...closeAtasIxns,
         ];
     ixns.forEach((ixn, i) => {
         console.log(`ixn ${i + 1}: ${ixn.programId.toString()}`);
@@ -961,8 +1003,7 @@ const getDecreaseLeverageIxns = async (props) => {
     const strategy = collIsKtoken ? await kamino?.getStrategyByKTokenMint(collTokenMint) : undefined;
     // 1. Create atas & budget txns
     const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
-    let mintsToCreateAtas = [];
-    let mintsToCreateAtasTokenPrograms = [];
+    let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBMint
@@ -974,23 +1015,42 @@ const getDecreaseLeverageIxns = async (props) => {
             : strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
                 ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategy.strategy.tokenATokenProgram;
-        mintsToCreateAtas = [collTokenMint, debtTokenMint, collReserve.getCTokenMint(), secondTokenAta];
-        mintsToCreateAtasTokenPrograms = [
-            collReserve.getLiquidityTokenProgram(),
-            debtReserve.getLiquidityTokenProgram(),
-            spl_token_1.TOKEN_PROGRAM_ID,
-            secondTokenTokenProgarm,
+        mintsToCreateAtas = [
+            {
+                mint: collTokenMint,
+                tokenProgram: collReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: debtTokenMint,
+                tokenProgram: debtReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: collReserve.getCTokenMint(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
+            {
+                mint: secondTokenAta,
+                tokenProgram: secondTokenTokenProgarm,
+            },
         ];
     }
     else {
-        mintsToCreateAtas = [collTokenMint, debtTokenMint, collReserve.getCTokenMint()];
-        mintsToCreateAtasTokenPrograms = [
-            collReserve.getLiquidityTokenProgram(),
-            debtReserve.getLiquidityTokenProgram(),
-            spl_token_1.TOKEN_PROGRAM_ID,
+        mintsToCreateAtas = [
+            {
+                mint: collTokenMint,
+                tokenProgram: collReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: debtTokenMint,
+                tokenProgram: debtReserve.getLiquidityTokenProgram(),
+            },
+            {
+                mint: collReserve.getCTokenMint(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            },
         ];
     }
-    const { atas: [, debtTokenAta], createAtasIxns, closeAtasIxns, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas, mintsToCreateAtasTokenPrograms);
+    const { atas: [, debtTokenAta], createAtaIxs, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas);
     // TODO: Mihai/Marius check if we can improve this logic and not convert any SOL
     // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
     const closeWsolAtaIxns = [];
@@ -998,7 +1058,6 @@ const getDecreaseLeverageIxns = async (props) => {
         const wsolAta = await (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, user, false);
         closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, user, user, [], spl_token_1.TOKEN_PROGRAM_ID));
     }
-    closeAtasIxns.push(...closeWsolAtaIxns);
     const fillWsolAtaIxns = [];
     if (debtTokenMint.equals(utils_1.WRAPPED_SOL_MINT)) {
         const halfSolBalance = (await connection.getBalance(user)) / web3_js_1.LAMPORTS_PER_SOL / 2;
@@ -1007,7 +1066,7 @@ const getDecreaseLeverageIxns = async (props) => {
     }
     // 3. Flash borrow & repay amount to repay (debt)
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + createAtasIxns.length + fillWsolAtaIxns.length,
+        borrowIxnIndex: budgetIxns.length + createAtaIxs.length + fillWsolAtaIxns.length,
         walletPublicKey: user,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -1042,7 +1101,7 @@ const getDecreaseLeverageIxns = async (props) => {
     referrer, currentSlot, { includeScopeRefresh: true, scopeFeed: scopeFeed });
     const klendIxns = [
         ...budgetIxns,
-        ...createAtasIxns,
+        ...createAtaIxs,
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
         ...repayAction.setupIxs,
@@ -1052,21 +1111,20 @@ const getDecreaseLeverageIxns = async (props) => {
         ...withdrawAction.lendingIxs,
         ...withdrawAction.cleanupIxs,
         ...[flashRepayIxn],
-        ...closeAtasIxns,
+        ...closeWsolAtaIxns,
     ];
-    const uniqueAccounts = new utils_1.PublicKeySet([]);
-    klendIxns.forEach((ixn) => {
-        ixn.keys.forEach((key) => {
-            uniqueAccounts.add(key.pubkey);
-        });
-    });
-    const totalKlendAccounts = uniqueAccounts.toArray().length;
+    const uniqueAccs = (0, utils_1.uniqueAccounts)(klendIxns);
+    const totalKlendAccounts = uniqueAccs.length;
     // return early to avoid extra swapper calls
     if (getTotalKlendAccountsOnly) {
         return {
             ixns: [],
             lookupTablesAddresses: [],
-            swapInputs: { inputAmountLamports: 0, inputMint: web3_js_1.PublicKey.default, outputMint: web3_js_1.PublicKey.default },
+            swapInputs: {
+                inputAmountLamports: new decimal_js_1.default('0'),
+                inputMint: web3_js_1.PublicKey.default,
+                outputMint: web3_js_1.PublicKey.default,
+            },
             totalKlendAccounts: totalKlendAccounts,
         };
     }
@@ -1081,18 +1139,16 @@ const getDecreaseLeverageIxns = async (props) => {
         withdrawSwapper = swapper;
     }
     const swapInputs = {
-        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals)
-            .ceil()
-            .toNumber(),
+        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals).ceil(),
         inputMint: collTokenMint,
         outputMint: debtTokenMint,
     };
     // 5. Get swap ixns
-    const [swapIxns, lookupTablesAddresses] = await withdrawSwapper(swapInputs.inputAmountLamports, swapInputs.inputMint, swapInputs.outputMint, slippagePct);
+    const [swapIxns, lookupTablesAddresses] = await withdrawSwapper(swapInputs.inputAmountLamports.toNumber(), swapInputs.inputMint, swapInputs.outputMint, slippagePct);
     const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxns, []);
     const ixns = [
         ...budgetIxns,
-        ...createAtasIxns,
+        ...createAtaIxs,
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
         ...repayAction.setupIxs,
@@ -1103,7 +1159,7 @@ const getDecreaseLeverageIxns = async (props) => {
         ...withdrawAction.cleanupIxs,
         ...swapInstructions,
         ...[flashRepayIxn],
-        ...closeAtasIxns,
+        ...closeWsolAtaIxns,
     ];
     ixns.forEach((ixn, i) => {
         console.log(`ixn ${i + 1}: ${ixn.programId.toString()}`);