@kamino-finance/klend-sdk 2.10.21 → 2.12.0-SNAPSHOT

package/dist/classes/action.d.ts

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

package/dist/classes/action.js

@@ -24,6 +24,7 @@ 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;
@@ -82,7 +83,7 @@ class KaminoAction {
             if (reserve === undefined) {
                 throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
             }
-            const { userTokenAccountAddress, userCollateralAccountAddress } = yield KaminoAction.getUserAccountAddresses(payer !== null && payer !== void 0 ? payer : owner, reserve.state);
+            const { userTokenAccountAddress, userCollateralAccountAddress } = 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) {
@@ -93,11 +94,9 @@ class KaminoAction {
         });
     }
     static getUserAccountAddresses(owner, reserve) {
-        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 };
-        });
+        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 };
     }
     static loadObligation(action, kaminoMarket, owner, reserve, obligation, outflowReserve) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -444,12 +443,14 @@ 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,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
@@ -462,11 +463,13 @@ 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,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
@@ -479,11 +482,13 @@ 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,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
@@ -504,7 +509,11 @@ class KaminoAction {
     }
     addBorrowIx() {
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
-        this.lendingIxs.push((0, instructions_1.borrowObligationLiquidity)({
+        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
+        });
+        const borrowIx = (0, instructions_1.borrowObligationLiquidity)({
             liquidityAmount: this.amount,
         }, {
             owner: this.owner,
@@ -512,13 +521,16 @@ 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: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-        }, this.kaminoMarket.programId));
+        }, this.kaminoMarket.programId);
+        borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
+        this.lendingIxs.push(borrowIx);
     }
     addDepositAndBorrowIx() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -532,12 +544,14 @@ 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,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId));
             if (!this.outflowReserve) {
@@ -549,7 +563,14 @@ class KaminoAction {
             if (!this.outflowAmount) {
                 throw new Error(`outflowAmount not set`);
             }
-            this.lendingIxs.push((0, instructions_1.borrowObligationLiquidity)({
+            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)({
                 liquidityAmount: this.outflowAmount,
             }, {
                 owner: this.owner,
@@ -557,13 +578,16 @@ 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: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
+            }, this.kaminoMarket.programId);
+            borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
+            this.lendingIxs.push(borrowIx);
         });
     }
     addRepayAndWithdrawIxs() {
@@ -577,9 +601,10 @@ class KaminoAction {
                 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: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId));
             if (!this.outflowReserve) {
@@ -602,12 +627,14 @@ 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,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId));
         });
@@ -627,12 +654,14 @@ 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,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             }, this.kaminoMarket.programId));
         });
@@ -640,18 +669,25 @@ class KaminoAction {
     addRepayIx() {
         return __awaiter(this, void 0, void 0, function* () {
             this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
-            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.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: spl_token_1.TOKEN_PROGRAM_ID,
+                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);
         });
     }
     addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
@@ -663,11 +699,14 @@ class KaminoAction {
             if (!this.additionalTokenAccountAddress) {
                 throw Error(`Liquidating token account address is not defined`);
             }
-            this.lendingIxs.push((0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
+            const depositReservesList = this.getAdditionalDepositReservesList();
+            const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+                return { pubkey: reserve, isSigner: false, isWritable: true };
+            });
+            const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateral)({
                 liquidityAmount: this.amount,
                 // TODO: Configure this when updating liquidator with new interface
-                minAcceptableReceivedCollateralAmount: this.outflowAmount || new bn_js_1.default(0),
-                // TODO: remove this before going live
+                minAcceptableReceivedLiquidityAmount: this.outflowAmount || new bn_js_1.default(0),
                 maxAllowedLtvOverridePercent: new bn_js_1.default(maxAllowedLtvOverridePercent),
             }, {
                 liquidator: this.owner,
@@ -675,8 +714,10 @@ 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,
@@ -684,9 +725,13 @@ class KaminoAction {
                 userDestinationCollateral: this.userCollateralAccountAddress,
                 userDestinationLiquidity: this.userTokenAccountAddress,
                 withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+                withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            }, this.kaminoMarket.programId));
+            }, this.kaminoMarket.programId);
+            liquidateIx.keys = liquidateIx.keys.concat([...depositReserveAccountMetas]);
+            this.lendingIxs.push(liquidateIx);
         });
     }
     addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, isClosingPosition = false) {
@@ -957,20 +1002,7 @@ class KaminoAction {
             lendingMarket: marketAddress,
             obligation: obligationPda,
         }, this.kaminoMarket.programId);
-        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 depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
         });
@@ -1012,20 +1044,7 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
         };
         const requestElevationGroupIx = (0, instructions_1.requestElevationGroup)(args, accounts, this.kaminoMarket.programId);
-        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 depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
         });
@@ -1092,7 +1111,6 @@ 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);
@@ -1153,7 +1171,6 @@ 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);
@@ -1187,7 +1204,6 @@ 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);
@@ -1256,11 +1272,12 @@ 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: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram: this.reserve.getLiquidityTokenProgram(),
         }, this.kaminoMarket.programId);
         this.lendingIxs.push(withdrawReferrerFeesIx);
         this.lendingIxsLabels.push(`WithdrawReferrerFeesIx[${this.owner.toString()}]`);
@@ -1278,7 +1295,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] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.userTokenAccountAddress);
+                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
                     if (this.positions === exports.POSITION_LIMIT && this.hostAta) {
                         this.preTxnIxs.push(createUserTokenAccountIx);
                         this.preTxnIxsLabels.push(`CreateLiquidityUserAta[${this.owner}]`);
@@ -1295,7 +1312,7 @@ class KaminoAction {
                     throw new Error(`Outflow reserve state not found ${this.mint}`);
                 }
                 if (!userTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.userTokenAccountAddress);
+                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), 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()}]`);
@@ -1309,7 +1326,7 @@ class KaminoAction {
                     .getConnection()
                     .getAccountInfo(this.userCollateralAccountAddress);
                 if (!userCollateralAccountInfo) {
-                    const [, createUserCollateralAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, this.userCollateralAccountAddress);
+                    const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, 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()}]`);
@@ -1335,7 +1352,7 @@ class KaminoAction {
                     .getConnection()
                     .getAccountInfo(this.additionalTokenAccountAddress);
                 if (!additionalUserTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.additionalTokenAccountAddress);
+                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.additionalTokenAccountAddress);
                     this.setupIxs.unshift(createUserTokenAccountIx);
                     this.setupIxsLabels.unshift(`CreateAdditionalUserTokenAta[${this.owner}]`);
                 }
@@ -1344,7 +1361,7 @@ class KaminoAction {
                 const userTokenAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
                 // TODO: Might need to remove this
                 if (!userTokenAccountInfo) {
-                    const [, createUserTokenAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.userTokenAccountAddress);
+                    const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
                     this.preTxnIxs.push(createUserTokenAccountIx);
                     this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
                 }
@@ -1355,7 +1372,7 @@ class KaminoAction {
                     .getAccountInfo(this.userCollateralAccountAddress);
                 if (!userCollateralAccountInfo) {
                     const collateralMintPubkey = this.reserve.getCTokenMint();
-                    const [, createUserCollateralAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, collateralMintPubkey, this.owner, this.userCollateralAccountAddress);
+                    const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, collateralMintPubkey, this.owner, spl_token_1.TOKEN_PROGRAM_ID, 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()}]`);
@@ -1401,7 +1418,7 @@ class KaminoAction {
                 userTokenAccountAddress = this.additionalTokenAccountAddress;
             }
             const userWSOLAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(userTokenAccountAddress);
-            const rentExempt = yield spl_token_1.Token.getMinBalanceRentForExemptAccount(this.kaminoMarket.getConnection());
+            const rentExempt = yield this.kaminoMarket.getConnection().getMinimumBalanceForRentExemption(165);
             // Add rent exemption lamports for WSOL accounts that need to be pre-funded for inflow/send transactions
             const sendAction = action === 'deposit' ||
                 action === 'repay' ||
@@ -1414,7 +1431,7 @@ class KaminoAction {
             });
             preIxs.push(transferLamportsIx);
             preIxsLabels.push(`TransferLamportsToUserAtaSOL[${userTokenAccountAddress}]`);
-            const closeWSOLAccountIx = spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, userTokenAccountAddress, this.owner, this.owner, []);
+            const closeWSOLAccountIx = (0, 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) {
@@ -1427,7 +1444,7 @@ class KaminoAction {
                 }
             }
             else {
-                const [, createUserWSOLAccountIx] = yield (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, spl_token_1.NATIVE_MINT, this.owner, userTokenAccountAddress);
+                const [, createUserWSOLAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, spl_token_1.NATIVE_MINT, this.owner, spl_token_1.TOKEN_PROGRAM_ID, userTokenAccountAddress);
                 preIxs.push(createUserWSOLAccountIx);
                 preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
                 preIxs.push(syncIx);
@@ -1456,8 +1473,8 @@ class KaminoAction {
             if (!outflowReserve || !inflowReserve) {
                 throw new Error('reserve states are not fetched');
             }
-            const { userTokenAccountAddress: userOutflowTokenAccountAddress, userCollateralAccountAddress: userOutflowCollateralAccountAddress, } = yield KaminoAction.getUserAccountAddresses(payer, outflowReserve.state);
-            const { userTokenAccountAddress: userInflowTokenAccountAddress, userCollateralAccountAddress: userInflowCollateralAccountAddress, } = yield KaminoAction.getUserAccountAddresses(payer, inflowReserve.state);
+            const { userTokenAccountAddress: userOutflowTokenAccountAddress, userCollateralAccountAddress: userOutflowCollateralAccountAddress, } = KaminoAction.getUserAccountAddresses(payer, outflowReserve.state);
+            const { userTokenAccountAddress: userInflowTokenAccountAddress, userCollateralAccountAddress: userInflowCollateralAccountAddress, } = 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) {
@@ -1517,6 +1534,23 @@ 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