@kamino-finance/klend-sdk 5.11.5-beta.0 → 5.11.5

package/src/classes/manager.ts

@@ -50,7 +50,6 @@ import {
   ReserveWithAddress,
   sameLengthArrayEquals,
   ScopeOracleConfig,
-  sleep,
   updateEntireReserveConfigIx,
   updateLendingMarket,
   UpdateLendingMarketAccounts,
@@ -594,8 +593,6 @@ export class KaminoManager {
       }
     );
 
-    await sleep(500);
-
     const markets = await Promise.all(
       lendingMarketsAccounts.map((account) =>
         KaminoMarket.load(this._connection, account.pubkey, this.recentSlotDurationMs, this._kaminoLendProgramId)

package/src/classes/obligation.ts

@@ -267,7 +267,7 @@ export class KaminoObligation {
   /**
    * @returns total borrow power of the obligation, relative to max LTV of each asset's reserve
    */
-  getMaxAllowedBorrowValue(): Decimal {
+  getAllowedBorrowValue(): Decimal {
     return new Fraction(this.state.allowedBorrowValueSf).toDecimal();
   }
 

package/src/classes/types.ts

@@ -58,4 +58,4 @@ export type ReserveAllocationOverview = {
 export type APYs = {
   grossAPY: Decimal;
   netAPY: Decimal;
-}
+};

package/src/classes/vault.ts

@@ -82,7 +82,7 @@ import {
 import { batchFetch, collToLamportsDecimal, ZERO } from '@kamino-finance/kliquidity-sdk';
 import { FullBPSDecimal } from '@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters';
 import { FarmState } from '@kamino-finance/farms-sdk/dist';
-import { getAccountsInLUT, initLookupTableIx } from '../utils/lookupTable';
+import { getAccountsInLUT, initLookupTableIx } from './lut_utils';
 import {
   getFarmStakeIxs,
   getFarmUnstakeAndWithdrawIxs,

package/src/lending_operations/repay_with_collateral_calcs.ts

@@ -2,7 +2,6 @@ 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,
@@ -103,7 +102,6 @@ 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) {
@@ -111,13 +109,8 @@ export function calcMaxWithdrawCollateral(
       .getDeposits()
       .filter((p) => !p.reserveAddress.equals(deposit.reserveAddress))
       .reduce((acc, d) => {
-        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));
+        const { maxLtv } = obligation.getLtvForReserve(market, market.getReserveByAddress(d.reserveAddress)!);
+        return acc.add(d.marketValueRefreshed.mul(maxLtv));
       }, new Decimal('0'));
   }
 
@@ -130,18 +123,16 @@ export function calcMaxWithdrawCollateral(
       repayingAllDebt: repayAmountLamports.gte(borrow.amount),
     };
   } else {
-    const { maxLtv: collMaxLtv, liquidationLtv: collLiquidationLtv } = obligation.getLtvForReserve(
+    const { maxLtv: collMaxLtv } = obligation.getLtvForReserve(
       market,
       market.getReserveByAddress(depositReserve.address)!
     );
-    const maxWithdrawLtv =
-      maxWithdrawLtvCheck === MaxWithdrawLtvCheck.LIQUIDATION_THRESHOLD ? collLiquidationLtv : collMaxLtv;
     const numerator = deposit.marketValueRefreshed
-      .mul(maxWithdrawLtv)
+      .mul(collMaxLtv)
       .add(remainingDepositsValueWithLtv)
       .sub(remainingBorrowsValue);
 
-    const denominator = depositReserve.getOracleMarketPrice().mul(maxWithdrawLtv);
+    const denominator = depositReserve.getOracleMarketPrice().mul(collMaxLtv);
     const maxCollWithdrawAmount = numerator.div(denominator);
     const withdrawableCollLamports = maxCollWithdrawAmount.mul(depositReserve.getMintFactor()).floor();
 

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -57,11 +57,6 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
 
-export enum MaxWithdrawLtvCheck {
-  MAX_LTV,
-  LIQUIDATION_THRESHOLD,
-}
-
 export async function getRepayWithCollSwapInputs<QuoteResponse>({
   collTokenMint,
   currentSlot,
@@ -218,17 +213,8 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
   const { inputAmountLamports: collSwapInLamports } = swapInputs;
 
-  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()}`);
-  }
+  const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
+  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
 
   // 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
@@ -320,48 +306,25 @@ 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
-  let repayAndWithdrawAction;
-  if (maxWithdrawLtvCheck === MaxWithdrawLtvCheck.MAX_LTV) {
-    repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns(
-      market,
-      isClosingPosition ? U64_MAX : debtRepayAmountLamports.toString(),
-      debtReserve.getLiquidityMint(),
-      isClosingPosition ? U64_MAX : collWithdrawLamports.toString(),
-      collReserve.getLiquidityMint(),
-      obligation.state.owner,
-      currentSlot,
-      obligation,
-      useV2Ixs,
-      undefined,
-      0,
-      false,
-      requestElevationGroup,
-      undefined,
-      undefined,
-      referrer
-    );
-  } else {
-    repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawV2Txns(
-      market,
-      isClosingPosition ? U64_MAX : debtRepayAmountLamports.toString(),
-      debtReserve.getLiquidityMint(),
-      isClosingPosition ? U64_MAX : collWithdrawLamports.toString(),
-      collReserve.getLiquidityMint(),
-      obligation.state.owner,
-      currentSlot,
-      obligation,
-      undefined,
-      0,
-      false,
-      requestElevationGroup,
-      undefined,
-      undefined,
-      referrer
-    );
-  }
+  const repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns(
+    market,
+    isClosingPosition ? U64_MAX : debtRepayAmountLamports.toString(),
+    debtReserve.getLiquidityMint(),
+    isClosingPosition ? U64_MAX : collWithdrawLamports.toString(),
+    collReserve.getLiquidityMint(),
+    obligation.state.owner,
+    currentSlot,
+    obligation,
+    useV2Ixs,
+    undefined,
+    0,
+    false,
+    requestElevationGroup,
+    undefined,
+    undefined,
+    referrer
+  );
 
   // 4. Swap collateral to debt to repay flash loan
   const { preActionIxs, swapIxs } = swapQuoteIxs;
@@ -378,9 +341,3 @@ 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/utils/lookupTable.ts

@@ -53,65 +53,3 @@ export const extendLookupTableIxs = (
 
   return extendLookupIxs;
 };
-
-/**
- * This method retuns an instruction that creates a lookup table, alongside the pubkey of the lookup table
- * @param payer - the owner of the lookup table
- * @param slot - the current slot
- * @returns - the instruction to create the lookup table and its address
- */
-export function initLookupTableIx(payer: PublicKey, slot: number): [TransactionInstruction, PublicKey] {
-  const [ixn, address] = AddressLookupTableProgram.createLookupTable({
-    authority: payer,
-    payer,
-    recentSlot: slot,
-  });
-
-  return [ixn, address];
-}
-
-/**
- * This method retuns an instruction that deactivates a lookup table, which is needed to close it
- * @param payer - the owner of the lookup table
- * @param lookupTable - the lookup table to deactivate
- * @returns - the instruction to deactivate the lookup table
- */
-export function deactivateLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction {
-  const ixn = AddressLookupTableProgram.deactivateLookupTable({
-    authority: payer,
-    lookupTable: lookupTable,
-  });
-
-  return ixn;
-}
-
-/**
- * This method returns an instruction that closes a lookup table. That lookup table needs to be disabled at least 500 blocks before closing it.
- * @param payer - the owner of the lookup table
- * @param lookupTable - the lookup table to close
- * @returns - the instruction to close the lookup table
- */
-/// this require the LUT to be deactivated at least 500 blocks before
-export function closeLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction {
-  const ixn = AddressLookupTableProgram.closeLookupTable({
-    authority: payer,
-    recipient: payer,
-    lookupTable: lookupTable,
-  });
-
-  return ixn;
-}
-
-/**
- * Returns the accounts in a lookup table
- * @param lookupTable - lookup table to get the accounts from
- * @returns - an array of accounts in the lookup table
- */
-export async function getAccountsInLUT(connection: Connection, lookupTable: PublicKey): Promise<PublicKey[]> {
-  const lutState = await connection.getAddressLookupTable(lookupTable);
-  if (!lutState || !lutState.value) {
-    throw new Error(`Lookup table ${lookupTable} not found`);
-  }
-
-  return lutState.value.state.addresses;
-}

package/src/utils/seeds.ts

@@ -38,10 +38,6 @@ export const BASE_SEED_REFERRER_STATE = 'ref_state';
  * Short url seed
  */
 export const BASE_SEED_SHORT_URL = 'short_url';
-/**
- * Farm user state seed
- */
-export const BASE_SEED_USER_STATE = 'user';
 
 /**
  * User farm state seed
@@ -192,15 +188,9 @@ export function shortUrlPda(shortUrl: string, programId: PublicKey = PROGRAM_ID)
   return PublicKey.findProgramAddressSync([Buffer.from(BASE_SEED_SHORT_URL), Buffer.from(shortUrl)], programId);
 }
 
-/**
- * Returns the PDA for the obligation farm state
- * @param farm
- * @param obligation
- * @returns pda
- */
-export function obligationFarmStatePda(farm: PublicKey, obligation: PublicKey) {
+export function obligationFarmStatePda(obligation: PublicKey, farm: PublicKey, programId: PublicKey = farmsId) {
   return PublicKey.findProgramAddressSync(
-    [Buffer.from(BASE_SEED_USER_STATE), farm.toBytes(), obligation.toBytes()],
-    farmsId
-  )[0];
+    [Buffer.from(BASE_SEED_FARM_USER_STATE), farm.toBuffer(), obligation.toBuffer()],
+    programId
+  );
 }

package/src/utils/userMetadata.ts

@@ -6,7 +6,6 @@ import {
   Connection,
   GetProgramAccountsFilter,
 } from '@solana/web3.js';
-import { NATIVE_MINT } from '@solana/spl-token';
 import { KaminoMarket, KaminoObligation } from '../classes';
 import {
   LeverageObligation,
@@ -259,7 +258,7 @@ function getMultiplyObligationAndObligationFarmStateAddresses(
     const collMintString = collMint.toString();
     const debtMintString = debtMint.toString();
     if (collReserve && debtReserve) {
-      const multiplyObligation = new MultiplyObligation(collMint, NATIVE_MINT, kaminoMarket.programId);
+      const multiplyObligation = new MultiplyObligation(collMint, debtMint, kaminoMarket.programId);
       obligationPdas.push({
         address: multiplyObligation.toPda(kaminoMarket.getAddress(), user),
         log: 'multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
@@ -267,18 +266,18 @@ function getMultiplyObligationAndObligationFarmStateAddresses(
       if (!collReserve.state.farmCollateral.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            collReserve.state.farmCollateral!,
-            multiplyObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+            multiplyObligation.toPda(kaminoMarket.getAddress(), user),
+            collReserve.state.farmCollateral!
+          )[0],
           log: 'collReserve farmState for multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
       if (!debtReserve.state.farmDebt.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            debtReserve.state.farmDebt!,
-            multiplyObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+            multiplyObligation.toPda(kaminoMarket.getAddress(), user),
+            debtReserve.state.farmDebt!
+          )[0],
           log: 'debtReserve farmState for multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
@@ -310,18 +309,18 @@ function getLeverageObligationAndObligationFarmStateAddresses(
       if (!collReserve.state.farmCollateral.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            collReserve.state.farmCollateral!,
-            leverageObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+            leverageObligation.toPda(kaminoMarket.getAddress(), user),
+            collReserve.state.farmCollateral!
+          )[0],
           log: 'collReserve farmState for leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
       if (!debtReserve.state.farmDebt.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            debtReserve.state.farmDebt!,
-            leverageObligation.toPda(kaminoMarket.getAddress(), user)
-          ),
+            leverageObligation.toPda(kaminoMarket.getAddress(), user),
+            debtReserve.state.farmDebt!
+          )[0],
           log: 'debtReserve farmState for leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
@@ -342,7 +341,7 @@ function getRepayWithCollObligationFarmStateAddresses(
     const borrowReserve = kaminoMarket.getReserveByMint(borrow.mintAddress)!;
     if (!borrowReserve.state.farmDebt.equals(PublicKey.default)) {
       farmUserStates.push({
-        address: obligationFarmStatePda(borrowReserve.state.farmDebt!, obligation.obligationAddress),
+        address: obligationFarmStatePda(obligation.obligationAddress, borrowReserve.state.farmDebt!)[0],
         log: 'debtReserve farmState for vanilla obligation: ' + obligationString,
       });
     }
@@ -352,7 +351,7 @@ function getRepayWithCollObligationFarmStateAddresses(
     const depositReserve = kaminoMarket.getReserveByMint(deposit.mintAddress)!;
     if (!depositReserve.state.farmCollateral.equals(PublicKey.default)) {
       farmUserStates.push({
-        address: obligationFarmStatePda(depositReserve.state.farmCollateral!, obligation.obligationAddress),
+        address: obligationFarmStatePda(obligation.obligationAddress, depositReserve.state.farmCollateral!)[0],
         log: 'collReserve farmState for vanilla obligation' + obligationString,
       });
     }