@kamino-finance/klend-sdk 2.12.0 → 2.12.2

package/dist/classes/action.js

@@ -24,7 +24,6 @@ const types_1 = require("../idl_codegen/types");
 const farms_sdk_1 = require("@hubbleprotocol/farms-sdk");
 const ObligationType_1 = require("../utils/ObligationType");
 const lib_1 = require("../lib");
-const token_1 = require("../utils/token");
 exports.POSITION_LIMIT = 10;
 exports.BORROWS_LIMIT = 5;
 exports.DEPOSITS_LIMIT = 8;
@@ -77,8 +76,8 @@ class KaminoAction {
         this.referrer = referrer ? referrer : web3_js_1.PublicKey.default;
         this.currentSlot = currentSlot;
     }
-    static initialize(action, amount, mint, owner, kaminoMarket, obligation, referrer = web3_js_1.PublicKey.default, currentSlot = 0, hostAta, payer) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static initialize(action_1, amount_1, mint_1, owner_1, kaminoMarket_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (action, amount, mint, owner, kaminoMarket, obligation, referrer = web3_js_1.PublicKey.default, currentSlot = 0, hostAta, payer) {
             const reserve = kaminoMarket.getReserveByMint(mint);
             if (reserve === undefined) {
                 throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
@@ -143,9 +142,9 @@ class KaminoAction {
             };
         });
     }
-    static buildRefreshObligationTxns(kaminoMarket, payer, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildRefreshObligationTxns(kaminoMarket_1, payer_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, payer, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        currentSlot = 0) {
             //  placeholder for action initialization
             const firstReserve = obligation.state.deposits[0].depositReserve;
             const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
@@ -160,9 +159,9 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildRequestElevationGroupTxns(kaminoMarket, payer, obligation, elevationGroup, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildRequestElevationGroupTxns(kaminoMarket_1, payer_1, obligation_2, elevationGroup_1) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, payer, obligation, elevationGroup, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        currentSlot = 0) {
             const firstReserve = obligation.state.deposits[0].depositReserve;
             const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
             if (!firstKaminoReserve) {
@@ -177,11 +176,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildDepositTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
             const axn = yield KaminoAction.initialize('deposit', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
             const addInitObligationForFarm = true;
             if (extraComputeBudget > 0) {
@@ -193,11 +192,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0, hostAta) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildBorrowTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0, hostAta) {
             const axn = yield KaminoAction.initialize('borrow', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, hostAta);
             const addInitObligationForFarm = true;
             if (extraComputeBudget > 0) {
@@ -209,11 +208,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildDepositReserveLiquidityTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        includeAtaIxns = true, // if true it includes create and close wsol and token atas
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
             const axn = yield KaminoAction.initialize('mint', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
             const addInitObligationForFarm = true;
             if (extraComputeBudget > 0) {
@@ -225,11 +224,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildRedeemReserveCollateralTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        includeAtaIxns = true, // if true it includes create and close wsol and token atas
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
             const axn = yield KaminoAction.initialize('redeem', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
             const addInitObligationForFarm = true;
             if (extraComputeBudget > 0) {
@@ -241,11 +240,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildDepositObligationCollateralTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        includeAtaIxns = true, // if true it includes create and close wsol and token atas
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
             const axn = yield KaminoAction.initialize('depositCollateral', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
             const addInitObligationForFarm = true;
             if (extraComputeBudget > 0) {
@@ -257,11 +256,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildDepositAndBorrowTxns(kaminoMarket_1, depositAmount_1, depositMint_1, borrowAmount_1, borrowMint_1, payer_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
             const axn = yield KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, payer, payer, obligation, borrowAmount, referrer, currentSlot);
             const addInitObligationForFarmForDeposit = true;
             const addInitObligationForFarmForBorrow = false;
@@ -276,11 +275,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-    isClosingPosition = false, referrer = web3_js_1.PublicKey.default) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildRepayAndWithdrawTxns(kaminoMarket_1, repayAmount_1, repayMint_1, withdrawAmount_1, withdrawMint_1, payer_1, currentSlot_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
+        isClosingPosition = false, referrer = web3_js_1.PublicKey.default) {
             const axn = yield KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
             const addInitObligationForFarmForRepay = true;
             const addInitObligationForFarmForWithdraw = false;
@@ -295,11 +294,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
-    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildWithdrawTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
+        includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
             const axn = yield KaminoAction.initialize('withdraw', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
             const addInitObligationForFarm = true;
             if (extraComputeBudget > 0) {
@@ -326,8 +325,8 @@ class KaminoAction {
      * @param includeUserMetadata - if true it includes user metadata
      * @param referrer
      */
-    static buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, currentSlot, payer = undefined, extraComputeBudget = 1000000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, referrer = web3_js_1.PublicKey.default) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildRepayTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2, currentSlot_1) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, currentSlot, payer = undefined, extraComputeBudget = 1000000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, referrer = web3_js_1.PublicKey.default) {
             const axn = yield KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, undefined, payer);
             const addInitObligationForFarm = true;
             if (extraComputeBudget > 0) {
@@ -339,11 +338,11 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, extraComputeBudget = 1000000, // 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
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildLiquidateTxns(kaminoMarket_1, amount_1, minCollateralReceiveAmount_1, repayTokenMint_1, withdrawTokenMint_1, liquidator_1, obligationOwner_1, obligation_2) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, extraComputeBudget = 1000000, // 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
+        requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
+        referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0) {
             const axn = yield KaminoAction.initializeMultiTokenAction(kaminoMarket, 'liquidate', amount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, minCollateralReceiveAmount, referrer, currentSlot);
             const addInitObligationForFarm = true;
             if (extraComputeBudget > 0) {
@@ -355,8 +354,8 @@ class KaminoAction {
             return axn;
         });
     }
-    static buildWithdrawReferrerFeeTxns(owner, tokenMint, kaminoMarket, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static buildWithdrawReferrerFeeTxns(owner_1, tokenMint_1, kaminoMarket_1) {
+        return __awaiter(this, arguments, void 0, function* (owner, tokenMint, kaminoMarket, currentSlot = 0) {
             const { axn, createAtasIxns } = yield KaminoAction.initializeWithdrawReferrerFees(tokenMint, owner, kaminoMarket, currentSlot);
             axn.preTxnIxs.push(...createAtasIxns);
             axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.toString()}]`);
@@ -446,7 +445,7 @@ class KaminoAction {
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
-            reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault,
+            reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
             userSourceLiquidity: this.userTokenAccountAddress,
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -508,6 +507,7 @@ class KaminoAction {
         }, this.kaminoMarket.programId));
     }
     addBorrowIx() {
+        var _a;
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -529,7 +529,9 @@ class KaminoAction {
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId);
-        borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
+        borrowIx.keys = ((_a = this.obligation) === null || _a === void 0 ? void 0 : _a.state.elevationGroup)
+            ? borrowIx.keys.concat([...depositReserveAccountMetas])
+            : borrowIx.keys;
         this.lendingIxs.push(borrowIx);
     }
     addDepositAndBorrowIx() {
@@ -547,7 +549,7 @@ class KaminoAction {
                 reserveLiquidityMint: this.reserve.getLiquidityMint(),
                 reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
                 reserveCollateralMint: this.reserve.getCTokenMint(),
-                reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault,
+                reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
                 userSourceLiquidity: this.userTokenAccountAddress,
                 placeholderUserDestinationCollateral: this.kaminoMarket.programId,
                 collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -594,7 +596,11 @@ class KaminoAction {
         return __awaiter(this, void 0, void 0, function* () {
             this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
             this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
-            this.lendingIxs.push((0, instructions_1.repayObligationLiquidity)({
+            const depositReservesList = this.getAdditionalDepositReservesList();
+            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+                return { pubkey: reserve, isSigner: false, isWritable: true };
+            });
+            const repayIx = (0, instructions_1.repayObligationLiquidity)({
                 liquidityAmount: this.amount,
             }, {
                 owner: this.owner,
@@ -606,7 +612,9 @@ class KaminoAction {
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
+            }, this.kaminoMarket.programId);
+            repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
+            this.lendingIxs.push(repayIx);
             if (!this.outflowReserve) {
                 throw new Error(`outflowReserve not set`);
             }
@@ -668,6 +676,7 @@ class KaminoAction {
     }
     addRepayIx() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
             const depositReservesList = this.getAdditionalDepositReservesList();
             const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -686,12 +695,14 @@ class KaminoAction {
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId);
-            repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
+            repayIx.keys =
+                ((_a = this.obligation) === null || _a === void 0 ? void 0 : _a.state.elevationGroup) !== 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
             this.lendingIxs.push(repayIx);
         });
     }
-    addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    addLiquidateIx() {
+        return __awaiter(this, arguments, void 0, function* (maxAllowedLtvOverridePercent = 0) {
+            var _a;
             this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
             if (!this.outflowReserve) {
                 throw Error(`Withdraw reserve during liquidation is not defined`);
@@ -730,12 +741,15 @@ class KaminoAction {
                 withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId);
-            liquidateIx.keys = liquidateIx.keys.concat([...depositReserveAccountMetas]);
+            liquidateIx.keys =
+                ((_a = this.obligation) === null || _a === void 0 ? void 0 : _a.state.elevationGroup) !== 0
+                    ? liquidateIx.keys.concat([...depositReserveAccountMetas])
+                    : liquidateIx.keys;
             this.lendingIxs.push(liquidateIx);
         });
     }
-    addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, isClosingPosition = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    addInBetweenIxs(action_1, includeAtaIxns_1, requestElevationGroup_1, addInitObligationForFarm_1) {
+        return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, isClosingPosition = false) {
             yield this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, false, requestElevationGroup, addInitObligationForFarm, isClosingPosition);
         });
     }
@@ -749,9 +763,9 @@ class KaminoAction {
         this.addRefreshFarmsForReserve(this.borrowReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxns, types_1.ReserveFarmKind.Debt, crank);
         this.addRefreshObligationIx(addAllToSetupIxns, false);
     }
-    addSupportIxsWithoutInitObligation(action, includeAtaIxns, addToSetupIxs = true, requestElevationGroup = false, addInitObligationForFarm = false, isClosingPosition = false, twoTokenAction = false) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    addSupportIxsWithoutInitObligation(action_1, includeAtaIxns_1) {
+        return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, addToSetupIxs = true, requestElevationGroup = false, addInitObligationForFarm = false, isClosingPosition = false, twoTokenAction = false) {
+            var _a;
             // TODO: why are we not doing this first?
             if (includeAtaIxns) {
                 yield this.addAtaIxs(action);
@@ -908,18 +922,18 @@ class KaminoAction {
                     const groupsColl = this.reserve.state.config.elevationGroups;
                     const groupsDebt = this.outflowReserve.state.config.elevationGroups;
                     const groups = this.kaminoMarket.state.elevationGroups;
-                    const commonElevationGroups = [...groupsColl].filter((item) => groupsDebt.includes(item) && item !== 0);
+                    const commonElevationGroups = [...groupsColl].filter((item) => groupsDebt.includes(item) && item !== 0 && groups[item - 1].debtReserve.equals(this.outflowReserve.address));
                     console.log('Groups of coll reserve', groupsColl, 'Groups of debt reserve', groupsDebt, 'Common groups', commonElevationGroups);
                     if (commonElevationGroups.length === 0) {
                         console.log('No common elevation groups found, staying with default');
                     }
                     else {
-                        const eModeGroupWithMaxLtv = commonElevationGroups.reduce((prev, curr) => {
+                        const eModeGroupWithMaxLtvAndDebtReserve = commonElevationGroups.reduce((prev, curr) => {
                             const prevGroup = groups.find((group) => group.id === prev);
                             const currGroup = groups.find((group) => group.id === curr);
                             return prevGroup.ltvPct > currGroup.ltvPct ? prev : curr;
                         });
-                        const eModeGroup = groups.find((group) => group.id === eModeGroupWithMaxLtv).id;
+                        const eModeGroup = groups.find((group) => group.id === eModeGroupWithMaxLtvAndDebtReserve).id;
                         console.log('Setting eModeGroup to', eModeGroup);
                         if (eModeGroup !== 0 && eModeGroup !== ((_a = this.obligation) === null || _a === void 0 ? void 0 : _a.state.elevationGroup)) {
                             this.addRequestElevationIx(eModeGroup, false);
@@ -932,8 +946,8 @@ class KaminoAction {
             }
         });
     }
-    addSupportIxs(action, includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, twoTokenAction = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    addSupportIxs(action_1, includeAtaIxns_1, requestElevationGroup_1, includeUserMetadata_1, addInitObligationForFarm_1) {
+        return __awaiter(this, arguments, void 0, function* (action, includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, twoTokenAction = false) {
             if (!['mint', 'redeem'].includes(action)) {
                 const [, ownerUserMetadata] = yield this.kaminoMarket.getUserMetadata(this.owner);
                 if (!ownerUserMetadata && includeUserMetadata) {
@@ -1139,8 +1153,8 @@ class KaminoAction {
         this.cleanupIxs.splice(this.cleanupIxs.length - 1, 0, ...this.refreshFarmsCleanupTxnIxs);
         this.cleanupIxsLabels.splice(this.cleanupIxsLabels.length - 1, 0, ...this.refreshFarmsCleanupTxnIxsLabels);
     }
-    addInitObligationForFarm(reserve, mode, addToSetupIxs = true) {
-        return __awaiter(this, void 0, void 0, function* () {
+    addInitObligationForFarm(reserve_1, mode_1) {
+        return __awaiter(this, arguments, void 0, function* (reserve, mode, addToSetupIxs = true) {
             const BASE_SEED_USER_STATE = Buffer.from('user');
             const getPda = (farm) => web3_js_1.PublicKey.findProgramAddressSync([BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()], farms_sdk_1.farmsId)[0];
             const farms = [];
@@ -1234,8 +1248,8 @@ class KaminoAction {
             this.setupIxsLabels.push(`initUserMetadata[${userMetadataAddress.toString()}]`);
         });
     }
-    addInitReferrerTokenStateIxs(reservesArr = []) {
-        return __awaiter(this, void 0, void 0, function* () {
+    addInitReferrerTokenStateIxs() {
+        return __awaiter(this, arguments, void 0, function* (reservesArr = []) {
             if (this.referrer.equals(web3_js_1.PublicKey.default)) {
                 return;
             }
@@ -1287,8 +1301,8 @@ class KaminoAction {
         this.setupIxsLabels.push(`AddComputeBudget[${units}]`);
     }
     addAtaIxs(action) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             if (this.mint.equals(utils_1.WRAPPED_SOL_MINT) || ((_a = this.secondaryMint) === null || _a === void 0 ? void 0 : _a.equals(utils_1.WRAPPED_SOL_MINT))) {
                 yield this.updateWSOLAccount(action);
             }
@@ -1386,8 +1400,8 @@ class KaminoAction {
         });
     }
     updateWSOLAccount(action) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const preIxs = [];
             const postIxs = [];
             const preIxsLabels = [];
@@ -1431,7 +1445,7 @@ class KaminoAction {
             });
             preIxs.push(transferLamportsIx);
             preIxsLabels.push(`TransferLamportsToUserAtaSOL[${userTokenAccountAddress}]`);
-            const closeWSOLAccountIx = (0, token_1.createCloseAccountInstruction)(userTokenAccountAddress, this.owner, this.owner, spl_token_1.TOKEN_PROGRAM_ID);
+            const closeWSOLAccountIx = (0, spl_token_1.createCloseAccountInstruction)(userTokenAccountAddress, this.owner, this.owner, [], spl_token_1.TOKEN_PROGRAM_ID);
             const syncIx = (0, utils_1.syncNative)(userTokenAccountAddress);
             if (userWSOLAccountInfo) {
                 if (sendAction) {
@@ -1466,8 +1480,8 @@ class KaminoAction {
             this.cleanupIxsLabels.push(...postIxsLabels);
         });
     }
-    static initializeMultiTokenAction(kaminoMarket, action, inflowAmount, inflowTokenMint, outflowTokenMint, payer, obligationOwner, obligation, outflowAmount, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static initializeMultiTokenAction(kaminoMarket_1, action_1, inflowAmount_1, inflowTokenMint_1, outflowTokenMint_1, payer_1, obligationOwner_1, obligation_2, outflowAmount_1) {
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, action, inflowAmount, inflowTokenMint, outflowTokenMint, payer, obligationOwner, obligation, outflowAmount, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
             const inflowReserve = kaminoMarket.getReserveByMint(inflowTokenMint);
             const outflowReserve = kaminoMarket.getReserveByMint(outflowTokenMint);
             if (!outflowReserve || !inflowReserve) {
@@ -1513,8 +1527,8 @@ class KaminoAction {
             return new KaminoAction(kaminoMarket, payer, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, undefined, secondaryMint, additionalUserTokenAccountAddress, outflowReserve, outflowAmount, referrerKey);
         });
     }
-    static initializeWithdrawReferrerFees(mint, owner, kaminoMarket, currentSlot = 0, hostAta) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static initializeWithdrawReferrerFees(mint_1, owner_1, kaminoMarket_1) {
+        return __awaiter(this, arguments, void 0, function* (mint, owner, kaminoMarket, currentSlot = 0, hostAta) {
             const reserve = kaminoMarket.getReserveByMint(mint);
             if (reserve === undefined) {
                 throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);