@kamino-finance/klend-sdk 5.11.2-beta.0 → 5.11.3-beta.0

package/dist/classes/action.js

@@ -10,12 +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;
@@ -180,27 +180,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 +201,23 @@ 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);
-        }
-        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 +227,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 +272,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 +283,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('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,62 +292,24 @@ class KaminoAction {
         }
         await axn.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow, useV2Ixs);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-        return axn;
-    }
-    static async buildDepositAndWithdrawV2Txns(kaminoMarket, depositAmount, depositMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, 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,
-    referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndWithdraw', depositAmount, depositMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
-        const addInitObligationForFarm = true;
-        const twoTokenAction = true;
-        if (extraComputeBudget > 0) {
-            axn.addComputeBudgetIxn(extraComputeBudget);
-        }
+        // 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.address,
+            ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
+            ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
         ]).toArray();
-        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
-        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
-            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        const tokenIds = (0, market_1.getTokenIdsForScopeRefresh)(axn.kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefreshConfig) {
+            await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
         }
-        await axn.addSupportIxs('depositAndWithdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, true, twoTokenAction);
-        const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
-        axn.addDepositAndWithdrawV2Ixs(withdrawCollateralAmount);
         return axn;
     }
-    static async buildRepayAndWithdrawV2Txns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, 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' }) {
-        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdrawV2', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
-        const addInitObligationForFarm = true;
-        const twoTokenAction = 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('repayAndWithdrawV2', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, true, createLookupTable, twoTokenAction);
-        const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
-        axn.addRepayAndWithdrawV2Ixs(withdrawCollateralAmount);
-        return axn;
-    }
-    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, 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;
@@ -432,17 +317,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);
@@ -452,13 +327,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);
@@ -467,16 +354,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);
@@ -502,22 +380,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();
         }
@@ -527,26 +396,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);
         }
@@ -689,7 +548,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
                 reserveFarmState: this.reserve.state.farmCollateral,
             };
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateralV2`);
@@ -739,7 +598,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
                 reserveFarmState: this.reserve.state.farmCollateral,
             };
         this.lendingIxsLabels.push(`depositObligationCollateralV2`);
@@ -802,7 +661,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
                 reserveFarmState: this.reserve.state.farmDebt,
             };
         const borrowIx = (0, instructions_1.borrowObligationLiquidityV2)({
@@ -860,7 +719,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
                 reserveFarmState: this.reserve.state.farmCollateral,
             };
         this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateralV2`);
@@ -920,7 +779,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
                 reserveFarmState: this.reserve.state.farmDebt,
             };
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -948,165 +807,6 @@ class KaminoAction {
             this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
         this.lendingIxs.push(repayIx);
     }
-    addRepayAndWithdrawV2Ixs(withdrawCollateralAmount) {
-        this.lendingIxsLabels.push(`repayAndWithdrawAndRedeem(repayReserve=${this.reserve.address})(withdrawReserve=${this.outflowReserve.address})(obligation=${this.getObligationPda()})`);
-        const depositReservesList = this.getAdditionalDepositReservesList();
-        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        if (!this.outflowAmount) {
-            throw new Error(`outflowAmount not set`);
-        }
-        if (!this.outflowReserve) {
-            throw new Error(`outflowReserve not set`);
-        }
-        if (!this.additionalTokenAccountAddress) {
-            throw new Error(`additionalTokenAccountAddress not set`);
-        }
-        const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.outflowReserve.state.farmCollateral,
-            };
-        const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
-        const repayAndWithdrawIx = (0, instructions_1.repayAndWithdrawAndRedeem)({
-            repayAmount: this.amount,
-            withdrawCollateralAmount,
-        }, {
-            repayAccounts: {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                repayReserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                userSourceLiquidity: this.userTokenAccountAddress,
-                reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
-                tokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            withdrawAccounts: {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                withdrawReserve: this.outflowReserve.address,
-                reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-                reserveCollateralMint: this.outflowReserve.getCTokenMint(),
-                reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-                reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-                userDestinationLiquidity: this.additionalTokenAccountAddress,
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            collateralFarmsAccounts,
-            debtFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId);
-        repayAndWithdrawIx.keys = repayAndWithdrawIx.keys.concat([
-            ...depositReserveAccountMetas,
-            ...borrowReserveAccountMetas,
-        ]);
-        this.lendingIxs.push(repayAndWithdrawIx);
-    }
-    addDepositAndWithdrawV2Ixs(withdrawCollateralAmount) {
-        this.lendingIxsLabels.push(`depositAndWithdrawV2(depositReserve=${this.reserve.address})(withdrawReserve=${this.outflowReserve.address})(obligation=${this.getObligationPda()})`);
-        const depositReservesList = this.getAdditionalDepositReservesList();
-        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        if (!this.outflowAmount) {
-            throw new Error(`outflowAmount not set`);
-        }
-        if (!this.outflowReserve) {
-            throw new Error(`outflowReserve not set`);
-        }
-        if (!this.additionalTokenAccountAddress) {
-            throw new Error(`additionalTokenAccountAddress not set`);
-        }
-        const depositFarmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
-        const withdrawFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: this.kaminoMarket.programId,
-                reserveFarmState: this.kaminoMarket.programId,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
-                reserveFarmState: this.outflowReserve.state.farmCollateral,
-            };
-        const depositAndWithdrawIx = (0, instructions_1.depositAndWithdraw)({
-            liquidityAmount: this.amount,
-            withdrawCollateralAmount,
-        }, {
-            depositAccounts: {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                reserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
-                reserveCollateralMint: this.reserve.getCTokenMint(),
-                reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-                userSourceLiquidity: this.userTokenAccountAddress,
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            withdrawAccounts: {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                withdrawReserve: this.outflowReserve.address,
-                reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-                reserveCollateralMint: this.outflowReserve.getCTokenMint(),
-                reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-                reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-                userDestinationLiquidity: this.additionalTokenAccountAddress,
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            depositFarmsAccounts,
-            withdrawFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId);
-        depositAndWithdrawIx.keys = depositAndWithdrawIx.keys.concat([
-            ...depositReserveAccountMetas,
-            ...borrowReserveAccountMetas,
-        ]);
-        this.lendingIxs.push(depositAndWithdrawIx);
-    }
     async addDepositAndBorrowIx() {
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
@@ -1170,7 +870,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmCollateral, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
                 reserveFarmState: this.reserve.state.farmCollateral,
             };
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateralV2`);
@@ -1219,7 +919,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmDebt, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmDebt)[0],
                 reserveFarmState: this.outflowReserve.state.farmDebt,
             };
         const borrowIx = (0, instructions_1.borrowObligationLiquidityV2)({
@@ -1308,7 +1008,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
                 reserveFarmState: this.reserve.state.farmDebt,
             };
         const repayIx = (0, instructions_1.repayObligationLiquidityV2)({
@@ -1346,7 +1046,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmCollateral)[0],
                 reserveFarmState: this.outflowReserve.state.farmCollateral,
             };
         this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateralV2)({
@@ -1372,7 +1072,7 @@ class KaminoAction {
             farmsProgram: farms_sdk_1.farmsId,
         }, this.kaminoMarket.programId));
     }
-    addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
+    async addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
         this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
         if (!this.outflowReserve) {
             throw Error(`Withdraw reserve during liquidation is not defined`);
@@ -1435,7 +1135,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmCollateral)[0],
                 reserveFarmState: this.outflowReserve.state.farmCollateral,
             };
         const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
@@ -1444,7 +1144,7 @@ class KaminoAction {
                 reserveFarmState: lib_1.PROGRAM_ID,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
                 reserveFarmState: this.reserve.state.farmDebt,
             };
         const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateralV2)({
@@ -1512,7 +1212,6 @@ class KaminoAction {
             'repay',
             'depositAndBorrow',
             'repayAndWithdraw',
-            'repayAndWithdrawV2',
             'refreshObligation',
         ].includes(action)) {
             // The support ixns in order are:
@@ -1528,14 +1227,11 @@ class KaminoAction {
             // 7. Ixn to refresh the `debt` farm of the obligation
             // 8. Ixn to refresh the `collateral` farm of the obligation
             let currentReserves = [];
-            if (action === 'liquidate' ||
-                action === 'depositAndBorrow' ||
-                action === 'repayAndWithdraw' ||
-                action === 'repayAndWithdrawV2') {
+            if (action === 'liquidate' || action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
                 if (!this.outflowReserve) {
                     throw new Error('outflowReserve is undefined');
                 }
-                if (action === 'depositAndBorrow' || action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2') {
+                if (action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
                     currentReserves = [this.reserve, this.outflowReserve];
                     if (action === 'depositAndBorrow') {
                         if (this.obligation) {
@@ -1579,10 +1275,7 @@ class KaminoAction {
                         await this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                     }
                 }
-                else if (action === 'repayAndWithdraw' ||
-                    action === 'borrow' ||
-                    action === 'repay' ||
-                    action === 'repayAndWithdrawV2') {
+                else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
                     // todo - probably don't need to add both debt and collateral for everything here
                     await this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                     if (this.outflowReserve) {
@@ -1613,7 +1306,7 @@ class KaminoAction {
                 this.addRefreshObligationIx(addAsSupportIx);
             }
             if (requestElevationGroup) {
-                if (action === 'repay' || action === 'repayAndWithdrawV2') {
+                if (action === 'repay') {
                     const repayObligationLiquidity = this.obligation.borrows.get(this.reserve.address);
                     if (!repayObligationLiquidity) {
                         throw new Error(`Could not find debt reserve ${this.reserve.address} in obligation`);
@@ -1737,7 +1430,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) {
@@ -1757,9 +1450,20 @@ class KaminoAction {
             if (action === 'deposit' && this.outflowReserve) {
                 await this.addInitReferrerTokenStateIx(this.outflowReserve);
             }
-            this.addInitObligationIxs();
+            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)) {
@@ -1913,7 +1617,7 @@ class KaminoAction {
                 farms.push([
                     types_1.ReserveFarmKind.Collateral,
                     kaminoReserve.state.farmCollateral,
-                    (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmCollateral, this.getObligationPda()),
+                    (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), kaminoReserve.state.farmCollateral)[0],
                     kaminoReserve,
                 ]);
             }
@@ -1921,7 +1625,7 @@ class KaminoAction {
                 farms.push([
                     types_1.ReserveFarmKind.Debt,
                     kaminoReserve.state.farmDebt,
-                    (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmDebt, this.getObligationPda()),
+                    (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), kaminoReserve.state.farmDebt)[0],
                     kaminoReserve,
                 ]);
             }
@@ -1971,17 +1675,17 @@ class KaminoAction {
     async addInitObligationForFarm(reserve, mode, addAsSupportIx = 'setup') {
         const farms = [];
         if (mode === types_1.ReserveFarmKind.Collateral && (0, utils_1.isNotNullPubkey)(reserve.state.farmCollateral)) {
-            const pda = (0, utils_1.obligationFarmStatePda)(reserve.state.farmCollateral, this.getObligationPda());
-            const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
+            const userPda = (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), reserve.state.farmCollateral)[0];
+            const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
             if (!account) {
-                farms.push([types_1.ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, pda]);
+                farms.push([types_1.ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, userPda]);
             }
         }
         if (mode === types_1.ReserveFarmKind.Debt && (0, utils_1.isNotNullPubkey)(reserve.state.farmDebt)) {
-            const pda = (0, utils_1.obligationFarmStatePda)(reserve.state.farmDebt, this.getObligationPda());
-            const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
+            const userPda = (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), reserve.state.farmDebt)[0];
+            const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
             if (!account) {
-                farms.push([types_1.ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, pda]);
+                farms.push([types_1.ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, userPda]);
             }
         }
         farms.forEach((arg) => {
@@ -2010,7 +1714,7 @@ class KaminoAction {
             }
         });
     }
-    addInitObligationIxs() {
+    async addInitObligationIxs() {
         if (!this.obligation) {
             const obligationPda = this.getObligationPda();
             const [userMetadataAddress, _bump] = (0, utils_1.userMetadataPda)(this.owner, this.kaminoMarket.programId);
@@ -2152,13 +1856,14 @@ class KaminoAction {
             return;
         }
         let safeRepay = new bn_js_1.default(this.amount);
-        if (this.obligation && (action === 'repay' || action === 'repayAndWithdrawV2') && this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))) {
+        if (this.obligation && action === 'repay' && this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))) {
             const borrow = this.obligation.state.borrows.find((borrow) => borrow.borrowReserve.toString() === this.reserve.address.toString());
             if (!borrow) {
                 throw Error(`Unable to find obligation borrow to repay for ${this.obligation.state.owner.toBase58()}`);
             }
             const cumulativeBorrowRateObligation = obligation_1.KaminoObligation.getCumulativeBorrowRate(borrow);
             const cumulativeBorrowRateReserve = this.reserve.getEstimatedCumulativeBorrowRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
+            // TODO: shouldn't this calc be added to all other stuff as well?
             safeRepay = new bn_js_1.default(Math.floor(obligation_1.KaminoObligation.getBorrowAmount(borrow)
                 .mul(cumulativeBorrowRateReserve)
                 .div(cumulativeBorrowRateObligation)
@@ -2177,7 +1882,6 @@ class KaminoAction {
         // Add rent exemption lamports for WSOL accounts that need to be pre-funded for inflow/send transactions
         const sendAction = action === 'deposit' ||
             action === 'repay' ||
-            action === 'repayAndWithdrawV2' ||
             action === 'mint' ||
             (action === 'liquidate' && this.secondaryMint?.equals(spl_token_1.NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
         const transferLamportsIx = web3_js_1.SystemProgram.transfer({
@@ -2242,7 +1946,7 @@ class KaminoAction {
             primaryMint = inflowTokenMint;
             secondaryMint = outflowTokenMint;
         }
-        else if (action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2') {
+        else if (action === 'repayAndWithdraw') {
             primaryMint = inflowTokenMint;
             secondaryMint = outflowTokenMint;
             userTokenAccountAddress = userInflowTokenAccountAddress;