@kamino-finance/klend-sdk 5.2.13 → 5.3.0

package/src/idl_codegen/types/UpdateConfigMode.ts

@@ -716,25 +716,25 @@ export class UpdateMinLiquidationBonusBps {
   }
 }
 
-export interface DeleveragingMarginCallPeriodJSON {
-  kind: "DeleveragingMarginCallPeriod"
+export interface UpdateDeleveragingMarginCallPeriodJSON {
+  kind: "UpdateDeleveragingMarginCallPeriod"
 }
 
-export class DeleveragingMarginCallPeriod {
+export class UpdateDeleveragingMarginCallPeriod {
   static readonly discriminator = 31
-  static readonly kind = "DeleveragingMarginCallPeriod"
+  static readonly kind = "UpdateDeleveragingMarginCallPeriod"
   readonly discriminator = 31
-  readonly kind = "DeleveragingMarginCallPeriod"
+  readonly kind = "UpdateDeleveragingMarginCallPeriod"
 
-  toJSON(): DeleveragingMarginCallPeriodJSON {
+  toJSON(): UpdateDeleveragingMarginCallPeriodJSON {
     return {
-      kind: "DeleveragingMarginCallPeriod",
+      kind: "UpdateDeleveragingMarginCallPeriod",
     }
   }
 
   toEncodable() {
     return {
-      DeleveragingMarginCallPeriod: {},
+      UpdateDeleveragingMarginCallPeriod: {},
     }
   }
 }
@@ -808,25 +808,25 @@ export class UpdateElevationGroup {
   }
 }
 
-export interface DeleveragingThresholdSlotsPerBpsJSON {
-  kind: "DeleveragingThresholdSlotsPerBps"
+export interface UpdateDeleveragingThresholdSecsPerBpsJSON {
+  kind: "UpdateDeleveragingThresholdSecsPerBps"
 }
 
-export class DeleveragingThresholdSlotsPerBps {
+export class UpdateDeleveragingThresholdSecsPerBps {
   static readonly discriminator = 35
-  static readonly kind = "DeleveragingThresholdSlotsPerBps"
+  static readonly kind = "UpdateDeleveragingThresholdSecsPerBps"
   readonly discriminator = 35
-  readonly kind = "DeleveragingThresholdSlotsPerBps"
+  readonly kind = "UpdateDeleveragingThresholdSecsPerBps"
 
-  toJSON(): DeleveragingThresholdSlotsPerBpsJSON {
+  toJSON(): UpdateDeleveragingThresholdSecsPerBpsJSON {
     return {
-      kind: "DeleveragingThresholdSlotsPerBps",
+      kind: "UpdateDeleveragingThresholdSecsPerBps",
     }
   }
 
   toEncodable() {
     return {
-      DeleveragingThresholdSlotsPerBps: {},
+      UpdateDeleveragingThresholdSecsPerBps: {},
     }
   }
 }
@@ -1084,6 +1084,52 @@ export class UpdateHostFixedInterestRateBps {
   }
 }
 
+export interface UpdateAutodeleverageEnabledJSON {
+  kind: "UpdateAutodeleverageEnabled"
+}
+
+export class UpdateAutodeleverageEnabled {
+  static readonly discriminator = 47
+  static readonly kind = "UpdateAutodeleverageEnabled"
+  readonly discriminator = 47
+  readonly kind = "UpdateAutodeleverageEnabled"
+
+  toJSON(): UpdateAutodeleverageEnabledJSON {
+    return {
+      kind: "UpdateAutodeleverageEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateAutodeleverageEnabled: {},
+    }
+  }
+}
+
+export interface UpdateDeleveragingBonusIncreaseBpsPerDayJSON {
+  kind: "UpdateDeleveragingBonusIncreaseBpsPerDay"
+}
+
+export class UpdateDeleveragingBonusIncreaseBpsPerDay {
+  static readonly discriminator = 48
+  static readonly kind = "UpdateDeleveragingBonusIncreaseBpsPerDay"
+  readonly discriminator = 48
+  readonly kind = "UpdateDeleveragingBonusIncreaseBpsPerDay"
+
+  toJSON(): UpdateDeleveragingBonusIncreaseBpsPerDayJSON {
+    return {
+      kind: "UpdateDeleveragingBonusIncreaseBpsPerDay",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateDeleveragingBonusIncreaseBpsPerDay: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.UpdateConfigModeKind {
   if (typeof obj !== "object") {
@@ -1183,8 +1229,8 @@ export function fromDecoded(obj: any): types.UpdateConfigModeKind {
   if ("UpdateMinLiquidationBonusBps" in obj) {
     return new UpdateMinLiquidationBonusBps()
   }
-  if ("DeleveragingMarginCallPeriod" in obj) {
-    return new DeleveragingMarginCallPeriod()
+  if ("UpdateDeleveragingMarginCallPeriod" in obj) {
+    return new UpdateDeleveragingMarginCallPeriod()
   }
   if ("UpdateBorrowFactor" in obj) {
     return new UpdateBorrowFactor()
@@ -1195,8 +1241,8 @@ export function fromDecoded(obj: any): types.UpdateConfigModeKind {
   if ("UpdateElevationGroup" in obj) {
     return new UpdateElevationGroup()
   }
-  if ("DeleveragingThresholdSlotsPerBps" in obj) {
-    return new DeleveragingThresholdSlotsPerBps()
+  if ("UpdateDeleveragingThresholdSecsPerBps" in obj) {
+    return new UpdateDeleveragingThresholdSecsPerBps()
   }
   if ("DeprecatedUpdateMultiplierSideBoost" in obj) {
     return new DeprecatedUpdateMultiplierSideBoost()
@@ -1231,6 +1277,12 @@ export function fromDecoded(obj: any): types.UpdateConfigModeKind {
   if ("UpdateHostFixedInterestRateBps" in obj) {
     return new UpdateHostFixedInterestRateBps()
   }
+  if ("UpdateAutodeleverageEnabled" in obj) {
+    return new UpdateAutodeleverageEnabled()
+  }
+  if ("UpdateDeleveragingBonusIncreaseBpsPerDay" in obj) {
+    return new UpdateDeleveragingBonusIncreaseBpsPerDay()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -1332,8 +1384,8 @@ export function fromJSON(
     case "UpdateMinLiquidationBonusBps": {
       return new UpdateMinLiquidationBonusBps()
     }
-    case "DeleveragingMarginCallPeriod": {
-      return new DeleveragingMarginCallPeriod()
+    case "UpdateDeleveragingMarginCallPeriod": {
+      return new UpdateDeleveragingMarginCallPeriod()
     }
     case "UpdateBorrowFactor": {
       return new UpdateBorrowFactor()
@@ -1344,8 +1396,8 @@ export function fromJSON(
     case "UpdateElevationGroup": {
       return new UpdateElevationGroup()
     }
-    case "DeleveragingThresholdSlotsPerBps": {
-      return new DeleveragingThresholdSlotsPerBps()
+    case "UpdateDeleveragingThresholdSecsPerBps": {
+      return new UpdateDeleveragingThresholdSecsPerBps()
     }
     case "DeprecatedUpdateMultiplierSideBoost": {
       return new DeprecatedUpdateMultiplierSideBoost()
@@ -1380,6 +1432,12 @@ export function fromJSON(
     case "UpdateHostFixedInterestRateBps": {
       return new UpdateHostFixedInterestRateBps()
     }
+    case "UpdateAutodeleverageEnabled": {
+      return new UpdateAutodeleverageEnabled()
+    }
+    case "UpdateDeleveragingBonusIncreaseBpsPerDay": {
+      return new UpdateDeleveragingBonusIncreaseBpsPerDay()
+    }
   }
 }
 
@@ -1416,11 +1474,11 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateDepositWithdrawalCapCurrentTotal"),
     borsh.struct([], "UpdateBadDebtLiquidationBonusBps"),
     borsh.struct([], "UpdateMinLiquidationBonusBps"),
-    borsh.struct([], "DeleveragingMarginCallPeriod"),
+    borsh.struct([], "UpdateDeleveragingMarginCallPeriod"),
     borsh.struct([], "UpdateBorrowFactor"),
     borsh.struct([], "UpdateAssetTier"),
     borsh.struct([], "UpdateElevationGroup"),
-    borsh.struct([], "DeleveragingThresholdSlotsPerBps"),
+    borsh.struct([], "UpdateDeleveragingThresholdSecsPerBps"),
     borsh.struct([], "DeprecatedUpdateMultiplierSideBoost"),
     borsh.struct([], "DeprecatedUpdateMultiplierTagBoost"),
     borsh.struct([], "UpdateReserveStatus"),
@@ -1432,6 +1490,8 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateBorrowLimitOutsideElevationGroup"),
     borsh.struct([], "UpdateBorrowLimitsInElevationGroupAgainstThisReserve"),
     borsh.struct([], "UpdateHostFixedInterestRateBps"),
+    borsh.struct([], "UpdateAutodeleverageEnabled"),
+    borsh.struct([], "UpdateDeleveragingBonusIncreaseBpsPerDay"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/idl_codegen/types/UpdateLendingMarketMode.ts

@@ -371,25 +371,48 @@ export class UpdateMinNetValueObligationPostAction {
   }
 }
 
-export interface UpdateMinValueSkipPriorityLiqCheckJSON {
-  kind: "UpdateMinValueSkipPriorityLiqCheck"
+export interface UpdateMinValueLtvSkipPriorityLiqCheckJSON {
+  kind: "UpdateMinValueLtvSkipPriorityLiqCheck"
 }
 
-export class UpdateMinValueSkipPriorityLiqCheck {
+export class UpdateMinValueLtvSkipPriorityLiqCheck {
   static readonly discriminator = 16
-  static readonly kind = "UpdateMinValueSkipPriorityLiqCheck"
+  static readonly kind = "UpdateMinValueLtvSkipPriorityLiqCheck"
   readonly discriminator = 16
-  readonly kind = "UpdateMinValueSkipPriorityLiqCheck"
+  readonly kind = "UpdateMinValueLtvSkipPriorityLiqCheck"
 
-  toJSON(): UpdateMinValueSkipPriorityLiqCheckJSON {
+  toJSON(): UpdateMinValueLtvSkipPriorityLiqCheckJSON {
     return {
-      kind: "UpdateMinValueSkipPriorityLiqCheck",
+      kind: "UpdateMinValueLtvSkipPriorityLiqCheck",
     }
   }
 
   toEncodable() {
     return {
-      UpdateMinValueSkipPriorityLiqCheck: {},
+      UpdateMinValueLtvSkipPriorityLiqCheck: {},
+    }
+  }
+}
+
+export interface UpdateMinValueBfSkipPriorityLiqCheckJSON {
+  kind: "UpdateMinValueBfSkipPriorityLiqCheck"
+}
+
+export class UpdateMinValueBfSkipPriorityLiqCheck {
+  static readonly discriminator = 17
+  static readonly kind = "UpdateMinValueBfSkipPriorityLiqCheck"
+  readonly discriminator = 17
+  readonly kind = "UpdateMinValueBfSkipPriorityLiqCheck"
+
+  toJSON(): UpdateMinValueBfSkipPriorityLiqCheckJSON {
+    return {
+      kind: "UpdateMinValueBfSkipPriorityLiqCheck",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateMinValueBfSkipPriorityLiqCheck: {},
     }
   }
 }
@@ -399,9 +422,9 @@ export interface UpdatePaddingFieldsJSON {
 }
 
 export class UpdatePaddingFields {
-  static readonly discriminator = 17
+  static readonly discriminator = 18
   static readonly kind = "UpdatePaddingFields"
-  readonly discriminator = 17
+  readonly discriminator = 18
   readonly kind = "UpdatePaddingFields"
 
   toJSON(): UpdatePaddingFieldsJSON {
@@ -422,9 +445,9 @@ export interface UpdateNameJSON {
 }
 
 export class UpdateName {
-  static readonly discriminator = 18
+  static readonly discriminator = 19
   static readonly kind = "UpdateName"
-  readonly discriminator = 18
+  readonly discriminator = 19
   readonly kind = "UpdateName"
 
   toJSON(): UpdateNameJSON {
@@ -440,6 +463,29 @@ export class UpdateName {
   }
 }
 
+export interface UpdateIndividualAutodeleverageMarginCallPeriodSecsJSON {
+  kind: "UpdateIndividualAutodeleverageMarginCallPeriodSecs"
+}
+
+export class UpdateIndividualAutodeleverageMarginCallPeriodSecs {
+  static readonly discriminator = 20
+  static readonly kind = "UpdateIndividualAutodeleverageMarginCallPeriodSecs"
+  readonly discriminator = 20
+  readonly kind = "UpdateIndividualAutodeleverageMarginCallPeriodSecs"
+
+  toJSON(): UpdateIndividualAutodeleverageMarginCallPeriodSecsJSON {
+    return {
+      kind: "UpdateIndividualAutodeleverageMarginCallPeriodSecs",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateIndividualAutodeleverageMarginCallPeriodSecs: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if (typeof obj !== "object") {
@@ -494,8 +540,11 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdateMinNetValueObligationPostAction" in obj) {
     return new UpdateMinNetValueObligationPostAction()
   }
-  if ("UpdateMinValueSkipPriorityLiqCheck" in obj) {
-    return new UpdateMinValueSkipPriorityLiqCheck()
+  if ("UpdateMinValueLtvSkipPriorityLiqCheck" in obj) {
+    return new UpdateMinValueLtvSkipPriorityLiqCheck()
+  }
+  if ("UpdateMinValueBfSkipPriorityLiqCheck" in obj) {
+    return new UpdateMinValueBfSkipPriorityLiqCheck()
   }
   if ("UpdatePaddingFields" in obj) {
     return new UpdatePaddingFields()
@@ -503,6 +552,9 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdateName" in obj) {
     return new UpdateName()
   }
+  if ("UpdateIndividualAutodeleverageMarginCallPeriodSecs" in obj) {
+    return new UpdateIndividualAutodeleverageMarginCallPeriodSecs()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -559,8 +611,11 @@ export function fromJSON(
     case "UpdateMinNetValueObligationPostAction": {
       return new UpdateMinNetValueObligationPostAction()
     }
-    case "UpdateMinValueSkipPriorityLiqCheck": {
-      return new UpdateMinValueSkipPriorityLiqCheck()
+    case "UpdateMinValueLtvSkipPriorityLiqCheck": {
+      return new UpdateMinValueLtvSkipPriorityLiqCheck()
+    }
+    case "UpdateMinValueBfSkipPriorityLiqCheck": {
+      return new UpdateMinValueBfSkipPriorityLiqCheck()
     }
     case "UpdatePaddingFields": {
       return new UpdatePaddingFields()
@@ -568,6 +623,9 @@ export function fromJSON(
     case "UpdateName": {
       return new UpdateName()
     }
+    case "UpdateIndividualAutodeleverageMarginCallPeriodSecs": {
+      return new UpdateIndividualAutodeleverageMarginCallPeriodSecs()
+    }
   }
 }
 
@@ -589,9 +647,11 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateAutodeleverageEnabled"),
     borsh.struct([], "UpdateBorrowingDisabled"),
     borsh.struct([], "UpdateMinNetValueObligationPostAction"),
-    borsh.struct([], "UpdateMinValueSkipPriorityLiqCheck"),
+    borsh.struct([], "UpdateMinValueLtvSkipPriorityLiqCheck"),
+    borsh.struct([], "UpdateMinValueBfSkipPriorityLiqCheck"),
     borsh.struct([], "UpdatePaddingFields"),
     borsh.struct([], "UpdateName"),
+    borsh.struct([], "UpdateIndividualAutodeleverageMarginCallPeriodSecs"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/idl_codegen/types/index.ts

@@ -40,11 +40,11 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateDepositWithdrawalCapCurrentTotal
   | UpdateConfigMode.UpdateBadDebtLiquidationBonusBps
   | UpdateConfigMode.UpdateMinLiquidationBonusBps
-  | UpdateConfigMode.DeleveragingMarginCallPeriod
+  | UpdateConfigMode.UpdateDeleveragingMarginCallPeriod
   | UpdateConfigMode.UpdateBorrowFactor
   | UpdateConfigMode.UpdateAssetTier
   | UpdateConfigMode.UpdateElevationGroup
-  | UpdateConfigMode.DeleveragingThresholdSlotsPerBps
+  | UpdateConfigMode.UpdateDeleveragingThresholdSecsPerBps
   | UpdateConfigMode.DeprecatedUpdateMultiplierSideBoost
   | UpdateConfigMode.DeprecatedUpdateMultiplierTagBoost
   | UpdateConfigMode.UpdateReserveStatus
@@ -56,6 +56,8 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateBorrowLimitOutsideElevationGroup
   | UpdateConfigMode.UpdateBorrowLimitsInElevationGroupAgainstThisReserve
   | UpdateConfigMode.UpdateHostFixedInterestRateBps
+  | UpdateConfigMode.UpdateAutodeleverageEnabled
+  | UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay
 export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateLoanToValuePctJSON
   | UpdateConfigMode.UpdateMaxLiquidationBonusBpsJSON
@@ -88,11 +90,11 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateDepositWithdrawalCapCurrentTotalJSON
   | UpdateConfigMode.UpdateBadDebtLiquidationBonusBpsJSON
   | UpdateConfigMode.UpdateMinLiquidationBonusBpsJSON
-  | UpdateConfigMode.DeleveragingMarginCallPeriodJSON
+  | UpdateConfigMode.UpdateDeleveragingMarginCallPeriodJSON
   | UpdateConfigMode.UpdateBorrowFactorJSON
   | UpdateConfigMode.UpdateAssetTierJSON
   | UpdateConfigMode.UpdateElevationGroupJSON
-  | UpdateConfigMode.DeleveragingThresholdSlotsPerBpsJSON
+  | UpdateConfigMode.UpdateDeleveragingThresholdSecsPerBpsJSON
   | UpdateConfigMode.DeprecatedUpdateMultiplierSideBoostJSON
   | UpdateConfigMode.DeprecatedUpdateMultiplierTagBoostJSON
   | UpdateConfigMode.UpdateReserveStatusJSON
@@ -104,6 +106,8 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateBorrowLimitOutsideElevationGroupJSON
   | UpdateConfigMode.UpdateBorrowLimitsInElevationGroupAgainstThisReserveJSON
   | UpdateConfigMode.UpdateHostFixedInterestRateBpsJSON
+  | UpdateConfigMode.UpdateAutodeleverageEnabledJSON
+  | UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDayJSON
 
 export { UpdateLendingMarketConfigValue }
 
@@ -147,9 +151,11 @@ export type UpdateLendingMarketModeKind =
   | UpdateLendingMarketMode.UpdateAutodeleverageEnabled
   | UpdateLendingMarketMode.UpdateBorrowingDisabled
   | UpdateLendingMarketMode.UpdateMinNetValueObligationPostAction
-  | UpdateLendingMarketMode.UpdateMinValueSkipPriorityLiqCheck
+  | UpdateLendingMarketMode.UpdateMinValueLtvSkipPriorityLiqCheck
+  | UpdateLendingMarketMode.UpdateMinValueBfSkipPriorityLiqCheck
   | UpdateLendingMarketMode.UpdatePaddingFields
   | UpdateLendingMarketMode.UpdateName
+  | UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecs
 export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateOwnerJSON
   | UpdateLendingMarketMode.UpdateEmergencyModeJSON
@@ -167,9 +173,11 @@ export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateAutodeleverageEnabledJSON
   | UpdateLendingMarketMode.UpdateBorrowingDisabledJSON
   | UpdateLendingMarketMode.UpdateMinNetValueObligationPostActionJSON
-  | UpdateLendingMarketMode.UpdateMinValueSkipPriorityLiqCheckJSON
+  | UpdateLendingMarketMode.UpdateMinValueLtvSkipPriorityLiqCheckJSON
+  | UpdateLendingMarketMode.UpdateMinValueBfSkipPriorityLiqCheckJSON
   | UpdateLendingMarketMode.UpdatePaddingFieldsJSON
   | UpdateLendingMarketMode.UpdateNameJSON
+  | UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecsJSON
 
 export { LastUpdate } from "./LastUpdate"
 export type { LastUpdateFields, LastUpdateJSON } from "./LastUpdate"

package/src/idl_codegen/zero_padding/ObligationZP.ts

@@ -48,8 +48,12 @@ 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`. */
+  readonly autodeleverageTargetLtvPct: number
   reserved: Array<BN> = new Array(0)
   highestBorrowFactorPct: BN
+  /** 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)
 
   static readonly layout = borsh.struct([
@@ -72,8 +76,10 @@ export class ObligationZP {
     borsh.u8("hasDebt"),
     borsh.publicKey("referrer"),
     borsh.u8("borrowingDisabled"),
+    borsh.u8("autodeleverageTargetLtvPct"),
     borsh.array(borsh.u8(), 7, "reserved"),
     borsh.u64("highestBorrowFactorPct"),
+    borsh.u64("autodeleverageMarginCallStartedTimestamp"),
   ])
 
   constructor(fields: ObligationFields) {
@@ -102,8 +108,10 @@ export class ObligationZP {
     this.hasDebt = fields.hasDebt
     this.referrer = fields.referrer
     this.borrowingDisabled = fields.borrowingDisabled
+    this.autodeleverageTargetLtvPct = fields.autodeleverageTargetLtvPct
     this.reserved = new Array<BN>(0);
     this.highestBorrowFactorPct = fields.highestBorrowFactorPct
+    this.autodeleverageMarginCallStartedTimestamp = fields.autodeleverageMarginCallStartedTimestamp
     this.padding3 = new Array<BN>(0);
   }
 
@@ -178,7 +186,9 @@ export class ObligationZP {
       hasDebt: dec.hasDebt,
       referrer: dec.referrer,
       borrowingDisabled: dec.borrowingDisabled,
+      autodeleverageTargetLtvPct: dec.autodeleverageTargetLtvPct,
       highestBorrowFactorPct: dec.highestBorrowFactorPct,
+      autodeleverageMarginCallStartedTimestamp: dec.autodeleverageMarginCallStartedTimestamp,
       reserved: [],
       padding3: [],
     })

package/src/lending_operations/repay_with_collateral_calcs.ts

@@ -76,79 +76,73 @@ export const calcFlashRepayAmount = (props: {
 };
 
 export function calcMaxWithdrawCollateral(
-  kaminoMarket: KaminoMarket,
+  market: KaminoMarket,
+  obligation: KaminoObligation,
   collReserveAddr: PublicKey,
   debtReserveAddr: PublicKey,
-  obligation: KaminoObligation,
   repayAmountLamports: Decimal
 ): {
-  canWithdrawRemainingColl: boolean;
+  repayAmountLamports: Decimal;
   withdrawableCollLamports: Decimal;
+  canWithdrawAllColl: boolean;
+  repayingAllDebt: boolean;
 } {
-  const collReserve = kaminoMarket.getReserveByAddress(collReserveAddr)!;
-  const collOraclePx = collReserve.getOracleMarketPrice();
-  const { maxLtv: collMaxLtv } = obligation.getLtvForReserve(kaminoMarket, collReserve);
-
-  const collPosition = obligation.getDepositByReserve(collReserve.address)!;
-  const initialCollValue = collPosition.amount.floor().div(collReserve.getMintFactor()).mul(collOraclePx);
-
-  let totalRemainingDebtValue = new Decimal(0);
-  const borrows = obligation.getBorrows();
-  for (const debtPosition of borrows) {
-    const debtReserve = kaminoMarket.getReserveByAddress(debtPosition.reserveAddress)!;
-    const debtOraclePx = debtReserve.getOracleMarketPrice();
-    const debtBorrowFactor = debtReserve.getBorrowFactor();
-    let remainingDebtAmountLamports = debtPosition.amount;
-    if (debtPosition.reserveAddress.equals(debtReserveAddr)) {
-      remainingDebtAmountLamports = remainingDebtAmountLamports.sub(repayAmountLamports);
-    }
-    const remainingDebtBfWeightedValue = remainingDebtAmountLamports
-      .ceil()
-      .div(debtReserve.getMintFactor())
-      .mul(debtBorrowFactor)
-      .mul(debtOraclePx);
-    totalRemainingDebtValue = totalRemainingDebtValue.add(remainingDebtBfWeightedValue);
-  }
-
-  let canWithdrawRemainingColl = false;
-  if (totalRemainingDebtValue.lte(new Decimal(0)) && borrows.length === 1) {
-    canWithdrawRemainingColl = true;
+  const deposit = obligation.getDepositByReserve(collReserveAddr)!;
+  const borrow = obligation.getBorrowByReserve(debtReserveAddr)!;
+  const depositReserve = market.getReserveByAddress(deposit.reserveAddress)!;
+  const debtReserve = market.getReserveByAddress(borrow.reserveAddress)!;
+  const depositTotalLamports = deposit.amount.floor();
+
+  const remainingBorrowLamports = borrow.amount.sub(repayAmountLamports).ceil();
+  const remainingBorrowAmount = remainingBorrowLamports.div(debtReserve.getMintFactor());
+  let remainingBorrowsValue = remainingBorrowAmount.mul(debtReserve.getOracleMarketPrice());
+  if (obligation.getBorrows().length > 1) {
+    remainingBorrowsValue = obligation
+      .getBorrows()
+      .filter((p) => !p.reserveAddress.equals(borrow.reserveAddress))
+      .reduce((acc, b) => acc.add(b.marketValueRefreshed), new Decimal('0'));
   }
 
-  const deposits = obligation.getDeposits();
-  const otherCollDeposits = deposits.filter((deposit) => !deposit.reserveAddress.equals(collReserve.address));
-
-  let totalOtherCollateralValue = new Decimal(0);
-  for (const d of otherCollDeposits) {
-    const otherCollReserve = kaminoMarket.getReserveByAddress(d.reserveAddress)!;
-    const otherCollOraclePx = otherCollReserve.getOracleMarketPrice();
-    const otherCollMaxLtv = obligation.getLtvForReserve(kaminoMarket, otherCollReserve).maxLtv;
-    const otherCollValue = d.amount
-      .floor()
-      .div(otherCollReserve.getMintFactor())
-      .mul(otherCollOraclePx)
-      .mul(otherCollMaxLtv);
-    totalOtherCollateralValue = totalOtherCollateralValue.add(otherCollValue);
+  let remainingDepositsValueWithLtv = new Decimal('0');
+  if (obligation.getDeposits().length > 1) {
+    remainingDepositsValueWithLtv = obligation
+      .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));
+      }, new Decimal('0'));
   }
 
-  const numerator = initialCollValue.mul(collMaxLtv).add(totalOtherCollateralValue).sub(totalRemainingDebtValue);
-
-  // If all collateral cannot cover the remaining debt
-  if (numerator.lte('0')) {
-    return { canWithdrawRemainingColl: false, withdrawableCollLamports: new Decimal(0) };
-  }
-
-  const denominator = collOraclePx.mul(collMaxLtv);
-  const maxCollWithdrawAmount = numerator.div(denominator);
-  const maxCollateralWithdrawalAmountLamports = maxCollWithdrawAmount.mul(collReserve.getMintFactor()).floor();
-
-  let withdrawableCollLamports: Decimal;
-  if (canWithdrawRemainingColl) {
-    withdrawableCollLamports = Decimal.min(maxCollateralWithdrawalAmountLamports, collPosition.amount).floor();
+  // can withdraw all coll
+  if (remainingDepositsValueWithLtv.gte(remainingBorrowsValue)) {
+    return {
+      repayAmountLamports: repayAmountLamports,
+      withdrawableCollLamports: depositTotalLamports,
+      canWithdrawAllColl: true,
+      repayingAllDebt: repayAmountLamports.gte(borrow.amount),
+    };
   } else {
-    withdrawableCollLamports = Decimal.max(new Decimal(0), maxCollateralWithdrawalAmountLamports);
+    const { maxLtv: collMaxLtv } = obligation.getLtvForReserve(
+      market,
+      market.getReserveByAddress(depositReserve.address)!
+    );
+    const numerator = deposit.marketValueRefreshed
+      .mul(collMaxLtv)
+      .add(remainingDepositsValueWithLtv)
+      .sub(remainingBorrowsValue);
+
+    const denominator = depositReserve.getOracleMarketPrice().mul(collMaxLtv);
+    const maxCollWithdrawAmount = numerator.div(denominator);
+    const withdrawableCollLamports = maxCollWithdrawAmount.mul(depositReserve.getMintFactor()).floor();
+
+    return {
+      repayAmountLamports: repayAmountLamports,
+      withdrawableCollLamports,
+      canWithdrawAllColl: false,
+      repayingAllDebt: repayAmountLamports.gte(borrow.amount),
+    };
   }
-  return { canWithdrawRemainingColl, withdrawableCollLamports };
 }
 
 export function estimateDebtRepaymentWithColl(props: {