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

package/src/@codegen/klend/types/UpdateConfigMode.ts

@@ -119,25 +119,25 @@ export class UpdateProtocolTakeRate {
   }
 }
 
-export interface UpdateFeesOriginationFeeJSON {
-  kind: "UpdateFeesOriginationFee"
+export interface UpdateFeesBorrowFeeJSON {
+  kind: "UpdateFeesBorrowFee"
 }
 
-export class UpdateFeesOriginationFee {
+export class UpdateFeesBorrowFee {
   static readonly discriminator = 5
-  static readonly kind = "UpdateFeesOriginationFee"
+  static readonly kind = "UpdateFeesBorrowFee"
   readonly discriminator = 5
-  readonly kind = "UpdateFeesOriginationFee"
+  readonly kind = "UpdateFeesBorrowFee"
 
-  toJSON(): UpdateFeesOriginationFeeJSON {
+  toJSON(): UpdateFeesBorrowFeeJSON {
     return {
-      kind: "UpdateFeesOriginationFee",
+      kind: "UpdateFeesBorrowFee",
     }
   }
 
   toEncodable() {
     return {
-      UpdateFeesOriginationFee: {},
+      UpdateFeesBorrowFee: {},
     }
   }
 }
@@ -1154,75 +1154,6 @@ export class UpdateProtocolOrderExecutionFee {
   }
 }
 
-export interface UpdateProposerAuthorityLockJSON {
-  kind: "UpdateProposerAuthorityLock"
-}
-
-export class UpdateProposerAuthorityLock {
-  static readonly discriminator = 50
-  static readonly kind = "UpdateProposerAuthorityLock"
-  readonly discriminator = 50
-  readonly kind = "UpdateProposerAuthorityLock"
-
-  toJSON(): UpdateProposerAuthorityLockJSON {
-    return {
-      kind: "UpdateProposerAuthorityLock",
-    }
-  }
-
-  toEncodable() {
-    return {
-      UpdateProposerAuthorityLock: {},
-    }
-  }
-}
-
-export interface UpdateMinDeleveragingBonusBpsJSON {
-  kind: "UpdateMinDeleveragingBonusBps"
-}
-
-export class UpdateMinDeleveragingBonusBps {
-  static readonly discriminator = 51
-  static readonly kind = "UpdateMinDeleveragingBonusBps"
-  readonly discriminator = 51
-  readonly kind = "UpdateMinDeleveragingBonusBps"
-
-  toJSON(): UpdateMinDeleveragingBonusBpsJSON {
-    return {
-      kind: "UpdateMinDeleveragingBonusBps",
-    }
-  }
-
-  toEncodable() {
-    return {
-      UpdateMinDeleveragingBonusBps: {},
-    }
-  }
-}
-
-export interface UpdateBlockCTokenUsageJSON {
-  kind: "UpdateBlockCTokenUsage"
-}
-
-export class UpdateBlockCTokenUsage {
-  static readonly discriminator = 52
-  static readonly kind = "UpdateBlockCTokenUsage"
-  readonly discriminator = 52
-  readonly kind = "UpdateBlockCTokenUsage"
-
-  toJSON(): UpdateBlockCTokenUsageJSON {
-    return {
-      kind: "UpdateBlockCTokenUsage",
-    }
-  }
-
-  toEncodable() {
-    return {
-      UpdateBlockCTokenUsage: {},
-    }
-  }
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.UpdateConfigModeKind {
   if (typeof obj !== "object") {
@@ -1244,8 +1175,8 @@ export function fromDecoded(obj: any): types.UpdateConfigModeKind {
   if ("UpdateProtocolTakeRate" in obj) {
     return new UpdateProtocolTakeRate()
   }
-  if ("UpdateFeesOriginationFee" in obj) {
-    return new UpdateFeesOriginationFee()
+  if ("UpdateFeesBorrowFee" in obj) {
+    return new UpdateFeesBorrowFee()
   }
   if ("UpdateFeesFlashLoanFee" in obj) {
     return new UpdateFeesFlashLoanFee()
@@ -1379,15 +1310,6 @@ export function fromDecoded(obj: any): types.UpdateConfigModeKind {
   if ("UpdateProtocolOrderExecutionFee" in obj) {
     return new UpdateProtocolOrderExecutionFee()
   }
-  if ("UpdateProposerAuthorityLock" in obj) {
-    return new UpdateProposerAuthorityLock()
-  }
-  if ("UpdateMinDeleveragingBonusBps" in obj) {
-    return new UpdateMinDeleveragingBonusBps()
-  }
-  if ("UpdateBlockCTokenUsage" in obj) {
-    return new UpdateBlockCTokenUsage()
-  }
 
   throw new Error("Invalid enum object")
 }
@@ -1411,8 +1333,8 @@ export function fromJSON(
     case "UpdateProtocolTakeRate": {
       return new UpdateProtocolTakeRate()
     }
-    case "UpdateFeesOriginationFee": {
-      return new UpdateFeesOriginationFee()
+    case "UpdateFeesBorrowFee": {
+      return new UpdateFeesBorrowFee()
     }
     case "UpdateFeesFlashLoanFee": {
       return new UpdateFeesFlashLoanFee()
@@ -1546,15 +1468,6 @@ export function fromJSON(
     case "UpdateProtocolOrderExecutionFee": {
       return new UpdateProtocolOrderExecutionFee()
     }
-    case "UpdateProposerAuthorityLock": {
-      return new UpdateProposerAuthorityLock()
-    }
-    case "UpdateMinDeleveragingBonusBps": {
-      return new UpdateMinDeleveragingBonusBps()
-    }
-    case "UpdateBlockCTokenUsage": {
-      return new UpdateBlockCTokenUsage()
-    }
   }
 }
 
@@ -1565,7 +1478,7 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateLiquidationThresholdPct"),
     borsh.struct([], "UpdateProtocolLiquidationFee"),
     borsh.struct([], "UpdateProtocolTakeRate"),
-    borsh.struct([], "UpdateFeesOriginationFee"),
+    borsh.struct([], "UpdateFeesBorrowFee"),
     borsh.struct([], "UpdateFeesFlashLoanFee"),
     borsh.struct([], "DeprecatedUpdateFeesReferralFeeBps"),
     borsh.struct([], "UpdateDepositLimit"),
@@ -1610,9 +1523,6 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateAutodeleverageEnabled"),
     borsh.struct([], "UpdateDeleveragingBonusIncreaseBpsPerDay"),
     borsh.struct([], "UpdateProtocolOrderExecutionFee"),
-    borsh.struct([], "UpdateProposerAuthorityLock"),
-    borsh.struct([], "UpdateMinDeleveragingBonusBps"),
-    borsh.struct([], "UpdateBlockCTokenUsage"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/@codegen/klend/types/UpdateLendingMarketMode.ts

@@ -579,52 +579,6 @@ export class UpdateObligationOrderCreationEnabled {
   }
 }
 
-export interface UpdateProposerAuthorityJSON {
-  kind: "UpdateProposerAuthority"
-}
-
-export class UpdateProposerAuthority {
-  static readonly discriminator = 25
-  static readonly kind = "UpdateProposerAuthority"
-  readonly discriminator = 25
-  readonly kind = "UpdateProposerAuthority"
-
-  toJSON(): UpdateProposerAuthorityJSON {
-    return {
-      kind: "UpdateProposerAuthority",
-    }
-  }
-
-  toEncodable() {
-    return {
-      UpdateProposerAuthority: {},
-    }
-  }
-}
-
-export interface UpdatePriceTriggeredLiquidationDisabledJSON {
-  kind: "UpdatePriceTriggeredLiquidationDisabled"
-}
-
-export class UpdatePriceTriggeredLiquidationDisabled {
-  static readonly discriminator = 26
-  static readonly kind = "UpdatePriceTriggeredLiquidationDisabled"
-  readonly discriminator = 26
-  readonly kind = "UpdatePriceTriggeredLiquidationDisabled"
-
-  toJSON(): UpdatePriceTriggeredLiquidationDisabledJSON {
-    return {
-      kind: "UpdatePriceTriggeredLiquidationDisabled",
-    }
-  }
-
-  toEncodable() {
-    return {
-      UpdatePriceTriggeredLiquidationDisabled: {},
-    }
-  }
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if (typeof obj !== "object") {
@@ -706,12 +660,6 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdateObligationOrderCreationEnabled" in obj) {
     return new UpdateObligationOrderCreationEnabled()
   }
-  if ("UpdateProposerAuthority" in obj) {
-    return new UpdateProposerAuthority()
-  }
-  if ("UpdatePriceTriggeredLiquidationDisabled" in obj) {
-    return new UpdatePriceTriggeredLiquidationDisabled()
-  }
 
   throw new Error("Invalid enum object")
 }
@@ -795,12 +743,6 @@ export function fromJSON(
     case "UpdateObligationOrderCreationEnabled": {
       return new UpdateObligationOrderCreationEnabled()
     }
-    case "UpdateProposerAuthority": {
-      return new UpdateProposerAuthority()
-    }
-    case "UpdatePriceTriggeredLiquidationDisabled": {
-      return new UpdatePriceTriggeredLiquidationDisabled()
-    }
   }
 }
 
@@ -831,8 +773,6 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateObligationOrderExecutionEnabled"),
     borsh.struct([], "UpdateImmutableFlag"),
     borsh.struct([], "UpdateObligationOrderCreationEnabled"),
-    borsh.struct([], "UpdateProposerAuthority"),
-    borsh.struct([], "UpdatePriceTriggeredLiquidationDisabled"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/@codegen/klend/types/index.ts

@@ -15,7 +15,7 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateLiquidationThresholdPct
   | UpdateConfigMode.UpdateProtocolLiquidationFee
   | UpdateConfigMode.UpdateProtocolTakeRate
-  | UpdateConfigMode.UpdateFeesOriginationFee
+  | UpdateConfigMode.UpdateFeesBorrowFee
   | UpdateConfigMode.UpdateFeesFlashLoanFee
   | UpdateConfigMode.DeprecatedUpdateFeesReferralFeeBps
   | UpdateConfigMode.UpdateDepositLimit
@@ -60,16 +60,13 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateAutodeleverageEnabled
   | UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay
   | UpdateConfigMode.UpdateProtocolOrderExecutionFee
-  | UpdateConfigMode.UpdateProposerAuthorityLock
-  | UpdateConfigMode.UpdateMinDeleveragingBonusBps
-  | UpdateConfigMode.UpdateBlockCTokenUsage
 export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateLoanToValuePctJSON
   | UpdateConfigMode.UpdateMaxLiquidationBonusBpsJSON
   | UpdateConfigMode.UpdateLiquidationThresholdPctJSON
   | UpdateConfigMode.UpdateProtocolLiquidationFeeJSON
   | UpdateConfigMode.UpdateProtocolTakeRateJSON
-  | UpdateConfigMode.UpdateFeesOriginationFeeJSON
+  | UpdateConfigMode.UpdateFeesBorrowFeeJSON
   | UpdateConfigMode.UpdateFeesFlashLoanFeeJSON
   | UpdateConfigMode.DeprecatedUpdateFeesReferralFeeBpsJSON
   | UpdateConfigMode.UpdateDepositLimitJSON
@@ -114,9 +111,6 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateAutodeleverageEnabledJSON
   | UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDayJSON
   | UpdateConfigMode.UpdateProtocolOrderExecutionFeeJSON
-  | UpdateConfigMode.UpdateProposerAuthorityLockJSON
-  | UpdateConfigMode.UpdateMinDeleveragingBonusBpsJSON
-  | UpdateConfigMode.UpdateBlockCTokenUsageJSON
 
 export { UpdateLendingMarketConfigValue }
 
@@ -169,8 +163,6 @@ export type UpdateLendingMarketModeKind =
   | UpdateLendingMarketMode.UpdateObligationOrderExecutionEnabled
   | UpdateLendingMarketMode.UpdateImmutableFlag
   | UpdateLendingMarketMode.UpdateObligationOrderCreationEnabled
-  | UpdateLendingMarketMode.UpdateProposerAuthority
-  | UpdateLendingMarketMode.UpdatePriceTriggeredLiquidationDisabled
 export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateOwnerJSON
   | UpdateLendingMarketMode.UpdateEmergencyModeJSON
@@ -197,8 +189,6 @@ export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateObligationOrderExecutionEnabledJSON
   | UpdateLendingMarketMode.UpdateImmutableFlagJSON
   | UpdateLendingMarketMode.UpdateObligationOrderCreationEnabledJSON
-  | UpdateLendingMarketMode.UpdateProposerAuthorityJSON
-  | UpdateLendingMarketMode.UpdatePriceTriggeredLiquidationDisabledJSON
 
 export { UpdateGlobalConfigMode }
 

package/src/classes/manager.ts

@@ -1706,8 +1706,6 @@ export const MARKET_UPDATER = new ConfigUpdater(UpdateLendingMarketMode.fromDeco
   [UpdateLendingMarketMode.UpdateInitialDepositAmount.kind]: config.minInitialDepositAmount,
   [UpdateLendingMarketMode.UpdateObligationOrderCreationEnabled.kind]: config.obligationOrderCreationEnabled,
   [UpdateLendingMarketMode.UpdateObligationOrderExecutionEnabled.kind]: config.obligationOrderExecutionEnabled,
-  [UpdateLendingMarketMode.UpdateProposerAuthority.kind]: config.proposerAuthority,
-  [UpdateLendingMarketMode.UpdatePriceTriggeredLiquidationDisabled.kind]: config.priceTriggeredLiquidationDisabled,
 }));
 
 function parseForChangesMarketConfigAndGetIxs(

package/src/classes/market.ts

@@ -55,6 +55,7 @@ import { parseTokenSymbol, parseZeroPaddedUtf8 } from './utils';
 import { ObligationZP } from '../@codegen/klend/zero_padding';
 import { checkDefined } from '../utils/validations';
 import { Buffer } from 'buffer';
+import { ReserveStatus } from '../@codegen/klend/types';
 
 export type KaminoMarketRpcApi = GetAccountInfoApi &
   GetMultipleAccountsApi &
@@ -1714,6 +1715,9 @@ export async function getReservesForMarket(
   const reservesAndOracles = await getTokenOracleData(rpc, deserializedReserves, oracleAccounts);
   const reservesByAddress = new Map<Address, KaminoReserve>();
   reservesAndOracles.forEach(([reserve, oracle], index) => {
+    if (reserve.config.status === ReserveStatus.Obsolete.discriminator) {
+      return;
+    }
     if (!oracle) {
       throw Error(
         `Could not find oracle for ${parseTokenSymbol(reserve.config.tokenInfo.name)} (${

package/src/classes/reserve.ts

@@ -216,7 +216,7 @@ export class KaminoReserve {
    * @returns the origination fee percentage of the reserve
    */
   getBorrowFee = (): Decimal => {
-    return new Fraction(this.state.config.fees.originationFeeSf).toDecimal();
+    return new Fraction(this.state.config.fees.borrowFeeSf).toDecimal();
   };
 
   /**
@@ -1180,12 +1180,13 @@ export async function createReserveIxs(
 
   const { liquiditySupplyVault, collateralMint, collateralSupplyVault, feeVault } = await reservePdas(
     programId,
-    reserveAddress.address,
+    lendingMarket,
+    liquidityMint
   );
   const [lendingMarketAuthority] = await lendingMarketAuthPda(lendingMarket, programId);
 
   const accounts: InitReserveAccounts = {
-    signer: owner,
+    lendingMarketOwner: owner,
     lendingMarket: lendingMarket,
     lendingMarketAuthority: lendingMarketAuthority,
     reserve: reserveAddress.address,
@@ -1238,7 +1239,7 @@ export const RESERVE_CONFIG_UPDATER = new ConfigUpdater(UpdateConfigMode.fromDec
   [UpdateConfigMode.UpdateLiquidationThresholdPct.kind]: config.liquidationThresholdPct,
   [UpdateConfigMode.UpdateProtocolLiquidationFee.kind]: config.protocolLiquidationFeePct,
   [UpdateConfigMode.UpdateProtocolTakeRate.kind]: config.protocolTakeRatePct,
-  [UpdateConfigMode.UpdateFeesOriginationFee.kind]: config.fees.originationFeeSf,
+  [UpdateConfigMode.UpdateFeesBorrowFee.kind]: config.fees.borrowFeeSf,
   [UpdateConfigMode.UpdateFeesFlashLoanFee.kind]: config.fees.flashLoanFeeSf,
   [UpdateConfigMode.DeprecatedUpdateFeesReferralFeeBps.kind]: [], // deprecated
   [UpdateConfigMode.UpdateDepositLimit.kind]: config.depositLimit,
@@ -1290,9 +1291,6 @@ export const RESERVE_CONFIG_UPDATER = new ConfigUpdater(UpdateConfigMode.fromDec
   [UpdateConfigMode.UpdateAutodeleverageEnabled.kind]: config.autodeleverageEnabled,
   [UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay.kind]: config.deleveragingBonusIncreaseBpsPerDay,
   [UpdateConfigMode.UpdateProtocolOrderExecutionFee.kind]: config.protocolOrderExecutionFeePct,
-  [UpdateConfigMode.UpdateProposerAuthorityLock.kind]: config.proposerAuthorityLocked,
-  [UpdateConfigMode.UpdateMinDeleveragingBonusBps.kind]: config.minDeleveragingBonusBps,
-  [UpdateConfigMode.UpdateBlockCTokenUsage.kind]: config.blockCtokenUsage,
 }));
 
 export async function updateEntireReserveConfigIx(