@kamino-finance/klend-sdk 5.10.34 → 5.10.35-beta.1

package/src/idl_codegen/instructions/refreshObligationFarmsForReserve.ts

@@ -40,7 +40,7 @@ export function refreshObligationFarmsForReserve(
     {
       pubkey: accounts.baseAccounts.lendingMarketAuthority,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.baseAccounts.reserve,

package/src/idl_codegen/instructions/repayAndWithdrawAndRedeem.ts

@@ -37,6 +37,15 @@ export interface RepayAndWithdrawAndRedeemAccounts {
     liquidityTokenProgram: PublicKey
     instructionSysvarAccount: PublicKey
   }
+  collateralFarmsAccounts: {
+    obligationFarmUserState: PublicKey
+    reserveFarmState: PublicKey
+  }
+  debtFarmsAccounts: {
+    obligationFarmUserState: PublicKey
+    reserveFarmState: PublicKey
+  }
+  farmsProgram: PublicKey
 }
 
 export const layout = borsh.struct([
@@ -69,7 +78,7 @@ export function repayAndWithdrawAndRedeem(
     {
       pubkey: accounts.repayAccounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.repayAccounts.reserveDestinationLiquidity,
@@ -94,7 +103,7 @@ export function repayAndWithdrawAndRedeem(
     {
       pubkey: accounts.withdrawAccounts.owner,
       isSigner: true,
-      isWritable: false,
+      isWritable: true,
     },
     {
       pubkey: accounts.withdrawAccounts.obligation,
@@ -119,7 +128,7 @@ export function repayAndWithdrawAndRedeem(
     {
       pubkey: accounts.withdrawAccounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.withdrawAccounts.reserveSourceCollateral,
@@ -161,6 +170,27 @@ export function repayAndWithdrawAndRedeem(
       isSigner: false,
       isWritable: false,
     },
+    {
+      pubkey: accounts.collateralFarmsAccounts.obligationFarmUserState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.collateralFarmsAccounts.reserveFarmState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.debtFarmsAccounts.obligationFarmUserState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.debtFarmsAccounts.reserveFarmState,
+      isSigner: false,
+      isWritable: true,
+    },
+    { pubkey: accounts.farmsProgram, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([2, 54, 152, 3, 148, 96, 109, 218])
   const buffer = Buffer.alloc(1000)

package/src/idl_codegen/instructions/repayObligationLiquidity.ts

@@ -35,7 +35,7 @@ export function repayObligationLiquidity(
     {
       pubkey: accounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.reserveDestinationLiquidity,

package/src/idl_codegen/instructions/repayObligationLiquidityV2.ts

@@ -55,7 +55,7 @@ export function repayObligationLiquidityV2(
     {
       pubkey: accounts.repayAccounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.repayAccounts.reserveDestinationLiquidity,

package/src/idl_codegen/instructions/withdrawObligationCollateralAndRedeemReserveCollateral.ts

@@ -33,7 +33,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateral(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.owner, isSigner: true, isWritable: false },
+    { pubkey: accounts.owner, isSigner: true, isWritable: true },
     { pubkey: accounts.obligation, isSigner: false, isWritable: true },
     { pubkey: accounts.lendingMarket, isSigner: false, isWritable: false },
     {
@@ -45,7 +45,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateral(
     {
       pubkey: accounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.reserveSourceCollateral,

package/src/idl_codegen/instructions/withdrawObligationCollateralAndRedeemReserveCollateralV2.ts

@@ -43,7 +43,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
     {
       pubkey: accounts.withdrawAccounts.owner,
       isSigner: true,
-      isWritable: false,
+      isWritable: true,
     },
     {
       pubkey: accounts.withdrawAccounts.obligation,
@@ -68,7 +68,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
     {
       pubkey: accounts.withdrawAccounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.withdrawAccounts.reserveSourceCollateral,

package/src/idl_codegen/instructions/withdrawProtocolFee.ts

@@ -33,7 +33,7 @@ export function withdrawProtocolFee(
     {
       pubkey: accounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.lendingMarketAuthority,

package/src/idl_codegen/instructions/withdrawReferrerFees.ts

@@ -27,7 +27,7 @@ export function withdrawReferrerFees(
     {
       pubkey: accounts.reserveLiquidityMint,
       isSigner: false,
-      isWritable: true,
+      isWritable: false,
     },
     {
       pubkey: accounts.reserveSupplyLiquidity,

package/src/idl_codegen/types/UpdateLendingMarketMode.ts

@@ -486,6 +486,29 @@ export class UpdateIndividualAutodeleverageMarginCallPeriodSecs {
   }
 }
 
+export interface UpdateInitialDepositAmountJSON {
+  kind: "UpdateInitialDepositAmount"
+}
+
+export class UpdateInitialDepositAmount {
+  static readonly discriminator = 21
+  static readonly kind = "UpdateInitialDepositAmount"
+  readonly discriminator = 21
+  readonly kind = "UpdateInitialDepositAmount"
+
+  toJSON(): UpdateInitialDepositAmountJSON {
+    return {
+      kind: "UpdateInitialDepositAmount",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateInitialDepositAmount: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if (typeof obj !== "object") {
@@ -555,6 +578,9 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdateIndividualAutodeleverageMarginCallPeriodSecs" in obj) {
     return new UpdateIndividualAutodeleverageMarginCallPeriodSecs()
   }
+  if ("UpdateInitialDepositAmount" in obj) {
+    return new UpdateInitialDepositAmount()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -626,6 +652,9 @@ export function fromJSON(
     case "UpdateIndividualAutodeleverageMarginCallPeriodSecs": {
       return new UpdateIndividualAutodeleverageMarginCallPeriodSecs()
     }
+    case "UpdateInitialDepositAmount": {
+      return new UpdateInitialDepositAmount()
+    }
   }
 }
 
@@ -652,6 +681,7 @@ export function layout(property?: string) {
     borsh.struct([], "UpdatePaddingFields"),
     borsh.struct([], "UpdateName"),
     borsh.struct([], "UpdateIndividualAutodeleverageMarginCallPeriodSecs"),
+    borsh.struct([], "UpdateInitialDepositAmount"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/idl_codegen/types/index.ts

@@ -156,6 +156,7 @@ export type UpdateLendingMarketModeKind =
   | UpdateLendingMarketMode.UpdatePaddingFields
   | UpdateLendingMarketMode.UpdateName
   | UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecs
+  | UpdateLendingMarketMode.UpdateInitialDepositAmount
 export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateOwnerJSON
   | UpdateLendingMarketMode.UpdateEmergencyModeJSON
@@ -178,6 +179,7 @@ export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdatePaddingFieldsJSON
   | UpdateLendingMarketMode.UpdateNameJSON
   | UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecsJSON
+  | UpdateLendingMarketMode.UpdateInitialDepositAmountJSON
 
 export { LastUpdate } from "./LastUpdate"
 export type { LastUpdateFields, LastUpdateJSON } from "./LastUpdate"

package/src/idl_codegen/zero_padding/ObligationZP.ts

@@ -48,13 +48,21 @@ export class ObligationZP {
   readonly referrer: PublicKey
   /** Marked = 1 if borrowing disabled, 0 = borrowing enabled */
   readonly borrowingDisabled: number
-  /** A target LTV set by the risk council when marking this obligation for deleveraging. Only effective when `deleveraging_margin_call_started_slot != 0`. */
+  /**
+   *  A target LTV set by the risk council when marking this obligation for deleveraging. 
+   * Only effective when `deleveraging_margin_call_started_slot != 0`. 
+   * */
   readonly autodeleverageTargetLtvPct: number
-  readonly reserved: Array<BN>;
+  /** The lowest max LTV found amongst the collateral deposits */
+  readonly lowestReserveDepositMaxLtvPct: number
+  readonly reserved: Array<number>
   readonly highestBorrowFactorPct: BN
-  /** A timestamp at which the risk council most-recently marked this obligation for deleveraging. Zero if not currently subject to deleveraging. */
+  /** 
+   * A timestamp at which the risk council most-recently marked this obligation for deleveraging.
+   *  Zero if not currently subject to deleveraging. 
+   * */
   readonly autodeleverageMarginCallStartedTimestamp: BN
-  padding3: Array<BN> = new Array(0)
+  readonly padding3: Array<BN> = new Array(0)
 
   static readonly layout = borsh.struct([
     borsh.u64("tag"),
@@ -77,7 +85,8 @@ export class ObligationZP {
     borsh.publicKey("referrer"),
     borsh.u8("borrowingDisabled"),
     borsh.u8("autodeleverageTargetLtvPct"),
-    borsh.array(borsh.u8(), 6, "reserved"),
+    borsh.u8("lowestReserveDepositMaxLtvPct"),
+    borsh.array(borsh.u8(), 5, "reserved"),
     borsh.u64("highestBorrowFactorPct"),
     borsh.u64("autodeleverageMarginCallStartedTimestamp"),
   ])
@@ -109,7 +118,8 @@ export class ObligationZP {
     this.referrer = fields.referrer
     this.borrowingDisabled = fields.borrowingDisabled
     this.autodeleverageTargetLtvPct = fields.autodeleverageTargetLtvPct
-    this.reserved = fields.reserved.map((num) => new BN(num))
+    this.lowestReserveDepositMaxLtvPct = fields.lowestReserveDepositMaxLtvPct
+    this.reserved = new Array<number>(0)
     this.highestBorrowFactorPct = fields.highestBorrowFactorPct
     this.autodeleverageMarginCallStartedTimestamp = fields.autodeleverageMarginCallStartedTimestamp
     this.padding3 = new Array<BN>(0);
@@ -187,10 +197,11 @@ export class ObligationZP {
       referrer: dec.referrer,
       borrowingDisabled: dec.borrowingDisabled,
       autodeleverageTargetLtvPct: dec.autodeleverageTargetLtvPct,
+      lowestReserveDepositMaxLtvPct: dec.lowestReserveDepositMaxLtvPct,
       reserved: dec.reserved,
       highestBorrowFactorPct: dec.highestBorrowFactorPct,
       autodeleverageMarginCallStartedTimestamp: dec.autodeleverageMarginCallStartedTimestamp,
       padding3: [],
     })
   }
-}
+}

package/src/lending_operations/repay_with_collateral_calcs.ts

@@ -2,6 +2,7 @@ import Decimal from 'decimal.js';
 import { KaminoMarket, KaminoObligation, KaminoReserve, numberToLamportsDecimal } from '../classes';
 import { PublicKey } from '@solana/web3.js';
 import { lamportsToDecimal } from '../classes/utils';
+import { MaxWithdrawLtvCheck, getMaxWithdrawLtvCheck } from './repay_with_collateral_operations';
 
 export function calcRepayAmountWithSlippage(
   kaminoMarket: KaminoMarket,
@@ -102,6 +103,7 @@ export function calcMaxWithdrawCollateral(
       .filter((p) => !p.reserveAddress.equals(borrow.reserveAddress))
       .reduce((acc, b) => acc.add(b.marketValueRefreshed), new Decimal('0'));
   }
+  const maxWithdrawLtvCheck = getMaxWithdrawLtvCheck(obligation);
 
   let remainingDepositsValueWithLtv = new Decimal('0');
   if (obligation.getDeposits().length > 1) {
@@ -109,8 +111,13 @@ export function calcMaxWithdrawCollateral(
       .getDeposits()
       .filter((p) => !p.reserveAddress.equals(deposit.reserveAddress))
       .reduce((acc, d) => {
-        const { maxLtv } = obligation.getLtvForReserve(market, market.getReserveByAddress(d.reserveAddress)!);
-        return acc.add(d.marketValueRefreshed.mul(maxLtv));
+        const { maxLtv, liquidationLtv } = obligation.getLtvForReserve(
+          market,
+          market.getReserveByAddress(d.reserveAddress)!
+        );
+        const maxWithdrawLtv =
+          maxWithdrawLtvCheck === MaxWithdrawLtvCheck.LIQUIDATION_THRESHOLD ? liquidationLtv : maxLtv;
+        return acc.add(d.marketValueRefreshed.mul(maxWithdrawLtv));
       }, new Decimal('0'));
   }
 
@@ -123,16 +130,18 @@ export function calcMaxWithdrawCollateral(
       repayingAllDebt: repayAmountLamports.gte(borrow.amount),
     };
   } else {
-    const { maxLtv: collMaxLtv } = obligation.getLtvForReserve(
+    const { maxLtv: collMaxLtv, liquidationLtv: collLiquidationLtv } = obligation.getLtvForReserve(
       market,
       market.getReserveByAddress(depositReserve.address)!
     );
+    const maxWithdrawLtv =
+      maxWithdrawLtvCheck === MaxWithdrawLtvCheck.LIQUIDATION_THRESHOLD ? collLiquidationLtv : collMaxLtv;
     const numerator = deposit.marketValueRefreshed
-      .mul(collMaxLtv)
+      .mul(maxWithdrawLtv)
       .add(remainingDepositsValueWithLtv)
       .sub(remainingBorrowsValue);
 
-    const denominator = depositReserve.getOracleMarketPrice().mul(collMaxLtv);
+    const denominator = depositReserve.getOracleMarketPrice().mul(maxWithdrawLtv);
     const maxCollWithdrawAmount = numerator.div(denominator);
     const withdrawableCollLamports = maxCollWithdrawAmount.mul(depositReserve.getMintFactor()).floor();
 

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -55,6 +55,11 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
 
+export enum MaxWithdrawLtvCheck {
+  MAX_LTV,
+  LIQUIDATION_THRESHOLD,
+}
+
 export async function getRepayWithCollSwapInputs<QuoteResponse>({
   collTokenMint,
   currentSlot,
@@ -207,8 +212,17 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
   const { inputAmountLamports: collSwapInLamports } = swapInputs;
 
-  const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
-  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
+  const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
+
+  if (!collReserve) {
+    throw new Error(`Collateral reserve with mint ${collTokenMint} not found in market ${kaminoMarket.getAddress()}`);
+  }
+
+  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
+
+  if (!debtReserve) {
+    throw new Error(`Debt reserve with mint ${debtTokenMint} not found in market ${kaminoMarket.getAddress()}`);
+  }
 
   // the client should use these values to prevent this input, but the tx may succeed, so we don't want to fail
   // there is also a chance that the tx will consume debt token from the user's ata which they would not expect
@@ -296,8 +310,12 @@ async function buildRepayWithCollateralIxs(
 
   const requestElevationGroup = !isClosingPosition && obligation.state.elevationGroup !== 0;
 
+  const maxWithdrawLtvCheck = getMaxWithdrawLtvCheck(obligation);
+
   // 3. Repay using the flash borrowed funds & withdraw collateral to swap and pay the flash loan
-  const repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns(
+  const repayAndWithdrawAction = await (maxWithdrawLtvCheck === MaxWithdrawLtvCheck.MAX_LTV
+    ? KaminoAction.buildRepayAndWithdrawTxns
+    : KaminoAction.buildRepayAndWithdrawV2Txns)(
     market,
     isClosingPosition ? U64_MAX : debtRepayAmountLamports.toString(),
     debtReserve.getLiquidityMint(),
@@ -310,6 +328,7 @@ async function buildRepayWithCollateralIxs(
     false,
     requestElevationGroup,
     undefined,
+    undefined,
     referrer,
     scopeRefresh
   );
@@ -328,3 +347,9 @@ async function buildRepayWithCollateralIxs(
     flashRepayIxn,
   ];
 }
+
+export const getMaxWithdrawLtvCheck = (obligation: KaminoObligation) => {
+  return obligation.refreshedStats.userTotalBorrowBorrowFactorAdjusted.gte(obligation.refreshedStats.borrowLimit)
+    ? MaxWithdrawLtvCheck.LIQUIDATION_THRESHOLD
+    : MaxWithdrawLtvCheck.MAX_LTV;
+};

package/src/lending_operations/swap_collateral_operations.ts

@@ -16,11 +16,10 @@ import {
   ScopeRefresh,
   U64_MAX,
   uniqueAccounts,
-  WRAPPED_SOL_MINT,
 } from '../utils';
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { createCloseAccountInstruction, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { createCloseAccountInstruction, NATIVE_MINT, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 
 /**
  * Inputs to the `getSwapCollIxns()` operation.
@@ -321,11 +320,11 @@ function getAtaCreationIxns(context: SwapCollContext<any>) {
 function getAtaCloseIxns(context: SwapCollContext<any>) {
   const ataCloseIxns: TransactionInstruction[] = [];
   if (
-    context.sourceCollReserve.getLiquidityMint().equals(WRAPPED_SOL_MINT) ||
-    context.targetCollReserve.getLiquidityMint().equals(WRAPPED_SOL_MINT)
+    context.sourceCollReserve.getLiquidityMint().equals(NATIVE_MINT) ||
+    context.targetCollReserve.getLiquidityMint().equals(NATIVE_MINT)
   ) {
     const owner = context.obligation.state.owner;
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
     ataCloseIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
   }
   return ataCloseIxns;
@@ -375,6 +374,7 @@ async function getDepositTargetCollIxns(
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     removesElevationGroup, // we may need to (temporarily) remove the elevation group; the same or a different one will be set on withdraw, if requested
     false, // we are dealing with an existing obligation, no need to create user metadata
+    false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
     context.scopeRefresh,
@@ -423,6 +423,7 @@ async function getWithdrawSourceCollIxns(
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     requestedElevationGroup !== undefined, // the `elevationGroupIdToRequestAfterWithdraw()` has already decided on this
     false, // we are dealing with an existing obligation, no need to create user metadata
+    false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
     undefined, // we have refreshed scope already, during depositing

package/src/leverage/instructions.ts

@@ -1,4 +1,5 @@
 import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from '@solana/web3.js';
+import * as anchor from '@coral-xyz/anchor';
 import { KaminoReserve } from '../classes';
 import {
   FlashBorrowReserveLiquidityArgs,
@@ -9,12 +10,6 @@ import {
   flashRepayReserveLiquidity,
 } from '../lib';
 import Decimal from 'decimal.js';
-import * as anchor from '@coral-xyz/anchor';
-
-export const SOL_MINTS: Array<PublicKey> = [
-  new PublicKey('So11111111111111111111111111111111111111111'),
-  new PublicKey('So11111111111111111111111111111111111111112'),
-];
 
 export const getFlashLoanInstructions = (args: {
   borrowIxnIndex: number;

package/src/leverage/operations.ts

@@ -17,11 +17,10 @@ import {
   ObligationTypeTag,
   SOL_DECIMALS,
   U64_MAX,
-  WRAPPED_SOL_MINT,
   createAtasIdempotent,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxns,
-  getDepositWsolIxns,
+  getTransferWsolIxns,
   getLookupTableAccount,
   removeBudgetAndAtaIxns,
   uniqueAccounts,
@@ -35,7 +34,12 @@ import {
   toJson,
   withdrawLeverageCalcs,
 } from './calcs';
-import { TOKEN_PROGRAM_ID, createCloseAccountInstruction, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import {
+  NATIVE_MINT,
+  TOKEN_PROGRAM_ID,
+  createCloseAccountInstruction,
+  getAssociatedTokenAddressSync,
+} from '@solana/spl-token';
 import { Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
 import { getExpectedTokenBalanceAfterBorrow, getKtokenToTokenSwapper, getTokenToKtokenSwapper } from './utils';
 import { FullBPS } from '@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters';
@@ -89,7 +93,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 }> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const flashLoanFee = collReserve.getFlashLoanFee() || new Decimal(0);
 
   const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
@@ -191,7 +195,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 
   if (collIsKtoken) {
     let futureBalanceInAta = new Decimal(0);
-    if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
+    if (debtTokenMint.equals(NATIVE_MINT)) {
       futureBalanceInAta = futureBalanceInAta.add(
         !collIsKtoken ? quotePriceCalcs.initDepositInSol : quotePriceCalcs.initDepositInSol
       );
@@ -366,7 +370,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
 
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
 
   const ixs = await buildDepositWithLeverageIxns(
@@ -485,9 +489,9 @@ async function buildDepositWithLeverageIxns(
   const fillWsolAtaIxns: TransactionInstruction[] = [];
   if (depositTokenIsSol) {
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(
+      ...getTransferWsolIxns(
         owner,
-        getAssociatedTokenAddressSync(WRAPPED_SOL_MINT, owner),
+        getAssociatedTokenAddressSync(NATIVE_MINT, owner),
         toLamports(calcs.initDepositInSol, SOL_DECIMALS).ceil()
       )
     );
@@ -530,6 +534,7 @@ async function buildDepositWithLeverageIxns(
     false,
     elevationGroupOverride === 0 ? false : true, // emode
     false, // to be checked and created in a setup tx in the UI
+    false, // to be checked and created in a setup tx in the UI
     referrer,
     currentSlot,
     scopeRefresh
@@ -598,7 +603,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   const collIsKtoken = await isKtoken(collTokenMint);
   const strategy = collIsKtoken ? (await kamino!.getStrategyByKTokenMint(collTokenMint))! : undefined;
 
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
 
   const calcs = withdrawLeverageCalcs(
@@ -724,7 +729,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
 
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
   const { swapInputs, initialInputs } = await getWithdrawWithLeverageSwapInputs({
     owner,
@@ -885,8 +890,8 @@ export async function buildWithdrawWithLeverageIxns(
   const atasAndCreateIxns = createAtasIdempotent(owner, mintsToCreateAtas);
 
   const closeWsolAtaIxns: TransactionInstruction[] = [];
-  if (depositTokenIsSol || debtTokenMint.equals(WRAPPED_SOL_MINT)) {
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+  if (depositTokenIsSol || debtTokenMint.equals(NATIVE_MINT)) {
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
     closeWsolAtaIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
   }
 
@@ -895,13 +900,13 @@ export async function buildWithdrawWithLeverageIxns(
   // TODO: Might be worth removing as it's only needed for Ktokens
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
   const fillWsolAtaIxns: TransactionInstruction[] = [];
-  if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
+  if (debtTokenMint.equals(NATIVE_MINT)) {
     const halfSolBalance = (await market.getConnection().getBalance(owner)) / LAMPORTS_PER_SOL / 2;
     const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(
+      ...getTransferWsolIxns(
         owner,
-        getAssociatedTokenAddressSync(WRAPPED_SOL_MINT, owner),
+        getAssociatedTokenAddressSync(NATIVE_MINT, owner),
         toLamports(balanceToWrap, SOL_DECIMALS).ceil()
       )
     );
@@ -939,6 +944,7 @@ export async function buildWithdrawWithLeverageIxns(
     0,
     false,
     false, // 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)
+    false, // 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)
     isClosingPosition,
     referrer,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1473,6 +1479,7 @@ async function buildIncreaseLeverageIxns(
     false,
     false,
     false, // 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)
+    false, // 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,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1489,6 +1496,7 @@ async function buildIncreaseLeverageIxns(
     false,
     false,
     false, // 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)
+    false, // 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,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1608,15 +1616,15 @@ async function buildDecreaseLeverageIxns(
   // 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: TransactionInstruction[] = [];
   const fillWsolAtaIxns: TransactionInstruction[] = [];
-  if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+  if (debtTokenMint.equals(NATIVE_MINT)) {
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
 
     closeWsolAtaIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
 
     const halfSolBalance = (await kaminoMarket.getConnection().getBalance(owner)) / LAMPORTS_PER_SOL / 2;
     const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(owner, wsolAta, toLamports(balanceToWrap, debtReserve!.stats.decimals).ceil())
+      ...getTransferWsolIxns(owner, wsolAta, toLamports(balanceToWrap, debtReserve!.stats.decimals).ceil())
     );
   }
 
@@ -1649,6 +1657,7 @@ async function buildDecreaseLeverageIxns(
     false,
     false,
     false, // 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)
+    false, // 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,
     scopeRefresh
   );
@@ -1664,6 +1673,7 @@ async function buildDecreaseLeverageIxns(
     false,
     false,
     false, // 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)
+    false, // 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,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }

package/src/utils/ata.ts

@@ -98,7 +98,7 @@ export function createAtasIdempotent(
   return res;
 }
 
-export function getDepositWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
+export function getTransferWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
   const ixns: TransactionInstruction[] = [];
 
   ixns.push(