@kamino-finance/klend-sdk 5.1.10 → 5.2.0

package/src/lending_operations/repay_with_collateral_calcs.ts

@@ -64,43 +64,74 @@ export function calcMaxWithdrawCollateral(
   debtReserveAddr: PublicKey,
   obligation: KaminoObligation,
   repayAmountLamports: Decimal
-) {
+): {
+  canWithdrawRemainingColl: boolean;
+  withdrawableCollLamports: Decimal;
+} {
   const collReserve = kaminoMarket.getReserveByAddress(collReserveAddr)!;
-  const debtReserve = kaminoMarket.getReserveByAddress(debtReserveAddr)!;
-
-  const debtOraclePx = debtReserve.getOracleMarketPrice();
   const collOraclePx = collReserve.getOracleMarketPrice();
   const { maxLtv: collMaxLtv } = obligation.getLtvForReserve(kaminoMarket, collReserve);
-  const debtBorrowFactor = debtReserve.getBorrowFactor();
 
-  const debtPosition = obligation.getBorrowByReserve(debtReserve.address)!;
   const collPosition = obligation.getDepositByReserve(collReserve.address)!;
   const initialCollValue = collPosition.amount.floor().div(collReserve.getMintFactor()).mul(collOraclePx);
-  const remainingDebtAmountLamports = debtPosition.amount.sub(repayAmountLamports);
-  const remainingDebtBfWeightedValue = remainingDebtAmountLamports
-    .ceil()
-    .div(debtReserve.getMintFactor())
-    .mul(debtBorrowFactor)
-    .mul(debtOraclePx);
-
-  let isClosingPosition = false;
-  if (remainingDebtAmountLamports.lte(new Decimal(0)) && obligation.getBorrows().length === 1) {
-    isClosingPosition = true;
+
+  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 numerator = initialCollValue.mul(collMaxLtv).sub(remainingDebtBfWeightedValue);
+
+  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);
+  }
+
+  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 (isClosingPosition) {
-    // sanity check: we have extra collateral to swap, but we want to ensure we don't quote for way more than needed and get a bad px
-    const maxSwapCollLamportsWithBuffer = maxCollateralWithdrawalAmountLamports.mul('1.1');
-    withdrawableCollLamports = Decimal.min(maxSwapCollLamportsWithBuffer, collPosition.amount).floor();
+  if (canWithdrawRemainingColl) {
+    withdrawableCollLamports = Decimal.min(maxCollateralWithdrawalAmountLamports, collPosition.amount).floor();
   } else {
     withdrawableCollLamports = Decimal.max(new Decimal(0), maxCollateralWithdrawalAmountLamports);
   }
-  return { isClosingPosition, withdrawableCollLamports };
+  return { canWithdrawRemainingColl, withdrawableCollLamports };
 }
 
 export function estimateDebtRepaymentWithColl(props: {

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -74,14 +74,11 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     throw new Error(`Debt reserve with mint ${debtReserve} not found in market ${kaminoMarket.getAddress()}`);
   }
 
-  const { repayAmountLamports, flashRepayAmountLamports } = calcRepayAmountWithSlippage(
-    kaminoMarket,
-    debtReserve,
-    currentSlot,
-    obligation,
-    repayAmount,
-    referrer
-  );
+  const {
+    repayAmountLamports,
+    flashRepayAmountLamports,
+    repayAmount: finalRepayAmount,
+  } = calcRepayAmountWithSlippage(kaminoMarket, debtReserve, currentSlot, obligation, repayAmount, referrer);
 
   const debtPosition = obligation.getBorrowByReserve(debtReserve.address);
   const collPosition = obligation.getDepositByReserve(collReserve.address);
@@ -103,8 +100,17 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     repayAmountLamports
   );
 
+  // sanity check: we have extra collateral to swap, but we want to ensure we don't quote for way more than needed and get a bad px
+  const maxCollNeededFromOracle = finalRepayAmount
+    .mul(debtReserve.getOracleMarketPrice())
+    .div(collReserve.getOracleMarketPrice())
+    .mul('1.1')
+    .mul(collReserve.getMintFactor())
+    .ceil();
+  const inputAmountLamports = Decimal.min(withdrawableCollLamports, maxCollNeededFromOracle);
+
   const swapQuoteInputs: SwapInputs = {
-    inputAmountLamports: withdrawableCollLamports,
+    inputAmountLamports,
     inputMint: collTokenMint,
     outputMint: debtTokenMint,
     amountDebtAtaBalance: new Decimal(0), // only used for kTokens
@@ -127,7 +133,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     },
     isClosingPosition,
     repayAmountLamports,
-    withdrawableCollLamports
+    inputAmountLamports
   );
   const uniqueKlendAccounts = uniqueAccounts(klendIxs);
   const swapQuote = await quoter(swapQuoteInputs, uniqueKlendAccounts);

package/src/utils/ata.ts

@@ -154,7 +154,7 @@ export async function getTokenAccountBalanceDecimal(
   connection: Connection,
   mint: PublicKey,
   owner: PublicKey,
-  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID
 ): Promise<Decimal> {
   const ata = getAssociatedTokenAddress(mint, owner, true, tokenProgram);
   const accInfo = await connection.getAccountInfo(ata);