@kamino-finance/klend-sdk 6.0.5-beta.5 → 6.0.5

package/dist/leverage/operations.js

@@ -11,40 +11,41 @@ exports.getWithdrawWithLeverageIxs = getWithdrawWithLeverageIxs;
 exports.buildWithdrawWithLeverageIxs = buildWithdrawWithLeverageIxs;
 exports.getAdjustLeverageSwapInputs = getAdjustLeverageSwapInputs;
 exports.getAdjustLeverageIxs = getAdjustLeverageIxs;
-const web3_js_1 = require("@solana/web3.js");
+const kit_1 = require("@solana/kit");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const classes_1 = require("../classes");
 const instructions_1 = require("./instructions");
 const classes_2 = require("../classes");
 const utils_1 = require("../utils");
 const calcs_1 = require("./calcs");
-const spl_token_1 = require("@solana/spl-token");
 const utils_2 = require("./utils");
 const CreationParameters_1 = require("@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters");
+const token_1 = require("@solana-program/token");
+const token_2022_1 = require("@solana-program/token-2022");
+const consts_1 = require("../utils/consts");
+const address_lookup_table_1 = require("@solana-program/address-lookup-table");
 async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeRefreshConfig, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, useV2Ixs, elevationGroupOverride, }) {
-    const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-    const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_MINT);
+    const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
+    const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
+    const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
     const flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
-    const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
-    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
+    const selectedTokenIsCollToken = selectedTokenMint === collTokenMint;
+    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint === solTokenReserve.getLiquidityMint();
     const collIsKtoken = await isKtoken(collTokenMint);
     const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
     const calcs = await getDepositWithLeverageCalcs(depositAmount, selectedTokenIsCollToken, collIsKtoken, depositTokenIsSol, priceDebtToColl, targetLeverage, slippagePct, flashLoanFee, kamino, strategy, debtTokenMint, priceAinB, debtReserve);
     console.log('Ops Calcs', (0, classes_1.toJson)(calcs));
     const obligationType = checkObligationType(obligationTypeTagOverride, collTokenMint, debtTokenMint, kaminoMarket);
     // Build the repay & withdraw collateral tx to get the number of accounts
-    const klendIxs = (await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation ? obligation : obligationType, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, [
-        {
-            preActionIxs: [],
-            swapIxs: [],
-            lookupTables: [],
-            quote: {
-                priceAInB: new decimal_js_1.default(0), // not used
-                quoteResponse: undefined,
-            },
+    const klendIxs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation ? obligation : obligationType, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
+        preActionIxs: [],
+        swapIxs: [],
+        lookupTables: [],
+        quote: {
+            priceAInB: new decimal_js_1.default(0), // not used
+            quoteResponse: undefined,
         },
-    ], strategy, collIsKtoken, useV2Ixs, elevationGroupOverride))[0];
+    }, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride);
     const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
     const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.swapDebtTokenIn : calcs.singleSidedDepositKtokenOnly, debtReserve.stats.decimals).ceil();
     const swapInputsForQuote = {
@@ -59,11 +60,11 @@ async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtToken
     let expectedDebtTokenAtaBalance = new decimal_js_1.default(0);
     if (collIsKtoken) {
         let futureBalanceInAta = new decimal_js_1.default(0);
-        if (debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
+        if (debtTokenMint === utils_1.WRAPPED_SOL_MINT) {
             futureBalanceInAta = futureBalanceInAta.add(!collIsKtoken ? quotePriceCalcs.initDepositInSol : quotePriceCalcs.initDepositInSol);
         }
         futureBalanceInAta = futureBalanceInAta.add(!collIsKtoken ? quotePriceCalcs.debtTokenToBorrow : quotePriceCalcs.flashBorrowInDebtTokenKtokenOnly);
-        expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(kaminoMarket.getConnection(), debtTokenMint, owner, (0, classes_2.numberToLamportsDecimal)(futureBalanceInAta.toDecimalPlaces(debtReserve.stats.decimals), debtReserve.stats.decimals), debtReserve.state.liquidity.mintDecimals.toNumber());
+        expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(kaminoMarket.getRpc(), debtTokenMint, owner.address, (0, classes_2.numberToLamportsDecimal)(futureBalanceInAta.toDecimalPlaces(debtReserve.stats.decimals), debtReserve.stats.decimals), debtReserve.state.liquidity.mintDecimals.toNumber());
     }
     return {
         swapInputs: {
@@ -155,8 +156,8 @@ async function getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, c
     }
     const swapsArray = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
     if (initialInputs.collIsKtoken) {
-        if (initialInputs.strategy.strategy.strategyLookupTable) {
-            const strategyLut = await (0, utils_1.getLookupTableAccount)(kaminoMarket.getConnection(), initialInputs.strategy.strategy.strategyLookupTable);
+        if (initialInputs.strategy && initialInputs.strategy.strategy.strategyLookupTable !== utils_1.DEFAULT_PUBLIC_KEY) {
+            const strategyLut = await (0, address_lookup_table_1.fetchAddressLookupTable)(kaminoMarket.getRpc(), initialInputs.strategy.strategy.strategyLookupTable);
             swapsArray.forEach((swap) => {
                 swap.lookupTables.push(strategyLut);
             });
@@ -167,51 +168,59 @@ async function getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, c
     }
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_MINT);
-    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
-    const depositWithLeverageIxs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, initialInputs.obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, swapsArray.map((swap) => {
-        return {
+    const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
+    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint === solTokenReserve.getLiquidityMint();
+    return Promise.all(swapsArray.map(async (swap) => {
+        const ixs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, initialInputs.obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
             preActionIxs: [],
             swapIxs: swap.swapIxs,
             lookupTables: swap.lookupTables,
             quote: swap.quote,
-        };
-    }), initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs, elevationGroupOverride);
-    return depositWithLeverageIxs.map((depositWithLeverageIxs, index) => {
+        }, initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs, elevationGroupOverride);
         return {
-            ixs: depositWithLeverageIxs.instructions,
-            flashLoanInfo: depositWithLeverageIxs.flashLoanInfo,
-            lookupTables: swapsArray[index].lookupTables,
+            ixs: ixs.instructions,
+            flashLoanInfo: ixs.flashLoanInfo,
+            lookupTables: swap.lookupTables,
             swapInputs,
             initialInputs,
-            quote: swapsArray[index].quote.quoteResponse,
+            quote: swap.quote.quoteResponse,
         };
-    });
+    }));
 }
-async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxsArray, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride) {
+async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride) {
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
-    const collTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collTokenMint, owner, false, collReserve.getLiquidityTokenProgram());
-    const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
+    const [[collTokenAta], [debtTokenAta]] = await Promise.all([
+        (0, token_2022_1.findAssociatedTokenPda)({
+            owner: owner.address,
+            mint: collTokenMint,
+            tokenProgram: collReserve.getLiquidityTokenProgram(),
+        }),
+        (0, token_2022_1.findAssociatedTokenPda)({
+            owner: owner.address,
+            mint: debtTokenMint,
+            tokenProgram: debtReserve.getLiquidityTokenProgram(),
+        }),
+    ]);
     // 1. Create atas & budget ixs
     const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, market, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     const fillWsolAtaIxs = [];
     if (depositTokenIsSol) {
-        fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, owner), (0, classes_2.numberToLamportsDecimal)(calcs.initDepositInSol, utils_1.SOL_DECIMALS).ceil()));
+        fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, await (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, owner.address), (0, kit_1.lamports)(BigInt((0, classes_2.numberToLamportsDecimal)(calcs.initDepositInSol, utils_1.SOL_DECIMALS).ceil().toString()))));
     }
     // 2. 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 { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
         borrowIxIndex: budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
-        walletPublicKey: owner,
-        lendingMarketAuthority: market.getLendingMarketAuthority(),
+        userTransferAuthority: owner,
+        lendingMarketAuthority: await market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
         reserve: !collIsKtoken ? collReserve : debtReserve,
         amountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.flashBorrowInCollToken : calcs.flashBorrowInDebtTokenKtokenOnly, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
         destinationAta: !collIsKtoken ? collTokenAta : debtTokenAta,
         // TODO(referrals): once we support referrals, we will have to replace the placeholder args below:
-        referrerAccount: market.programId,
-        referrerTokenState: market.programId,
+        referrerAccount: (0, kit_1.none)(),
+        referrerTokenState: (0, kit_1.none)(),
         programId: market.programId,
     });
     // 3. Deposit initial tokens + borrowed tokens into reserve
@@ -222,51 +231,47 @@ async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, own
         .toString(), debtTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, elevationGroupOverride === 0 ? false : true, // emode
     { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI
     referrer, currentSlot);
-    return swapQuoteIxsArray.map((swapQuoteIxs) => {
-        // 4. Swap
-        const { swapIxs } = swapQuoteIxs;
-        const swapInstructions = (0, utils_1.removeBudgetIxs)(swapIxs);
-        const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
-        const flashLoanInfo = {
-            flashBorrowReserve: flashBorrowReserve.address,
-            flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
-        };
-        return {
-            flashLoanInfo,
-            instructions: [
-                ...scopeRefreshIx,
-                ...budgetIxs,
-                ...createAtasIxs,
-                ...fillWsolAtaIxs,
-                ...[flashBorrowIx],
-                ...(collIsKtoken ? swapInstructions : []),
-                ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
-                ...(collIsKtoken ? [] : swapInstructions),
-                ...[flashRepayIx],
-            ],
-        };
-    });
+    // 4. Swap
+    const { swapIxs } = swapQuoteIxs;
+    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapIxs);
+    const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
+    const flashLoanInfo = {
+        flashBorrowReserve: flashBorrowReserve.address,
+        flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
+    };
+    return {
+        flashLoanInfo,
+        instructions: [
+            ...scopeRefreshIx,
+            ...budgetIxs,
+            ...createAtasIxs,
+            ...fillWsolAtaIxs,
+            ...[flashBorrowIx],
+            ...(collIsKtoken ? swapInstructions : []),
+            ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
+            ...(collIsKtoken ? [] : swapInstructions),
+            ...[flashRepayIx],
+        ],
+    };
 }
 async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, deposited, borrowed, obligation, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const flashLoanFee = debtReserve.getFlashLoanFee() || new decimal_js_1.default(0);
-    const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
+    const selectedTokenIsCollToken = selectedTokenMint === collTokenMint;
     const collIsKtoken = await isKtoken(collTokenMint);
     const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
-    const inputTokenIsSol = selectedTokenMint.equals(spl_token_1.NATIVE_MINT);
+    const inputTokenIsSol = selectedTokenMint === utils_1.WRAPPED_SOL_MINT;
     const calcs = (0, calcs_1.withdrawLeverageCalcs)(kaminoMarket, collReserve, debtReserve, priceCollToDebt, withdrawAmount, deposited, borrowed, currentSlot, isClosingPosition, selectedTokenIsCollToken, selectedTokenMint, obligation, flashLoanFee, slippagePct);
-    const klendIxs = (await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, [
-        {
-            preActionIxs: [],
-            swapIxs: [],
-            lookupTables: [],
-            quote: {
-                priceAInB: new decimal_js_1.default(0), // not used
-                quoteResponse: undefined,
-            },
+    const klendIxs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
+        preActionIxs: [],
+        swapIxs: [],
+        lookupTables: [],
+        quote: {
+            priceAInB: new decimal_js_1.default(0), // not used
+            quoteResponse: undefined,
         },
-    ], strategy, collIsKtoken, useV2Ixs))[0];
+    }, strategy, collIsKtoken, useV2Ixs);
     const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
     const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.collTokenSwapIn, collReserve.getMintDecimals()).ceil();
     const swapInputsForQuote = {
@@ -301,7 +306,7 @@ async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtToke
 async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, deposited, borrowed, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, swapper, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const inputTokenIsSol = selectedTokenMint.equals(spl_token_1.NATIVE_MINT);
+    const inputTokenIsSol = selectedTokenMint === utils_1.WRAPPED_SOL_MINT;
     const { swapInputs, initialInputs } = await getWithdrawWithLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -337,8 +342,8 @@ async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint,
     }
     const swapsArray = await withdrawSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
     if (initialInputs.collIsKtoken) {
-        if (initialInputs.strategy.strategy.strategyLookupTable) {
-            const strategyLut = await (0, utils_1.getLookupTableAccount)(kaminoMarket.getConnection(), initialInputs.strategy.strategy.strategyLookupTable);
+        if (initialInputs.strategy?.strategy.strategyLookupTable) {
+            const strategyLut = await (0, address_lookup_table_1.fetchAddressLookupTable)(kaminoMarket.getRpc(), initialInputs.strategy.strategy.strategyLookupTable);
             swapsArray.forEach((swap) => {
                 swap.lookupTables.push(strategyLut);
             });
@@ -347,59 +352,61 @@ async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint,
             console.log('Strategy lookup table not found');
         }
     }
-    const withdrawWithLeverageIxs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, swapsArray.map((swap) => {
-        return {
+    return Promise.all(swapsArray.map(async (swap) => {
+        const ixs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
             preActionIxs: [],
             swapIxs: swap.swapIxs,
             lookupTables: swap.lookupTables,
             quote: swap.quote,
-        };
-    }), initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs);
-    // Send ixs and lookup tables
-    return withdrawWithLeverageIxs.map((ixs, index) => {
+        }, initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs);
+        // Send ixs and lookup tables
         return {
             ixs: ixs.instructions,
             flashLoanInfo: ixs.flashLoanInfo,
-            lookupTables: swapsArray[index].lookupTables,
+            lookupTables: swap.lookupTables,
             swapInputs,
             initialInputs: initialInputs,
-            quote: swapsArray[index].quote.quoteResponse,
+            quote: swap.quote.quoteResponse,
         };
-    });
+    }));
 }
-async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxsArray, strategy, collIsKtoken, useV2Ixs) {
+async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs) {
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
-    const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
+    const debtTokenAta = await (0, utils_1.getAssociatedTokenAddress)(debtTokenMint, owner.address, debtReserve.getLiquidityTokenProgram());
     // 1. Create atas & budget txns & user metadata
     const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, market, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     const closeWsolAtaIxs = [];
-    if (depositTokenIsSol || debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
-        const wsolAta = (0, utils_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, owner, false);
-        closeWsolAtaIxs.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
+    if (depositTokenIsSol || debtTokenMint === utils_1.WRAPPED_SOL_MINT) {
+        const wsolAta = await (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, owner.address);
+        closeWsolAtaIxs.push((0, token_2022_1.getCloseAccountInstruction)({
+            owner,
+            destination: owner.address,
+            account: wsolAta,
+        }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS }));
     }
     // 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 fillWsolAtaIxs = [];
-    if (debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
-        const halfSolBalance = (await market.getConnection().getBalance(owner)) / web3_js_1.LAMPORTS_PER_SOL / 2;
+    if (debtTokenMint === utils_1.WRAPPED_SOL_MINT) {
+        const halfSolBalance = Number.parseInt((await market.getRpc().getBalance(owner.address).send()).value.toString()) / consts_1.LAMPORTS_PER_SOL / 2;
         const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
-        fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, owner), (0, classes_2.numberToLamportsDecimal)(balanceToWrap, utils_1.SOL_DECIMALS).ceil()));
+        fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, await (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, owner.address), (0, kit_1.lamports)(BigInt((0, classes_2.numberToLamportsDecimal)(balanceToWrap, utils_1.SOL_DECIMALS).ceil().toString()))));
     }
     // 2. Prepare the flash borrow and flash repay amounts and ixs
     // We borrow exactly how much we need to repay
     // and repay that + flash amount fee
     const { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
         borrowIxIndex: budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
-        walletPublicKey: owner,
-        lendingMarketAuthority: market.getLendingMarketAuthority(),
+        userTransferAuthority: owner,
+        lendingMarketAuthority: await market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
         reserve: debtReserve,
         amountLamports: (0, classes_2.numberToLamportsDecimal)(calcs.repayAmount, debtReserve.stats.decimals),
         destinationAta: debtTokenAta,
         // TODO(referrals): once we support referrals, we will have to replace the placeholder args below:
-        referrerAccount: market.programId,
-        referrerTokenState: market.programId,
+        referrerAccount: (0, kit_1.none)(),
+        referrerTokenState: (0, kit_1.none)(),
         programId: market.programId,
     });
     // 3. Repay borrowed tokens and Withdraw tokens from reserve that will be swapped to repay flash loan
@@ -407,26 +414,24 @@ async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, ow
         ? utils_1.U64_MAX
         : (0, classes_2.numberToLamportsDecimal)(calcs.depositTokenWithdrawAmount, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, currentSlot, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
     referrer);
-    return swapQuoteIxsArray.map((swapQuoteIxs) => {
-        const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
-        return {
-            flashLoanInfo: {
-                flashLoanFee: debtReserve.getFlashLoanFee(),
-                flashBorrowReserve: debtReserve.address,
-            },
-            instructions: [
-                ...scopeRefreshIx,
-                ...budgetIxs,
-                ...createAtasIxs,
-                ...fillWsolAtaIxs,
-                ...[flashBorrowIx],
-                ...classes_1.KaminoAction.actionToIxs(repayAndWithdrawAction),
-                ...swapInstructions,
-                ...[flashRepayIx],
-                ...closeWsolAtaIxs,
-            ],
-        };
-    });
+    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
+    return {
+        flashLoanInfo: {
+            flashLoanFee: debtReserve.getFlashLoanFee(),
+            flashBorrowReserve: debtReserve.address,
+        },
+        instructions: [
+            ...scopeRefreshIx,
+            ...budgetIxs,
+            ...createAtasIxs,
+            ...fillWsolAtaIxs,
+            ...[flashBorrowIx],
+            ...classes_1.KaminoAction.actionToIxs(repayAndWithdrawAction),
+            ...swapInstructions,
+            ...[flashRepayIx],
+            ...closeWsolAtaIxs,
+        ],
+    };
 }
 async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
@@ -457,19 +462,17 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
         throw new Error('Invalid target leverage');
     }
     if (isDeposit) {
-        const calcs = await (0, calcs_1.adjustDepositLeverageCalcs)(kaminoMarket, owner, debtReserve, adjustDepositPosition, adjustBorrowPosition, priceDebtToColl, flashLoanFee, slippagePct, collIsKtoken);
+        const calcs = await (0, calcs_1.adjustDepositLeverageCalcs)(kaminoMarket, owner.address, debtReserve, adjustDepositPosition, adjustBorrowPosition, priceDebtToColl, flashLoanFee, slippagePct, collIsKtoken);
         // Build the repay & withdraw collateral tx to get the number of accounts
-        const klendIxs = (await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, [
-            {
-                preActionIxs: [],
-                swapIxs: [],
-                lookupTables: [],
-                quote: {
-                    priceAInB: new decimal_js_1.default(0), // not used
-                    quoteResponse: undefined,
-                },
+        const klendIxs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, {
+            preActionIxs: [],
+            swapIxs: [],
+            lookupTables: [],
+            quote: {
+                priceAInB: new decimal_js_1.default(0), // not used
+                quoteResponse: undefined,
             },
-        ], budgetAndPriorityFeeIxs, useV2Ixs))[0];
+        }, budgetAndPriorityFeeIxs, useV2Ixs);
         const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
         const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.borrowAmount : calcs.amountToFlashBorrowDebt, debtReserve.stats.decimals).ceil();
         const swapInputsForQuote = {
@@ -486,11 +489,11 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
             priceCollToDebt: new decimal_js_1.default(1).div(swapQuote.priceAInB),
             flashLoanFee: new decimal_js_1.default(flashLoanFee),
         });
-        const calcsQuotePrice = await (0, calcs_1.adjustDepositLeverageCalcs)(kaminoMarket, owner, debtReserve, adjustDepositPositionQuotePrice, adjustBorrowPositionQuotePrice, swapQuote.priceAInB, flashLoanFee, slippagePct, collIsKtoken);
+        const calcsQuotePrice = await (0, calcs_1.adjustDepositLeverageCalcs)(kaminoMarket, owner.address, debtReserve, adjustDepositPositionQuotePrice, adjustBorrowPositionQuotePrice, swapQuote.priceAInB, flashLoanFee, slippagePct, collIsKtoken);
         const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.getMintDecimals()).ceil();
         let expectedDebtTokenAtaBalance = new decimal_js_1.default(0);
         if (collIsKtoken) {
-            expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(kaminoMarket.getConnection(), debtTokenMint, owner, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.getMintDecimals());
+            expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(kaminoMarket.getRpc(), debtTokenMint, owner.address, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.getMintDecimals());
         }
         return {
             swapInputs: {
@@ -515,17 +518,15 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
     }
     else {
         const calcs = (0, calcs_1.adjustWithdrawLeverageCalcs)(adjustDepositPosition, adjustBorrowPosition, flashLoanFee, slippagePct);
-        const klendIxs = (await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, [
-            {
-                preActionIxs: [],
-                swapIxs: [],
-                lookupTables: [],
-                quote: {
-                    priceAInB: new decimal_js_1.default(0), // not used
-                    quoteResponse: undefined,
-                },
+        const klendIxs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, {
+            preActionIxs: [],
+            swapIxs: [],
+            lookupTables: [],
+            quote: {
+                priceAInB: new decimal_js_1.default(0), // not used
+                quoteResponse: undefined,
             },
-        ], budgetAndPriorityFeeIxs, useV2Ixs))[0];
+        }, budgetAndPriorityFeeIxs, useV2Ixs);
         const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
         const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
         const swapInputsForQuote = {
@@ -603,24 +604,22 @@ async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTo
             depositSwapper = swapper;
         }
         const swapsArray = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-        const increaseLeverageIxs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, swapsArray.map((swap) => {
-            return {
+        return Promise.all(swapsArray.map(async (swap) => {
+            const ixs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
                 preActionIxs: [],
                 swapIxs: swap.swapIxs,
                 lookupTables: swap.lookupTables,
                 quote: swap.quote,
-            };
-        }), budgetAndPriorityFeeIxs, useV2Ixs);
-        return increaseLeverageIxs.map((ixs, index) => {
+            }, budgetAndPriorityFeeIxs, useV2Ixs);
             return {
                 ixs: ixs.instructions,
                 flashLoanInfo: ixs.flashLoanInfo,
-                lookupTables: swapsArray[index].lookupTables,
+                lookupTables: swap.lookupTables,
                 swapInputs,
                 initialInputs,
-                quote: swapsArray[index].quote.quoteResponse,
+                quote: swap.quote.quoteResponse,
             };
-        });
+        }));
     }
     else {
         console.log('Decreasing leverage');
@@ -636,110 +635,118 @@ async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTo
         }
         // 5. Get swap ixs
         const swapsArray = await withdrawSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-        const decreaseLeverageIxs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, swapsArray.map((swap) => {
-            return {
+        return Promise.all(swapsArray.map(async (swap) => {
+            const ixs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
                 preActionIxs: [],
                 swapIxs: swap.swapIxs,
                 lookupTables: swap.lookupTables,
                 quote: swap.quote,
-            };
-        }), budgetAndPriorityFeeIxs, useV2Ixs);
-        return decreaseLeverageIxs.map((ixs, index) => {
+            }, budgetAndPriorityFeeIxs, useV2Ixs);
             return {
                 ixs: ixs.instructions,
                 flashLoanInfo: ixs.flashLoanInfo,
-                lookupTables: swapsArray[index].lookupTables,
+                lookupTables: swap.lookupTables,
                 swapInputs,
                 initialInputs,
-                quote: swapsArray[index].quote.quoteResponse,
+                quote: swap.quote.quoteResponse,
             };
-        });
+        }));
     }
 }
 /**
  * Deposit and borrow tokens if leverage increased
  */
-async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxsArray, budgetAndPriorityFeeIxs, useV2Ixs) {
+async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxs, useV2Ixs) {
     const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
-    const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
-    const collTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collTokenMint, owner, false, collReserve.getLiquidityTokenProgram());
+    const [debtTokenAta, collTokenAta] = await Promise.all([
+        (0, utils_1.getAssociatedTokenAddress)(debtTokenMint, owner.address, debtReserve.getLiquidityTokenProgram()),
+        (0, utils_1.getAssociatedTokenAddress)(collTokenMint, owner.address, collReserve.getLiquidityTokenProgram()),
+    ]);
     // 1. Create atas & budget txns
     const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     // 2. Create borrow flash loan instruction
     const { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
         borrowIxIndex: budgetIxs.length + createAtasIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0), // TODO: how about user metadata ixs
-        walletPublicKey: owner,
-        lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
+        userTransferAuthority: owner,
+        lendingMarketAuthority: await kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
         reserve: !collIsKtoken ? collReserve : debtReserve,
         amountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.adjustDepositPosition : calcs.amountToFlashBorrowDebt, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
         destinationAta: !collIsKtoken ? collTokenAta : debtTokenAta,
         // TODO(referrals): once we support referrals, we will have to replace the placeholder args below:
-        referrerAccount: kaminoMarket.programId,
-        referrerTokenState: kaminoMarket.programId,
+        referrerAccount: (0, kit_1.none)(),
+        referrerTokenState: (0, kit_1.none)(),
         programId: kaminoMarket.programId,
     });
     const depositAction = await classes_1.KaminoAction.buildDepositTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.adjustDepositPosition, collReserve.stats.decimals).floor().toString(), collTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, referrer, currentSlot);
     // 4. Borrow tokens in borrow token reserve that will be swapped to repay flash loan
     const borrowAction = await classes_1.KaminoAction.buildBorrowTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.borrowAmount, debtReserve.stats.decimals).ceil().toString(), debtTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer, currentSlot);
-    return swapQuoteIxsArray.map((swapQuoteIxs) => {
-        const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
-        const ixs = [
-            ...scopeRefreshIx,
-            ...budgetIxs,
-            ...createAtasIxs,
-            ...[flashBorrowIx],
-            ...(collIsKtoken ? swapInstructions : []),
-            ...classes_1.KaminoAction.actionToIxs(depositAction),
-            ...classes_1.KaminoAction.actionToIxs(borrowAction),
-            ...(collIsKtoken ? [] : swapInstructions),
-            ...[flashRepayIx],
-        ];
-        const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
-        const res = {
-            flashLoanInfo: {
-                flashBorrowReserve: flashBorrowReserve.address,
-                flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
-            },
-            instructions: ixs,
-        };
-        return res;
-    });
+    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
+    const ixs = [
+        ...scopeRefreshIx,
+        ...budgetIxs,
+        ...createAtasIxs,
+        ...[flashBorrowIx],
+        ...(collIsKtoken ? swapInstructions : []),
+        ...classes_1.KaminoAction.actionToIxs(depositAction),
+        ...classes_1.KaminoAction.actionToIxs(borrowAction),
+        ...(collIsKtoken ? [] : swapInstructions),
+        ...[flashRepayIx],
+    ];
+    const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
+    const res = {
+        flashLoanInfo: {
+            flashBorrowReserve: flashBorrowReserve.address,
+            flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
+        },
+        instructions: ixs,
+    };
+    return res;
 }
 /**
  * Withdraw and repay tokens if leverage decreased
  */
-async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxsArray, budgetAndPriorityFeeIxs, useV2Ixs) {
+async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxs, useV2Ixs) {
     const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
-    const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
+    const [debtTokenAta] = await (0, token_2022_1.findAssociatedTokenPda)({
+        owner: owner.address,
+        mint: debtTokenMint,
+        tokenProgram: debtReserve.getLiquidityTokenProgram(),
+    });
     // 1. Create atas & budget txns
     const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     // 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 closeWsolAtaIxs = [];
     const fillWsolAtaIxs = [];
-    if (debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
-        const wsolAta = (0, utils_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, owner, false);
-        closeWsolAtaIxs.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
-        const halfSolBalance = (await kaminoMarket.getConnection().getBalance(owner)) / web3_js_1.LAMPORTS_PER_SOL / 2;
+    if (debtTokenMint === utils_1.WRAPPED_SOL_MINT) {
+        const wsolAta = await (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, owner.address);
+        closeWsolAtaIxs.push((0, token_2022_1.getCloseAccountInstruction)({
+            owner,
+            account: wsolAta,
+            destination: owner.address,
+        }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS }));
+        const halfSolBalance = Number.parseInt((await kaminoMarket.getRpc().getBalance(owner.address).send()).value.toString()) /
+            consts_1.LAMPORTS_PER_SOL /
+            2;
         const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
-        fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, wsolAta, (0, classes_2.numberToLamportsDecimal)(balanceToWrap, debtReserve.stats.decimals).ceil()));
+        fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, wsolAta, (0, kit_1.lamports)(BigInt((0, classes_2.numberToLamportsDecimal)(balanceToWrap, debtReserve.stats.decimals).ceil().toString()))));
     }
     // 3. Flash borrow & repay amount to repay (debt)
     const { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
         borrowIxIndex: budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
-        walletPublicKey: owner,
-        lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
+        userTransferAuthority: owner,
+        lendingMarketAuthority: await kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
         reserve: debtReserve,
         amountLamports: (0, classes_2.numberToLamportsDecimal)(decimal_js_1.default.abs(calcs.adjustBorrowPosition), debtReserve.stats.decimals),
         destinationAta: debtTokenAta,
         // TODO(referrals): once we support referrals, we will have to replace the placeholder args below:
-        referrerAccount: kaminoMarket.programId,
-        referrerTokenState: kaminoMarket.programId,
+        referrerAccount: (0, kit_1.none)(),
+        referrerTokenState: (0, kit_1.none)(),
         programId: kaminoMarket.programId,
     });
     // 4. Actually do the repay of the flash borrowed amounts
@@ -748,34 +755,32 @@ async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
     // 6. Withdraw collateral (a little bit more to be able to pay for the slippage on swap)
     const withdrawAction = await classes_1.KaminoAction.buildWithdrawTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer, currentSlot);
-    return swapQuoteIxsArray.map((swapQuoteIxs) => {
-        const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
-        const ixs = [
-            ...scopeRefreshIx,
-            ...budgetIxs,
-            ...createAtasIxs,
-            ...fillWsolAtaIxs,
-            ...[flashBorrowIx],
-            ...classes_1.KaminoAction.actionToIxs(repayAction),
-            ...classes_1.KaminoAction.actionToIxs(withdrawAction),
-            ...swapInstructions,
-            ...[flashRepayIx],
-            ...closeWsolAtaIxs,
-        ];
-        const res = {
-            flashLoanInfo: {
-                flashBorrowReserve: debtReserve.address,
-                flashLoanFee: debtReserve.getFlashLoanFee(),
-            },
-            instructions: ixs,
-        };
-        return res;
-    });
+    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
+    const ixs = [
+        ...scopeRefreshIx,
+        ...budgetIxs,
+        ...createAtasIxs,
+        ...fillWsolAtaIxs,
+        ...[flashBorrowIx],
+        ...classes_1.KaminoAction.actionToIxs(repayAction),
+        ...classes_1.KaminoAction.actionToIxs(withdrawAction),
+        ...swapInstructions,
+        ...[flashRepayIx],
+        ...closeWsolAtaIxs,
+    ];
+    const res = {
+        flashLoanInfo: {
+            flashBorrowReserve: debtReserve.address,
+            flashLoanFee: debtReserve.getFlashLoanFee(),
+        },
+        instructions: ixs,
+    };
+    return res;
 }
 const getSetupIxs = async (owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs) => {
     const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
     const mintsWithTokenPrograms = getTokenMintsWithTokenPrograms(collTokenMint, collReserve, debtTokenMint, debtReserve, collIsKtoken, strategy);
-    const createAtasIxs = (0, utils_1.createAtasIdempotent)(owner, mintsWithTokenPrograms).map((x) => x.createAtaIx);
+    const createAtasIxs = (await (0, utils_1.createAtasIdempotent)(owner, mintsWithTokenPrograms)).map((x) => x.createAtaIx);
     const scopeRefreshIx = await (0, exports.getScopeRefreshIx)(kaminoMarket, collReserve, debtReserve, obligation, scopeRefreshConfig);
     return {
         budgetIxs,
@@ -786,13 +791,15 @@ const getSetupIxs = async (owner, kaminoMarket, obligation, collTokenMint, collR
 exports.getSetupIxs = getSetupIxs;
 const getScopeRefreshIx = async (market, collReserve, debtReserve, obligation, scopeRefreshConfig) => {
     const allReserves = obligation && (0, classes_1.isKaminoObligation)(obligation)
-        ? new utils_1.PublicKeySet([
-            ...obligation.getDeposits().map((x) => x.reserveAddress),
-            ...obligation.getBorrows().map((x) => x.reserveAddress),
-            collReserve.address,
-            debtReserve.address,
-        ]).toArray()
-        : new utils_1.PublicKeySet([collReserve.address, debtReserve.address]).toArray();
+        ? [
+            ...new Set([
+                ...obligation.getDeposits().map((x) => x.reserveAddress),
+                ...obligation.getBorrows().map((x) => x.reserveAddress),
+                collReserve.address,
+                debtReserve.address,
+            ]),
+        ]
+        : [...new Set([collReserve.address, debtReserve.address])];
     const tokenIds = (0, classes_1.getTokenIdsForScopeRefresh)(market, allReserves);
     const scopeRefreshIxs = [];
     if (tokenIds.length > 0 && scopeRefreshConfig) {
@@ -830,23 +837,25 @@ const getTokenMintsWithTokenPrograms = (collTokenMint, collReserve, debtTokenMin
         },
         {
             mint: collReserve.getCTokenMint(),
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
         },
     ];
     if (collIsKtoken) {
         let kTokenAta;
         let kTokenTokenProgram;
-        if (strategy.strategy.tokenAMint.equals(debtTokenMint)) {
+        if (strategy.strategy.tokenAMint === debtTokenMint) {
             kTokenAta = strategy.strategy.tokenBMint;
-            kTokenTokenProgram = strategy.strategy.tokenBTokenProgram.equals(web3_js_1.PublicKey.default)
-                ? spl_token_1.TOKEN_PROGRAM_ID
-                : strategy.strategy.tokenBTokenProgram;
+            kTokenTokenProgram =
+                strategy.strategy.tokenBTokenProgram === utils_1.DEFAULT_PUBLIC_KEY
+                    ? token_1.TOKEN_PROGRAM_ADDRESS
+                    : strategy.strategy.tokenBTokenProgram;
         }
         else {
             kTokenAta = strategy.strategy.tokenAMint;
-            kTokenTokenProgram = strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
-                ? spl_token_1.TOKEN_PROGRAM_ID
-                : strategy.strategy.tokenATokenProgram;
+            kTokenTokenProgram =
+                strategy.strategy.tokenATokenProgram === utils_1.DEFAULT_PUBLIC_KEY
+                    ? token_1.TOKEN_PROGRAM_ADDRESS
+                    : strategy.strategy.tokenATokenProgram;
         }
         mintsWithTokenPrograms.push({
             mint: kTokenAta,