@kamino-finance/klend-sdk 5.11.6-beta.0 → 5.11.7

package/dist/classes/action.js

@@ -10,13 +10,12 @@ const bn_js_1 = __importDefault(require("bn.js"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const instructions_1 = require("../idl_codegen/instructions");
 const utils_1 = require("../utils");
+const market_1 = require("./market");
 const obligation_1 = require("./obligation");
 const types_1 = require("../idl_codegen/types");
 const farms_sdk_1 = require("@kamino-finance/farms-sdk");
 const ObligationType_1 = require("../utils/ObligationType");
 const lib_1 = require("../lib");
-const scope_sdk_1 = require("@kamino-finance/scope-sdk");
-const SOL_PADDING_FOR_INTEREST = new bn_js_1.default('1000000');
 class KaminoAction {
     kaminoMarket;
     reserve;
@@ -25,9 +24,6 @@ class KaminoAction {
     payer;
     obligation = null;
     referrer;
-    userTokenAccountAddress;
-    userCollateralAccountAddress;
-    additionalTokenAccountAddress;
     /**
      * Null unless the obligation is not passed
      */
@@ -47,17 +43,13 @@ class KaminoAction {
     lendingIxsLabels;
     cleanupIxs;
     cleanupIxsLabels;
-    preTxnIxs;
-    preTxnIxsLabels;
-    postTxnIxs;
-    postTxnIxsLabels;
     refreshFarmsCleanupTxnIxs;
     refreshFarmsCleanupTxnIxsLabels;
     depositReserves;
     borrowReserves;
     preLoadedDepositReservesSameTx;
     currentSlot;
-    constructor(kaminoMarket, owner, obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, positions, amount, depositReserves, borrowReserves, reserveState, currentSlot, secondaryMint, additionalTokenAccountAddress, outflowReserveState, outflowAmount, referrer, payer) {
+    constructor(kaminoMarket, owner, obligation, mint, positions, amount, depositReserves, borrowReserves, reserveState, currentSlot, secondaryMint, outflowReserveState, outflowAmount, referrer, payer) {
         if (obligation instanceof obligation_1.KaminoObligation) {
             this.obligation = obligation;
         }
@@ -70,8 +62,6 @@ class KaminoAction {
         this.amount = new bn_js_1.default(amount);
         this.mint = mint;
         this.positions = positions;
-        this.userTokenAccountAddress = userTokenAccountAddress;
-        this.userCollateralAccountAddress = userCollateralAccountAddress;
         this.computeBudgetIxs = [];
         this.computeBudgetIxsLabels = [];
         this.setupIxs = [];
@@ -82,15 +72,10 @@ class KaminoAction {
         this.lendingIxsLabels = [];
         this.cleanupIxs = [];
         this.cleanupIxsLabels = [];
-        this.preTxnIxs = [];
-        this.preTxnIxsLabels = [];
-        this.postTxnIxs = [];
-        this.postTxnIxsLabels = [];
         this.refreshFarmsCleanupTxnIxs = [];
         this.refreshFarmsCleanupTxnIxsLabels = [];
         this.depositReserves = depositReserves;
         this.borrowReserves = borrowReserves;
-        this.additionalTokenAccountAddress = additionalTokenAccountAddress;
         this.secondaryMint = secondaryMint;
         this.reserve = reserveState;
         this.outflowReserve = outflowReserveState;
@@ -104,10 +89,9 @@ class KaminoAction {
         if (reserve === undefined) {
             throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
         }
-        const { userTokenAccountAddress, userCollateralAccountAddress } = KaminoAction.getUserAccountAddresses(payer ?? owner, reserve.state);
         const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = await KaminoAction.loadObligation(action, kaminoMarket, owner, reserve.address, obligation);
         const referrerKey = await this.getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer);
-        return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, undefined, undefined, undefined, undefined, referrerKey, payer);
+        return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, mint, distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, undefined, undefined, undefined, referrerKey, payer);
     }
     static getUserAccountAddresses(owner, reserve) {
         const userTokenAccountAddress = (0, utils_1.getAssociatedTokenAddress)(reserve.liquidity.mintPubkey, owner, true, reserve.liquidity.tokenProgram, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
@@ -180,27 +164,18 @@ class KaminoAction {
         axn.addRequestElevationIx(elevationGroup, 'setup');
         return axn;
     }
-    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, // to be requested *before* the deposit
     includeUserMetadata = true, // if true it includes user metadata
-    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, 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);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-        }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, undefined, overrideElevationGroupRequest);
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, createLookupTable, undefined, overrideElevationGroupRequest);
         if (useV2Ixs) {
             axn.addDepositIxV2();
         }
@@ -210,54 +185,30 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    getTokenIdsForScopeRefresh(kaminoMarket, reserves) {
-        const tokenIds = [];
-        for (const reserveAddress of reserves) {
-            const reserve = kaminoMarket.getReserveByAddress(reserveAddress);
-            if (!reserve) {
-                throw new Error(`Reserve not found for reserve ${reserveAddress.toBase58()}`);
-            }
-            if (!reserve.state.config.tokenInfo.scopeConfiguration.priceFeed.equals(web3_js_1.PublicKey.default)) {
-                reserve.state.config.tokenInfo.scopeConfiguration.priceChain.map((x) => {
-                    if (x !== scope_sdk_1.U16_MAX) {
-                        tokenIds.push(x);
-                    }
-                });
-                reserve.state.config.tokenInfo.scopeConfiguration.twapChain.map((x) => {
-                    if (x !== scope_sdk_1.U16_MAX) {
-                        tokenIds.push(x);
-                    }
-                });
-            }
-        }
-        return tokenIds;
-    }
-    async addScopeRefreshIxs(tokens, feed = 'hubble') {
-        this.preTxnIxsLabels.unshift(`refreshScopePrices`);
-        this.preTxnIxs.unshift(await this.kaminoMarket.scope.refreshPriceListIx({
+    async addScopeRefreshIxs(scope, tokens, feed = 'hubble') {
+        this.setupIxsLabels.unshift(`refreshScopePrices`);
+        this.setupIxs.unshift(await scope.refreshPriceListIx({
             feed: feed,
         }, tokens));
     }
-    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // 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
-    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, 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);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        if (!axn.referrer.equals(web3_js_1.PublicKey.default)) {
+            const referrerTokenState = (0, utils_1.referrerTokenStatePda)(axn.referrer, axn.reserve.address, axn.kaminoMarket.programId)[0];
+            const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
+            if (!account) {
+                axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
+            }
         }
-        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, undefined, overrideElevationGroupRequest);
+        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, createLookupTable, undefined, overrideElevationGroupRequest);
         if (useV2Ixs) {
             axn.addBorrowIxV2();
         }
@@ -267,69 +218,42 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
         const axn = await KaminoAction.initialize('mint', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-        }
-        await axn.addSupportIxs('mint', includeAtaIxns, requestElevationGroup, false, addInitObligationForFarm, false, false);
+        await axn.addSupportIxs('mint', includeAtaIxns, requestElevationGroup, false, addInitObligationForFarm, false, scopeRefreshConfig, false);
         axn.addDepositReserveLiquidityIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
         const axn = await KaminoAction.initialize('redeem', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-        }
-        await axn.addSupportIxs('redeem', includeAtaIxns, requestElevationGroup, false, addInitObligationForFarm, false, false);
+        await axn.addSupportIxs('redeem', includeAtaIxns, requestElevationGroup, false, addInitObligationForFarm, false, scopeRefreshConfig, false);
         axn.addRedeemReserveCollateralIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // 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
-    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
         const axn = await KaminoAction.initialize('depositCollateral', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-        }
-        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable);
+        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, createLookupTable);
         if (useV2Ixs) {
             axn.addDepositObligationCollateralIxV2();
         }
@@ -339,10 +263,10 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // 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,
-    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
         const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, payer, payer, obligation, borrowAmount, referrer, currentSlot);
         const addInitObligationForFarmForDeposit = true;
         const addInitObligationForFarmForBorrow = false;
@@ -350,17 +274,14 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-            axn.outflowReserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        if (!axn.referrer.equals(web3_js_1.PublicKey.default)) {
+            const referrerTokenState = (0, utils_1.referrerTokenStatePda)(axn.referrer, axn.outflowReserve.address, axn.kaminoMarket.programId)[0];
+            const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
+            if (!account) {
+                axn.addInitReferrerTokenStateIx(axn.outflowReserve, referrerTokenState);
+            }
         }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, useV2Ixs, createLookupTable, twoTokenAction);
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, useV2Ixs, undefined, createLookupTable, twoTokenAction);
         if (useV2Ixs) {
             await axn.addDepositAndBorrowIxV2();
         }
@@ -369,12 +290,24 @@ class KaminoAction {
         }
         await axn.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow, useV2Ixs);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        // Create the scope refresh ixn in here to ensure it's the first ixn in the txn
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+            ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
+            ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
+        ]).toArray();
+        const tokenIds = (0, market_1.getTokenIdsForScopeRefresh)(axn.kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefreshConfig) {
+            await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
+        }
         return axn;
     }
-    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // 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,
-    createLookupTable = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default) {
         const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
         const addInitObligationForFarmForRepay = true;
         const addInitObligationForFarmForWithdraw = false;
@@ -382,17 +315,7 @@ class KaminoAction {
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-            axn.outflowReserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-        }
-        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, useV2Ixs, createLookupTable, twoTokenAction);
+        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, useV2Ixs, undefined, createLookupTable, twoTokenAction);
         const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
         if (useV2Ixs) {
             await axn.addRepayAndWithdrawIxsV2(withdrawCollateralAmount);
@@ -402,13 +325,25 @@ class KaminoAction {
         }
         await axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw, useV2Ixs);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        // Create the scope refresh ixn in here to ensure it's the first ixn in the txn
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+            ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
+            ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
+        ]).toArray();
+        const tokenIds = (0, market_1.getTokenIdsForScopeRefresh)(axn.kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefreshConfig) {
+            await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
+        }
         return axn;
     }
-    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, // to be requested *after* the withdraw
     includeUserMetadata = true, // if true it includes user metadata
-    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = undefined, overrideElevationGroupRequest, 
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, overrideElevationGroupRequest, 
     // Optional customizations which may be needed if the obligation was mutated by some previous ixn.
     obligationCustomizations) {
         const axn = await KaminoAction.initialize('withdraw', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
@@ -417,16 +352,7 @@ class KaminoAction {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
         axn.depositReserves.push(...(obligationCustomizations?.addedDepositReserves || []));
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-        }
-        await axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, false, overrideElevationGroupRequest);
+        await axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, createLookupTable, false, overrideElevationGroupRequest);
         const collateralAmount = axn.getWithdrawCollateralAmount(axn.reserve, axn.amount);
         if (useV2Ixs) {
             await axn.addWithdrawIxV2(collateralAmount);
@@ -452,22 +378,13 @@ class KaminoAction {
      * @param includeUserMetadata - if true it includes user metadata
      * @param referrer
      */
-    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, currentSlot, payer = undefined, extraComputeBudget = 1_000_000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, createLookupTable = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, scopeRefreshConfig, currentSlot, payer = undefined, extraComputeBudget = 1_000_000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, createLookupTable = true, referrer = web3_js_1.PublicKey.default) {
         const axn = await KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, payer);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-        }
-        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable);
+        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, createLookupTable);
         if (useV2Ixs) {
             await axn.addRepayIxV2();
         }
@@ -477,26 +394,16 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, useV2Ixs, scopeRefreshConfig, extraComputeBudget = 1_000_000, // 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
-    createLookupTable = true, referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0) {
         const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'liquidate', amount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, minCollateralReceiveAmount, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
             axn.addComputeBudgetIxn(extraComputeBudget);
         }
-        const allReserves = new utils_1.PublicKeySet([
-            ...axn.depositReserves,
-            ...axn.borrowReserves,
-            axn.reserve.address,
-            axn.outflowReserve.address,
-        ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
-        }
-        await axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable);
+        await axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, createLookupTable);
         if (useV2Ixs) {
             await axn.addLiquidateIxV2(maxAllowedLtvOverridePercent);
         }
@@ -508,49 +415,38 @@ class KaminoAction {
     }
     static async buildWithdrawReferrerFeeTxns(owner, tokenMint, kaminoMarket, currentSlot = 0) {
         const { axn, createAtaIxs } = await KaminoAction.initializeWithdrawReferrerFees(tokenMint, owner, kaminoMarket, currentSlot);
-        axn.preTxnIxs.push(...createAtaIxs);
-        axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.toString()}]`);
+        axn.setupIxs.push(...createAtaIxs);
+        axn.setupIxsLabels.push(`createAtasIxs[${axn.owner.toString()}]`);
+        if (!axn.referrer.equals(web3_js_1.PublicKey.default)) {
+            const referrerTokenState = (0, utils_1.referrerTokenStatePda)(axn.referrer, axn.reserve.address, axn.kaminoMarket.programId)[0];
+            const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
+            if (!account) {
+                axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
+            }
+        }
         axn.addRefreshReserveIxs([axn.reserve.address]);
         axn.addWithdrawReferrerFeesIxs();
         return axn;
     }
     async getTransactions() {
-        const txns = {
-            preLendingTxn: null,
-            lendingTxn: null,
-            postLendingTxn: null,
-        };
-        if (this.preTxnIxs.length) {
-            txns.preLendingTxn = new web3_js_1.Transaction({
-                feePayer: this.owner,
-                recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-            }).add(...this.preTxnIxs);
-        }
+        let txns;
         if (this.lendingIxs.length === 2) {
-            txns.lendingTxn = new web3_js_1.Transaction({
+            txns = new web3_js_1.Transaction({
                 feePayer: this.owner,
                 recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
             }).add(...this.setupIxs, ...[this.lendingIxs[0]], ...this.inBetweenIxs, ...[this.lendingIxs[1]], ...this.cleanupIxs);
         }
         else {
-            txns.lendingTxn = new web3_js_1.Transaction({
+            txns = new web3_js_1.Transaction({
                 feePayer: this.owner,
                 recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
             }).add(...this.setupIxs, ...this.lendingIxs, ...this.cleanupIxs);
         }
-        if (this.postTxnIxs.length) {
-            txns.postLendingTxn = new web3_js_1.Transaction({
-                feePayer: this.owner,
-                recentBlockhash: (await this.kaminoMarket.getConnection().getLatestBlockhash()).blockhash,
-            }).add(...this.postTxnIxs);
-        }
         return txns;
     }
     async sendTransactions(sendTransaction) {
         const txns = await this.getTransactions();
-        await this.sendSingleTransaction(txns.preLendingTxn, sendTransaction);
-        const signature = await this.sendSingleTransaction(txns.lendingTxn, sendTransaction);
-        await this.sendSingleTransaction(txns.postLendingTxn, sendTransaction);
+        const signature = await this.sendSingleTransaction(txns, sendTransaction);
         return signature;
     }
     async sendSingleTransaction(txn, sendTransaction) {
@@ -562,9 +458,7 @@ class KaminoAction {
     }
     async simulateTransactions(sendTransaction) {
         const txns = await this.getTransactions();
-        await this.simulateSingleTransaction(txns.preLendingTxn, sendTransaction);
-        const signature = await this.simulateSingleTransaction(txns.lendingTxn, sendTransaction);
-        await this.simulateSingleTransaction(txns.postLendingTxn, sendTransaction);
+        const signature = await this.simulateSingleTransaction(txns, sendTransaction);
         return signature;
     }
     async simulateSingleTransaction(txn, sendTransaction) {
@@ -584,8 +478,8 @@ class KaminoAction {
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
-            userSourceLiquidity: this.userTokenAccountAddress,
-            userDestinationCollateral: this.userCollateralAccountAddress,
+            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+            userDestinationCollateral: this.getUserCollateralAccountAddress(this.reserve),
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -603,8 +497,8 @@ class KaminoAction {
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
-            userSourceCollateral: this.userCollateralAccountAddress,
-            userDestinationLiquidity: this.userTokenAccountAddress,
+            userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
+            userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -625,7 +519,7 @@ class KaminoAction {
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
             reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-            userSourceLiquidity: this.userTokenAccountAddress,
+            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -635,8 +529,8 @@ class KaminoAction {
     addDepositIxV2() {
         const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
@@ -656,7 +550,7 @@ class KaminoAction {
                 reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
                 reserveCollateralMint: this.reserve.getCTokenMint(),
                 reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-                userSourceLiquidity: this.userTokenAccountAddress,
+                userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
                 placeholderUserDestinationCollateral: this.kaminoMarket.programId,
                 collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -677,7 +571,7 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
             depositReserve: this.reserve.address,
             reserveDestinationCollateral: this.reserve.state.collateral.supplyVault,
-            userSourceCollateral: this.userCollateralAccountAddress,
+            userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
@@ -685,8 +579,8 @@ class KaminoAction {
     addDepositObligationCollateralIxV2() {
         const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
@@ -702,7 +596,7 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 depositReserve: this.reserve.address,
                 reserveDestinationCollateral: this.reserve.state.collateral.supplyVault,
-                userSourceCollateral: this.userCollateralAccountAddress,
+                userSourceCollateral: this.getUserCollateralAccountAddress(this.reserve),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
@@ -728,7 +622,7 @@ class KaminoAction {
             borrowReserve: this.reserve.address,
             borrowReserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveSourceLiquidity: this.reserve.state.liquidity.supplyVault,
-            userDestinationLiquidity: this.userTokenAccountAddress,
+            userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
             borrowReserveLiquidityFeeReceiver: this.reserve.state.liquidity.feeVault,
             referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.reserve.address, this.kaminoMarket.programId)[0],
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -748,8 +642,8 @@ class KaminoAction {
         });
         const farmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -766,7 +660,7 @@ class KaminoAction {
                 borrowReserve: this.reserve.address,
                 borrowReserveLiquidityMint: this.reserve.getLiquidityMint(),
                 reserveSourceLiquidity: this.reserve.state.liquidity.supplyVault,
-                userDestinationLiquidity: this.userTokenAccountAddress,
+                userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
                 borrowReserveLiquidityFeeReceiver: this.reserve.state.liquidity.feeVault,
                 referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.reserve.address, this.kaminoMarket.programId)[0],
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -796,7 +690,7 @@ class KaminoAction {
             reserveCollateralMint: this.reserve.getCTokenMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
-            userDestinationLiquidity: this.userTokenAccountAddress,
+            userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -806,8 +700,8 @@ class KaminoAction {
     async addWithdrawIxV2(collateralAmount) {
         const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
@@ -827,7 +721,7 @@ class KaminoAction {
                 reserveCollateralMint: this.reserve.getCTokenMint(),
                 reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
                 reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
-                userDestinationLiquidity: this.userTokenAccountAddress,
+                userDestinationLiquidity: this.getUserTokenAccountAddress(this.reserve),
                 placeholderUserDestinationCollateral: this.kaminoMarket.programId,
                 collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -852,7 +746,7 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
             repayReserve: this.reserve.address,
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
-            userSourceLiquidity: this.userTokenAccountAddress,
+            userSourceLiquidity: this.getTokenAccountAddressByUser(this.reserve, this.payer),
             reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -866,8 +760,8 @@ class KaminoAction {
         const depositReservesList = this.getAdditionalDepositReservesList();
         const farmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -885,7 +779,7 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 repayReserve: this.reserve.address,
                 reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                userSourceLiquidity: this.userTokenAccountAddress,
+                userSourceLiquidity: this.getTokenAccountAddressByUser(this.reserve, this.payer),
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -913,7 +807,7 @@ class KaminoAction {
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
             reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-            userSourceLiquidity: this.userTokenAccountAddress,
+            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -922,9 +816,6 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
         }
-        if (!this.additionalTokenAccountAddress) {
-            throw new Error(`additionalTokenAccountAddress not set`);
-        }
         if (!this.outflowAmount) {
             throw new Error(`outflowAmount not set`);
         }
@@ -945,7 +836,7 @@ class KaminoAction {
             borrowReserve: this.outflowReserve.address,
             borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
             reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
-            userDestinationLiquidity: this.additionalTokenAccountAddress,
+            userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
             borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
             referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
             tokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
@@ -957,8 +848,8 @@ class KaminoAction {
     async addDepositAndBorrowIxV2() {
         const collateralFarmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
@@ -979,7 +870,7 @@ class KaminoAction {
                 reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
                 reserveCollateralMint: this.reserve.getCTokenMint(),
                 reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-                userSourceLiquidity: this.userTokenAccountAddress,
+                userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
                 placeholderUserDestinationCollateral: this.kaminoMarket.programId,
                 collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -991,9 +882,6 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
         }
-        if (!this.additionalTokenAccountAddress) {
-            throw new Error(`additionalTokenAccountAddress not set`);
-        }
         if (!this.outflowAmount) {
             throw new Error(`outflowAmount not set`);
         }
@@ -1006,8 +894,8 @@ class KaminoAction {
         });
         const debtFarmsAccounts = this.outflowReserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmDebt)[0],
@@ -1024,7 +912,7 @@ class KaminoAction {
                 borrowReserve: this.outflowReserve.address,
                 borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
                 reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
-                userDestinationLiquidity: this.additionalTokenAccountAddress,
+                userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
                 borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
                 referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
                 tokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
@@ -1051,7 +939,7 @@ class KaminoAction {
             lendingMarket: this.kaminoMarket.getAddress(),
             repayReserve: this.reserve.address,
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
-            userSourceLiquidity: this.userTokenAccountAddress,
+            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
             reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1061,9 +949,6 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
         }
-        if (!this.additionalTokenAccountAddress) {
-            throw new Error(`additionalTokenAccountAddress not set`);
-        }
         if (!this.outflowAmount) {
             throw new Error(`outflowAmount not set`);
         }
@@ -1079,7 +964,7 @@ class KaminoAction {
             reserveCollateralMint: this.outflowReserve.getCTokenMint(),
             reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
             reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-            userDestinationLiquidity: this.additionalTokenAccountAddress,
+            userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
             placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
@@ -1095,8 +980,8 @@ class KaminoAction {
         });
         const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -1111,7 +996,7 @@ class KaminoAction {
                 lendingMarket: this.kaminoMarket.getAddress(),
                 repayReserve: this.reserve.address,
                 reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                userSourceLiquidity: this.userTokenAccountAddress,
+                userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
                 reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -1125,16 +1010,13 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw new Error(`outflowReserve not set`);
         }
-        if (!this.additionalTokenAccountAddress) {
-            throw new Error(`additionalTokenAccountAddress not set`);
-        }
         if (!this.outflowAmount) {
             throw new Error(`outflowAmount not set`);
         }
         const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmCollateral)[0],
@@ -1153,7 +1035,7 @@ class KaminoAction {
                 reserveCollateralMint: this.outflowReserve.getCTokenMint(),
                 reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
                 reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-                userDestinationLiquidity: this.additionalTokenAccountAddress,
+                userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
                 placeholderUserDestinationCollateral: this.kaminoMarket.programId,
                 collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
@@ -1168,9 +1050,6 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw Error(`Withdraw reserve during liquidation is not defined`);
         }
-        if (!this.additionalTokenAccountAddress) {
-            throw Error(`Liquidating token account address is not defined`);
-        }
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
@@ -1193,9 +1072,9 @@ class KaminoAction {
             withdrawReserveCollateralMint: this.outflowReserve.getCTokenMint(),
             withdrawReserveCollateralSupply: this.outflowReserve.state.collateral.supplyVault,
             withdrawReserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-            userSourceLiquidity: this.additionalTokenAccountAddress,
-            userDestinationCollateral: this.userCollateralAccountAddress,
-            userDestinationLiquidity: this.userTokenAccountAddress,
+            userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+            userDestinationCollateral: this.getUserCollateralAccountAddress(this.outflowReserve),
+            userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
             withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1213,17 +1092,14 @@ class KaminoAction {
         if (!this.outflowReserve) {
             throw Error(`Withdraw reserve during liquidation is not defined`);
         }
-        if (!this.additionalTokenAccountAddress) {
-            throw Error(`Liquidating token account address is not defined`);
-        }
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
         });
         const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmCollateral)[0],
@@ -1231,8 +1107,8 @@ class KaminoAction {
             };
         const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
                 obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -1257,9 +1133,9 @@ class KaminoAction {
                 withdrawReserveCollateralMint: this.outflowReserve.getCTokenMint(),
                 withdrawReserveCollateralSupply: this.outflowReserve.state.collateral.supplyVault,
                 withdrawReserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-                userSourceLiquidity: this.additionalTokenAccountAddress,
-                userDestinationCollateral: this.userCollateralAccountAddress,
-                userDestinationLiquidity: this.userTokenAccountAddress,
+                userSourceLiquidity: this.getUserTokenAccountAddress(this.reserve),
+                userDestinationCollateral: this.getUserCollateralAccountAddress(this.outflowReserve),
+                userDestinationLiquidity: this.getUserTokenAccountAddress(this.outflowReserve),
                 withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
                 collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
@@ -1521,7 +1397,7 @@ class KaminoAction {
             }
         }
     }
-    async addSupportIxs(action, includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, twoTokenAction = false, overrideElevationGroupRequest) {
+    async addSupportIxs(action, includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, scopeRefreshConfig, createLookupTable, twoTokenAction = false, overrideElevationGroupRequest) {
         if (!['mint', 'redeem'].includes(action)) {
             const [, ownerUserMetadata] = await this.kaminoMarket.getUserMetadata(this.owner);
             if (!ownerUserMetadata && includeUserMetadata) {
@@ -1534,16 +1410,20 @@ class KaminoAction {
                 }
                 this.addInitUserMetadataIxs(lookupTable);
             }
-            if (['borrow', 'withdrawReferrerFees'].includes(action)) {
-                await this.addInitReferrerTokenStateIx(this.reserve);
-            }
-            // depositAndBorrow
-            if (action === 'deposit' && this.outflowReserve) {
-                await this.addInitReferrerTokenStateIx(this.outflowReserve);
-            }
             await this.addInitObligationIxs();
         }
         await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, useV2Ixs, 'setup', requestElevationGroup, addInitObligationForFarm, twoTokenAction, overrideElevationGroupRequest);
+        const allReserves = new utils_1.PublicKeySet([
+            ...this.depositReserves,
+            ...this.borrowReserves,
+            this.reserve.address,
+            ...(this.outflowReserve ? [this.outflowReserve.address] : []),
+            ...(this.preLoadedDepositReservesSameTx ? this.preLoadedDepositReservesSameTx : []),
+        ]).toArray();
+        const tokenIds = (0, market_1.getTokenIdsForScopeRefresh)(this.kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefreshConfig) {
+            await this.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
+        }
     }
     static optionalAccount(pubkey, programId = lib_1.PROGRAM_ID) {
         if ((0, utils_1.isNotNullPubkey)(pubkey)) {
@@ -1836,25 +1716,18 @@ class KaminoAction {
         this.setupIxs.push(initUserMetadataIx);
         this.setupIxsLabels.push(`initUserMetadata[${userMetadataAddress.toString()}]`);
     }
-    async addInitReferrerTokenStateIx(reserve) {
-        if (this.referrer.equals(web3_js_1.PublicKey.default)) {
-            return;
-        }
-        const referrerTokenState = (0, utils_1.referrerTokenStatePda)(this.referrer, reserve.address, this.kaminoMarket.programId)[0];
-        const account = await this.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
-        if (!account) {
-            const initReferrerTokenStateIx = (0, instructions_1.initReferrerTokenState)({
-                lendingMarket: this.kaminoMarket.getAddress(),
-                payer: this.owner,
-                reserve: reserve.address,
-                referrer: this.referrer,
-                referrerTokenState,
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                systemProgram: web3_js_1.SystemProgram.programId,
-            }, this.kaminoMarket.programId);
-            this.setupIxs.unshift(initReferrerTokenStateIx);
-            this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenState.toString()} res=${reserve.address}]`);
-        }
+    addInitReferrerTokenStateIx(reserve, referrerTokenState) {
+        const initReferrerTokenStateIx = (0, instructions_1.initReferrerTokenState)({
+            lendingMarket: this.kaminoMarket.getAddress(),
+            payer: this.owner,
+            reserve: reserve.address,
+            referrer: this.referrer,
+            referrerTokenState,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            systemProgram: web3_js_1.SystemProgram.programId,
+        }, this.kaminoMarket.programId);
+        this.setupIxs.unshift(initReferrerTokenStateIx);
+        this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenState.toString()} res=${reserve.address}]`);
     }
     addWithdrawReferrerFeesIxs() {
         const referrerTokenStateAddress = (0, utils_1.referrerTokenStatePda)(this.owner, this.reserve.address, this.kaminoMarket.programId)[0];
@@ -1865,7 +1738,7 @@ class KaminoAction {
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             referrerTokenState: referrerTokenStateAddress,
             reserveSupplyLiquidity: this.reserve.state.liquidity.supplyVault,
-            referrerTokenAccount: this.userTokenAccountAddress,
+            referrerTokenAccount: this.getUserTokenAccountAddress(this.reserve),
             lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
             tokenProgram: this.reserve.getLiquidityTokenProgram(),
         }, this.kaminoMarket.programId);
@@ -1881,50 +1754,44 @@ class KaminoAction {
             await this.updateWSOLAccount(action);
         }
         if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(spl_token_1.NATIVE_MINT)) {
-            const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+            const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.getUserTokenAccountAddress(this.reserve));
             this.setupIxs.unshift(createUserTokenAccountIx);
             this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${this.owner}]`);
         }
         if (action === 'liquidate') {
             if (!this.outflowReserve) {
-                throw new Error(`Outflow reserve state not found ${this.mint}`);
+                throw new Error(`Outflow reserve state not found ${this.secondaryMint}`);
             }
-            const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
+            const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.getUserTokenAccountAddress(this.outflowReserve));
             this.setupIxs.unshift(createUserTokenAccountIx);
-            this.setupIxsLabels.unshift(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
-            const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
+            this.setupIxsLabels.unshift(`CreateUserAta[${this.getUserTokenAccountAddress(this.outflowReserve).toBase58()}]`);
+            const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.getUserCollateralAccountAddress(this.outflowReserve));
             this.setupIxs.unshift(createUserCollateralAccountIx);
-            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-            if (!this.additionalTokenAccountAddress) {
-                throw new Error(`Additional token account address not found ${this.mint}`);
-            }
+            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.getUserCollateralAccountAddress(this.outflowReserve).toString()}]`);
         }
         if (action === 'depositAndBorrow' || (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(spl_token_1.NATIVE_MINT))) {
-            if (!this.additionalTokenAccountAddress) {
-                throw new Error(`Additional token account address not found ${this.secondaryMint}`);
-            }
             if (!this.outflowReserve) {
                 throw new Error(`Outflow reserve state not found ${this.mint}`);
             }
+            const additionalUserTokenAccountAddress = this.getUserTokenAccountAddress(this.outflowReserve);
             const additionalUserTokenAccountInfo = await this.kaminoMarket
                 .getConnection()
-                .getAccountInfo(this.additionalTokenAccountAddress);
+                .getAccountInfo(additionalUserTokenAccountAddress);
             if (!additionalUserTokenAccountInfo) {
-                const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.additionalTokenAccountAddress);
+                const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), additionalUserTokenAccountAddress);
                 this.setupIxs.unshift(createUserTokenAccountIx);
                 this.setupIxsLabels.unshift(`CreateAdditionalUserTokenAta[${this.owner}]`);
             }
         }
         if (action === 'withdraw' || action === 'mint' || action === 'deposit' || action === 'repayAndWithdraw') {
-            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()}]`);
+            const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.getUserTokenAccountAddress(this.reserve));
+            this.setupIxs.unshift(createUserTokenAccountIx);
+            this.setupIxsLabels.unshift(`CreateUserAta[${this.getUserTokenAccountAddress(this.reserve).toBase58()}]`);
         }
         if (action === 'mint') {
-            const collateralMintPubkey = this.reserve.getCTokenMint();
-            const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, collateralMintPubkey, this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
+            const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.getUserCollateralAccountAddress(this.reserve));
             this.setupIxs.unshift(createUserCollateralAccountIx);
-            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
+            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.getUserCollateralAccountAddress(this.reserve).toString()}]`);
         }
     }
     async updateWSOLAccount(action) {
@@ -1947,15 +1814,16 @@ class KaminoAction {
             safeRepay = new bn_js_1.default(Math.floor(obligation_1.KaminoObligation.getBorrowAmount(borrow)
                 .mul(cumulativeBorrowRateReserve)
                 .div(cumulativeBorrowRateObligation)
-                .add(new decimal_js_1.default(SOL_PADDING_FOR_INTEREST.toString()))
+                .add(new decimal_js_1.default(utils_1.SOL_PADDING_FOR_INTEREST.toString()))
                 .toNumber()).toString());
         }
-        let userTokenAccountAddress = this.userTokenAccountAddress;
+        let userTokenAccountAddress = this.getUserTokenAccountAddress(this.reserve);
         if (this.secondaryMint?.equals(spl_token_1.NATIVE_MINT)) {
-            if (!this.additionalTokenAccountAddress) {
-                throw new Error(`Additional token account address not found ${this.secondaryMint}`);
+            if (!this.outflowReserve) {
+                throw new Error(`Outflow reserve state not found ${this.secondaryMint}`);
             }
-            userTokenAccountAddress = this.additionalTokenAccountAddress;
+            const additionalUserTokenAccountAddress = this.getUserTokenAccountAddress(this.outflowReserve);
+            userTokenAccountAddress = additionalUserTokenAccountAddress;
         }
         const userWSOLAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(userTokenAccountAddress);
         const rentExempt = await this.kaminoMarket.getConnection().getMinimumBalanceForRentExemption(165);
@@ -1963,7 +1831,7 @@ class KaminoAction {
         const sendAction = action === 'deposit' ||
             action === 'repay' ||
             action === 'mint' ||
-            (action === 'liquidate' && this.secondaryMint?.equals(spl_token_1.NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
+            (action === 'liquidate' && this.mint?.equals(spl_token_1.NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
         const transferLamportsIx = web3_js_1.SystemProgram.transfer({
             fromPubkey: this.owner,
             toPubkey: userTokenAccountAddress,
@@ -2003,55 +1871,32 @@ class KaminoAction {
         if (!outflowReserve || !inflowReserve) {
             throw new Error('reserve states are not fetched');
         }
-        const { userTokenAccountAddress: userOutflowTokenAccountAddress, userCollateralAccountAddress: userOutflowCollateralAccountAddress, } = KaminoAction.getUserAccountAddresses(payer, outflowReserve.state);
-        const { userTokenAccountAddress: userInflowTokenAccountAddress, userCollateralAccountAddress: userInflowCollateralAccountAddress, } = KaminoAction.getUserAccountAddresses(payer, inflowReserve.state);
         const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = await KaminoAction.loadObligation(action, kaminoMarket, obligationOwner, inflowReserve.address, obligation, outflowReserve.address);
         const referrerKey = await this.getReferrerKey(kaminoMarket, payer, kaminoObligation, referrer);
-        let userTokenAccountAddress;
-        let userCollateralAccountAddress;
-        let additionalUserTokenAccountAddress;
         let secondaryMint;
         let primaryMint;
-        if (action === 'liquidate') {
-            userTokenAccountAddress = userOutflowTokenAccountAddress;
-            userCollateralAccountAddress = userOutflowCollateralAccountAddress;
-            additionalUserTokenAccountAddress = userInflowTokenAccountAddress;
-            primaryMint = outflowTokenMint;
-            secondaryMint = inflowTokenMint;
-        }
-        else if (action === 'depositAndBorrow') {
-            userTokenAccountAddress = userInflowTokenAccountAddress;
-            userCollateralAccountAddress = userInflowCollateralAccountAddress;
-            additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
+        if (action === 'liquidate' || action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
             primaryMint = inflowTokenMint;
             secondaryMint = outflowTokenMint;
         }
-        else if (action === 'repayAndWithdraw') {
-            primaryMint = inflowTokenMint;
-            secondaryMint = outflowTokenMint;
-            userTokenAccountAddress = userInflowTokenAccountAddress;
-            userCollateralAccountAddress = userOutflowCollateralAccountAddress;
-            additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
-        }
         else {
             throw new Error('Invalid action');
         }
-        return new KaminoAction(kaminoMarket, payer, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, secondaryMint, additionalUserTokenAccountAddress, outflowReserve, outflowAmount, referrerKey);
+        return new KaminoAction(kaminoMarket, payer, kaminoObligation || obligation, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, secondaryMint, outflowReserve, outflowAmount, referrerKey);
     }
     static async initializeWithdrawReferrerFees(mint, owner, kaminoMarket, currentSlot = 0) {
         const reserve = kaminoMarket.getReserveByMint(mint);
         if (reserve === undefined) {
             throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
         }
-        const [{ ata, createAtaIx }] = (0, utils_1.createAtasIdempotent)(owner, [
+        const [{ createAtaIx }] = (0, utils_1.createAtasIdempotent)(owner, [
             {
                 mint: reserve.getLiquidityMint(),
                 tokenProgram: reserve.getLiquidityTokenProgram(),
             },
         ]);
-        const userTokenAccountAddress = ata;
         return {
-            axn: new KaminoAction(kaminoMarket, owner, new ObligationType_1.VanillaObligation(kaminoMarket.programId), userTokenAccountAddress, web3_js_1.PublicKey.default, 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), mint, 0, new bn_js_1.default(0), [], [], reserve, currentSlot, undefined, undefined, undefined, undefined, undefined),
             createAtaIxs: [createAtaIx],
         };
     }
@@ -2098,6 +1943,15 @@ class KaminoAction {
         }
         return referrerKey;
     }
+    getUserTokenAccountAddress(reserve) {
+        return (0, utils_1.getAssociatedTokenAddress)(reserve.getLiquidityMint(), this.owner, true, reserve.getLiquidityTokenProgram());
+    }
+    getTokenAccountAddressByUser(reserve, user) {
+        return (0, utils_1.getAssociatedTokenAddress)(reserve.getLiquidityMint(), user, true, reserve.getLiquidityTokenProgram());
+    }
+    getUserCollateralAccountAddress(reserve) {
+        return (0, utils_1.getAssociatedTokenAddress)(reserve.getCTokenMint(), this.owner, true);
+    }
     static actionToIxs(action) {
         const ixs = [...action.computeBudgetIxs, ...action.setupIxs];
         ixs.push(...KaminoAction.actionToLendingIxs(action));
@@ -2121,14 +1975,14 @@ class KaminoAction {
         return labels;
     }
     static actionToLendingIxLabels(action) {
-        const lables = [];
+        const labels = [];
         for (let i = 0; i < action.lendingIxsLabels.length; i++) {
-            lables.push(action.lendingIxsLabels[i]);
+            labels.push(action.lendingIxsLabels[i]);
             if (i !== action.lendingIxsLabels.length - 1) {
-                lables.push(...action.inBetweenIxsLabels);
+                labels.push(...action.inBetweenIxsLabels);
             }
         }
-        return lables;
+        return labels;
     }
 }
 exports.KaminoAction = KaminoAction;