@kamino-finance/klend-sdk 5.10.33 → 5.10.35-beta.0

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_operations.ts

@@ -52,6 +52,7 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   isClosingPosition: boolean;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
   scopeRefresh?: ScopeRefresh;
+  useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
 
@@ -67,6 +68,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   isClosingPosition,
   budgetAndPriorityFeeIxs,
   scopeRefresh,
+  useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
   initialInputs: RepayWithCollInitialInputs<QuoteResponse>;
@@ -132,7 +134,8 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     },
     isClosingPosition,
     repayAmountLamports,
-    inputAmountLamports
+    inputAmountLamports,
+    useV2Ixs
   );
   const uniqueKlendAccounts = uniqueAccounts(klendIxs);
 
@@ -189,6 +192,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   swapper,
   referrer,
   scopeRefresh,
+  useV2Ixs,
   logger = console.log,
 }: RepayWithCollIxsProps<QuoteResponse>): Promise<RepayWithCollIxsResponse<QuoteResponse>> {
   const { swapInputs, initialInputs } = await getRepayWithCollSwapInputs({
@@ -203,6 +207,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     isClosingPosition,
     budgetAndPriorityFeeIxs,
     scopeRefresh,
+    useV2Ixs,
   });
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
   const { inputAmountLamports: collSwapInLamports } = swapInputs;
@@ -243,7 +248,8 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     swapResponse,
     isClosingPosition,
     debtRepayAmountLamports,
-    swapInputs.inputAmountLamports
+    swapInputs.inputAmountLamports,
+    useV2Ixs
   );
 
   return {
@@ -266,7 +272,8 @@ async function buildRepayWithCollateralIxs(
   swapQuoteIxs: SwapIxs,
   isClosingPosition: boolean,
   debtRepayAmountLamports: Decimal,
-  collWithdrawLamports: Decimal
+  collWithdrawLamports: Decimal,
+  useV2Ixs: boolean
 ): Promise<TransactionInstruction[]> {
   // 1. Create atas & budget txns
   const budgetIxns = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxns(1_400_000);
@@ -306,10 +313,12 @@ async function buildRepayWithCollateralIxs(
     obligation.state.owner,
     currentSlot,
     obligation,
+    useV2Ixs,
     0,
     false,
     requestElevationGroup,
     undefined,
+    undefined,
     referrer,
     scopeRefresh
   );

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.
@@ -63,6 +62,7 @@ export interface SwapCollIxnsInputs<QuoteResponse> {
   currentSlot: number;
   budgetAndPriorityFeeIxns?: TransactionInstruction[];
   scopeRefresh?: ScopeRefresh;
+  useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
   swapper: SwapIxsProvider<QuoteResponse>;
   logger?: (msg: string, ...extra: any[]) => void;
@@ -82,6 +82,11 @@ export interface SwapCollIxnsOutputs<QuoteResponse> {
    */
   lookupTables: AddressLookupTableAccount[];
 
+  /**
+   * Whether the swap is using V2 instructions.
+   */
+  useV2Ixs: boolean;
+
   /**
    * Informational-only details of the token amounts/fees/rates that were used during construction of `ixs`.
    */
@@ -168,6 +173,7 @@ export async function getSwapCollIxns<QuoteResponse>(
   return {
     ixs: listIxns(klendIxns, externalSwapIxns.ixns),
     lookupTables: externalSwapIxns.luts,
+    useV2Ixs: context.useV2Ixs,
     simulationDetails: {
       flashLoan: {
         targetCollFlashBorrowedAmount: klendIxns.simulationDetails.targetCollFlashBorrowedAmount,
@@ -198,6 +204,7 @@ type SwapCollContext<QuoteResponse> = {
   swapper: SwapIxsProvider<QuoteResponse>;
   referrer: PublicKey;
   currentSlot: number;
+  useV2Ixs: boolean;
   scopeRefresh: ScopeRefresh | undefined;
   logger: (msg: string, ...extra: any[]) => void;
 };
@@ -230,6 +237,7 @@ function extractArgsAndContext<QuoteResponse>(
       referrer: inputs.referrer,
       scopeRefresh: inputs.scopeRefresh,
       currentSlot: inputs.currentSlot,
+      useV2Ixs: inputs.useV2Ixs,
     },
   ];
 }
@@ -321,11 +329,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;
@@ -371,10 +379,12 @@ async function getDepositTargetCollIxns(
     context.targetCollReserve.getLiquidityMint(),
     context.obligation.state.owner,
     context.obligation,
+    context.useV2Ixs,
     0, // no extra compute budget
     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,
@@ -419,10 +429,12 @@ async function getWithdrawSourceCollIxns(
     context.sourceCollReserve.getLiquidityMint(),
     context.obligation.state.owner,
     context.obligation,
+    context.useV2Ixs,
     0, // no extra compute budget
     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;