@kamino-finance/klend-sdk 7.3.10-beta.0 → 7.4.0-beta.1

package/dist/classes/action.js

@@ -82,14 +82,15 @@ class KaminoAction {
         this.referrer = referrer;
         this.currentSlot = currentSlot;
     }
-    static async initialize(action, amount, mint, owner, kaminoMarket, obligation, referrer = (0, kit_1.none)(), currentSlot = 0n, payer = owner) {
-        const reserve = kaminoMarket.getReserveByMint(mint);
+    static async initialize(props) {
+        const { kaminoMarket, action, amount, reserveAddress, owner, obligation, referrer = (0, kit_1.none)(), currentSlot = 0n, payer = owner, } = props;
+        const reserve = kaminoMarket.getReserveByAddress(reserveAddress);
         if (reserve === undefined) {
-            throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress()}`);
+            throw new Error(`Reserve ${reserveAddress} not found in market ${kaminoMarket.getAddress()}`);
         }
         const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = await KaminoAction.loadObligation(action, kaminoMarket, owner.address, reserve.address, obligation);
         const referrerKey = await this.getReferrerKey(kaminoMarket, owner.address, kaminoObligation, referrer);
-        return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, mint, distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, undefined, undefined, undefined, referrerKey, payer);
+        return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, reserve.getLiquidityMint(), distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, undefined, undefined, undefined, referrerKey, payer);
     }
     static async getUserAccountAddresses(owner, reserve) {
         const [userTokenAccountAddress, userCollateralAccountAddress] = await Promise.all([
@@ -134,30 +135,45 @@ class KaminoAction {
             distinctReserveCount,
         };
     }
-    static async buildRefreshObligationTxns(kaminoMarket, payer, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    currentSlot = 0n) {
+    static async buildRefreshObligationTxns(props) {
+        const { kaminoMarket, payer, obligation, extraComputeBudget = 1_000_000, currentSlot = 0n } = props;
         //  placeholder for action initialization
         const firstReserve = obligation.getDeposits()[0].reserveAddress;
         const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
         if (!firstKaminoReserve) {
             throw new Error(`Reserve ${firstReserve} not found`);
         }
-        const axn = await KaminoAction.initialize('refreshObligation', '0', firstKaminoReserve?.getLiquidityMint(), (0, signer_1.noopSigner)(obligation.state.owner), // owner does not need to sign for refresh
-        kaminoMarket, obligation, undefined, currentSlot);
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'refreshObligation',
+            amount: '0',
+            reserveAddress: firstKaminoReserve.address,
+            owner: (0, signer_1.noopSigner)(obligation.state.owner), // owner does not need to sign for refresh
+            obligation,
+            currentSlot,
+        });
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
         }
         await axn.addRefreshObligation(payer);
         return axn;
     }
-    static async buildRequestElevationGroupTxns(kaminoMarket, owner, obligation, elevationGroup, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    currentSlot = 0n) {
+    static async buildRequestElevationGroupTxns(props) {
+        const { kaminoMarket, owner, obligation, elevationGroup, extraComputeBudget = 1_000_000, currentSlot = 0n } = props;
         const firstReserve = obligation.state.deposits.find((x) => x.depositReserve !== utils_1.DEFAULT_PUBLIC_KEY).depositReserve;
         const firstKaminoReserve = kaminoMarket.getReserveByAddress(firstReserve);
         if (!firstKaminoReserve) {
             throw new Error(`Reserve ${firstReserve} not found`);
         }
-        const axn = await KaminoAction.initialize('requestElevationGroup', '0', firstKaminoReserve?.getLiquidityMint(), owner, kaminoMarket, obligation, undefined, currentSlot);
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'requestElevationGroup',
+            amount: '0',
+            reserveAddress: firstKaminoReserve.address,
+            owner,
+            obligation,
+            currentSlot,
+        });
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
         }
@@ -165,15 +181,18 @@ class KaminoAction {
         await axn.addRequestElevationIx(elevationGroup, 'setup');
         return axn;
     }
-    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, // to be requested *before* the deposit
-    initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)(), currentSlot = 0n, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
-    ) {
-        const axn = await KaminoAction.initialize('deposit', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+    static async buildDepositTxns(props) {
+        const { kaminoMarket, amount, reserveAddress, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), currentSlot = 0n, overrideElevationGroupRequest, } = props;
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'deposit',
+            amount,
+            reserveAddress,
+            owner,
+            obligation,
+            referrer,
+            currentSlot,
+        });
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
@@ -195,14 +214,18 @@ class KaminoAction {
             this.setupIxs.unshift(refreshIx);
         }
     }
-    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)(), currentSlot = 0n, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
-    ) {
-        const axn = await KaminoAction.initialize('borrow', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+    static async buildBorrowTxns(props) {
+        const { kaminoMarket, amount, reserveAddress, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), currentSlot = 0n, overrideElevationGroupRequest, } = props;
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'borrow',
+            amount,
+            reserveAddress,
+            owner,
+            obligation,
+            referrer,
+            currentSlot,
+        });
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
@@ -224,10 +247,18 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, referrer = (0, kit_1.none)(), currentSlot = 0n) {
-        const axn = await KaminoAction.initialize('mint', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+    static async buildDepositReserveLiquidityTxns(props) {
+        const { kaminoMarket, amount, reserveAddress, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, referrer = (0, kit_1.none)(), currentSlot = 0n, } = props;
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'mint',
+            amount,
+            reserveAddress,
+            owner,
+            obligation,
+            referrer,
+            currentSlot,
+        });
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
@@ -237,10 +268,18 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, referrer = (0, kit_1.none)(), currentSlot = 0n) {
-        const axn = await KaminoAction.initialize('redeem', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+    static async buildRedeemReserveCollateralTxns(props) {
+        const { kaminoMarket, amount, reserveAddress, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, referrer = (0, kit_1.none)(), currentSlot = 0n, } = props;
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'redeem',
+            amount,
+            reserveAddress,
+            owner,
+            obligation,
+            referrer,
+            currentSlot,
+        });
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
@@ -250,13 +289,18 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)(), currentSlot = 0n) {
-        const axn = await KaminoAction.initialize('depositCollateral', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+    static async buildDepositObligationCollateralTxns(props) {
+        const { kaminoMarket, amount, reserveAddress, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), currentSlot = 0n, } = props;
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'depositCollateral',
+            amount,
+            reserveAddress,
+            owner,
+            obligation,
+            referrer,
+            currentSlot,
+        });
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
@@ -271,13 +315,9 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)(), currentSlot = 0n) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, owner, owner.address, obligation, borrowAmount, referrer, currentSlot);
+    static async buildDepositAndBorrowTxns(props) {
+        const { kaminoMarket, depositAmount, depositReserveAddress, borrowAmount, borrowReserveAddress, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), currentSlot = 0n, } = props;
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositReserveAddress, borrowReserveAddress, owner, owner.address, obligation, borrowAmount, referrer, currentSlot);
         const addInitObligationForFarmForDeposit = true;
         const addInitObligationForFarmForBorrow = false;
         const twoTokenAction = true;
@@ -321,13 +361,9 @@ class KaminoAction {
         }
         return axn;
     }
-    static async buildDepositAndWithdrawV2Txns(kaminoMarket, depositAmount, depositMint, withdrawAmount, withdrawMint, owner, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)()) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndWithdraw', depositAmount, depositMint, withdrawMint, owner, owner.address, obligation, withdrawAmount, referrer, currentSlot);
+    static async buildDepositAndWithdrawV2Txns(props) {
+        const { kaminoMarket, depositAmount, depositReserveAddress, withdrawAmount, withdrawReserveAddress, owner, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), } = props;
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndWithdraw', depositAmount, depositReserveAddress, withdrawReserveAddress, owner, owner.address, obligation, withdrawAmount, referrer, currentSlot);
         const addInitObligationForFarm = true;
         const twoTokenAction = true;
         if (extraComputeBudget > 0) {
@@ -338,13 +374,9 @@ class KaminoAction {
         await axn.addDepositAndWithdrawV2Ixs(withdrawCollateralAmount);
         return axn;
     }
-    static async buildRepayAndWithdrawV2Txns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)()) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdrawV2', repayAmount, repayMint, withdrawMint, payer, payer.address, obligation, withdrawAmount, referrer, currentSlot);
+    static async buildRepayAndWithdrawV2Txns(props) {
+        const { kaminoMarket, repayAmount, repayReserveAddress, withdrawAmount, withdrawReserveAddress, payer, currentSlot, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), } = props;
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdrawV2', repayAmount, repayReserveAddress, withdrawReserveAddress, payer, payer.address, obligation, withdrawAmount, referrer, currentSlot);
         const addInitObligationForFarm = true;
         const twoTokenAction = true;
         if (extraComputeBudget > 0) {
@@ -355,13 +387,9 @@ class KaminoAction {
         await axn.addRepayAndWithdrawV2Ixs(withdrawCollateralAmount);
         return axn;
     }
-    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)()) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer.address, obligation, withdrawAmount, referrer, currentSlot);
+    static async buildRepayAndWithdrawTxns(props) {
+        const { kaminoMarket, repayAmount, repayReserveAddress, withdrawAmount, withdrawReserveAddress, payer, currentSlot, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), } = props;
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayReserveAddress, withdrawReserveAddress, payer, payer.address, obligation, withdrawAmount, referrer, currentSlot);
         const addInitObligationForFarmForRepay = true;
         const addInitObligationForFarmForWithdraw = false;
         const twoTokenAction = true;
@@ -399,16 +427,18 @@ class KaminoAction {
         }
         return axn;
     }
-    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup = false, // to be requested *after* the withdraw
-    initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)(), currentSlot = 0n, overrideElevationGroupRequest, 
-    // Optional customizations which may be needed if the obligation was mutated by some previous ix.
-    obligationCustomizations) {
-        const axn = await KaminoAction.initialize('withdraw', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
+    static async buildWithdrawTxns(props) {
+        const { kaminoMarket, amount, reserveAddress, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), currentSlot = 0n, overrideElevationGroupRequest, obligationCustomizations, } = props;
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'withdraw',
+            amount,
+            reserveAddress,
+            owner,
+            obligation,
+            referrer,
+            currentSlot,
+        });
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
@@ -426,27 +456,22 @@ class KaminoAction {
         return axn;
     }
     /**
-     *
-     * @param kaminoMarket
-     * @param amount
-     * @param mint
-     * @param owner
-     * @param obligation - obligation to repay or the PDA seeds
-     * @param useV2Ixs
-     * @param scopeRefreshConfig
-     * @param currentSlot
-     * @param payer - if not set then owner is used
-     * @param extraComputeBudget - if > 0 then adds the ix
-     * @param includeAtaIxs - if true it includes create and close wsol and token atas
-     * @param requestElevationGroup
-     * @param initUserMetadata
-     * @param referrer
+     * Build repay transactions
+     * @param props - BuildRepayTxnsProps containing all required and optional parameters
      */
-    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, currentSlot, payer = owner, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)()) {
-        const axn = await KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, payer);
+    static async buildRepayTxns(props) {
+        const { kaminoMarket, amount, reserveAddress, owner, obligation, useV2Ixs, scopeRefreshConfig, currentSlot, payer = owner, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), } = props;
+        const axn = await KaminoAction.initialize({
+            kaminoMarket,
+            action: 'repay',
+            amount,
+            reserveAddress,
+            owner,
+            obligation,
+            referrer,
+            currentSlot,
+            payer,
+        });
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
@@ -461,13 +486,9 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, useV2Ixs, scopeRefreshConfig = undefined, extraComputeBudget = 1_000_000, // if > 0 then adds the ix
-    includeAtaIxs = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
-    requestElevationGroup = false, initUserMetadata = {
-        skipInitialization: false,
-        skipLutCreation: false,
-    }, referrer = (0, kit_1.none)(), maxAllowedLtvOverridePercent = 0, currentSlot = 0n) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'liquidate', amount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, minCollateralReceiveAmount, referrer, currentSlot);
+    static async buildLiquidateTxns(props) {
+        const { kaminoMarket, amount, minCollateralReceiveAmount, repayReserveAddress, withdrawReserveAddress, liquidator, obligationOwner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, includeAtaIxs = true, requestElevationGroup = false, initUserMetadata = { skipInitialization: false, skipLutCreation: false }, referrer = (0, kit_1.none)(), maxAllowedLtvOverridePercent = 0, currentSlot = 0n, } = props;
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'liquidate', amount, repayReserveAddress, withdrawReserveAddress, liquidator, obligationOwner, obligation, minCollateralReceiveAmount, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIx(extraComputeBudget);
@@ -482,8 +503,9 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildWithdrawReferrerFeeTxns(owner, tokenMint, kaminoMarket, currentSlot = 0n) {
-        const { axn, createAtaIxs } = await KaminoAction.initializeWithdrawReferrerFees(tokenMint, owner, kaminoMarket, currentSlot);
+    static async buildWithdrawReferrerFeeTxns(props) {
+        const { owner, reserveAddress, kaminoMarket, currentSlot = 0n } = props;
+        const { axn, createAtaIxs } = await KaminoAction.initializeWithdrawReferrerFees(reserveAddress, owner, kaminoMarket, currentSlot);
         axn.setupIxs.push(...createAtaIxs);
         axn.setupIxsLabels.push(`createAtasIxs[${axn.owner.toString()}]`);
         if ((0, kit_1.isSome)(axn.referrer)) {
@@ -2002,8 +2024,11 @@ class KaminoAction {
             action === 'repayAndWithdrawV2' ||
             action === 'mint' ||
             (action === 'liquidate' && this.mint === utils_1.WRAPPED_SOL_MINT); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
+        const isValidTokenAccount = userWSOLAccountInfo.exists &&
+            (userWSOLAccountInfo.programAddress === token_1.TOKEN_PROGRAM_ADDRESS ||
+                userWSOLAccountInfo.programAddress === token_2022_1.TOKEN_2022_PROGRAM_ADDRESS);
         const transferLamportsIx = (0, system_1.getTransferSolInstruction)({
-            amount: (userWSOLAccountInfo.exists ? 0n : rentExemptLamports) + (sendAction ? BigInt(safeRepay.toString()) : 0n),
+            amount: (isValidTokenAccount ? 0n : rentExemptLamports) + (sendAction ? BigInt(safeRepay.toString()) : 0n),
             source: this.owner,
             destination: userTokenAccountAddress,
         });
@@ -2017,33 +2042,21 @@ class KaminoAction {
         const syncIx = (0, token_2022_1.getSyncNativeInstruction)({
             account: userTokenAccountAddress,
         }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS });
-        if (userWSOLAccountInfo.exists) {
-            if (sendAction) {
-                preIxs.push(syncIx);
-                preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
-            }
-            else {
-                postIxs.push(closeWSOLAccountIx);
-                postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
-            }
-        }
-        else {
-            const [, createUserWSOLAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, utils_1.WRAPPED_SOL_MINT, this.owner.address, token_1.TOKEN_PROGRAM_ADDRESS, userTokenAccountAddress);
-            preIxs.push(createUserWSOLAccountIx);
-            preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
-            preIxs.push(syncIx);
-            preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
-            postIxs.push(closeWSOLAccountIx);
-            postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
-        }
+        const [, createUserWSOLAccountIx] = await (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, utils_1.WRAPPED_SOL_MINT, this.owner.address, token_1.TOKEN_PROGRAM_ADDRESS, userTokenAccountAddress);
+        preIxs.push(createUserWSOLAccountIx);
+        preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
+        preIxs.push(syncIx);
+        preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
+        postIxs.push(closeWSOLAccountIx);
+        postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
         this.setupIxs.unshift(...preIxs);
         this.setupIxsLabels.unshift(...preIxsLabels);
         this.cleanupIxs.push(...postIxs);
         this.cleanupIxsLabels.push(...postIxsLabels);
     }
-    static async initializeMultiTokenAction(kaminoMarket, action, inflowAmount, inflowTokenMint, outflowTokenMint, signer, obligationOwner, obligation, outflowAmount, referrer = (0, kit_1.none)(), currentSlot = 0n) {
-        const inflowReserve = kaminoMarket.getExistingReserveByMint(inflowTokenMint);
-        const outflowReserve = kaminoMarket.getExistingReserveByMint(outflowTokenMint);
+    static async initializeMultiTokenAction(kaminoMarket, action, inflowAmount, inflowReserveAddress, outflowReserveAddress, signer, obligationOwner, obligation, outflowAmount, referrer = (0, kit_1.none)(), currentSlot = 0n) {
+        const inflowReserve = kaminoMarket.getExistingReserveByAddress(inflowReserveAddress);
+        const outflowReserve = kaminoMarket.getExistingReserveByAddress(outflowReserveAddress);
         const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = await KaminoAction.loadObligation(action, kaminoMarket, obligationOwner, inflowReserve.address, obligation, outflowReserve.address);
         const referrerKey = await this.getReferrerKey(kaminoMarket, signer.address, kaminoObligation, referrer);
         let secondaryMint;
@@ -2052,18 +2065,18 @@ class KaminoAction {
             action === 'depositAndBorrow' ||
             action === 'repayAndWithdraw' ||
             action === 'repayAndWithdrawV2') {
-            primaryMint = inflowTokenMint;
-            secondaryMint = outflowTokenMint;
+            primaryMint = inflowReserve.getLiquidityMint();
+            secondaryMint = outflowReserve.getLiquidityMint();
         }
         else {
             throw new Error('Invalid action');
         }
         return new KaminoAction(kaminoMarket, signer, kaminoObligation || obligation, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, secondaryMint, outflowReserve, outflowAmount, referrerKey);
     }
-    static async initializeWithdrawReferrerFees(mint, owner, kaminoMarket, currentSlot = 0n) {
-        const reserve = kaminoMarket.getReserveByMint(mint);
+    static async initializeWithdrawReferrerFees(reserveAddress, owner, kaminoMarket, currentSlot = 0n) {
+        const reserve = kaminoMarket.getReserveByAddress(reserveAddress);
         if (reserve === undefined) {
-            throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress()}`);
+            throw new Error(`Reserve ${reserveAddress} not found in market ${kaminoMarket.getAddress()}`);
         }
         const [{ createAtaIx }] = await (0, utils_1.createAtasIdempotent)(owner, [
             {
@@ -2072,7 +2085,7 @@ class KaminoAction {
             },
         ]);
         return {
-            axn: new KaminoAction(kaminoMarket, owner, new ObligationType_1.VanillaObligation(kaminoMarket.programId), mint, 0, new bn_js_1.default(0), [], [], reserve, currentSlot, undefined, undefined, undefined, undefined, undefined),
+            axn: new KaminoAction(kaminoMarket, owner, new ObligationType_1.VanillaObligation(kaminoMarket.programId), reserve.getLiquidityMint(), 0, new bn_js_1.default(0), [], [], reserve, currentSlot, undefined, undefined, undefined, undefined, undefined),
             createAtaIxs: [createAtaIx],
         };
     }