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

package/src/classes/vault.ts

@@ -293,7 +293,7 @@ export class KaminoVaultClient {
     );
 
     const updateReserveAllocationAccounts: UpdateReserveAllocationAccounts = {
-      signer: vaultState.vaultAdminAuthority,
+      signer: vaultState.adminAuthority,
       vaultState: vault.address,
       baseVaultAuthority: vaultState.baseVaultAuthority,
       reserveCollateralMint: reserveState.collateral.mintPubkey,
@@ -325,7 +325,7 @@ export class KaminoVaultClient {
     accountsToAddToLUT.push(lendingMarketAuth);
 
     const insertIntoLUTIxs = await this.insertIntoLookupTableIxs(
-      vaultState.vaultAdminAuthority,
+      vaultState.adminAuthority,
       vaultState.vaultLookupTable,
       accountsToAddToLUT
     );
@@ -355,12 +355,12 @@ export class KaminoVaultClient {
     const vaultState: VaultState = await vault.getState(this.getConnection());
 
     const updateVaultConfigAccs: UpdateVaultConfigAccounts = {
-      vaultAdminAuthority: vaultState.vaultAdminAuthority,
+      adminAuthority: vaultState.adminAuthority,
       vaultState: vault.address,
       klendProgram: this._kaminoLendProgramId,
     };
     if (signer) {
-      updateVaultConfigAccs.vaultAdminAuthority = signer;
+      updateVaultConfigAccs.adminAuthority = signer;
     }
 
     const updateVaultConfigArgs: UpdateVaultConfigArgs = {
@@ -414,7 +414,7 @@ export class KaminoVaultClient {
     if (mode.kind === new VaultConfigField.PendingVaultAdmin().kind) {
       const newPubkey = new PublicKey(value);
       const insertIntoLutIxs = await this.insertIntoLookupTableIxs(
-        vaultState.vaultAdminAuthority,
+        vaultState.adminAuthority,
         vaultState.vaultLookupTable,
         [newPubkey]
       );
@@ -432,7 +432,7 @@ export class KaminoVaultClient {
           farmState!.globalConfig
         );
         const insertIntoLutIxs = await this.insertIntoLookupTableIxs(
-          vaultState.vaultAdminAuthority,
+          vaultState.adminAuthority,
           vaultState.vaultLookupTable,
           keysToAddToLUT
         );
@@ -481,7 +481,7 @@ export class KaminoVaultClient {
     value: string
   ): TransactionInstruction {
     const updateVaultConfigAccs: UpdateVaultConfigAccounts = {
-      vaultAdminAuthority: admin,
+      adminAuthority: admin,
       vaultState: vault,
       klendProgram: this._kaminoLendProgramId,
     };
@@ -531,7 +531,7 @@ export class KaminoVaultClient {
 
     // read the current LUT and create a new one for the new admin and backfill it
     const accountsInExistentLUT = (await getAccountsInLUT(this.getConnection(), vaultState.vaultLookupTable)).filter(
-      (account) => !account.equals(vaultState.vaultAdminAuthority)
+      (account) => !account.equals(vaultState.adminAuthority)
     );
 
     const LUTIxs: TransactionInstruction[] = [];
@@ -574,7 +574,7 @@ export class KaminoVaultClient {
     const vaultState: VaultState = await vault.getState(this.getConnection());
 
     const giveUpPendingFeesAccounts: GiveUpPendingFeesAccounts = {
-      vaultAdminAuthority: vaultState.vaultAdminAuthority,
+      adminAuthority: vaultState.adminAuthority,
       vaultState: vault.address,
       klendProgram: this._kaminoLendProgramId,
     };
@@ -604,7 +604,7 @@ export class KaminoVaultClient {
   ): Promise<TransactionInstruction[]> {
     const vaultState: VaultState = await vault.getState(this.getConnection());
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
-    const [{ ata: adminTokenAta, createAtaIx }] = createAtasIdempotent(vaultState.vaultAdminAuthority, [
+    const [{ ata: adminTokenAta, createAtaIx }] = createAtasIdempotent(vaultState.adminAuthority, [
       {
         mint: vaultState.tokenMint,
         tokenProgram: TOKEN_PROGRAM_ID,
@@ -1295,7 +1295,7 @@ export class KaminoVaultClient {
     const lendingMarketAuth = lendingMarketAuthPda(marketAddress, this._kaminoLendProgramId)[0];
 
     const withdrawPendingFeesAccounts: WithdrawPendingFeesAccounts = {
-      vaultAdminAuthority: vaultState.vaultAdminAuthority,
+      adminAuthority: vaultState.adminAuthority,
       vaultState: vault.address,
       reserve: reserve.address,
       tokenVault: vaultState.tokenVault,
@@ -1355,7 +1355,7 @@ export class KaminoVaultClient {
     const vaultState = await vault.getState(this.getConnection());
     const allAccountsToBeInserted = [
       vault.address,
-      vaultState.vaultAdminAuthority,
+      vaultState.adminAuthority,
       vaultState.baseVaultAuthority,
       vaultState.tokenMint,
       vaultState.tokenVault,
@@ -1400,7 +1400,7 @@ export class KaminoVaultClient {
     let lut = vaultState.vaultLookupTable;
     if (lut.equals(PublicKey.default)) {
       const recentSlot = await this.getConnection().getSlot();
-      const [ixn, address] = initLookupTableIx(vaultState.vaultAdminAuthority, recentSlot);
+      const [ixn, address] = initLookupTableIx(vaultState.adminAuthority, recentSlot);
       setupLUTIfNeededIxs.push(ixn);
       lut = address;
 
@@ -1420,7 +1420,7 @@ export class KaminoVaultClient {
     }
     ixns.push(
       ...(await this.insertIntoLookupTableIxs(
-        vaultState.vaultAdminAuthority,
+        vaultState.adminAuthority,
         lut,
         allAccountsToBeInserted,
         overridenExistentAccounts

package/src/client.ts

@@ -22,6 +22,7 @@ import { VanillaObligation } from './utils/ObligationType';
 import { parseTokenSymbol } from './classes/utils';
 import { Env, initEnv } from '../tests/runner/setup_utils';
 import { initializeFarmsForReserve } from '../tests/runner/farms/farms_operations';
+import { Scope } from '@kamino-finance/scope-sdk';
 
 const STAGING_LENDING_MARKET = new PublicKey('6WVSwDQXrBZeQVnu6hpnsRZhodaJTZBUaC334SiiBKdb');
 const MAINNET_LENDING_MARKET = new PublicKey('7u3HeHxYDLhnCoErrtycNokbQYbWGzLs6JSDqGAv5PfF');
@@ -309,7 +310,8 @@ async function deposit(connection: Connection, wallet: Keypair, token: string, d
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
     new VanillaObligation(STAGING_LENDING_MARKET),
-    true
+    true,
+    { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -330,7 +332,8 @@ async function withdraw(connection: Connection, wallet: Keypair, token: string,
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
     new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
-    true
+    true,
+    { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -351,7 +354,8 @@ async function borrow(connection: Connection, wallet: Keypair, token: string, bo
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
     new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
-    true
+    true,
+    { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -373,6 +377,7 @@ async function repay(connection: Connection, wallet: Keypair, token: string, bor
     wallet.publicKey,
     new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
     true,
+    { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' },
     await connection.getSlot()
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());

package/src/idl_codegen_kamino_vault/accounts/VaultState.ts

@@ -5,7 +5,7 @@ import * as types from "../types" // eslint-disable-line @typescript-eslint/no-u
 import { PROGRAM_ID } from "../programId"
 
 export interface VaultStateFields {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   baseVaultAuthority: PublicKey
   baseVaultAuthorityBump: BN
   tokenMint: PublicKey
@@ -43,7 +43,7 @@ export interface VaultStateFields {
 }
 
 export interface VaultStateJSON {
-  vaultAdminAuthority: string
+  adminAuthority: string
   baseVaultAuthority: string
   baseVaultAuthorityBump: string
   tokenMint: string
@@ -81,7 +81,7 @@ export interface VaultStateJSON {
 }
 
 export class VaultState {
-  readonly vaultAdminAuthority: PublicKey
+  readonly adminAuthority: PublicKey
   readonly baseVaultAuthority: PublicKey
   readonly baseVaultAuthorityBump: BN
   readonly tokenMint: PublicKey
@@ -122,7 +122,7 @@ export class VaultState {
   ])
 
   static readonly layout = borsh.struct([
-    borsh.publicKey("vaultAdminAuthority"),
+    borsh.publicKey("adminAuthority"),
     borsh.publicKey("baseVaultAuthority"),
     borsh.u64("baseVaultAuthorityBump"),
     borsh.publicKey("tokenMint"),
@@ -160,7 +160,7 @@ export class VaultState {
   ])
 
   constructor(fields: VaultStateFields) {
-    this.vaultAdminAuthority = fields.vaultAdminAuthority
+    this.adminAuthority = fields.adminAuthority
     this.baseVaultAuthority = fields.baseVaultAuthority
     this.baseVaultAuthorityBump = fields.baseVaultAuthorityBump
     this.tokenMint = fields.tokenMint
@@ -243,7 +243,7 @@ export class VaultState {
     const dec = VaultState.layout.decode(data.slice(8))
 
     return new VaultState({
-      vaultAdminAuthority: dec.vaultAdminAuthority,
+      adminAuthority: dec.adminAuthority,
       baseVaultAuthority: dec.baseVaultAuthority,
       baseVaultAuthorityBump: dec.baseVaultAuthorityBump,
       tokenMint: dec.tokenMint,
@@ -287,7 +287,7 @@ export class VaultState {
 
   toJSON(): VaultStateJSON {
     return {
-      vaultAdminAuthority: this.vaultAdminAuthority.toString(),
+      adminAuthority: this.adminAuthority.toString(),
       baseVaultAuthority: this.baseVaultAuthority.toString(),
       baseVaultAuthorityBump: this.baseVaultAuthorityBump.toString(),
       tokenMint: this.tokenMint.toString(),
@@ -329,7 +329,7 @@ export class VaultState {
 
   static fromJSON(obj: VaultStateJSON): VaultState {
     return new VaultState({
-      vaultAdminAuthority: new PublicKey(obj.vaultAdminAuthority),
+      adminAuthority: new PublicKey(obj.adminAuthority),
       baseVaultAuthority: new PublicKey(obj.baseVaultAuthority),
       baseVaultAuthorityBump: new BN(obj.baseVaultAuthorityBump),
       tokenMint: new PublicKey(obj.tokenMint),

package/src/idl_codegen_kamino_vault/instructions/giveUpPendingFees.ts

@@ -9,7 +9,7 @@ export interface GiveUpPendingFeesArgs {
 }
 
 export interface GiveUpPendingFeesAccounts {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -22,7 +22,7 @@ export function giveUpPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
   ]

package/src/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.ts

@@ -11,7 +11,7 @@ export interface InitializeSharesMetadataArgs {
 }
 
 export interface InitializeSharesMetadataAccounts {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   sharesMint: PublicKey
   baseVaultAuthority: PublicKey
@@ -33,7 +33,7 @@ export function initializeSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/updateSharesMetadata.ts

@@ -11,7 +11,7 @@ export interface UpdateSharesMetadataArgs {
 }
 
 export interface UpdateSharesMetadataAccounts {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   sharesMetadata: PublicKey
@@ -30,7 +30,7 @@ export function updateSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMetadata, isSigner: false, isWritable: true },

package/src/idl_codegen_kamino_vault/instructions/updateVaultConfig.ts

@@ -10,7 +10,7 @@ export interface UpdateVaultConfigArgs {
 }
 
 export interface UpdateVaultConfigAccounts {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -26,7 +26,7 @@ export function updateVaultConfig(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: false },
+    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: false },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
   ]

package/src/idl_codegen_kamino_vault/instructions/withdrawPendingFees.ts

@@ -5,7 +5,7 @@ import * as types from "../types" // eslint-disable-line @typescript-eslint/no-u
 import { PROGRAM_ID } from "../programId"
 
 export interface WithdrawPendingFeesAccounts {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   reserve: PublicKey
   tokenVault: PublicKey
@@ -29,7 +29,7 @@ export function withdrawPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.reserve, isSigner: false, isWritable: true },
     { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },

package/src/idl_kamino_vault.json

@@ -403,7 +403,7 @@
       "name": "updateVaultConfig",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": false,
           "isSigner": true
         },
@@ -435,7 +435,7 @@
       "name": "withdrawPendingFees",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -540,7 +540,7 @@
       "name": "giveUpPendingFees",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -566,7 +566,7 @@
       "name": "initializeSharesMetadata",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -625,7 +625,7 @@
       "name": "updateSharesMetadata",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -858,7 +858,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultAdminAuthority",
+            "name": "adminAuthority",
             "type": "publicKey"
           },
           {
@@ -2189,4 +2189,4 @@
       "msg": "Wrong admin or allocation admin"
     }
   ]
-}
+}

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -6,12 +6,13 @@ import {
   SwapIxs,
   SwapIxsProvider,
   SwapQuoteProvider,
+  getScopeRefreshIx,
 } from '../leverage';
 import {
   createAtasIdempotent,
   getComputeBudgetAndPriorityFeeIxns,
   removeBudgetAndAtaIxns,
-  ScopeRefresh,
+  ScopePriceRefreshConfig,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -51,7 +52,7 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   repayAmount: Decimal;
   isClosingPosition: boolean;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
-  scopeRefresh?: ScopeRefresh;
+  scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
@@ -67,7 +68,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   repayAmount,
   isClosingPosition,
   budgetAndPriorityFeeIxs,
-  scopeRefresh,
+  scopeRefreshConfig,
   useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
@@ -126,7 +127,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     {
       preActionIxs: [],
       swapIxs: [],
@@ -191,7 +192,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   quoter,
   swapper,
   referrer,
-  scopeRefresh,
+  scopeRefreshConfig,
   useV2Ixs,
   logger = console.log,
 }: RepayWithCollIxsProps<QuoteResponse>): Promise<RepayWithCollIxsResponse<QuoteResponse>> {
@@ -206,7 +207,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     repayAmount,
     isClosingPosition,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     useV2Ixs,
   });
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
@@ -244,7 +245,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     swapResponse,
     isClosingPosition,
     debtRepayAmountLamports,
@@ -268,7 +269,7 @@ async function buildRepayWithCollateralIxs(
   referrer: PublicKey,
   currentSlot: number,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
-  scopeRefresh: ScopeRefresh | undefined,
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   swapQuoteIxs: SwapIxs,
   isClosingPosition: boolean,
   debtRepayAmountLamports: Decimal,
@@ -286,9 +287,11 @@ async function buildRepayWithCollateralIxs(
   const atasAndIxs = createAtasIdempotent(obligation.state.owner, atas);
   const [, { ata: debtTokenAta }] = atasAndIxs;
 
+  const scopeRefreshIxn = await getScopeRefreshIx(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
+
   // 2. Flash borrow & repay the debt to repay amount needed
   const { flashBorrowIxn, flashRepayIxn } = getFlashLoanInstructions({
-    borrowIxnIndex: budgetIxns.length + atasAndIxs.length,
+    borrowIxnIndex: budgetIxns.length + atasAndIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
     walletPublicKey: obligation.state.owner,
     lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -314,13 +317,13 @@ async function buildRepayWithCollateralIxs(
     currentSlot,
     obligation,
     useV2Ixs,
+    undefined,
     0,
     false,
     requestElevationGroup,
     undefined,
     undefined,
-    referrer,
-    scopeRefresh
+    referrer
   );
 
   // 4. Swap collateral to debt to repay flash loan
@@ -328,6 +331,7 @@ async function buildRepayWithCollateralIxs(
   const swapInstructions = removeBudgetAndAtaIxns(swapIxs, []);
 
   return [
+    ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndIxs.map((x) => x.createAtaIx),
     flashBorrowIxn,

package/src/lending_operations/swap_collateral_operations.ts

@@ -6,14 +6,14 @@ import {
   KaminoObligation,
   KaminoReserve,
 } from '../classes';
-import { getFlashLoanInstructions, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
+import { getFlashLoanInstructions, getScopeRefreshIx, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
 import {
   createAtasIdempotent,
   DEFAULT_MAX_COMPUTE_UNITS,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxns,
   PublicKeySet,
-  ScopeRefresh,
+  ScopePriceRefreshConfig,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -61,7 +61,7 @@ export interface SwapCollIxnsInputs<QuoteResponse> {
   referrer: PublicKey;
   currentSlot: number;
   budgetAndPriorityFeeIxns?: TransactionInstruction[];
-  scopeRefresh?: ScopeRefresh;
+  scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
   swapper: SwapIxsProvider<QuoteResponse>;
@@ -205,7 +205,7 @@ type SwapCollContext<QuoteResponse> = {
   referrer: PublicKey;
   currentSlot: number;
   useV2Ixs: boolean;
-  scopeRefresh: ScopeRefresh | undefined;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
   logger: (msg: string, ...extra: any[]) => void;
 };
 
@@ -235,7 +235,7 @@ function extractArgsAndContext<QuoteResponse>(
       quoter: inputs.quoter,
       swapper: inputs.swapper,
       referrer: inputs.referrer,
-      scopeRefresh: inputs.scopeRefresh,
+      scopeRefreshConfig: inputs.scopeRefreshConfig,
       currentSlot: inputs.currentSlot,
       useV2Ixs: inputs.useV2Ixs,
     },
@@ -264,6 +264,18 @@ async function getKlendIxns(
   const { ataCreationIxns, targetCollAta } = getAtaCreationIxns(context);
   const setupIxns = [...context.budgetAndPriorityFeeIxns, ...ataCreationIxns];
 
+  const scopeRefreshIxn = await getScopeRefreshIx(
+    context.market,
+    context.sourceCollReserve,
+    context.targetCollReserve,
+    context.obligation,
+    context.scopeRefreshConfig
+  );
+
+  if (scopeRefreshIxn) {
+    setupIxns.unshift(...scopeRefreshIxn);
+  }
+
   const targetCollFlashBorrowedAmount = calculateTargetCollFlashBorrowedAmount(targetCollSwapOutAmount, context);
   const { targetCollFlashBorrowIxn, targetCollFlashRepayIxn } = getTargetCollFlashLoanIxns(
     targetCollFlashBorrowedAmount,
@@ -380,6 +392,7 @@ async function getDepositTargetCollIxns(
     context.obligation.state.owner,
     context.obligation,
     context.useV2Ixs,
+    undefined, // we create the scope refresh ixn outside of KaminoAction
     0, // no extra compute budget
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     removesElevationGroup, // we may need to (temporarily) remove the elevation group; the same or a different one will be set on withdraw, if requested
@@ -387,7 +400,6 @@ async function getDepositTargetCollIxns(
     false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
-    context.scopeRefresh,
     removesElevationGroup ? 0 : undefined // only applicable when removing the group
   );
   return {
@@ -430,6 +442,7 @@ async function getWithdrawSourceCollIxns(
     context.obligation.state.owner,
     context.obligation,
     context.useV2Ixs,
+    undefined, // we create the scope refresh ixn outside of KaminoAction
     0, // no extra compute budget
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     requestedElevationGroup !== undefined, // the `elevationGroupIdToRequestAfterWithdraw()` has already decided on this
@@ -437,7 +450,6 @@ async function getWithdrawSourceCollIxns(
     false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
-    undefined, // we have refreshed scope already, during depositing
     requestedElevationGroup,
     context.obligation.deposits.has(context.targetCollReserve.address) // if our obligation already had the target coll...
       ? undefined // ... then we need no customizations here, but otherwise...