@kamino-finance/klend-sdk 5.11.3-beta.1 → 5.11.3

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,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 +234,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 +279,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 +290,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 +306,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 +331,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 +341,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 +368,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 +394,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 +410,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);
         }
@@ -510,6 +433,13 @@ class KaminoAction {
         const { axn, createAtaIxs } = await KaminoAction.initializeWithdrawReferrerFees(tokenMint, owner, kaminoMarket, currentSlot);
         axn.preTxnIxs.push(...createAtaIxs);
         axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.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;
@@ -635,8 +565,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],
@@ -685,8 +615,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],
@@ -748,8 +678,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],
@@ -806,8 +736,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],
@@ -866,8 +796,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],
@@ -957,8 +887,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],
@@ -1006,8 +936,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],
@@ -1095,8 +1025,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],
@@ -1133,8 +1063,8 @@ class KaminoAction {
         }
         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],
@@ -1222,8 +1152,8 @@ class KaminoAction {
         });
         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 +1161,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],
@@ -1521,7 +1451,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 +1464,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 +1770,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];