@kamino-finance/klend-sdk 7.4.0-beta.0 → 7.4.0-beta.1

package/src/classes/actionTypes.ts

@@ -0,0 +1,295 @@
+import { Address, Option, Slot, TransactionSigner } from '@solana/kit';
+import BN from 'bn.js';
+import { ObligationType, ScopePriceRefreshConfig } from '../utils';
+import { KaminoObligation } from './obligation';
+import { KaminoMarket } from './market';
+import { ActionType } from './action';
+
+/**
+ * Props for KaminoAction.initialize
+ */
+export interface InitializeActionProps {
+  kaminoMarket: KaminoMarket;
+  action: ActionType;
+  amount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+  payer?: TransactionSigner;
+}
+
+/**
+ * Props for KaminoAction.buildDepositTxns
+ */
+export interface BuildDepositTxnsProps {
+  kaminoMarket: KaminoMarket;
+  amount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  useV2Ixs: boolean;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+  overrideElevationGroupRequest?: number;
+}
+
+/**
+ * Props for KaminoAction.buildBorrowTxns
+ */
+export interface BuildBorrowTxnsProps {
+  kaminoMarket: KaminoMarket;
+  amount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  useV2Ixs: boolean;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+  overrideElevationGroupRequest?: number;
+}
+
+/**
+ * Props for KaminoAction.buildDepositReserveLiquidityTxns
+ */
+export interface BuildDepositReserveLiquidityTxnsProps {
+  kaminoMarket: KaminoMarket;
+  amount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+}
+
+/**
+ * Props for KaminoAction.buildRedeemReserveCollateralTxns
+ */
+export interface BuildRedeemReserveCollateralTxnsProps {
+  kaminoMarket: KaminoMarket;
+  amount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+}
+
+/**
+ * Props for KaminoAction.buildWithdrawTxns
+ */
+export interface BuildWithdrawTxnsProps {
+  kaminoMarket: KaminoMarket;
+  amount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  useV2Ixs: boolean;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+  overrideElevationGroupRequest?: number;
+  obligationCustomizations?: {
+    addedDepositReserves?: Address[];
+  };
+}
+
+/**
+ * Props for KaminoAction.buildRepayTxns
+ */
+export interface BuildRepayTxnsProps {
+  kaminoMarket: KaminoMarket;
+  amount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  useV2Ixs: boolean;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  currentSlot: Slot;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  payer?: TransactionSigner;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+}
+
+/**
+ * Props for KaminoAction.buildDepositAndBorrowTxns
+ */
+export interface BuildDepositAndBorrowTxnsProps {
+  kaminoMarket: KaminoMarket;
+  depositAmount: string | BN;
+  depositReserveAddress: Address;
+  borrowAmount: string | BN;
+  borrowReserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  useV2Ixs: boolean;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+}
+
+/**
+ * Props for KaminoAction.buildRefreshObligationTxns
+ */
+export interface BuildRefreshObligationTxnsProps {
+  kaminoMarket: KaminoMarket;
+  payer: TransactionSigner;
+  obligation: KaminoObligation;
+  extraComputeBudget?: number;
+  currentSlot?: Slot;
+}
+
+/**
+ * Props for KaminoAction.buildRequestElevationGroupTxns
+ */
+export interface BuildRequestElevationGroupTxnsProps {
+  kaminoMarket: KaminoMarket;
+  owner: TransactionSigner;
+  obligation: KaminoObligation;
+  elevationGroup: number;
+  extraComputeBudget?: number;
+  currentSlot?: Slot;
+}
+
+/**
+ * Props for KaminoAction.buildDepositAndWithdrawV2Txns
+ */
+export interface BuildDepositAndWithdrawV2TxnsProps {
+  kaminoMarket: KaminoMarket;
+  depositAmount: string | BN;
+  depositReserveAddress: Address;
+  withdrawAmount: string | BN;
+  withdrawReserveAddress: Address;
+  owner: TransactionSigner;
+  currentSlot: Slot;
+  obligation: KaminoObligation | ObligationType;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+}
+
+/**
+ * Props for KaminoAction.buildRepayAndWithdrawTxns
+ */
+export interface BuildRepayAndWithdrawTxnsProps {
+  kaminoMarket: KaminoMarket;
+  repayAmount: string | BN;
+  repayReserveAddress: Address;
+  withdrawAmount: string | BN;
+  withdrawReserveAddress: Address;
+  payer: TransactionSigner;
+  currentSlot: Slot;
+  obligation: KaminoObligation | ObligationType;
+  useV2Ixs: boolean;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+}
+
+/**
+ * Props for KaminoAction.buildRepayAndWithdrawV2Txns
+ */
+export interface BuildRepayAndWithdrawV2TxnsProps {
+  kaminoMarket: KaminoMarket;
+  repayAmount: string | BN;
+  repayReserveAddress: Address;
+  withdrawAmount: string | BN;
+  withdrawReserveAddress: Address;
+  payer: TransactionSigner;
+  currentSlot: Slot;
+  obligation: KaminoObligation | ObligationType;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+}
+
+/**
+ * Props for KaminoAction.buildLiquidateTxns
+ */
+export interface BuildLiquidateTxnsProps {
+  kaminoMarket: KaminoMarket;
+  amount: string | BN;
+  minCollateralReceiveAmount: string | BN;
+  repayReserveAddress: Address;
+  withdrawReserveAddress: Address;
+  liquidator: TransactionSigner;
+  obligationOwner: Address;
+  obligation: KaminoObligation | ObligationType;
+  useV2Ixs: boolean;
+  scopeRefreshConfig?: ScopePriceRefreshConfig;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+  maxAllowedLtvOverridePercent?: number;
+  currentSlot?: Slot;
+}
+
+/**
+ * Props for KaminoAction.buildWithdrawReferrerFeeTxns
+ */
+export interface BuildWithdrawReferrerFeeTxnsProps {
+  owner: TransactionSigner;
+  reserveAddress: Address;
+  kaminoMarket: KaminoMarket;
+  currentSlot?: Slot;
+}
+
+/**
+ * Props for KaminoAction.buildDepositObligationCollateralTxns
+ */
+export interface BuildDepositObligationCollateralTxnsProps {
+  kaminoMarket: KaminoMarket;
+  amount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  useV2Ixs: boolean;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+}

package/src/classes/manager.ts

@@ -1796,11 +1796,6 @@ export const MARKET_UPDATER = new ConfigUpdater(UpdateLendingMarketMode.fromDeco
   [UpdateLendingMarketMode.UpdateObligationOrderExecutionEnabled.kind]: config.obligationOrderExecutionEnabled,
   [UpdateLendingMarketMode.UpdateProposerAuthority.kind]: config.proposerAuthority,
   [UpdateLendingMarketMode.UpdatePriceTriggeredLiquidationDisabled.kind]: config.priceTriggeredLiquidationDisabled,
-  [UpdateLendingMarketMode.UpdateMatureReserveDebtLiquidationEnabled.kind]: config.matureReserveDebtLiquidationEnabled,
-  [UpdateLendingMarketMode.UpdateObligationBorrowDebtTermLiquidationEnabled.kind]:
-    config.obligationBorrowDebtTermLiquidationEnabled,
-  [UpdateLendingMarketMode.UpdateBorrowOrderCreationEnabled.kind]: config.borrowOrderCreationEnabled,
-  [UpdateLendingMarketMode.UpdateBorrowOrderExecutionEnabled.kind]: config.borrowOrderExecutionEnabled,  
 }));
 
 function parseForChangesMarketConfigAndGetIxs(

package/src/classes/market.ts

@@ -34,8 +34,11 @@ import {
   isNotNullPubkey,
   lendingMarketAuthPda,
   LendingObligation,
+  LendingObligationFixedRate,
   LeverageObligation,
+  LeverageObligationFixedRate,
   MultiplyObligation,
+  MultiplyObligationFixedRate,
   ObligationType,
   PythPrices,
   referrerTokenStatePda,
@@ -121,22 +124,6 @@ export class KaminoMarket {
     );
   }
 
-  /**
-   * TESTING ONLY!
-   *
-   * Used to create mock markets for testing
-   */
-  static createMarket(
-    rpc: Rpc<KaminoMarketRpcApi>,
-    state: LendingMarket,
-    marketAddress: Address,
-    reserves: Map<Address, KaminoReserve>,
-    recentSlotDurationMs: number,
-    programId: Address = PROGRAM_ID
-  ) {
-    return new KaminoMarket(rpc, state, marketAddress, reserves, recentSlotDurationMs, programId);
-  }
-
   /**
    * Load a new market with all of its associated reserves
    * @param rpc
@@ -307,14 +294,22 @@ export class KaminoMarket {
     return parseZeroPaddedUtf8(this.state.name);
   }
 
-  async getObligationDepositByWallet(owner: Address, mint: Address, obligationType: ObligationType): Promise<Decimal> {
+  async getObligationDepositByWallet(
+    owner: Address,
+    depositReserveAddress: Address,
+    obligationType: ObligationType
+  ): Promise<Decimal> {
     const obligation = await this.getObligationByWallet(owner, obligationType);
-    return obligation?.getDepositByMint(mint)?.amount ?? new Decimal(0);
+    return obligation?.getDepositByReserve(depositReserveAddress)?.amount ?? new Decimal(0);
   }
 
-  async getObligationBorrowByWallet(owner: Address, mint: Address, obligationType: ObligationType): Promise<Decimal> {
+  async getObligationBorrowByWallet(
+    owner: Address,
+    borrowReserveAddress: Address,
+    obligationType: ObligationType
+  ): Promise<Decimal> {
     const obligation = await this.getObligationByWallet(owner, obligationType);
-    return obligation?.getBorrowByMint(mint)?.amount ?? new Decimal(0);
+    return obligation?.getBorrowByReserve(borrowReserveAddress)?.amount ?? new Decimal(0);
   }
 
   getTotalDepositTVL(): Decimal {
@@ -333,10 +328,10 @@ export class KaminoMarket {
     return tvl;
   }
 
-  getMaxLeverageForPair(collTokenMint: Address, debtTokenMint: Address): number {
+  getMaxLeverageForPair(collReserveAddress: Address, debtReserveAddress: Address): number {
     const { maxLtv: maxCollateralLtv, borrowFactor } = this.getMaxAndLiquidationLtvAndBorrowFactorForPair(
-      collTokenMint,
-      debtTokenMint
+      collReserveAddress,
+      debtReserveAddress
     );
 
     const maxLeverage =
@@ -361,12 +356,11 @@ export class KaminoMarket {
   }
 
   getMaxAndLiquidationLtvAndBorrowFactorForPair(
-    collTokenMint: Address,
-    debtTokenMint: Address
+    collReserveAddress: Address,
+    debtReserveAddress: Address
   ): { maxLtv: number; liquidationLtv: number; borrowFactor: number } {
-    const collReserve: KaminoReserve | undefined = this.getReserveByMint(collTokenMint);
-    const debtReserve: KaminoReserve | undefined = this.getReserveByMint(debtTokenMint);
-
+    const collReserve: KaminoReserve | undefined = this.getReserveByAddress(collReserveAddress);
+    const debtReserve: KaminoReserve | undefined = this.getReserveByAddress(debtReserveAddress);
     if (!collReserve || !debtReserve) {
       throw Error('Could not find one of the reserves.');
     }
@@ -421,6 +415,22 @@ export class KaminoMarket {
         );
         break;
       }
+      case LendingObligationFixedRate.tag: {
+        const reserveAddress = productType.toArgs().seed1;
+        obligations = obligations.filter((obligation) => obligation.getDepositByReserve(reserveAddress) !== undefined);
+        break;
+      }
+      case LeverageObligationFixedRate.tag:
+      case MultiplyObligationFixedRate.tag: {
+        const collReserveAddress = productType.toArgs().seed1;
+        const debtReserveAddress = productType.toArgs().seed2;
+        obligations = obligations.filter((obligation) => {
+          const collDeposit = obligation.getDepositByReserve(collReserveAddress);
+          const debtBorrow = obligation.getBorrowByReserve(debtReserveAddress);
+          return collDeposit !== undefined && debtBorrow !== undefined;
+        });
+        break;
+      }
       default:
         throw new Error('Invalid obligation type');
     }
@@ -473,7 +483,7 @@ export class KaminoMarket {
     obligation?: KaminoObligation
   ): Decimal {
     return obligation
-      ? obligation.getMaxBorrowAmount(this, debtReserve.getLiquidityMint(), slot, requestElevationGroup)
+      ? obligation.getMaxBorrowAmount(this, debtReserve.address, slot, requestElevationGroup)
       : debtReserve.getMaxBorrowAmountWithCollReserve(this, collReserve, slot);
   }
 
@@ -584,7 +594,7 @@ export class KaminoMarket {
   }
 
   async getReserveFarmInfo(
-    mint: Address,
+    reserveAddress: Address,
     getRewardPrice: (mint: Address) => Promise<number>
   ): Promise<{ borrowingRewards: ReserveRewardInfo; depositingRewards: ReserveRewardInfo }> {
     const { address } = this;
@@ -596,10 +606,10 @@ export class KaminoMarket {
     }
 
     // Find the reserve
-    const kaminoReserve = this.getReserveByMint(mint);
+    const kaminoReserve = this.getReserveByAddress(reserveAddress);
 
     if (!kaminoReserve) {
-      throw Error(`Could not find reserve. ${mint}`);
+      throw Error(`Could not find reserve ${reserveAddress}`);
     }
 
     const totalDepositAmount = lamportsToNumberDecimal(