@kamino-finance/klend-sdk 5.13.1 → 5.13.2

package/dist/classes/action.js

@@ -22,7 +22,7 @@ class KaminoAction {
     outflowReserve;
     owner;
     payer;
-    obligation = null;
+    obligation;
     referrer;
     /**
      * Null unless the obligation is not passed
@@ -50,13 +50,8 @@ class KaminoAction {
     preLoadedDepositReservesSameTx;
     currentSlot;
     constructor(kaminoMarket, owner, obligation, mint, positions, amount, depositReserves, borrowReserves, reserveState, currentSlot, secondaryMint, outflowReserveState, outflowAmount, referrer, payer) {
-        if (obligation instanceof obligation_1.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_js_1.default(amount);
@@ -134,7 +129,7 @@ class KaminoAction {
             distinctReserveCount,
         };
     }
-    static async buildRefreshObligationTxns(kaminoMarket, payer, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildRefreshObligationTxns(kaminoMarket, payer, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
     currentSlot = 0) {
         //  placeholder for action initialization
         const firstReserve = obligation.getDeposits()[0].reserveAddress;
@@ -149,7 +144,7 @@ class KaminoAction {
         axn.addRefreshObligation(payer);
         return axn;
     }
-    static async buildRequestElevationGroupTxns(kaminoMarket, payer, obligation, elevationGroup, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildRequestElevationGroupTxns(kaminoMarket, payer, obligation, elevationGroup, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
     currentSlot = 0) {
         const firstReserve = obligation.state.deposits.find((x) => !x.depositReserve.equals(web3_js_1.PublicKey.default)).depositReserve;
         const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
@@ -164,8 +159,8 @@ class KaminoAction {
         axn.addRequestElevationIx(elevationGroup, 'setup');
         return axn;
     }
-    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, // to be requested *before* the deposit
     initUserMetadata = {
         skipInitialization: false,
@@ -177,7 +172,7 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, undefined, overrideElevationGroupRequest);
+        await axn.addSupportIxs('deposit', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, undefined, overrideElevationGroupRequest);
         if (useV2Ixs) {
             axn.addDepositIxV2();
         }
@@ -193,8 +188,8 @@ class KaminoAction {
             feed: feed,
         }, tokens));
     }
-    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
@@ -212,7 +207,7 @@ class KaminoAction {
                 axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
             }
         }
-        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, undefined, overrideElevationGroupRequest);
+        await axn.addSupportIxs('borrow', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, undefined, overrideElevationGroupRequest);
         if (useV2Ixs) {
             axn.addBorrowIxV2();
         }
@@ -222,34 +217,34 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas
+    static async buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas
     requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
         const axn = await KaminoAction.initialize('mint', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('mint', includeAtaIxns, requestElevationGroup, false, addInitObligationForFarm, scopeRefreshConfig, { skipInitialization: true, skipLutCreation: true });
+        await axn.addSupportIxs('mint', includeAtaIxs, requestElevationGroup, false, addInitObligationForFarm, scopeRefreshConfig, { skipInitialization: true, skipLutCreation: true });
         axn.addDepositReserveLiquidityIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas
+    static async buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas
     requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
         const axn = await KaminoAction.initialize('redeem', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('redeem', includeAtaIxns, requestElevationGroup, false, addInitObligationForFarm, scopeRefreshConfig, { skipInitialization: true, skipLutCreation: true });
+        await axn.addSupportIxs('redeem', includeAtaIxs, requestElevationGroup, false, addInitObligationForFarm, scopeRefreshConfig, { skipInitialization: true, skipLutCreation: true });
         axn.addRedeemReserveCollateralIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas
+    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
@@ -259,7 +254,7 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata);
+        await axn.addSupportIxs('depositCollateral', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata);
         if (useV2Ixs) {
             axn.addDepositObligationCollateralIxV2();
         }
@@ -269,8 +264,8 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
@@ -289,16 +284,16 @@ class KaminoAction {
                 axn.addInitReferrerTokenStateIx(axn.outflowReserve, referrerTokenState);
             }
         }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForDeposit, useV2Ixs, undefined, initUserMetadata, twoTokenAction);
+        await axn.addSupportIxs('deposit', includeAtaIxs, requestElevationGroup, addInitObligationForFarmForDeposit, useV2Ixs, undefined, initUserMetadata, twoTokenAction);
         if (useV2Ixs) {
             await axn.addDepositAndBorrowIxV2();
         }
         else {
             await axn.addDepositAndBorrowIx();
         }
-        await axn.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow, useV2Ixs);
+        await axn.addInBetweenIxs('depositAndBorrow', 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 utils_1.PublicKeySet([
             ...axn.depositReserves,
             ...axn.borrowReserves,
@@ -312,8 +307,8 @@ class KaminoAction {
         }
         return axn;
     }
-    static async buildDepositAndWithdrawV2Txns(kaminoMarket, depositAmount, depositMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    static async buildDepositAndWithdrawV2Txns(kaminoMarket, depositAmount, depositMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
@@ -324,13 +319,13 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('depositAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarm, true, scopeRefreshConfig, initUserMetadata, twoTokenAction);
+        await axn.addSupportIxs('depositAndWithdraw', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, true, scopeRefreshConfig, initUserMetadata, twoTokenAction);
         const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
         axn.addDepositAndWithdrawV2Ixs(withdrawCollateralAmount);
         return axn;
     }
-    static async buildRepayAndWithdrawV2Txns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    static async buildRepayAndWithdrawV2Txns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
@@ -341,13 +336,13 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('repayAndWithdrawV2', includeAtaIxns, requestElevationGroup, addInitObligationForFarm, true, scopeRefreshConfig, initUserMetadata, twoTokenAction);
+        await axn.addSupportIxs('repayAndWithdrawV2', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, true, scopeRefreshConfig, initUserMetadata, twoTokenAction);
         const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
         axn.addRepayAndWithdrawV2Ixs(withdrawCollateralAmount);
         return axn;
     }
-    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
@@ -359,7 +354,7 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForRepay, useV2Ixs, undefined, initUserMetadata, twoTokenAction);
+        await axn.addSupportIxs('repay', includeAtaIxs, requestElevationGroup, addInitObligationForFarmForRepay, useV2Ixs, undefined, initUserMetadata, twoTokenAction);
         const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
         if (useV2Ixs) {
             await axn.addRepayAndWithdrawIxsV2(withdrawCollateralAmount);
@@ -367,9 +362,9 @@ class KaminoAction {
         else {
             await axn.addRepayAndWithdrawIxs(withdrawCollateralAmount);
         }
-        await axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw, useV2Ixs);
+        await axn.addInBetweenIxs('repayAndWithdraw', 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 utils_1.PublicKeySet([
             ...axn.depositReserves,
             ...axn.borrowReserves,
@@ -383,14 +378,14 @@ class KaminoAction {
         }
         return axn;
     }
-    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, // to be requested *after* the withdraw
     initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
     }, referrer = web3_js_1.PublicKey.default, currentSlot = 0, overrideElevationGroupRequest, 
-    // 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) {
         const axn = await KaminoAction.initialize('withdraw', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
@@ -398,7 +393,7 @@ class KaminoAction {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
         axn.depositReserves.push(...(obligationCustomizations?.addedDepositReserves || []));
-        await axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, false, overrideElevationGroupRequest);
+        await axn.addSupportIxs('withdraw', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, false, overrideElevationGroupRequest);
         const collateralAmount = axn.getWithdrawCollateralAmount(axn.reserve, axn.amount);
         if (useV2Ixs) {
             await axn.addWithdrawIxV2(collateralAmount);
@@ -418,13 +413,13 @@ 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
      */
-    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, currentSlot, payer = undefined, extraComputeBudget = 1_000_000, includeAtaIxns = true, requestElevationGroup = false, initUserMetadata = {
+    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, currentSlot, payer = undefined, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
     }, referrer = web3_js_1.PublicKey.default) {
@@ -433,7 +428,7 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata);
+        await axn.addSupportIxs('repay', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata);
         if (useV2Ixs) {
             await axn.addRepayIxV2();
         }
@@ -443,8 +438,8 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, useV2Ixs, scopeRefreshConfig = undefined, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
+    static async buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, useV2Ixs, scopeRefreshConfig = undefined, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
+    includeAtaIxs = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
     requestElevationGroup = false, initUserMetadata = {
         skipInitialization: false,
         skipLutCreation: false,
@@ -454,7 +449,7 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        await axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata);
+        await axn.addSupportIxs('liquidate', includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata);
         if (useV2Ixs) {
             await axn.addLiquidateIxV2(maxAllowedLtvOverridePercent);
         }
@@ -696,7 +691,8 @@ class KaminoAction {
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId);
         borrowIx.keys =
-            this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0
+            (0, obligation_1.isKaminoObligation)(this.obligation) &&
+                (this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0)
                 ? borrowIx.keys.concat([...depositReserveAccountMetas])
                 : borrowIx.keys;
         this.lendingIxs.push(borrowIx);
@@ -737,7 +733,8 @@ class KaminoAction {
             farmsProgram: farms_sdk_1.farmsId,
         }, this.kaminoMarket.programId);
         borrowIx.keys =
-            this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0
+            (0, obligation_1.isKaminoObligation)(this.obligation) &&
+                (this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0)
                 ? borrowIx.keys.concat([...depositReserveAccountMetas])
                 : borrowIx.keys;
         this.lendingIxs.push(borrowIx);
@@ -819,7 +816,9 @@ class KaminoAction {
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId);
         repayIx.keys =
-            this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
+            (0, obligation_1.isKaminoObligation)(this.obligation) && this.obligation.state.elevationGroup > 0
+                ? repayIx.keys.concat([...depositReserveAccountMetas])
+                : repayIx.keys;
         this.lendingIxs.push(repayIx);
     }
     async addRepayIxV2() {
@@ -856,7 +855,10 @@ class KaminoAction {
             farmsProgram: farms_sdk_1.farmsId,
         }, this.kaminoMarket.programId);
         repayIx.keys =
-            this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
+            // TODO: potential elev group update?
+            (0, obligation_1.isKaminoObligation)(this.obligation) && this.obligation.state.elevationGroup > 0
+                ? repayIx.keys.concat([...depositReserveAccountMetas])
+                : repayIx.keys;
         this.lendingIxs.push(repayIx);
     }
     addRepayAndWithdrawV2Ixs(withdrawCollateralAmount) {
@@ -1194,6 +1196,9 @@ class KaminoAction {
     async addRepayAndWithdrawIxsV2(withdrawCollateralAmount) {
         this.lendingIxsLabels.push(`repayObligationLiquidityV2(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
         this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateralV2`);
+        if (!(0, obligation_1.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 };
@@ -1225,7 +1230,8 @@ class KaminoAction {
             farmsAccounts: debtFarmsAccounts,
             farmsProgram: farms_sdk_1.farmsId,
         }, 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) {
             throw new Error(`outflowReserve not set`);
@@ -1270,6 +1276,9 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw Error(`Withdraw reserve during liquidation is not defined`);
         }
+        if (!(0, obligation_1.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 };
@@ -1312,6 +1321,9 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw Error(`Withdraw reserve during liquidation is not defined`);
         }
+        if (!(0, obligation_1.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 };
@@ -1372,22 +1384,22 @@ class KaminoAction {
                 : liquidateIx.keys;
         this.lendingIxs.push(liquidateIx);
     }
-    async addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs) {
-        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, useV2Ixs, 'inBetween', requestElevationGroup, addInitObligationForFarm);
+    async addInBetweenIxs(action, includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs) {
+        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxs, useV2Ixs, 'inBetween', requestElevationGroup, addInitObligationForFarm);
     }
     addRefreshObligation(crank) {
         const uniqueReserveAddresses = new utils_1.PublicKeySet(this.depositReserves.concat(this.borrowReserves)).toArray();
-        const addAllToSetupIxns = 'setup';
+        const addAllToSetupIxs = 'setup';
         // Union of addresses
         const allReservesExcludingCurrent = [...uniqueReserveAddresses];
-        this.addRefreshReserveIxs(allReservesExcludingCurrent, addAllToSetupIxns);
-        this.addRefreshFarmsForReserve(this.depositReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxns, types_1.ReserveFarmKind.Collateral, crank);
-        this.addRefreshFarmsForReserve(this.borrowReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxns, types_1.ReserveFarmKind.Debt, crank);
-        this.addRefreshObligationIx(addAllToSetupIxns);
+        this.addRefreshReserveIxs(allReservesExcludingCurrent, addAllToSetupIxs);
+        this.addRefreshFarmsForReserve(this.depositReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxs, types_1.ReserveFarmKind.Collateral, crank);
+        this.addRefreshFarmsForReserve(this.borrowReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxs, types_1.ReserveFarmKind.Debt, crank);
+        this.addRefreshObligationIx(addAllToSetupIxs);
     }
-    async addSupportIxsWithoutInitObligation(action, includeAtaIxns, useV2Ixs, addAsSupportIx = 'setup', requestElevationGroup = false, addInitObligationForFarm = false, twoTokenAction = false, overrideElevationGroupRequest) {
+    async addSupportIxsWithoutInitObligation(action, includeAtaIxs, useV2Ixs, addAsSupportIx = 'setup', requestElevationGroup = false, addInitObligationForFarm = false, twoTokenAction = false, overrideElevationGroupRequest) {
         // TODO: why are we not doing this first?
-        if (includeAtaIxns) {
+        if (includeAtaIxs) {
             await this.addAtaIxs(action);
         }
         if ([
@@ -1403,18 +1415,18 @@ class KaminoAction {
             'refreshObligation',
             '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 = [];
             if (action === 'liquidate' ||
                 action === 'depositAndBorrow' ||
@@ -1426,7 +1438,7 @@ class KaminoAction {
                 if (action === 'depositAndBorrow' || action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2') {
                     currentReserves = [this.reserve, this.outflowReserve];
                     if (action === 'depositAndBorrow') {
-                        if (this.obligation) {
+                        if ((0, obligation_1.isKaminoObligation)(this.obligation)) {
                             const deposit = this.obligation.getDepositByReserve(this.reserve.address);
                             if (!deposit) {
                                 this.preLoadedDepositReservesSameTx.push(this.reserve.address);
@@ -1489,6 +1501,9 @@ class KaminoAction {
             }
             this.addRefreshReserveIxs(currentReserveAddresses.toArray(), addAsSupportIx);
             if (action === 'repayAndWithdraw' && addAsSupportIx === 'inBetween') {
+                if (!(0, obligation_1.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`);
@@ -1503,13 +1518,16 @@ class KaminoAction {
             }
             if (requestElevationGroup) {
                 if (action === 'repay' || action === 'repayAndWithdrawV2') {
-                    const repayObligationLiquidity = this.obligation.borrows.get(this.reserve.address);
+                    if (!(0, obligation_1.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`);
                     }
                     if (repayObligationLiquidity.amount.lte(new decimal_js_1.default(this.amount.toString())) &&
                         this.obligation.borrows.size === 1 &&
-                        this.obligation?.state.elevationGroup !== 0) {
+                        this.obligation.state.elevationGroup !== 0) {
                         this.addRefreshReserveIxs(allReservesExcludingCurrent, 'cleanup');
                         // Skip the borrow reserve, since we repay in the same tx
                         this.addRefreshObligationIx('cleanup', [this.reserve.address]);
@@ -1532,6 +1550,9 @@ class KaminoAction {
                             addAsSupportIx = 'inBetween';
                         }
                         else if (action === 'borrow') {
+                            if (!(0, obligation_1.isKaminoObligation)(this.obligation)) {
+                                throw new Error(`obligation is not a KaminoObligation`);
+                            }
                             const depositReserve = this.obligation.state.deposits.find((x) => !x.depositReserve.equals(web3_js_1.PublicKey.default)).depositReserve;
                             const collReserve = this.kaminoMarket.getReserveByAddress(depositReserve);
                             emodeGroupsColl = collReserve.state.config.elevationGroups;
@@ -1551,25 +1572,30 @@ 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 !== ((0, obligation_1.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 !== ((0, obligation_1.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') {
+                            if (!(0, obligation_1.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 !==
+                        ((0, obligation_1.isKaminoObligation)(this.obligation) ? this.obligation.state.elevationGroup : 0)) {
                     const addAsSupportIx = 'setup';
                     console.log('Deposit: Requesting elevation group', overrideElevationGroupRequest);
                     this.addRequestElevationIx(overrideElevationGroupRequest, addAsSupportIx);
@@ -1590,7 +1616,7 @@ 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, types_1.ReserveFarmKind.Collateral);
@@ -1612,7 +1638,7 @@ 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, types_1.ReserveFarmKind.Debt);
                     }
@@ -1626,7 +1652,7 @@ class KaminoAction {
             }
         }
     }
-    async addSupportIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, twoTokenAction = false, overrideElevationGroupRequest) {
+    async addSupportIxs(action, includeAtaIxs, requestElevationGroup, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, initUserMetadata, twoTokenAction = false, overrideElevationGroupRequest) {
         if (!['mint', 'redeem'].includes(action)) {
             const [, ownerUserMetadata] = await this.kaminoMarket.getUserMetadata(this.owner);
             if (!ownerUserMetadata && !initUserMetadata.skipInitialization) {
@@ -1641,7 +1667,7 @@ class KaminoAction {
             }
             await this.addInitObligationIxs();
         }
-        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, useV2Ixs, 'setup', requestElevationGroup, addInitObligationForFarm, twoTokenAction, overrideElevationGroupRequest);
+        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxs, useV2Ixs, 'setup', requestElevationGroup, addInitObligationForFarm, twoTokenAction, overrideElevationGroupRequest);
         const allReserves = new utils_1.PublicKeySet([
             ...this.depositReserves,
             ...this.borrowReserves,
@@ -1880,7 +1906,7 @@ class KaminoAction {
         farms.forEach((arg) => {
             const args = { mode: arg[0] };
             const accounts = {
-                owner: this.obligation ? this.obligation.state.owner : this.owner,
+                owner: (0, obligation_1.isKaminoObligation)(this.obligation) ? this.obligation.state.owner : this.owner,
                 payer: this.owner,
                 obligation: this.getObligationPda(),
                 lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
@@ -1904,21 +1930,21 @@ class KaminoAction {
         });
     }
     addInitObligationIxs() {
-        if (!this.obligation) {
+        if (!(0, obligation_1.isKaminoObligation)(this.obligation)) {
             const obligationPda = this.getObligationPda();
             const [userMetadataAddress, _bump] = (0, utils_1.userMetadataPda)(this.owner, this.kaminoMarket.programId);
             const initObligationIx = (0, instructions_1.initObligation)({
                 args: {
-                    tag: this.obligationType.toArgs().tag,
-                    id: this.obligationType.toArgs().id,
+                    tag: this.obligation.toArgs().tag,
+                    id: this.obligation.toArgs().id,
                 },
             }, {
                 obligationOwner: this.owner,
                 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: web3_js_1.SYSVAR_RENT_PUBKEY,
                 systemProgram: web3_js_1.SystemProgram.programId,
@@ -2032,7 +2058,9 @@ class KaminoAction {
             return;
         }
         let safeRepay = new bn_js_1.default(this.amount);
-        if (this.obligation && (action === 'repay' || action === 'repayAndWithdrawV2') && this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))) {
+        if ((0, obligation_1.isKaminoObligation)(this.obligation) &&
+            (action === 'repay' || action === 'repayAndWithdrawV2') &&
+            this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))) {
             const borrow = this.obligation.state.borrows.find((borrow) => borrow.borrowReserve.toString() === this.reserve.address.toString());
             if (!borrow) {
                 throw Error(`Unable to find obligation borrow to repay for ${this.obligation.state.owner.toBase58()}`);
@@ -2139,9 +2167,12 @@ class KaminoAction {
             : new bn_js_1.default(new decimal_js_1.default(amount.toString()).mul(collateralExchangeRate).ceil().toString());
     }
     getObligationPda() {
-        return this.obligation
+        return (0, obligation_1.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 obligation_1.KaminoObligation;
     }
     getAdditionalDepositReservesList() {
         const depositReservesList = this.depositReserves;