@kamino-finance/klend-sdk 5.10.12 → 5.10.14

package/src/idl_codegen/instructions/withdrawObligationCollateralAndRedeemReserveCollateralV2.ts

@@ -0,0 +1,136 @@
+import { TransactionInstruction, PublicKey, AccountMeta } from "@solana/web3.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import BN from "bn.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as borsh from "@coral-xyz/borsh" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as types from "../types" // eslint-disable-line @typescript-eslint/no-unused-vars
+import { PROGRAM_ID } from "../programId"
+
+export interface WithdrawObligationCollateralAndRedeemReserveCollateralV2Args {
+  collateralAmount: BN
+}
+
+export interface WithdrawObligationCollateralAndRedeemReserveCollateralV2Accounts {
+  withdrawAccounts: {
+    owner: PublicKey
+    obligation: PublicKey
+    lendingMarket: PublicKey
+    lendingMarketAuthority: PublicKey
+    withdrawReserve: PublicKey
+    reserveLiquidityMint: PublicKey
+    reserveSourceCollateral: PublicKey
+    reserveCollateralMint: PublicKey
+    reserveLiquiditySupply: PublicKey
+    userDestinationLiquidity: PublicKey
+    placeholderUserDestinationCollateral: PublicKey
+    collateralTokenProgram: PublicKey
+    liquidityTokenProgram: PublicKey
+    instructionSysvarAccount: PublicKey
+  }
+  farmsAccounts: {
+    obligationFarmUserState: PublicKey
+    reserveFarmState: PublicKey
+  }
+  farmsProgram: PublicKey
+}
+
+export const layout = borsh.struct([borsh.u64("collateralAmount")])
+
+export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
+  args: WithdrawObligationCollateralAndRedeemReserveCollateralV2Args,
+  accounts: WithdrawObligationCollateralAndRedeemReserveCollateralV2Accounts,
+  programId: PublicKey = PROGRAM_ID
+) {
+  const keys: Array<AccountMeta> = [
+    {
+      pubkey: accounts.withdrawAccounts.owner,
+      isSigner: true,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.obligation,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.lendingMarket,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.lendingMarketAuthority,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.withdrawReserve,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.reserveLiquidityMint,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.reserveSourceCollateral,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.reserveCollateralMint,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.reserveLiquiditySupply,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.userDestinationLiquidity,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.placeholderUserDestinationCollateral,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.collateralTokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.liquidityTokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.instructionSysvarAccount,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.farmsAccounts.obligationFarmUserState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.farmsAccounts.reserveFarmState,
+      isSigner: false,
+      isWritable: true,
+    },
+    { pubkey: accounts.farmsProgram, isSigner: false, isWritable: false },
+  ]
+  const identifier = Buffer.from([235, 52, 119, 152, 149, 197, 20, 7])
+  const buffer = Buffer.alloc(1000)
+  const len = layout.encode(
+    {
+      collateralAmount: args.collateralAmount,
+    },
+    buffer
+  )
+  const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
+  const ix = new TransactionInstruction({ keys, programId, data })
+  return ix
+}

package/src/idl_codegen/instructions/withdrawObligationCollateralV2.ts

@@ -0,0 +1,106 @@
+import { TransactionInstruction, PublicKey, AccountMeta } from "@solana/web3.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import BN from "bn.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as borsh from "@coral-xyz/borsh" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as types from "../types" // eslint-disable-line @typescript-eslint/no-unused-vars
+import { PROGRAM_ID } from "../programId"
+
+export interface WithdrawObligationCollateralV2Args {
+  collateralAmount: BN
+}
+
+export interface WithdrawObligationCollateralV2Accounts {
+  withdrawAccounts: {
+    owner: PublicKey
+    obligation: PublicKey
+    lendingMarket: PublicKey
+    lendingMarketAuthority: PublicKey
+    withdrawReserve: PublicKey
+    reserveSourceCollateral: PublicKey
+    userDestinationCollateral: PublicKey
+    tokenProgram: PublicKey
+    instructionSysvarAccount: PublicKey
+  }
+  farmsAccounts: {
+    obligationFarmUserState: PublicKey
+    reserveFarmState: PublicKey
+  }
+  farmsProgram: PublicKey
+}
+
+export const layout = borsh.struct([borsh.u64("collateralAmount")])
+
+export function withdrawObligationCollateralV2(
+  args: WithdrawObligationCollateralV2Args,
+  accounts: WithdrawObligationCollateralV2Accounts,
+  programId: PublicKey = PROGRAM_ID
+) {
+  const keys: Array<AccountMeta> = [
+    {
+      pubkey: accounts.withdrawAccounts.owner,
+      isSigner: true,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.obligation,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.lendingMarket,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.lendingMarketAuthority,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.withdrawReserve,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.reserveSourceCollateral,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.userDestinationCollateral,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.tokenProgram,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.withdrawAccounts.instructionSysvarAccount,
+      isSigner: false,
+      isWritable: false,
+    },
+    {
+      pubkey: accounts.farmsAccounts.obligationFarmUserState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.farmsAccounts.reserveFarmState,
+      isSigner: false,
+      isWritable: true,
+    },
+    { pubkey: accounts.farmsProgram, isSigner: false, isWritable: false },
+  ]
+  const identifier = Buffer.from([202, 249, 117, 114, 231, 192, 47, 138])
+  const buffer = Buffer.alloc(1000)
+  const len = layout.encode(
+    {
+      collateralAmount: args.collateralAmount,
+    },
+    buffer
+  )
+  const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
+  const ix = new TransactionInstruction({ keys, programId, data })
+  return ix
+}

package/src/idl_codegen/types/ReserveConfig.ts

@@ -60,7 +60,8 @@ export interface ReserveConfigFields {
   debtWithdrawalCap: types.WithdrawalCapsFields
   elevationGroups: Array<number>
   disableUsageAsCollOutsideEmode: number
-  utilizationLimitBlockBorrowingAbove: number
+  /** Utilization (in percentage) above which borrowing is blocked. 0 to disable. */
+  utilizationLimitBlockBorrowingAbovePct: number
   /**
    * Whether this reserve should be subject to auto-deleveraging after deposit or borrow limit is
    * crossed.
@@ -147,7 +148,8 @@ export interface ReserveConfigJSON {
   debtWithdrawalCap: types.WithdrawalCapsJSON
   elevationGroups: Array<number>
   disableUsageAsCollOutsideEmode: number
-  utilizationLimitBlockBorrowingAbove: number
+  /** Utilization (in percentage) above which borrowing is blocked. 0 to disable. */
+  utilizationLimitBlockBorrowingAbovePct: number
   /**
    * Whether this reserve should be subject to auto-deleveraging after deposit or borrow limit is
    * crossed.
@@ -235,7 +237,8 @@ export class ReserveConfig {
   readonly debtWithdrawalCap: types.WithdrawalCaps
   readonly elevationGroups: Array<number>
   readonly disableUsageAsCollOutsideEmode: number
-  readonly utilizationLimitBlockBorrowingAbove: number
+  /** Utilization (in percentage) above which borrowing is blocked. 0 to disable. */
+  readonly utilizationLimitBlockBorrowingAbovePct: number
   /**
    * Whether this reserve should be subject to auto-deleveraging after deposit or borrow limit is
    * crossed.
@@ -297,8 +300,8 @@ export class ReserveConfig {
     })
     this.elevationGroups = fields.elevationGroups
     this.disableUsageAsCollOutsideEmode = fields.disableUsageAsCollOutsideEmode
-    this.utilizationLimitBlockBorrowingAbove =
-      fields.utilizationLimitBlockBorrowingAbove
+    this.utilizationLimitBlockBorrowingAbovePct =
+      fields.utilizationLimitBlockBorrowingAbovePct
     this.autodeleverageEnabled = fields.autodeleverageEnabled
     this.reserved1 = fields.reserved1
     this.borrowLimitOutsideElevationGroup =
@@ -336,7 +339,7 @@ export class ReserveConfig {
         types.WithdrawalCaps.layout("debtWithdrawalCap"),
         borsh.array(borsh.u8(), 20, "elevationGroups"),
         borsh.u8("disableUsageAsCollOutsideEmode"),
-        borsh.u8("utilizationLimitBlockBorrowingAbove"),
+        borsh.u8("utilizationLimitBlockBorrowingAbovePct"),
         borsh.u8("autodeleverageEnabled"),
         borsh.array(borsh.u8(), 1, "reserved1"),
         borsh.u64("borrowLimitOutsideElevationGroup"),
@@ -383,8 +386,8 @@ export class ReserveConfig {
       ),
       elevationGroups: obj.elevationGroups,
       disableUsageAsCollOutsideEmode: obj.disableUsageAsCollOutsideEmode,
-      utilizationLimitBlockBorrowingAbove:
-        obj.utilizationLimitBlockBorrowingAbove,
+      utilizationLimitBlockBorrowingAbovePct:
+        obj.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: obj.autodeleverageEnabled,
       reserved1: obj.reserved1,
       borrowLimitOutsideElevationGroup: obj.borrowLimitOutsideElevationGroup,
@@ -428,8 +431,8 @@ export class ReserveConfig {
       ),
       elevationGroups: fields.elevationGroups,
       disableUsageAsCollOutsideEmode: fields.disableUsageAsCollOutsideEmode,
-      utilizationLimitBlockBorrowingAbove:
-        fields.utilizationLimitBlockBorrowingAbove,
+      utilizationLimitBlockBorrowingAbovePct:
+        fields.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: fields.autodeleverageEnabled,
       reserved1: fields.reserved1,
       borrowLimitOutsideElevationGroup: fields.borrowLimitOutsideElevationGroup,
@@ -468,8 +471,8 @@ export class ReserveConfig {
       debtWithdrawalCap: this.debtWithdrawalCap.toJSON(),
       elevationGroups: this.elevationGroups,
       disableUsageAsCollOutsideEmode: this.disableUsageAsCollOutsideEmode,
-      utilizationLimitBlockBorrowingAbove:
-        this.utilizationLimitBlockBorrowingAbove,
+      utilizationLimitBlockBorrowingAbovePct:
+        this.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: this.autodeleverageEnabled,
       reserved1: this.reserved1,
       borrowLimitOutsideElevationGroup:
@@ -515,8 +518,8 @@ export class ReserveConfig {
       debtWithdrawalCap: types.WithdrawalCaps.fromJSON(obj.debtWithdrawalCap),
       elevationGroups: obj.elevationGroups,
       disableUsageAsCollOutsideEmode: obj.disableUsageAsCollOutsideEmode,
-      utilizationLimitBlockBorrowingAbove:
-        obj.utilizationLimitBlockBorrowingAbove,
+      utilizationLimitBlockBorrowingAbovePct:
+        obj.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: obj.autodeleverageEnabled,
       reserved1: obj.reserved1,
       borrowLimitOutsideElevationGroup: new BN(

package/src/idl_codegen/types/UpdateConfigMode.ts

@@ -969,25 +969,25 @@ export class UpdateDisableUsageAsCollateralOutsideEmode {
   }
 }
 
-export interface UpdateBlockBorrowingAboveUtilizationJSON {
-  kind: "UpdateBlockBorrowingAboveUtilization"
+export interface UpdateBlockBorrowingAboveUtilizationPctJSON {
+  kind: "UpdateBlockBorrowingAboveUtilizationPct"
 }
 
-export class UpdateBlockBorrowingAboveUtilization {
+export class UpdateBlockBorrowingAboveUtilizationPct {
   static readonly discriminator = 42
-  static readonly kind = "UpdateBlockBorrowingAboveUtilization"
+  static readonly kind = "UpdateBlockBorrowingAboveUtilizationPct"
   readonly discriminator = 42
-  readonly kind = "UpdateBlockBorrowingAboveUtilization"
+  readonly kind = "UpdateBlockBorrowingAboveUtilizationPct"
 
-  toJSON(): UpdateBlockBorrowingAboveUtilizationJSON {
+  toJSON(): UpdateBlockBorrowingAboveUtilizationPctJSON {
     return {
-      kind: "UpdateBlockBorrowingAboveUtilization",
+      kind: "UpdateBlockBorrowingAboveUtilizationPct",
     }
   }
 
   toEncodable() {
     return {
-      UpdateBlockBorrowingAboveUtilization: {},
+      UpdateBlockBorrowingAboveUtilizationPct: {},
     }
   }
 }
@@ -1262,8 +1262,8 @@ export function fromDecoded(obj: any): types.UpdateConfigModeKind {
   if ("UpdateDisableUsageAsCollateralOutsideEmode" in obj) {
     return new UpdateDisableUsageAsCollateralOutsideEmode()
   }
-  if ("UpdateBlockBorrowingAboveUtilization" in obj) {
-    return new UpdateBlockBorrowingAboveUtilization()
+  if ("UpdateBlockBorrowingAboveUtilizationPct" in obj) {
+    return new UpdateBlockBorrowingAboveUtilizationPct()
   }
   if ("UpdateBlockPriceUsage" in obj) {
     return new UpdateBlockPriceUsage()
@@ -1417,8 +1417,8 @@ export function fromJSON(
     case "UpdateDisableUsageAsCollateralOutsideEmode": {
       return new UpdateDisableUsageAsCollateralOutsideEmode()
     }
-    case "UpdateBlockBorrowingAboveUtilization": {
-      return new UpdateBlockBorrowingAboveUtilization()
+    case "UpdateBlockBorrowingAboveUtilizationPct": {
+      return new UpdateBlockBorrowingAboveUtilizationPct()
     }
     case "UpdateBlockPriceUsage": {
       return new UpdateBlockPriceUsage()
@@ -1485,7 +1485,7 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateFarmCollateral"),
     borsh.struct([], "UpdateFarmDebt"),
     borsh.struct([], "UpdateDisableUsageAsCollateralOutsideEmode"),
-    borsh.struct([], "UpdateBlockBorrowingAboveUtilization"),
+    borsh.struct([], "UpdateBlockBorrowingAboveUtilizationPct"),
     borsh.struct([], "UpdateBlockPriceUsage"),
     borsh.struct([], "UpdateBorrowLimitOutsideElevationGroup"),
     borsh.struct([], "UpdateBorrowLimitsInElevationGroupAgainstThisReserve"),

package/src/idl_codegen/types/UpdateLendingMarketMode.ts

@@ -95,25 +95,25 @@ export class UpdateLiquidationMaxValue {
   }
 }
 
-export interface UpdateGlobalUnhealthyBorrowJSON {
-  kind: "UpdateGlobalUnhealthyBorrow"
+export interface DeprecatedUpdateGlobalUnhealthyBorrowJSON {
+  kind: "DeprecatedUpdateGlobalUnhealthyBorrow"
 }
 
-export class UpdateGlobalUnhealthyBorrow {
+export class DeprecatedUpdateGlobalUnhealthyBorrow {
   static readonly discriminator = 4
-  static readonly kind = "UpdateGlobalUnhealthyBorrow"
+  static readonly kind = "DeprecatedUpdateGlobalUnhealthyBorrow"
   readonly discriminator = 4
-  readonly kind = "UpdateGlobalUnhealthyBorrow"
+  readonly kind = "DeprecatedUpdateGlobalUnhealthyBorrow"
 
-  toJSON(): UpdateGlobalUnhealthyBorrowJSON {
+  toJSON(): DeprecatedUpdateGlobalUnhealthyBorrowJSON {
     return {
-      kind: "UpdateGlobalUnhealthyBorrow",
+      kind: "DeprecatedUpdateGlobalUnhealthyBorrow",
     }
   }
 
   toEncodable() {
     return {
-      UpdateGlobalUnhealthyBorrow: {},
+      DeprecatedUpdateGlobalUnhealthyBorrow: {},
     }
   }
 }
@@ -504,8 +504,8 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdateLiquidationMaxValue" in obj) {
     return new UpdateLiquidationMaxValue()
   }
-  if ("UpdateGlobalUnhealthyBorrow" in obj) {
-    return new UpdateGlobalUnhealthyBorrow()
+  if ("DeprecatedUpdateGlobalUnhealthyBorrow" in obj) {
+    return new DeprecatedUpdateGlobalUnhealthyBorrow()
   }
   if ("UpdateGlobalAllowedBorrow" in obj) {
     return new UpdateGlobalAllowedBorrow()
@@ -575,8 +575,8 @@ export function fromJSON(
     case "UpdateLiquidationMaxValue": {
       return new UpdateLiquidationMaxValue()
     }
-    case "UpdateGlobalUnhealthyBorrow": {
-      return new UpdateGlobalUnhealthyBorrow()
+    case "DeprecatedUpdateGlobalUnhealthyBorrow": {
+      return new DeprecatedUpdateGlobalUnhealthyBorrow()
     }
     case "UpdateGlobalAllowedBorrow": {
       return new UpdateGlobalAllowedBorrow()
@@ -635,7 +635,7 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateEmergencyMode"),
     borsh.struct([], "UpdateLiquidationCloseFactor"),
     borsh.struct([], "UpdateLiquidationMaxValue"),
-    borsh.struct([], "UpdateGlobalUnhealthyBorrow"),
+    borsh.struct([], "DeprecatedUpdateGlobalUnhealthyBorrow"),
     borsh.struct([], "UpdateGlobalAllowedBorrow"),
     borsh.struct([], "UpdateRiskCouncil"),
     borsh.struct([], "UpdateMinFullLiquidationThreshold"),

package/src/idl_codegen/types/index.ts

@@ -51,7 +51,7 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateFarmCollateral
   | UpdateConfigMode.UpdateFarmDebt
   | UpdateConfigMode.UpdateDisableUsageAsCollateralOutsideEmode
-  | UpdateConfigMode.UpdateBlockBorrowingAboveUtilization
+  | UpdateConfigMode.UpdateBlockBorrowingAboveUtilizationPct
   | UpdateConfigMode.UpdateBlockPriceUsage
   | UpdateConfigMode.UpdateBorrowLimitOutsideElevationGroup
   | UpdateConfigMode.UpdateBorrowLimitsInElevationGroupAgainstThisReserve
@@ -101,7 +101,7 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateFarmCollateralJSON
   | UpdateConfigMode.UpdateFarmDebtJSON
   | UpdateConfigMode.UpdateDisableUsageAsCollateralOutsideEmodeJSON
-  | UpdateConfigMode.UpdateBlockBorrowingAboveUtilizationJSON
+  | UpdateConfigMode.UpdateBlockBorrowingAboveUtilizationPctJSON
   | UpdateConfigMode.UpdateBlockPriceUsageJSON
   | UpdateConfigMode.UpdateBorrowLimitOutsideElevationGroupJSON
   | UpdateConfigMode.UpdateBorrowLimitsInElevationGroupAgainstThisReserveJSON
@@ -139,7 +139,7 @@ export type UpdateLendingMarketModeKind =
   | UpdateLendingMarketMode.UpdateEmergencyMode
   | UpdateLendingMarketMode.UpdateLiquidationCloseFactor
   | UpdateLendingMarketMode.UpdateLiquidationMaxValue
-  | UpdateLendingMarketMode.UpdateGlobalUnhealthyBorrow
+  | UpdateLendingMarketMode.DeprecatedUpdateGlobalUnhealthyBorrow
   | UpdateLendingMarketMode.UpdateGlobalAllowedBorrow
   | UpdateLendingMarketMode.UpdateRiskCouncil
   | UpdateLendingMarketMode.UpdateMinFullLiquidationThreshold
@@ -161,7 +161,7 @@ export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateEmergencyModeJSON
   | UpdateLendingMarketMode.UpdateLiquidationCloseFactorJSON
   | UpdateLendingMarketMode.UpdateLiquidationMaxValueJSON
-  | UpdateLendingMarketMode.UpdateGlobalUnhealthyBorrowJSON
+  | UpdateLendingMarketMode.DeprecatedUpdateGlobalUnhealthyBorrowJSON
   | UpdateLendingMarketMode.UpdateGlobalAllowedBorrowJSON
   | UpdateLendingMarketMode.UpdateRiskCouncilJSON
   | UpdateLendingMarketMode.UpdateMinFullLiquidationThresholdJSON

package/src/idl_codegen_kamino_vault/programId.ts

@@ -6,4 +6,8 @@ export const PROGRAM_ID_CLI = new PublicKey(
 )
 
 // This constant will not get overwritten on subsequent code generations and it's safe to modify it's value.
-export const PROGRAM_ID: PublicKey = PROGRAM_ID_CLI
+export let PROGRAM_ID: PublicKey = PROGRAM_ID_CLI
+
+export const setKVaultsProgramId = (programId: PublicKey) => {
+  PROGRAM_ID = programId;
+}

package/src/lending_operations/swap_collateral_operations.ts

@@ -319,7 +319,7 @@ function getAtaCreationIxns(context: SwapCollContext<any>) {
 }
 
 function getAtaCloseIxns(context: SwapCollContext<any>) {
-  const ataCloseIxns = [];
+  const ataCloseIxns: TransactionInstruction[] = [];
   if (
     context.sourceCollReserve.getLiquidityMint().equals(WRAPPED_SOL_MINT) ||
     context.targetCollReserve.getLiquidityMint().equals(WRAPPED_SOL_MINT)

package/src/pyth/accounts/index.ts

@@ -1,2 +1,2 @@
 export { PriceUpdateV2 } from './PriceUpdateV2';
-export { PriceUpdateV2Fields, PriceUpdateV2JSON } from './PriceUpdateV2';
+export type { PriceUpdateV2Fields, PriceUpdateV2JSON } from './PriceUpdateV2';

package/src/utils/ObligationType.ts

@@ -19,16 +19,18 @@ export type InitObligationArgsModel = {
 
 export class VanillaObligation {
   readonly programId: PublicKey;
+  readonly id: number;
   static tag = 0;
 
-  constructor(programId: PublicKey) {
+  constructor(programId: PublicKey, id?: number) {
     this.programId = programId;
+    this.id = id ?? 0;
   }
 
   toArgs() {
     const initObligationArgs: InitObligationArgsModel = {
       tag: VanillaObligation.tag,
-      id: 0,
+      id: this.id,
       seed1: PublicKey.default,
       seed2: PublicKey.default,
     };
@@ -45,18 +47,20 @@ export class MultiplyObligation {
   readonly collToken: PublicKey;
   readonly debtToken: PublicKey;
   readonly programId: PublicKey;
+  readonly id: number;
   static tag = 1;
 
-  constructor(collToken: PublicKey, debtToken: PublicKey, programId: PublicKey) {
+  constructor(collToken: PublicKey, debtToken: PublicKey, programId: PublicKey, id?: number) {
     this.collToken = collToken;
     this.debtToken = debtToken;
     this.programId = programId;
+    this.id = id ?? 0;
   }
 
   toArgs() {
     const initObligationArgs: InitObligationArgsModel = {
       tag: MultiplyObligation.tag,
-      id: 0,
+      id: this.id,
       seed1: this.collToken,
       seed2: this.debtToken,
     };
@@ -73,18 +77,20 @@ export class LeverageObligation {
   readonly collToken: PublicKey;
   readonly debtToken: PublicKey;
   readonly programId: PublicKey;
+  readonly id: number;
   static tag = 3;
 
-  constructor(collToken: PublicKey, debtToken: PublicKey, programId: PublicKey) {
+  constructor(collToken: PublicKey, debtToken: PublicKey, programId: PublicKey, id?: number) {
     this.collToken = collToken;
     this.debtToken = debtToken;
     this.programId = programId;
+    this.id = id ?? 0;
   }
 
   toArgs() {
     const initObligationArgs: InitObligationArgsModel = {
       tag: LeverageObligation.tag,
-      id: 0,
+      id: this.id,
       seed1: this.collToken,
       seed2: this.debtToken,
     };
@@ -100,11 +106,13 @@ export class LeverageObligation {
 export class LendingObligation {
   readonly token: PublicKey;
   readonly programId: PublicKey;
+  readonly id: number;
   static tag = 2;
 
-  constructor(token: PublicKey, programId: PublicKey) {
+  constructor(token: PublicKey, programId: PublicKey, id?: number) {
     this.token = token;
     this.programId = programId;
+    this.id = id ?? 0;
   }
 
   toArgs() {
@@ -123,7 +131,7 @@ export class LendingObligation {
   }
 }
 
-function getObligationPdaWithArgs(
+export function getObligationPdaWithArgs(
   market: PublicKey,
   user: PublicKey,
   args: InitObligationArgsModel,
@@ -141,6 +149,31 @@ function getObligationPdaWithArgs(
   return obligationAddress;
 }
 
+export function getObligationType(
+  kaminoMarket: KaminoMarket,
+  obligationTag: ObligationTypeTag,
+  mintAddress1: PublicKey = PublicKey.default,
+  mintAddress2: PublicKey = PublicKey.default
+): ObligationType {
+  switch (obligationTag) {
+    case VanillaObligation.tag: {
+      return new VanillaObligation(kaminoMarket.programId);
+    }
+    case MultiplyObligation.tag: {
+      return new MultiplyObligation(mintAddress1, mintAddress2, kaminoMarket.programId);
+    }
+    case LeverageObligation.tag: {
+      return new LeverageObligation(mintAddress1, mintAddress2, kaminoMarket.programId);
+    }
+    case LendingObligation.tag: {
+      return new LendingObligation(mintAddress1, kaminoMarket.programId);
+    }
+    default: {
+      throw new Error('Invalid obligation type');
+    }
+  }
+}
+
 export function getObligationTypeFromObligation(
   kaminoMarket: KaminoMarket,
   obligation: KaminoObligation
@@ -148,7 +181,6 @@ export function getObligationTypeFromObligation(
   switch (obligation.obligationTag) {
     case VanillaObligation.tag: {
       return new VanillaObligation(kaminoMarket.programId);
-      break;
     }
     case MultiplyObligation.tag: {
       return new MultiplyObligation(
@@ -156,7 +188,6 @@ export function getObligationTypeFromObligation(
         obligation.getBorrows()[0].mintAddress,
         kaminoMarket.programId
       );
-      break;
     }
     case LeverageObligation.tag: {
       return new LeverageObligation(
@@ -164,11 +195,9 @@ export function getObligationTypeFromObligation(
         obligation.getBorrows()[0].mintAddress,
         kaminoMarket.programId
       );
-      break;
     }
     case LendingObligation.tag: {
       return new LendingObligation(obligation.getDeposits()[0].mintAddress, kaminoMarket.programId);
-      break;
     }
     default: {
       throw new Error('Invalid obligation type');