@kamino-finance/klend-sdk 5.13.1 → 5.13.4

package/src/classes/action.ts

@@ -70,7 +70,7 @@ import {
   obligationFarmStatePda,
 } from '../utils';
 import { getTokenIdsForScopeRefresh, KaminoMarket } from './market';
-import { KaminoObligation } from './obligation';
+import { isKaminoObligation, KaminoObligation } from './obligation';
 import { KaminoReserve } from './reserve';
 import { ReserveFarmKind } from '../idl_codegen/types';
 import { farmsId } from '@kamino-finance/farms-sdk';
@@ -109,7 +109,7 @@ export class KaminoAction {
   owner: PublicKey;
   payer: PublicKey;
 
-  obligation: KaminoObligation | null = null;
+  obligation: KaminoObligation | ObligationType;
 
   referrer: PublicKey;
 
@@ -155,7 +155,7 @@ export class KaminoAction {
   private constructor(
     kaminoMarket: KaminoMarket,
     owner: PublicKey,
-    obligation: KaminoObligation | ObligationType | null,
+    obligation: KaminoObligation | ObligationType,
     mint: PublicKey,
     positions: number,
     amount: string | BN,
@@ -169,13 +169,8 @@ export class KaminoAction {
     referrer?: PublicKey,
     payer?: PublicKey
   ) {
-    if (obligation instanceof KaminoObligation) {
-      this.obligation = obligation;
-    } else if (obligation !== null) {
-      this.obligationType = obligation;
-    }
-
     this.kaminoMarket = kaminoMarket;
+    this.obligation = obligation;
     this.owner = owner;
     this.payer = payer ?? owner;
     this.amount = new BN(amount);
@@ -314,7 +309,7 @@ export class KaminoAction {
     kaminoMarket: KaminoMarket,
     payer: PublicKey,
     obligation: KaminoObligation,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
     currentSlot: number = 0
   ) {
     //  placeholder for action initialization
@@ -348,7 +343,7 @@ export class KaminoAction {
     payer: PublicKey,
     obligation: KaminoObligation,
     elevationGroup: number,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
     currentSlot: number = 0
   ) {
     const firstReserve = obligation.state.deposits.find(
@@ -387,8 +382,8 @@ export class KaminoAction {
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false, // to be requested *before* the deposit
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -416,7 +411,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'deposit',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarm,
       useV2Ixs,
@@ -455,8 +450,8 @@ export class KaminoAction {
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -495,7 +490,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'borrow',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarm,
       useV2Ixs,
@@ -521,8 +516,8 @@ export class KaminoAction {
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0
@@ -545,7 +540,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'mint',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       false,
       addInitObligationForFarm,
@@ -564,8 +559,8 @@ export class KaminoAction {
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0
@@ -588,7 +583,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'redeem',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       false,
       addInitObligationForFarm,
@@ -608,8 +603,8 @@ export class KaminoAction {
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -636,7 +631,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'depositCollateral',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarm,
       useV2Ixs,
@@ -662,8 +657,8 @@ export class KaminoAction {
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -706,7 +701,7 @@ export class KaminoAction {
     }
     await axn.addSupportIxs(
       'deposit',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarmForDeposit,
       useV2Ixs,
@@ -722,14 +717,14 @@ export class KaminoAction {
     }
     await axn.addInBetweenIxs(
       'depositAndBorrow',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarmForBorrow,
       useV2Ixs
     );
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
 
-    // Create the scope refresh ixn in here to ensure it's the first ixn in the txn
+    // Create the scope refresh ix in here to ensure it's the first ix in the txn
     const allReserves = new PublicKeySet<PublicKey>([
       ...axn.depositReserves,
       ...axn.borrowReserves,
@@ -755,8 +750,8 @@ export class KaminoAction {
     currentSlot: number,
     obligation: KaminoObligation | ObligationType,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -785,7 +780,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'depositAndWithdraw',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarm,
       true,
@@ -809,8 +804,8 @@ export class KaminoAction {
     currentSlot: number,
     obligation: KaminoObligation | ObligationType,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -839,7 +834,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'repayAndWithdrawV2',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarm,
       true,
@@ -864,8 +859,8 @@ export class KaminoAction {
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -895,7 +890,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'repay',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarmForRepay,
       useV2Ixs,
@@ -913,13 +908,13 @@ export class KaminoAction {
 
     await axn.addInBetweenIxs(
       'repayAndWithdraw',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarmForWithdraw,
       useV2Ixs
     );
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-    // Create the scope refresh ixn in here to ensure it's the first ixn in the txn
+    // Create the scope refresh ix in here to ensure it's the first ix in the txn
     const allReserves = new PublicKeySet<PublicKey>([
       ...axn.depositReserves,
       ...axn.borrowReserves,
@@ -943,8 +938,8 @@ export class KaminoAction {
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false, // to be requested *after* the withdraw
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -953,7 +948,7 @@ export class KaminoAction {
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     overrideElevationGroupRequest?: number,
-    // Optional customizations which may be needed if the obligation was mutated by some previous ixn.
+    // Optional customizations which may be needed if the obligation was mutated by some previous ix.
     obligationCustomizations?: {
       // Any newly-added deposit reserves.
       addedDepositReserves?: PublicKey[];
@@ -979,7 +974,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'withdraw',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarm,
       useV2Ixs,
@@ -1010,8 +1005,8 @@ export class KaminoAction {
    * @param obligation - obligation to repay or the PDA seeds
    * @param currentSlot
    * @param payer - if not set then owner is used
-   * @param extraComputeBudget - if > 0 then adds the ixn
-   * @param includeAtaIxns - if true it includes create and close wsol and token atas
+   * @param extraComputeBudget - if > 0 then adds the ix
+   * @param includeAtaIxs - if true it includes create and close wsol and token atas
    * @param requestElevationGroup
    * @param includeUserMetadata - if true it includes user metadata
    * @param referrer
@@ -1027,7 +1022,7 @@ export class KaminoAction {
     currentSlot: number,
     payer: PublicKey | undefined = undefined,
     extraComputeBudget: number = 1_000_000,
-    includeAtaIxns: boolean = true,
+    includeAtaIxs: boolean = true,
     requestElevationGroup: boolean = false,
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -1054,7 +1049,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'repay',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarm,
       useV2Ixs,
@@ -1082,8 +1077,8 @@ export class KaminoAction {
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
     scopeRefreshConfig: ScopePriceRefreshConfig | undefined = undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs: boolean = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
     requestElevationGroup: boolean = false,
     initUserMetadata: { skipInitialization: boolean; skipLutCreation: boolean } = {
       skipInitialization: false,
@@ -1114,7 +1109,7 @@ export class KaminoAction {
 
     await axn.addSupportIxs(
       'liquidate',
-      includeAtaIxns,
+      includeAtaIxs,
       requestElevationGroup,
       addInitObligationForFarm,
       useV2Ixs,
@@ -1471,7 +1466,8 @@ export class KaminoAction {
       this.kaminoMarket.programId
     );
     borrowIx.keys =
-      this.obligation!.state.elevationGroup > 0 || this.obligation!.refreshedStats.potentialElevationGroupUpdate > 0
+      isKaminoObligation(this.obligation) &&
+      (this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0)
         ? borrowIx.keys.concat([...depositReserveAccountMetas])
         : borrowIx.keys;
     this.lendingIxs.push(borrowIx);
@@ -1525,7 +1521,8 @@ export class KaminoAction {
       this.kaminoMarket.programId
     );
     borrowIx.keys =
-      this.obligation!.state.elevationGroup > 0 || this.obligation!.refreshedStats.potentialElevationGroupUpdate > 0
+      isKaminoObligation(this.obligation) &&
+      (this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0)
         ? borrowIx.keys.concat([...depositReserveAccountMetas])
         : borrowIx.keys;
     this.lendingIxs.push(borrowIx);
@@ -1633,7 +1630,9 @@ export class KaminoAction {
     );
 
     repayIx.keys =
-      this.obligation!.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
+      isKaminoObligation(this.obligation) && this.obligation.state.elevationGroup > 0
+        ? repayIx.keys.concat([...depositReserveAccountMetas])
+        : repayIx.keys;
 
     this.lendingIxs.push(repayIx);
   }
@@ -1682,7 +1681,10 @@ export class KaminoAction {
     );
 
     repayIx.keys =
-      this.obligation!.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
+      // TODO: potential elev group update?
+      isKaminoObligation(this.obligation) && this.obligation.state.elevationGroup > 0
+        ? repayIx.keys.concat([...depositReserveAccountMetas])
+        : repayIx.keys;
 
     this.lendingIxs.push(repayIx);
   }
@@ -2129,6 +2131,10 @@ export class KaminoAction {
     );
     this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateralV2`);
 
+    if (!isKaminoObligation(this.obligation)) {
+      throw new Error(`obligation is not a KaminoObligation`);
+    }
+
     const depositReservesList = this.getAdditionalDepositReservesList();
 
     const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -2168,7 +2174,8 @@ export class KaminoAction {
       this.kaminoMarket.programId
     );
 
-    repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
+    repayIx.keys =
+      this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
 
     this.lendingIxs.push(repayIx);
     if (!this.outflowReserve) {
@@ -2228,6 +2235,10 @@ export class KaminoAction {
       throw Error(`Withdraw reserve during liquidation is not defined`);
     }
 
+    if (!isKaminoObligation(this.obligation)) {
+      throw new Error(`obligation is not a KaminoObligation`);
+    }
+
     const depositReservesList = this.getAdditionalDepositReservesList();
     const depositReserveAccountMetas = depositReservesList.map((reserve) => {
       return { pubkey: reserve, isSigner: false, isWritable: true };
@@ -2265,7 +2276,7 @@ export class KaminoAction {
       this.kaminoMarket.programId
     );
     liquidateIx.keys =
-      this.obligation!.state.elevationGroup > 0
+      this.obligation.state.elevationGroup > 0
         ? liquidateIx.keys.concat([...depositReserveAccountMetas])
         : liquidateIx.keys;
     this.lendingIxs.push(liquidateIx);
@@ -2277,6 +2288,10 @@ export class KaminoAction {
       throw Error(`Withdraw reserve during liquidation is not defined`);
     }
 
+    if (!isKaminoObligation(this.obligation)) {
+      throw new Error(`obligation is not a KaminoObligation`);
+    }
+
     const depositReservesList = this.getAdditionalDepositReservesList();
     const depositReserveAccountMetas = depositReservesList.map((reserve) => {
       return { pubkey: reserve, isSigner: false, isWritable: true };
@@ -2350,14 +2365,14 @@ export class KaminoAction {
 
   async addInBetweenIxs(
     action: ActionType,
-    includeAtaIxns: boolean,
+    includeAtaIxs: boolean,
     requestElevationGroup: boolean,
     addInitObligationForFarm: boolean,
     useV2Ixs: boolean
   ) {
     await this.addSupportIxsWithoutInitObligation(
       action,
-      includeAtaIxns,
+      includeAtaIxs,
       useV2Ixs,
       'inBetween',
       requestElevationGroup,
@@ -2368,29 +2383,29 @@ export class KaminoAction {
   addRefreshObligation(crank: PublicKey) {
     const uniqueReserveAddresses = new PublicKeySet(this.depositReserves.concat(this.borrowReserves)).toArray();
 
-    const addAllToSetupIxns = 'setup';
+    const addAllToSetupIxs = 'setup';
     // Union of addresses
     const allReservesExcludingCurrent = [...uniqueReserveAddresses];
 
-    this.addRefreshReserveIxs(allReservesExcludingCurrent, addAllToSetupIxns);
+    this.addRefreshReserveIxs(allReservesExcludingCurrent, addAllToSetupIxs);
     this.addRefreshFarmsForReserve(
       this.depositReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)!),
-      addAllToSetupIxns,
+      addAllToSetupIxs,
       ReserveFarmKind.Collateral,
       crank
     );
     this.addRefreshFarmsForReserve(
       this.borrowReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)!),
-      addAllToSetupIxns,
+      addAllToSetupIxs,
       ReserveFarmKind.Debt,
       crank
     );
-    this.addRefreshObligationIx(addAllToSetupIxns);
+    this.addRefreshObligationIx(addAllToSetupIxs);
   }
 
   async addSupportIxsWithoutInitObligation(
     action: ActionType,
-    includeAtaIxns: boolean,
+    includeAtaIxs: boolean,
     useV2Ixs: boolean,
     addAsSupportIx: AuxiliaryIx = 'setup',
     requestElevationGroup: boolean = false,
@@ -2399,7 +2414,7 @@ export class KaminoAction {
     overrideElevationGroupRequest?: number
   ) {
     // TODO: why are we not doing this first?
-    if (includeAtaIxns) {
+    if (includeAtaIxs) {
       await this.addAtaIxs(action);
     }
 
@@ -2418,18 +2433,18 @@ export class KaminoAction {
         'depositAndWithdraw',
       ].includes(action)
     ) {
-      // The support ixns in order are:
-      // 0. Init obligation ixn
-      // 0. Token Ata ixns
+      // The support ixs in order are:
+      // 0. Init obligation ix
+      // 0. Token Ata ixs
       // 0. Init obligation for farm
-      // 1. Ixns to refresh the reserves of the obligation not related to the current action
-      // 2. Ixn to refresh the reserve of the current action
-      // 3. Ixn to refresh the obligation
-      // 4. Ixn to refresh the `debt` farm of the obligation
-      // 5. Ixn to refresh the `collateral` farm of the obligation
+      // 1. Ixs to refresh the reserves of the obligation not related to the current action
+      // 2. Ix to refresh the reserve of the current action
+      // 3. Ix to refresh the obligation
+      // 4. Ix to refresh the `debt` farm of the obligation
+      // 5. Ix to refresh the `collateral` farm of the obligation
       // 6. The instruction itself
-      // 7. Ixn to refresh the `debt` farm of the obligation
-      // 8. Ixn to refresh the `collateral` farm of the obligation
+      // 7. Ix to refresh the `debt` farm of the obligation
+      // 8. Ix to refresh the `collateral` farm of the obligation
 
       let currentReserves: KaminoReserve[] = [];
 
@@ -2446,7 +2461,7 @@ export class KaminoAction {
         if (action === 'depositAndBorrow' || action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2') {
           currentReserves = [this.reserve, this.outflowReserve];
           if (action === 'depositAndBorrow') {
-            if (this.obligation) {
+            if (isKaminoObligation(this.obligation)) {
               const deposit = this.obligation.getDepositByReserve(this.reserve.address);
               if (!deposit) {
                 this.preLoadedDepositReservesSameTx.push(this.reserve.address);
@@ -2512,7 +2527,10 @@ export class KaminoAction {
       this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
 
       if (action === 'repayAndWithdraw' && addAsSupportIx === 'inBetween') {
-        const repayObligationLiquidity = this.obligation!.getBorrowByReserve(this.reserve.address);
+        if (!isKaminoObligation(this.obligation)) {
+          throw new Error(`obligation is not a KaminoObligation`);
+        }
+        const repayObligationLiquidity = this.obligation.getBorrowByReserve(this.reserve.address);
         if (!repayObligationLiquidity) {
           throw new Error(`Could not find debt reserve ${this.reserve.address} in obligation`);
         }
@@ -2526,7 +2544,10 @@ export class KaminoAction {
 
       if (requestElevationGroup) {
         if (action === 'repay' || action === 'repayAndWithdrawV2') {
-          const repayObligationLiquidity = this.obligation!.borrows.get(this.reserve.address);
+          if (!isKaminoObligation(this.obligation)) {
+            throw new Error(`obligation is not a KaminoObligation`);
+          }
+          const repayObligationLiquidity = this.obligation.getBorrowByReserve(this.reserve.address);
 
           if (!repayObligationLiquidity) {
             throw new Error(`Could not find debt reserve ${this.reserve.address} in obligation`);
@@ -2534,8 +2555,8 @@ export class KaminoAction {
 
           if (
             repayObligationLiquidity.amount.lte(new Decimal(this.amount.toString())) &&
-            this.obligation!.borrows.size === 1 &&
-            this.obligation?.state.elevationGroup !== 0
+            this.obligation.borrows.size === 1 &&
+            this.obligation.state.elevationGroup !== 0
           ) {
             this.addRefreshReserveIxs(allReservesExcludingCurrent, 'cleanup');
             // Skip the borrow reserve, since we repay in the same tx
@@ -2558,7 +2579,10 @@ export class KaminoAction {
               debtReserve = this.outflowReserve!.address;
               addAsSupportIx = 'inBetween';
             } else if (action === 'borrow') {
-              const depositReserve = this.obligation!.state.deposits.find(
+              if (!isKaminoObligation(this.obligation)) {
+                throw new Error(`obligation is not a KaminoObligation`);
+              }
+              const depositReserve = this.obligation.state.deposits.find(
                 (x) => !x.depositReserve.equals(PublicKey.default)
               )!.depositReserve;
               const collReserve = this.kaminoMarket.getReserveByAddress(depositReserve);
@@ -2592,27 +2616,36 @@ export class KaminoAction {
               const eModeGroup = groups.find((group) => group.id === eModeGroupWithMaxLtvAndDebtReserve)!.id;
               console.log('Setting eModeGroup to', eModeGroup);
 
-              if (eModeGroup !== 0 && eModeGroup !== this.obligation?.state.elevationGroup) {
+              if (
+                eModeGroup !== 0 &&
+                eModeGroup !== (isKaminoObligation(this.obligation) ? this.obligation.state.elevationGroup : 0)
+              ) {
                 newElevationGroup = eModeGroup;
               }
             }
           }
 
-          console.log('newElevationGroup', newElevationGroup, addAsSupportIx);
-          if (newElevationGroup >= 0 && newElevationGroup !== this.obligation?.state.elevationGroup) {
+          if (
+            newElevationGroup >= 0 &&
+            newElevationGroup !== (isKaminoObligation(this.obligation) ? this.obligation.state.elevationGroup : 0)
+          ) {
             this.addRequestElevationIx(newElevationGroup, addAsSupportIx);
             this.addRefreshReserveIxs(allReservesExcludingCurrent, addAsSupportIx);
             this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
             this.addRefreshObligationIx(addAsSupportIx);
 
             if (action === 'borrow') {
-              this.obligation!.refreshedStats.potentialElevationGroupUpdate = newElevationGroup;
+              if (!isKaminoObligation(this.obligation)) {
+                throw new Error(`obligation is not a KaminoObligation`);
+              }
+              this.obligation.refreshedStats.potentialElevationGroupUpdate = newElevationGroup;
             }
           }
         } else if (
           action === 'deposit' &&
           overrideElevationGroupRequest !== undefined &&
-          overrideElevationGroupRequest !== this.obligation?.state.elevationGroup
+          overrideElevationGroupRequest !==
+            (isKaminoObligation(this.obligation) ? this.obligation.state.elevationGroup : 0)
         ) {
           const addAsSupportIx: AuxiliaryIx = 'setup';
           console.log('Deposit: Requesting elevation group', overrideElevationGroupRequest);
@@ -2635,7 +2668,7 @@ export class KaminoAction {
 
       if (!useV2Ixs) {
         if (addAsSupportIx === 'setup') {
-          // If this is an setup ixn (therefore not an in-between), it means it's either a one off action
+          // If this is an setup ix (therefore not an in-between), it means it's either a one off action
           // or the first of a two-token-action
           if (action === 'liquidate') {
             this.addRefreshFarmsForReserve([this.outflowReserve!], addAsSupportIx, ReserveFarmKind.Collateral);
@@ -2667,7 +2700,7 @@ export class KaminoAction {
         } else {
           // If this is an inbetween, it means it's part of a two-token-action
           // so we skip the refresh farm obligation of the first reserve as that operation already happened
-          // add added to 'setup' ixns
+          // add added to 'setup' ixs
           if (action === 'depositAndBorrow') {
             this.addRefreshFarmsForReserve([this.outflowReserve!], addAsSupportIx, ReserveFarmKind.Debt);
           } else if (action === 'repayAndWithdraw') {
@@ -2682,7 +2715,7 @@ export class KaminoAction {
 
   async addSupportIxs(
     action: ActionType,
-    includeAtaIxns: boolean,
+    includeAtaIxs: boolean,
     requestElevationGroup: boolean,
     addInitObligationForFarm: boolean,
     useV2Ixs: boolean,
@@ -2712,7 +2745,7 @@ export class KaminoAction {
 
     await this.addSupportIxsWithoutInitObligation(
       action,
-      includeAtaIxns,
+      includeAtaIxs,
       useV2Ixs,
       'setup',
       requestElevationGroup,
@@ -3062,7 +3095,7 @@ export class KaminoAction {
     farms.forEach((arg: [number, PublicKey, PublicKey]) => {
       const args: InitObligationFarmsForReserveArgs = { mode: arg[0] };
       const accounts: InitObligationFarmsForReserveAccounts = {
-        owner: this.obligation ? this.obligation.state.owner : this.owner,
+        owner: isKaminoObligation(this.obligation) ? this.obligation.state.owner : this.owner,
         payer: this.owner,
         obligation: this.getObligationPda(),
         lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
@@ -3090,14 +3123,14 @@ export class KaminoAction {
   }
 
   private addInitObligationIxs() {
-    if (!this.obligation) {
+    if (!isKaminoObligation(this.obligation)) {
       const obligationPda = this.getObligationPda();
       const [userMetadataAddress, _bump] = userMetadataPda(this.owner, this.kaminoMarket.programId);
       const initObligationIx = initObligation(
         {
           args: {
-            tag: this.obligationType!.toArgs().tag,
-            id: this.obligationType!.toArgs().id,
+            tag: this.obligation.toArgs().tag,
+            id: this.obligation.toArgs().id,
           },
         },
         {
@@ -3105,8 +3138,8 @@ export class KaminoAction {
           feePayer: this.payer,
           obligation: obligationPda,
           lendingMarket: this.kaminoMarket.getAddress(),
-          seed1Account: this.obligationType!.toArgs().seed1,
-          seed2Account: this.obligationType!.toArgs().seed2,
+          seed1Account: this.obligation.toArgs().seed1,
+          seed2Account: this.obligation.toArgs().seed2,
           ownerUserMetadata: userMetadataAddress,
           rent: SYSVAR_RENT_PUBKEY,
           systemProgram: SystemProgram.programId,
@@ -3301,7 +3334,11 @@ export class KaminoAction {
 
     let safeRepay = new BN(this.amount);
 
-    if (this.obligation && (action === 'repay' || action === 'repayAndWithdrawV2') && this.amount.eq(new BN(U64_MAX))) {
+    if (
+      isKaminoObligation(this.obligation) &&
+      (action === 'repay' || action === 'repayAndWithdrawV2') &&
+      this.amount.eq(new BN(U64_MAX))
+    ) {
       const borrow = this.obligation.state.borrows.find(
         (borrow) => borrow.borrowReserve.toString() === this.reserve.address.toString()
       );
@@ -3512,9 +3549,13 @@ export class KaminoAction {
   }
 
   getObligationPda(): PublicKey {
-    return this.obligation
+    return isKaminoObligation(this.obligation)
       ? this.obligation.obligationAddress
-      : this.obligationType!.toPda(this.kaminoMarket.getAddress(), this.owner);
+      : this.obligation.toPda(this.kaminoMarket.getAddress(), this.owner);
+  }
+
+  isObligationInitialized() {
+    return this.obligation instanceof KaminoObligation;
   }
 
   getAdditionalDepositReservesList(): PublicKey[] {