@kamino-finance/klend-sdk 2.12.1 → 2.12.2-kv-beta

package/dist/classes/action.d.ts

@@ -153,5 +153,4 @@ export declare class KaminoAction {
         createAtasIxns: TransactionInstruction[];
     }>;
     getObligationPda(): PublicKey;
-    getAdditionalDepositReservesList(): PublicKey[];
 }

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;
@@ -83,7 +82,7 @@ class KaminoAction {
             if (reserve === undefined) {
                 throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
             }
-            const { userTokenAccountAddress, userCollateralAccountAddress } = KaminoAction.getUserAccountAddresses(payer !== null && payer !== void 0 ? payer : owner, reserve.state);
+            const { userTokenAccountAddress, userCollateralAccountAddress } = yield KaminoAction.getUserAccountAddresses(payer !== null && payer !== void 0 ? payer : owner, reserve.state);
             const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = yield KaminoAction.loadObligation(action, kaminoMarket, owner, reserve.address, obligation);
             const [_, userMetadata] = yield kaminoMarket.getUserMetadata(owner);
             if (userMetadata) {
@@ -94,9 +93,11 @@ class KaminoAction {
         });
     }
     static getUserAccountAddresses(owner, reserve) {
-        const userTokenAccountAddress = (0, utils_1.getAssociatedTokenAddress)(reserve.liquidity.mintPubkey, owner, true, reserve.liquidity.tokenProgram, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
-        const userCollateralAccountAddress = (0, utils_1.getAssociatedTokenAddress)(reserve.collateral.mintPubkey, owner, true, spl_token_1.TOKEN_PROGRAM_ID, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
-        return { userTokenAccountAddress, userCollateralAccountAddress };
+        return __awaiter(this, void 0, void 0, function* () {
+            const userTokenAccountAddress = yield spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, reserve.liquidity.mintPubkey, owner, true);
+            const userCollateralAccountAddress = yield spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, reserve.collateral.mintPubkey, owner, true);
+            return { userTokenAccountAddress, userCollateralAccountAddress };
+        });
     }
     static loadObligation(action, kaminoMarket, owner, reserve, obligation, outflowReserve) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -443,14 +444,12 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
             lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
             reserve: this.reserve.address,
-            reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
             reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault,
             userSourceLiquidity: this.userTokenAccountAddress,
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
@@ -463,13 +462,11 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
             lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
             reserve: this.reserve.address,
-            reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
             userSourceLiquidity: this.userTokenAccountAddress,
             userDestinationCollateral: this.userCollateralAccountAddress,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
@@ -482,13 +479,11 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
             lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
             reserve: this.reserve.address,
-            reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
             userSourceCollateral: this.userCollateralAccountAddress,
             userDestinationLiquidity: this.userTokenAccountAddress,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
@@ -508,13 +503,8 @@ class KaminoAction {
         }, this.kaminoMarket.programId));
     }
     addBorrowIx() {
-        var _a;
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
-        const depositReservesList = this.getAdditionalDepositReservesList();
-        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
+        this.lendingIxs.push((0, instructions_1.borrowObligationLiquidity)({
             liquidityAmount: this.amount,
         }, {
             owner: this.owner,
@@ -522,18 +512,13 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
             lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
             borrowReserve: this.reserve.address,
-            borrowReserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveSourceLiquidity: this.reserve.state.liquidity.supplyVault,
             userDestinationLiquidity: this.userTokenAccountAddress,
             borrowReserveLiquidityFeeReceiver: this.reserve.state.liquidity.feeVault,
             referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.reserve.address, this.kaminoMarket.programId)[0],
-            tokenProgram: this.reserve.getLiquidityTokenProgram(),
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-        }, this.kaminoMarket.programId);
-        borrowIx.keys = ((_a = this.obligation) === null || _a === void 0 ? void 0 : _a.state.elevationGroup)
-            ? borrowIx.keys.concat([...depositReserveAccountMetas])
-            : borrowIx.keys;
-        this.lendingIxs.push(borrowIx);
+        }, this.kaminoMarket.programId));
     }
     addDepositAndBorrowIx() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -547,14 +532,12 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
                 reserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
                 reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
                 reserveCollateralMint: this.reserve.getCTokenMint(),
                 reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault,
                 userSourceLiquidity: this.userTokenAccountAddress,
                 placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId));
             if (!this.outflowReserve) {
@@ -566,14 +549,7 @@ class KaminoAction {
             if (!this.outflowAmount) {
                 throw new Error(`outflowAmount not set`);
             }
-            const depositReservesList = this.getAdditionalDepositReservesList();
-            if (depositReservesList.length === 0) {
-                depositReservesList.push(this.reserve.address);
-            }
-            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-                return { pubkey: reserve, isSigner: false, isWritable: true };
-            });
-            const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
+            this.lendingIxs.push((0, instructions_1.borrowObligationLiquidity)({
                 liquidityAmount: this.outflowAmount,
             }, {
                 owner: this.owner,
@@ -581,41 +557,31 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
                 borrowReserve: this.outflowReserve.address,
-                borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
                 reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
                 userDestinationLiquidity: this.additionalTokenAccountAddress,
                 borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
                 referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
-                tokenProgram: this.reserve.getLiquidityTokenProgram(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId);
-            borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
-            this.lendingIxs.push(borrowIx);
+            }, this.kaminoMarket.programId));
         });
     }
     addRepayAndWithdrawIxs() {
         return __awaiter(this, void 0, void 0, function* () {
             this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
             this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
-            const depositReservesList = this.getAdditionalDepositReservesList();
-            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-                return { pubkey: reserve, isSigner: false, isWritable: true };
-            });
-            const repayIx = (0, instructions_1.repayObligationLiquidity)({
+            this.lendingIxs.push((0, instructions_1.repayObligationLiquidity)({
                 liquidityAmount: this.amount,
             }, {
                 owner: this.owner,
                 obligation: this.getObligationPda(),
                 lendingMarket: this.kaminoMarket.getAddress(),
                 repayReserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
                 userSourceLiquidity: this.userTokenAccountAddress,
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
-                tokenProgram: this.reserve.getLiquidityTokenProgram(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId);
-            repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
-            this.lendingIxs.push(repayIx);
+            }, this.kaminoMarket.programId));
             if (!this.outflowReserve) {
                 throw new Error(`outflowReserve not set`);
             }
@@ -636,14 +602,12 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
                 withdrawReserve: this.outflowReserve.address,
-                reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
                 reserveCollateralMint: this.outflowReserve.getCTokenMint(),
                 reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
                 reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
                 userDestinationLiquidity: this.additionalTokenAccountAddress,
                 placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId));
         });
@@ -663,46 +627,34 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
                 withdrawReserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
                 reserveCollateralMint: this.reserve.getCTokenMint(),
                 reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
                 reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
                 userDestinationLiquidity: this.userTokenAccountAddress,
                 placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId));
         });
     }
     addRepayIx() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
-            const depositReservesList = this.getAdditionalDepositReservesList();
-            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-                return { pubkey: reserve, isSigner: false, isWritable: true };
-            });
-            const repayIx = (0, instructions_1.repayObligationLiquidity)({
+            this.lendingIxs.push((0, instructions_1.repayObligationLiquidity)({
                 liquidityAmount: this.amount,
             }, {
                 owner: this.payer,
                 obligation: this.getObligationPda(),
                 lendingMarket: this.kaminoMarket.getAddress(),
                 repayReserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
                 userSourceLiquidity: this.userTokenAccountAddress,
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
-                tokenProgram: this.reserve.getLiquidityTokenProgram(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId);
-            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);
+            }, this.kaminoMarket.programId));
         });
     }
     addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
             if (!this.outflowReserve) {
@@ -711,14 +663,11 @@ class KaminoAction {
             if (!this.additionalTokenAccountAddress) {
                 throw Error(`Liquidating token account address is not defined`);
             }
-            const depositReservesList = this.getAdditionalDepositReservesList();
-            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-                return { pubkey: reserve, isSigner: false, isWritable: true };
-            });
-            const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
+            this.lendingIxs.push((0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
                 liquidityAmount: this.amount,
                 // TODO: Configure this when updating liquidator with new interface
-                minAcceptableReceivedLiquidityAmount: this.outflowAmount || new bn_js_1.default(0),
+                minAcceptableReceivedCollateralAmount: this.outflowAmount || new bn_js_1.default(0),
+                // TODO: remove this before going live
                 maxAllowedLtvOverridePercent: new bn_js_1.default(maxAllowedLtvOverridePercent),
             }, {
                 liquidator: this.owner,
@@ -726,10 +675,8 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
                 repayReserve: this.reserve.address,
-                repayReserveLiquidityMint: this.reserve.getLiquidityMint(),
                 repayReserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
                 withdrawReserve: this.outflowReserve.address,
-                withdrawReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
                 withdrawReserveCollateralMint: this.outflowReserve.getCTokenMint(),
                 withdrawReserveCollateralSupply: this.outflowReserve.state.collateral.supplyVault,
                 withdrawReserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
@@ -737,16 +684,9 @@ class KaminoAction {
                 userDestinationCollateral: this.userCollateralAccountAddress,
                 userDestinationLiquidity: this.userTokenAccountAddress,
                 withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId);
-            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);
+            }, this.kaminoMarket.programId));
         });
     }
     addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, isClosingPosition = false) {
@@ -923,18 +863,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 && groups[item - 1].debtReserve.equals(this.outflowReserve.address));
+                    const commonElevationGroups = [...groupsColl].filter((item) => groupsDebt.includes(item) && item !== 0);
                     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 eModeGroupWithMaxLtvAndDebtReserve = commonElevationGroups.reduce((prev, curr) => {
+                        const eModeGroupWithMaxLtv = 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 === eModeGroupWithMaxLtvAndDebtReserve).id;
+                        const eModeGroup = groups.find((group) => group.id === eModeGroupWithMaxLtv).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);
@@ -1017,7 +957,20 @@ class KaminoAction {
             lendingMarket: marketAddress,
             obligation: obligationPda,
         }, this.kaminoMarket.programId);
-        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReservesList = this.depositReserves;
+        // check if there's any member in the preloadedDepositReserves that is not in the depositReserves
+        // if so, add it to the depositReserves
+        for (let i = 0; i < this.preLoadedDepositReservesSameTx.length; i++) {
+            const preloadedDepositReserve = this.preLoadedDepositReservesSameTx[i];
+            // Check if the depositReserves array contains the current preloadedDepositReserve
+            const found = this.depositReserves.some((depositReserve) => {
+                return depositReserve.equals(preloadedDepositReserve);
+            });
+            // If not found, push the current preloadedDepositReserve to the depositReserves array
+            if (!found) {
+                depositReservesList.push(this.preLoadedDepositReservesSameTx[i]);
+            }
+        }
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
         });
@@ -1059,7 +1012,20 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
         };
         const requestElevationGroupIx = (0, instructions_1.requestElevationGroup)(args, accounts, this.kaminoMarket.programId);
-        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReservesList = this.depositReserves;
+        // check if there's any member in the preloadedDepositReserves that is not in the depositReserves
+        // if so, add it to the depositReserves
+        for (let i = 0; i < this.preLoadedDepositReservesSameTx.length; i++) {
+            const preloadedDepositReserveString = this.preLoadedDepositReservesSameTx[i].toString();
+            // Check if the depositReserves array contains the current preloadedDepositReserve
+            const found = this.depositReserves.some((depositReserve) => {
+                return depositReserve.toString() === preloadedDepositReserveString;
+            });
+            // If not found, push the current preloadedDepositReserve to the depositReserves array
+            if (!found) {
+                depositReservesList.push(this.preLoadedDepositReservesSameTx[i]);
+            }
+        }
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
         });
@@ -1126,6 +1092,7 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 farmsProgram: farms_sdk_1.farmsId,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 systemProgram: web3_js_1.SystemProgram.programId,
             };
             const refreshFarmForObligationix = (0, instructions_1.refreshObligationFarmsForReserve)(args, accounts, this.kaminoMarket.programId);
@@ -1186,6 +1153,7 @@ class KaminoAction {
                     lendingMarket: this.kaminoMarket.getAddress(),
                     farmsProgram: farms_sdk_1.farmsId,
                     rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                     systemProgram: web3_js_1.SystemProgram.programId,
                 };
                 const initObligationForFarm = (0, instructions_1.initObligationFarmsForReserve)(args, accounts, this.kaminoMarket.programId);
@@ -1219,6 +1187,7 @@ class KaminoAction {
                     seed2Account: this.obligationType.toArgs().seed2,
                     ownerUserMetadata: userMetadataAddress,
                     rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                     systemProgram: web3_js_1.SystemProgram.programId,
                 }, this.kaminoMarket.programId);
                 this.setupIxs.push(initObligationIx);
@@ -1287,12 +1256,11 @@ class KaminoAction {
             referrer: this.owner,
             lendingMarket: this.kaminoMarket.getAddress(),
             reserve: this.reserve.address,
-            reserveLiquidityMint: this.reserve.getLiquidityMint(),
             referrerTokenState: referrerTokenStateAddress,
             reserveSupplyLiquidity: this.reserve.state.liquidity.supplyVault,
             referrerTokenAccount: this.userTokenAccountAddress,
             lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-            tokenProgram: this.reserve.getLiquidityTokenProgram(),
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         }, this.kaminoMarket.programId);
         this.lendingIxs.push(withdrawReferrerFeesIx);
         this.lendingIxsLabels.push(`WithdrawReferrerFeesIx[${this.owner.toString()}]`);
@@ -1310,7 +1278,7 @@ class KaminoAction {
             if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
                 const userTokenAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
                 if (!userTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+                    const [, createUserTokenAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.userTokenAccountAddress);
                     if (this.positions === exports.POSITION_LIMIT && this.hostAta) {
                         this.preTxnIxs.push(createUserTokenAccountIx);
                         this.preTxnIxsLabels.push(`CreateLiquidityUserAta[${this.owner}]`);
@@ -1327,7 +1295,7 @@ class KaminoAction {
                     throw new Error(`Outflow reserve state not found ${this.mint}`);
                 }
                 if (!userTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+                    const [, createUserTokenAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.userTokenAccountAddress);
                     if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
                         this.preTxnIxs.push(createUserTokenAccountIx);
                         this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
@@ -1341,7 +1309,7 @@ class KaminoAction {
                     .getConnection()
                     .getAccountInfo(this.userCollateralAccountAddress);
                 if (!userCollateralAccountInfo) {
-                    const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
+                    const [, createUserCollateralAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, this.userCollateralAccountAddress);
                     if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
                         this.preTxnIxs.push(createUserCollateralAccountIx);
                         this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
@@ -1367,7 +1335,7 @@ class KaminoAction {
                     .getConnection()
                     .getAccountInfo(this.additionalTokenAccountAddress);
                 if (!additionalUserTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.additionalTokenAccountAddress);
+                    const [, createUserTokenAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.additionalTokenAccountAddress);
                     this.setupIxs.unshift(createUserTokenAccountIx);
                     this.setupIxsLabels.unshift(`CreateAdditionalUserTokenAta[${this.owner}]`);
                 }
@@ -1376,7 +1344,7 @@ class KaminoAction {
                 const userTokenAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
                 // TODO: Might need to remove this
                 if (!userTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+                    const [, createUserTokenAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.userTokenAccountAddress);
                     this.preTxnIxs.push(createUserTokenAccountIx);
                     this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
                 }
@@ -1387,7 +1355,7 @@ class KaminoAction {
                     .getAccountInfo(this.userCollateralAccountAddress);
                 if (!userCollateralAccountInfo) {
                     const collateralMintPubkey = this.reserve.getCTokenMint();
-                    const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, collateralMintPubkey, this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
+                    const [, createUserCollateralAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, collateralMintPubkey, this.owner, this.userCollateralAccountAddress);
                     if (this.positions === exports.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
                         this.preTxnIxs.push(createUserCollateralAccountIx);
                         this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
@@ -1433,7 +1401,7 @@ class KaminoAction {
                 userTokenAccountAddress = this.additionalTokenAccountAddress;
             }
             const userWSOLAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(userTokenAccountAddress);
-            const rentExempt = yield this.kaminoMarket.getConnection().getMinimumBalanceForRentExemption(165);
+            const rentExempt = yield spl_token_1.Token.getMinBalanceRentForExemptAccount(this.kaminoMarket.getConnection());
             // Add rent exemption lamports for WSOL accounts that need to be pre-funded for inflow/send transactions
             const sendAction = action === 'deposit' ||
                 action === 'repay' ||
@@ -1446,7 +1414,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 = spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, userTokenAccountAddress, this.owner, this.owner, []);
             const syncIx = (0, utils_1.syncNative)(userTokenAccountAddress);
             if (userWSOLAccountInfo) {
                 if (sendAction) {
@@ -1459,7 +1427,7 @@ class KaminoAction {
                 }
             }
             else {
-                const [, createUserWSOLAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, spl_token_1.NATIVE_MINT, this.owner, spl_token_1.TOKEN_PROGRAM_ID, userTokenAccountAddress);
+                const [, createUserWSOLAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, spl_token_1.NATIVE_MINT, this.owner, userTokenAccountAddress);
                 preIxs.push(createUserWSOLAccountIx);
                 preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
                 preIxs.push(syncIx);
@@ -1488,8 +1456,8 @@ class KaminoAction {
             if (!outflowReserve || !inflowReserve) {
                 throw new Error('reserve states are not fetched');
             }
-            const { userTokenAccountAddress: userOutflowTokenAccountAddress, userCollateralAccountAddress: userOutflowCollateralAccountAddress, } = KaminoAction.getUserAccountAddresses(payer, outflowReserve.state);
-            const { userTokenAccountAddress: userInflowTokenAccountAddress, userCollateralAccountAddress: userInflowCollateralAccountAddress, } = KaminoAction.getUserAccountAddresses(payer, inflowReserve.state);
+            const { userTokenAccountAddress: userOutflowTokenAccountAddress, userCollateralAccountAddress: userOutflowCollateralAccountAddress, } = yield KaminoAction.getUserAccountAddresses(payer, outflowReserve.state);
+            const { userTokenAccountAddress: userInflowTokenAccountAddress, userCollateralAccountAddress: userInflowCollateralAccountAddress, } = yield KaminoAction.getUserAccountAddresses(payer, inflowReserve.state);
             const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = yield KaminoAction.loadObligation(action, kaminoMarket, obligationOwner, inflowReserve.address, obligation, outflowReserve.address);
             const [_, userMetadata] = yield kaminoMarket.getUserMetadata(payer);
             if (userMetadata) {
@@ -1549,23 +1517,6 @@ class KaminoAction {
             ? this.obligation.obligationAddress
             : this.obligationType.toPda(this.kaminoMarket.getAddress(), this.owner);
     }
-    getAdditionalDepositReservesList() {
-        const depositReservesList = this.depositReserves;
-        // check if there's any member in the preloadedDepositReserves that is not in the depositReserves
-        // if so, add it to the depositReserves
-        for (let i = 0; i < this.preLoadedDepositReservesSameTx.length; i++) {
-            const preloadedDepositReserve = this.preLoadedDepositReservesSameTx[i];
-            // Check if the depositReserves array contains the current preloadedDepositReserve
-            const found = this.depositReserves.some((depositReserve) => {
-                return depositReserve.equals(preloadedDepositReserve);
-            });
-            // If not found, push the current preloadedDepositReserve to the depositReserves array
-            if (!found) {
-                depositReservesList.push(this.preLoadedDepositReservesSameTx[i]);
-            }
-        }
-        return depositReservesList;
-    }
 }
 exports.KaminoAction = KaminoAction;
 //# sourceMappingURL=action.js.map