@kamino-finance/klend-sdk 2.13.2 → 2.13.4

package/dist/classes/action.d.ts

@@ -1,6 +1,6 @@
 import { Connection, PublicKey, RpcResponseAndContext, SimulatedTransactionResponse, Transaction, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import BN from 'bn.js';
-import { ObligationType } from '../utils';
+import { ObligationType, ScopeRefresh } from '../utils';
 import { KaminoMarket } from './market';
 import { KaminoObligation } from './obligation';
 import { KaminoReserve } from './reserve';
@@ -28,7 +28,6 @@ export declare class KaminoAction {
     positions?: number;
     amount: BN;
     outflowAmount?: BN;
-    hostAta?: PublicKey;
     setupIxs: Array<TransactionInstruction>;
     setupIxsLabels: Array<string>;
     inBetweenIxs: Array<TransactionInstruction>;
@@ -49,7 +48,7 @@ export declare class KaminoAction {
     preLoadedBorrowReservesSameTx: Array<PublicKey>;
     currentSlot: number;
     private constructor();
-    static initialize(action: ActionType, amount: string | BN, mint: PublicKey, owner: PublicKey, kaminoMarket: KaminoMarket, obligation: KaminoObligation | ObligationType, referrer?: PublicKey, currentSlot?: number, hostAta?: PublicKey, payer?: PublicKey): Promise<KaminoAction>;
+    static initialize(action: ActionType, amount: string | BN, mint: PublicKey, owner: PublicKey, kaminoMarket: KaminoMarket, obligation: KaminoObligation | ObligationType, referrer?: PublicKey, currentSlot?: number, payer?: PublicKey): Promise<KaminoAction>;
     private static getUserAccountAddresses;
     private static loadObligation;
     static buildRefreshObligationTxns(kaminoMarket: KaminoMarket, payer: PublicKey, obligation: KaminoObligation, extraComputeBudget?: number, // if > 0 then adds the ixn
@@ -59,35 +58,37 @@ export declare class KaminoAction {
     static buildDepositTxns(kaminoMarket: KaminoMarket, amount: string | BN, mint: PublicKey, owner: PublicKey, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas,
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata
-    referrer?: PublicKey, currentSlot?: number): Promise<KaminoAction>;
+    referrer?: PublicKey, currentSlot?: number, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
+    getTokenIdsForScopeRefresh(kaminoMarket: KaminoMarket, reserves: PublicKey[]): number[];
+    addScopeRefreshIxs(tokens: number[], feed?: string): Promise<void>;
     static buildBorrowTxns(kaminoMarket: KaminoMarket, amount: string | BN, mint: PublicKey, owner: PublicKey, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas,
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata
-    referrer?: PublicKey, currentSlot?: number, hostAta?: PublicKey): Promise<KaminoAction>;
+    referrer?: PublicKey, currentSlot?: number, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     static buildDepositReserveLiquidityTxns(kaminoMarket: KaminoMarket, amount: string | BN, mint: PublicKey, owner: PublicKey, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata
-    referrer?: PublicKey, currentSlot?: number): Promise<KaminoAction>;
+    referrer?: PublicKey, currentSlot?: number, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     static buildRedeemReserveCollateralTxns(kaminoMarket: KaminoMarket, amount: string | BN, mint: PublicKey, owner: PublicKey, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata,
-    referrer?: PublicKey, currentSlot?: number): Promise<KaminoAction>;
+    referrer?: PublicKey, currentSlot?: number, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     static buildDepositObligationCollateralTxns(kaminoMarket: KaminoMarket, amount: string | BN, mint: PublicKey, owner: PublicKey, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata
-    referrer?: PublicKey, currentSlot?: number): Promise<KaminoAction>;
+    referrer?: PublicKey, currentSlot?: number, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     static buildDepositAndBorrowTxns(kaminoMarket: KaminoMarket, depositAmount: string | BN, depositMint: PublicKey, borrowAmount: string | BN, borrowMint: PublicKey, payer: PublicKey, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas,
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata,
-    referrer?: PublicKey, currentSlot?: number): Promise<KaminoAction>;
+    referrer?: PublicKey, currentSlot?: number, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     static buildRepayAndWithdrawTxns(kaminoMarket: KaminoMarket, repayAmount: string | BN, repayMint: PublicKey, withdrawAmount: string | BN, withdrawMint: PublicKey, payer: PublicKey, currentSlot: number, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas,
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata,
-    isClosingPosition?: boolean, referrer?: PublicKey): Promise<KaminoAction>;
+    isClosingPosition?: boolean, referrer?: PublicKey, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     static buildWithdrawTxns(kaminoMarket: KaminoMarket, amount: string | BN, mint: PublicKey, owner: PublicKey, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas,
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata
-    referrer?: PublicKey, currentSlot?: number): Promise<KaminoAction>;
+    referrer?: PublicKey, currentSlot?: number, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     /**
      *
      * @param kaminoMarket
@@ -103,11 +104,11 @@ export declare class KaminoAction {
      * @param includeUserMetadata - if true it includes user metadata
      * @param referrer
      */
-    static buildRepayTxns(kaminoMarket: KaminoMarket, amount: string | BN, mint: PublicKey, owner: PublicKey, obligation: KaminoObligation | ObligationType, currentSlot: number, payer?: PublicKey | undefined, extraComputeBudget?: number, includeAtaIxns?: boolean, requestElevationGroup?: boolean, includeUserMetadata?: boolean, referrer?: PublicKey): Promise<KaminoAction>;
+    static buildRepayTxns(kaminoMarket: KaminoMarket, amount: string | BN, mint: PublicKey, owner: PublicKey, obligation: KaminoObligation | ObligationType, currentSlot: number, payer?: PublicKey | undefined, extraComputeBudget?: number, includeAtaIxns?: boolean, requestElevationGroup?: boolean, includeUserMetadata?: boolean, referrer?: PublicKey, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     static buildLiquidateTxns(kaminoMarket: KaminoMarket, amount: string | BN, minCollateralReceiveAmount: string | BN, repayTokenMint: PublicKey, withdrawTokenMint: PublicKey, liquidator: PublicKey, obligationOwner: PublicKey, obligation: KaminoObligation | ObligationType, extraComputeBudget?: number, // if > 0 then adds the ixn
     includeAtaIxns?: boolean, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
     requestElevationGroup?: boolean, includeUserMetadata?: boolean, // if true it includes user metadata
-    referrer?: PublicKey, maxAllowedLtvOverridePercent?: number, currentSlot?: number): Promise<KaminoAction>;
+    referrer?: PublicKey, maxAllowedLtvOverridePercent?: number, currentSlot?: number, scopeRefresh?: ScopeRefresh): Promise<KaminoAction>;
     static buildWithdrawReferrerFeeTxns(owner: PublicKey, tokenMint: PublicKey, kaminoMarket: KaminoMarket, currentSlot?: number): Promise<KaminoAction>;
     getTransactions(): Promise<{
         preLendingTxn: Transaction | null;
@@ -148,10 +149,11 @@ export declare class KaminoAction {
     private addAtaIxs;
     private updateWSOLAccount;
     static initializeMultiTokenAction(kaminoMarket: KaminoMarket, action: ActionType, inflowAmount: string | BN, inflowTokenMint: PublicKey, outflowTokenMint: PublicKey, payer: PublicKey, obligationOwner: PublicKey, obligation: KaminoObligation | ObligationType, outflowAmount?: string | BN, referrer?: PublicKey, currentSlot?: number): Promise<KaminoAction>;
-    static initializeWithdrawReferrerFees(mint: PublicKey, owner: PublicKey, kaminoMarket: KaminoMarket, currentSlot?: number, hostAta?: PublicKey): Promise<{
+    static initializeWithdrawReferrerFees(mint: PublicKey, owner: PublicKey, kaminoMarket: KaminoMarket, currentSlot?: number): Promise<{
         axn: KaminoAction;
         createAtasIxns: TransactionInstruction[];
     }>;
     getObligationPda(): PublicKey;
     getAdditionalDepositReservesList(): PublicKey[];
+    private static getReferrerKey;
 }

package/dist/classes/action.js

@@ -24,12 +24,13 @@ const types_1 = require("../idl_codegen/types");
 const farms_sdk_1 = require("@hubbleprotocol/farms-sdk");
 const ObligationType_1 = require("../utils/ObligationType");
 const lib_1 = require("../lib");
+const scope_sdk_1 = require("@hubbleprotocol/scope-sdk");
 exports.POSITION_LIMIT = 10;
 exports.BORROWS_LIMIT = 5;
 exports.DEPOSITS_LIMIT = 8;
 const SOL_PADDING_FOR_INTEREST = new bn_js_1.default('1000000');
 class KaminoAction {
-    constructor(kaminoMarket, owner, obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, positions, amount, depositReserves, borrowReserves, reserveState, currentSlot, hostAta, secondaryMint, additionalTokenAccountAddress, outflowReserveState, outflowAmount, referrer, payer) {
+    constructor(kaminoMarket, owner, obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, positions, amount, depositReserves, borrowReserves, reserveState, currentSlot, secondaryMint, additionalTokenAccountAddress, outflowReserveState, outflowAmount, referrer, payer) {
         this.obligation = null;
         /**
          * Null unless the obligation is not passed
@@ -47,7 +48,6 @@ class KaminoAction {
         this.amount = new bn_js_1.default(amount);
         this.mint = mint;
         this.positions = positions;
-        this.hostAta = hostAta;
         this.userTokenAccountAddress = userTokenAccountAddress;
         this.userCollateralAccountAddress = userCollateralAccountAddress;
         this.setupIxs = [];
@@ -77,19 +77,15 @@ class KaminoAction {
         this.currentSlot = currentSlot;
     }
     static initialize(action_1, amount_1, mint_1, owner_1, kaminoMarket_1, obligation_2) {
-        return __awaiter(this, arguments, void 0, function* (action, amount, mint, owner, kaminoMarket, obligation, referrer = web3_js_1.PublicKey.default, currentSlot = 0, hostAta, payer) {
+        return __awaiter(this, arguments, void 0, function* (action, amount, mint, owner, kaminoMarket, obligation, referrer = web3_js_1.PublicKey.default, currentSlot = 0, payer) {
             const reserve = kaminoMarket.getReserveByMint(mint);
             if (reserve === undefined) {
                 throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
             }
             const { userTokenAccountAddress, userCollateralAccountAddress } = KaminoAction.getUserAccountAddresses(payer !== null && payer !== void 0 ? payer : owner, reserve.state);
             const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = yield KaminoAction.loadObligation(action, kaminoMarket, owner, reserve.address, obligation);
-            const [_, userMetadata] = yield kaminoMarket.getUserMetadata(owner);
-            if (userMetadata) {
-                referrer = userMetadata.referrer;
-            }
-            const referrerKey = kaminoObligation ? kaminoObligation.state.referrer : referrer;
-            return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, hostAta, undefined, undefined, undefined, undefined, referrerKey, payer);
+            const referrerKey = yield this.getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer);
+            return new KaminoAction(kaminoMarket, owner, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, mint, distinctReserveCount, amount, depositReserves, borrowReserves, reserve, currentSlot, undefined, undefined, undefined, undefined, referrerKey, payer);
         });
     }
     static getUserAccountAddresses(owner, reserve) {
@@ -117,20 +113,16 @@ class KaminoAction {
                 throw new Error(`Outflow reserve has not been set for depositAndBorrow`);
             }
             // Union of addresses
-            const distinctReserveCount = [
-                ...new Set([
-                    ...borrowReserves.map((e) => e.toBase58()),
-                    ...(action === 'borrow' ? [reserve.toBase58()] : []),
-                    ...(action === 'depositAndBorrow' ? [reserve.toBase58()] : []),
-                ]),
-            ].length +
-                [
-                    ...new Set([
-                        ...depositReserves.map((e) => e.toBase58()),
-                        ...(action === 'deposit' ? [reserve.toBase58()] : []),
-                        ...(action === 'depositAndBorrow' ? [outflowReserve.toBase58()] : []),
-                    ]),
-                ].length;
+            const distinctReserveCount = new utils_1.PublicKeySet([
+                ...borrowReserves.map((e) => e),
+                ...(action === 'borrow' ? [reserve] : []),
+                ...(action === 'depositAndBorrow' ? [reserve] : []),
+            ]).toArray().length +
+                new utils_1.PublicKeySet([
+                    ...depositReserves.map((e) => e),
+                    ...(action === 'deposit' ? [reserve] : []),
+                    ...(action === 'depositAndBorrow' ? [outflowReserve] : []),
+                ]).toArray().length;
             if (distinctReserveCount > exports.POSITION_LIMIT) {
                 throw Error(`Obligation already has max number of positions: ${exports.POSITION_LIMIT}`);
             }
@@ -151,7 +143,7 @@ class KaminoAction {
             if (!firstKaminoReserve) {
                 throw new Error(`Reserve ${firstReserve.toBase58()} not found`);
             }
-            const axn = yield KaminoAction.initialize('refreshObligation', '0', firstKaminoReserve === null || firstKaminoReserve === void 0 ? void 0 : firstKaminoReserve.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, kaminoMarket.programId, currentSlot);
+            const axn = yield KaminoAction.initialize('refreshObligation', '0', firstKaminoReserve === null || firstKaminoReserve === void 0 ? void 0 : firstKaminoReserve.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, undefined, currentSlot);
             if (extraComputeBudget > 0) {
                 axn.addComputeBudgetIxn(extraComputeBudget);
             }
@@ -167,7 +159,7 @@ class KaminoAction {
             if (!firstKaminoReserve) {
                 throw new Error(`Reserve ${firstReserve.toBase58()} not found`);
             }
-            const axn = yield KaminoAction.initialize('requestElevationGroup', '0', firstKaminoReserve === null || firstKaminoReserve === void 0 ? void 0 : firstKaminoReserve.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, kaminoMarket.programId, currentSlot);
+            const axn = yield KaminoAction.initialize('requestElevationGroup', '0', firstKaminoReserve === null || firstKaminoReserve === void 0 ? void 0 : firstKaminoReserve.getLiquidityMint(), obligation.state.owner, kaminoMarket, obligation, undefined, currentSlot);
             if (extraComputeBudget > 0) {
                 axn.addComputeBudgetIxn(extraComputeBudget);
             }
@@ -180,28 +172,76 @@ class KaminoAction {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas,
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
             const axn = yield 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
             axn.addDepositIx();
             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;
+    }
+    addScopeRefreshIxs(tokens_1) {
+        return __awaiter(this, arguments, void 0, function* (tokens, feed = 'hubble') {
+            this.preTxnIxsLabels.unshift(`refreshScopePrices`);
+            this.preTxnIxs.unshift(yield this.kaminoMarket.scope.refreshPriceListIx({
+                feed: feed,
+            }, tokens));
+        });
+    }
     static buildBorrowTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2) {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas,
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0, hostAta) {
-            const axn = yield KaminoAction.initialize('borrow', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, hostAta);
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+            const axn = yield 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
             axn.addBorrowIx();
             axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -212,12 +252,21 @@ class KaminoAction {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
             const axn = yield 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('mint', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
             axn.addDepositReserveLiquidityIx();
             axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -228,12 +277,21 @@ class KaminoAction {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
             const axn = yield 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('redeem', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
             axn.addRedeemReserveCollateralIx();
             axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -244,12 +302,21 @@ class KaminoAction {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
             const axn = yield 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
             axn.addDepositObligationCollateralIx();
             axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -260,7 +327,7 @@ class KaminoAction {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas,
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
             const axn = yield KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, payer, payer, obligation, borrowAmount, referrer, currentSlot);
             const addInitObligationForFarmForDeposit = true;
             const addInitObligationForFarmForBorrow = false;
@@ -268,6 +335,16 @@ 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, twoTokenAction);
             yield axn.addDepositAndBorrowIx();
             yield axn.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow);
@@ -279,7 +356,7 @@ class KaminoAction {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas,
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-        isClosingPosition = false, referrer = web3_js_1.PublicKey.default) {
+        isClosingPosition = false, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
             const axn = yield KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
             const addInitObligationForFarmForRepay = true;
             const addInitObligationForFarmForWithdraw = false;
@@ -287,6 +364,16 @@ 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, twoTokenAction);
             yield axn.addRepayAndWithdrawIxs();
             yield axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw, isClosingPosition);
@@ -298,12 +385,21 @@ class KaminoAction {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas,
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, currentSlot = 0) {
+        referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
             const axn = yield KaminoAction.initialize('withdraw', 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
             yield axn.addWithdrawIx();
             axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -326,12 +422,21 @@ class KaminoAction {
      * @param referrer
      */
     static buildRepayTxns(kaminoMarket_1, amount_1, mint_1, owner_1, obligation_2, currentSlot_1) {
-        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, currentSlot, payer = undefined, extraComputeBudget = 1000000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, referrer = web3_js_1.PublicKey.default) {
-            const axn = yield KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, undefined, payer);
+        return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, mint, owner, obligation, currentSlot, payer = undefined, extraComputeBudget = 1000000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+            const axn = yield 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
             yield axn.addRepayIx();
             axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -342,12 +447,22 @@ class KaminoAction {
         return __awaiter(this, arguments, void 0, function* (kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, extraComputeBudget = 1000000, // if > 0 then adds the ixn
         includeAtaIxns = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
         requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-        referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0) {
+        referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
             const axn = yield 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) {
+                yield axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+            }
             yield axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
             yield axn.addLiquidateIx(maxAllowedLtvOverridePercent);
             axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -1250,18 +1365,22 @@ class KaminoAction {
     }
     addInitReferrerTokenStateIxs() {
         return __awaiter(this, arguments, void 0, function* (reservesArr = []) {
+            var _a;
             if (this.referrer.equals(web3_js_1.PublicKey.default)) {
                 return;
             }
-            const reserves = reservesArr.length !== 0 ? reservesArr : [...new Set([this.reserve, this.outflowReserve])];
+            const outflowReserve = ((_a = this.outflowReserve) === null || _a === void 0 ? void 0 : _a.address) ? [this.outflowReserve.address] : [];
+            const reserves = reservesArr.length !== 0
+                ? reservesArr.map((reserve) => reserve.address)
+                : new utils_1.PublicKeySet([this.reserve.address, ...outflowReserve]).toArray();
             const tokenStatesToCreate = [];
             for (const reserve of reserves) {
                 if (!reserve) {
                     continue;
                 }
-                const referrerTokenStateAddress = (0, utils_1.referrerTokenStatePda)(this.referrer, reserve.address, this.kaminoMarket.programId)[0];
+                const referrerTokenStateAddress = (0, utils_1.referrerTokenStatePda)(this.referrer, reserve, this.kaminoMarket.programId)[0];
                 if (!(yield (0, utils_1.checkIfAccountExists)(this.kaminoMarket.getConnection(), referrerTokenStateAddress))) {
-                    tokenStatesToCreate.push([referrerTokenStateAddress, reserve === null || reserve === void 0 ? void 0 : reserve.address]);
+                    tokenStatesToCreate.push([referrerTokenStateAddress, reserve]);
                 }
             }
             tokenStatesToCreate.forEach(([referrerTokenStateAddress, reserveAddress]) => {
@@ -1310,7 +1429,7 @@ class KaminoAction {
                 const userTokenAccountInfo = yield this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
                 if (!userTokenAccountInfo) {
                     const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
-                    if (this.positions === exports.POSITION_LIMIT && this.hostAta) {
+                    if (this.positions === exports.POSITION_LIMIT) {
                         this.preTxnIxs.push(createUserTokenAccountIx);
                         this.preTxnIxsLabels.push(`CreateLiquidityUserAta[${this.owner}]`);
                     }
@@ -1490,11 +1609,7 @@ class KaminoAction {
             const { userTokenAccountAddress: userOutflowTokenAccountAddress, userCollateralAccountAddress: userOutflowCollateralAccountAddress, } = KaminoAction.getUserAccountAddresses(payer, outflowReserve.state);
             const { userTokenAccountAddress: userInflowTokenAccountAddress, userCollateralAccountAddress: userInflowCollateralAccountAddress, } = KaminoAction.getUserAccountAddresses(payer, inflowReserve.state);
             const { kaminoObligation, depositReserves, borrowReserves, distinctReserveCount } = yield KaminoAction.loadObligation(action, kaminoMarket, obligationOwner, inflowReserve.address, obligation, outflowReserve.address);
-            const [_, userMetadata] = yield kaminoMarket.getUserMetadata(payer);
-            if (userMetadata) {
-                referrer = userMetadata.referrer;
-            }
-            const referrerKey = kaminoObligation ? kaminoObligation.state.referrer : referrer;
+            const referrerKey = yield this.getReferrerKey(kaminoMarket, payer, kaminoObligation, referrer);
             let userTokenAccountAddress;
             let userCollateralAccountAddress;
             let additionalUserTokenAccountAddress;
@@ -1524,21 +1639,19 @@ class KaminoAction {
             else {
                 throw new Error('Invalid action');
             }
-            return new KaminoAction(kaminoMarket, payer, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, undefined, secondaryMint, additionalUserTokenAccountAddress, outflowReserve, outflowAmount, referrerKey);
+            return new KaminoAction(kaminoMarket, payer, kaminoObligation || obligation, userTokenAccountAddress, userCollateralAccountAddress, primaryMint, distinctReserveCount, inflowAmount, depositReserves, borrowReserves, inflowReserve, currentSlot, secondaryMint, additionalUserTokenAccountAddress, outflowReserve, outflowAmount, referrerKey);
         });
     }
     static initializeWithdrawReferrerFees(mint_1, owner_1, kaminoMarket_1) {
-        return __awaiter(this, arguments, void 0, function* (mint, owner, kaminoMarket, currentSlot = 0, hostAta) {
+        return __awaiter(this, arguments, void 0, function* (mint, owner, kaminoMarket, currentSlot = 0) {
             const reserve = kaminoMarket.getReserveByMint(mint);
             if (reserve === undefined) {
                 throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
             }
-            const { atas, createAtasIxns } = yield (0, utils_1.getAtasWithCreateIxnsIfMissing)(kaminoMarket.getConnection(), owner, [
-                reserve.getLiquidityMint(),
-            ]);
+            const { atas, createAtasIxns } = yield (0, utils_1.getAtasWithCreateIxnsIfMissing)(kaminoMarket.getConnection(), owner, [reserve.getLiquidityMint()], [reserve.getLiquidityTokenProgram()]);
             const userTokenAccountAddress = atas[0];
             return {
-                axn: new KaminoAction(kaminoMarket, owner, new ObligationType_1.VanillaObligation(kaminoMarket.programId), userTokenAccountAddress, web3_js_1.PublicKey.default, mint, 0, new bn_js_1.default(0), [], [], reserve, currentSlot, hostAta, undefined, undefined, undefined, undefined, undefined),
+                axn: new KaminoAction(kaminoMarket, owner, new ObligationType_1.VanillaObligation(kaminoMarket.programId), userTokenAccountAddress, web3_js_1.PublicKey.default, mint, 0, new bn_js_1.default(0), [], [], reserve, currentSlot, undefined, undefined, undefined, undefined, undefined),
                 createAtasIxns,
             };
         });
@@ -1565,6 +1678,23 @@ class KaminoAction {
         }
         return depositReservesList;
     }
+    static getReferrerKey(kaminoMarket, owner, kaminoObligation, referrer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let referrerKey = referrer;
+            if (!referrer || referrer.equals(web3_js_1.PublicKey.default)) {
+                if (kaminoObligation === null) {
+                    const [_, userMetadata] = yield kaminoMarket.getUserMetadata(owner);
+                    if (userMetadata) {
+                        referrerKey = userMetadata.referrer;
+                    }
+                }
+                else {
+                    referrerKey = kaminoObligation.state.referrer;
+                }
+            }
+            return referrerKey;
+        });
+    }
 }
 exports.KaminoAction = KaminoAction;
 //# sourceMappingURL=action.js.map