@kamino-finance/klend-sdk 2.11.0 → 2.12.0-SNAPSHOT.2

package/dist/classes/action.js

@@ -76,13 +76,13 @@ 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()}`);
             }
-            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 +93,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* () {
@@ -144,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);
@@ -161,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) {
@@ -178,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) {
@@ -194,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) {
@@ -210,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) {
@@ -226,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) {
@@ -242,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) {
@@ -258,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;
@@ -277,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;
@@ -296,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) {
@@ -327,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) {
@@ -340,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) {
@@ -356,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()}]`);
@@ -444,12 +442,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,
+            reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
             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 +462,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 +481,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));
     }
@@ -516,11 +520,12 @@ 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);
         borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
@@ -538,12 +543,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,
+                reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
                 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) {
@@ -570,11 +577,12 @@ 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);
             borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
@@ -592,9 +600,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) {
@@ -617,12 +626,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));
         });
@@ -642,12 +653,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));
         });
@@ -666,17 +679,18 @@ 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);
             repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
             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) {
             this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
             if (!this.outflowReserve) {
                 throw Error(`Withdraw reserve during liquidation is not defined`);
@@ -699,8 +713,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,
@@ -708,15 +724,17 @@ 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);
             liquidateIx.keys = liquidateIx.keys.concat([...depositReserveAccountMetas]);
             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);
         });
     }
@@ -730,9 +748,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);
@@ -913,8 +931,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) {
@@ -1092,7 +1110,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);
@@ -1121,8 +1138,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 = [];
@@ -1153,7 +1170,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 +1203,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);
@@ -1218,8 +1233,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;
             }
@@ -1256,11 +1271,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()}]`);
@@ -1270,15 +1286,15 @@ 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);
             }
             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 +1311,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 +1325,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 +1351,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 +1360,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 +1371,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()}]`);
@@ -1369,8 +1385,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 = [];
@@ -1401,7 +1417,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 +1430,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, 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) {
@@ -1427,7 +1443,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);
@@ -1449,15 +1465,15 @@ 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) {
                 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) {
@@ -1496,8 +1512,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()}`);