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

package/src/leverage/operations.ts

@@ -6,8 +6,6 @@ import {
   KaminoObligation,
   KaminoReserve,
   lamportsToNumberDecimal as fromLamports,
-  getTokenIdsForScopeRefresh,
-  isKaminoObligation,
 } from '../classes';
 import { getFlashLoanInstructions } from './instructions';
 
@@ -17,9 +15,7 @@ import {
   MultiplyObligation,
   ObligationType,
   ObligationTypeTag,
-  PublicKeySet,
   SOL_DECIMALS,
-  ScopePriceRefreshConfig,
   U64_MAX,
   createAtasIdempotent,
   getAssociatedTokenAddress,
@@ -84,7 +80,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
   selectedTokenMint,
   kamino,
   obligationTypeTagOverride,
-  scopeRefreshConfig,
+  scopeFeed,
   budgetAndPriorityFeeIxs,
   quoteBufferBps,
   priceAinB,
@@ -146,7 +142,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
     referrer,
     currentSlot,
     depositTokenIsSol,
-    scopeRefreshConfig,
+    scopeFeed,
     calcs,
     budgetAndPriorityFeeIxs,
     {
@@ -313,7 +309,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
   selectedTokenMint,
   kamino,
   obligationTypeTagOverride,
-  scopeRefreshConfig,
+  scopeFeed,
   budgetAndPriorityFeeIxs,
   quoteBufferBps,
   priceAinB,
@@ -338,7 +334,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
     selectedTokenMint,
     kamino,
     obligationTypeTagOverride,
-    scopeRefreshConfig,
+    scopeFeed,
     budgetAndPriorityFeeIxs,
     quoteBufferBps,
     priceAinB,
@@ -390,7 +386,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
     referrer,
     currentSlot,
     depositTokenIsSol,
-    scopeRefreshConfig,
+    scopeFeed,
     initialInputs.calcs,
     budgetAndPriorityFeeIxs,
     {
@@ -421,7 +417,7 @@ async function buildDepositWithLeverageIxns(
   referrer: PublicKey,
   currentSlot: number,
   depositTokenIsSol: boolean,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeFeed: string | undefined,
   calcs: DepositLeverageCalcsResult,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
   swapQuoteIxs: SwapIxs,
@@ -446,7 +442,7 @@ async function buildDepositWithLeverageIxns(
     debtReserve.getLiquidityTokenProgram()
   );
 
-  // 1. Create atas & budget ixns
+  // 1. Create atas & budget txns
   let mintsToCreateAtas: Array<{ mint: PublicKey; tokenProgram: PublicKey }>;
   if (collIsKtoken) {
     const secondTokenAta = strategy!.strategy.tokenAMint.equals(debtTokenMint)
@@ -507,13 +503,10 @@ async function buildDepositWithLeverageIxns(
     );
   }
 
-  const scopeRefreshIxn = await getScopeRefreshIx(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
-
   // 2. Flash borrow & repay the collateral amount needed for given leverage
   // if user deposits coll, then we borrow the diff, else we borrow the entire amount
   const { flashBorrowIxn, flashRepayIxn } = getFlashLoanInstructions({
-    borrowIxnIndex:
-      budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
     walletPublicKey: owner,
     lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -530,6 +523,7 @@ async function buildDepositWithLeverageIxns(
   });
 
   // 3. Deposit initial tokens + borrowed tokens into reserve
+  const scopeRefresh = scopeFeed ? { includeScopeRefresh: true, scopeFeed: scopeFeed } : undefined;
   const kaminoDepositAndBorrowAction = await KaminoAction.buildDepositAndBorrowTxns(
     market,
     toLamports(!collIsKtoken ? calcs.collTokenToDeposit : calcs.collTokenToDeposit, collReserve.stats.decimals)
@@ -543,14 +537,14 @@ async function buildDepositWithLeverageIxns(
     owner,
     obligation!,
     useV2Ixs,
-    undefined,
     0,
     false,
     elevationGroupOverride === 0 ? false : true, // emode
     false, // to be checked and created in a setup tx in the UI
     false, // to be checked and created in a setup tx in the UI
     referrer,
-    currentSlot
+    currentSlot,
+    scopeRefresh
   );
 
   // 4. Swap
@@ -559,18 +553,18 @@ async function buildDepositWithLeverageIxns(
 
   if (!collIsKtoken) {
     return [
-      ...scopeRefreshIxn,
       ...budgetIxns,
       ...atasAndCreateIxns.map((x) => x.createAtaIx),
       ...fillWsolAtaIxns,
       ...[flashBorrowIxn],
-      ...KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
+      ...kaminoDepositAndBorrowAction.setupIxs,
+      ...KaminoAction.actionToLendingIxs(kaminoDepositAndBorrowAction),
+      ...kaminoDepositAndBorrowAction.cleanupIxs,
       ...swapInstructions,
       ...[flashRepayIxn],
     ];
   } else {
     return [
-      ...scopeRefreshIxn,
       ...budgetIxns,
       ...atasAndCreateIxns.map((x) => x.createAtaIx),
       ...fillWsolAtaIxns,
@@ -601,7 +595,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   selectedTokenMint,
   budgetAndPriorityFeeIxs,
   kamino,
-  scopeRefreshConfig,
+  scopeFeed,
   quoteBufferBps,
   isKtoken,
   quoter,
@@ -647,7 +641,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
     currentSlot,
     isClosingPosition,
     depositTokenIsSol,
-    scopeRefreshConfig,
+    scopeFeed,
     calcs,
     budgetAndPriorityFeeIxs,
     {
@@ -735,7 +729,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
   selectedTokenMint,
   budgetAndPriorityFeeIxs,
   kamino,
-  scopeRefreshConfig,
+  scopeFeed,
   quoteBufferBps,
   isKtoken,
   quoter,
@@ -764,7 +758,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
     selectedTokenMint,
     budgetAndPriorityFeeIxs,
     kamino,
-    scopeRefreshConfig,
+    scopeFeed,
     quoteBufferBps,
     isKtoken,
     quoter,
@@ -810,7 +804,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
     currentSlot,
     isClosingPosition,
     depositTokenIsSol,
-    scopeRefreshConfig,
+    scopeFeed,
     initialInputs.calcs,
     budgetAndPriorityFeeIxs,
     {
@@ -842,7 +836,7 @@ export async function buildWithdrawWithLeverageIxns(
   currentSlot: number,
   isClosingPosition: boolean,
   depositTokenIsSol: boolean,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeFeed: string | undefined,
   calcs: WithdrawLeverageCalcsResult,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
   swapQuoteIxs: SwapIxs,
@@ -916,7 +910,7 @@ export async function buildWithdrawWithLeverageIxns(
 
   const budgetIxns = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxns(3000000);
 
-  // TODO: Mihai/Marius check if we can improve this logic and not convert any SOL
+  // TODO: Might be worth removing as it's only needed for Ktokens
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
   const fillWsolAtaIxns: TransactionInstruction[] = [];
   if (debtTokenMint.equals(NATIVE_MINT)) {
@@ -931,14 +925,11 @@ export async function buildWithdrawWithLeverageIxns(
     );
   }
 
-  const scopeRefreshIxn = await getScopeRefreshIx(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
-
   // 2. Prepare the flash borrow and flash repay amounts and ixns
   // We borrow exactly how much we need to repay
   // and repay that + flash amount fee
   const { flashBorrowIxn, flashRepayIxn } = getFlashLoanInstructions({
-    borrowIxnIndex:
-      budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
     walletPublicKey: owner,
     lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -951,7 +942,7 @@ export async function buildWithdrawWithLeverageIxns(
     programId: market.programId,
   });
 
-  // 3. Repay borrowed tokens and Withdraw tokens from reserve that will be swapped to repay flash loan
+  // 6. Repay borrowed tokens and Withdraw tokens from reserve that will be swapped to repay flash loan
   const repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns(
     market,
     isClosingPosition ? U64_MAX : toLamports(calcs.repayAmount, debtReserve!.stats.decimals).floor().toString(),
@@ -964,24 +955,25 @@ export async function buildWithdrawWithLeverageIxns(
     currentSlot,
     obligation,
     useV2Ixs,
-    undefined,
     0,
     false,
     false, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
     false, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
     isClosingPosition,
-    referrer
+    referrer,
+    { includeScopeRefresh: true, scopeFeed: scopeFeed! }
   );
 
   const swapInstructions = removeBudgetAndAtaIxns(swapQuoteIxs.swapIxs, []);
 
   return [
-    ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndCreateIxns.map((x) => x.createAtaIx),
     ...fillWsolAtaIxns,
     ...[flashBorrowIxn],
-    ...KaminoAction.actionToIxs(repayAndWithdrawAction),
+    ...repayAndWithdrawAction.setupIxs,
+    ...KaminoAction.actionToLendingIxs(repayAndWithdrawAction),
+    ...repayAndWithdrawAction.cleanupIxs,
     ...swapInstructions,
     ...[flashRepayIxn],
     ...closeWsolAtaIxns,
@@ -1004,7 +996,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   slippagePct,
   budgetAndPriorityFeeIxs,
   kamino,
-  scopeRefreshConfig,
+  scopeFeed,
   quoteBufferBps,
   isKtoken,
   quoter,
@@ -1067,7 +1059,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       currentSlot,
       calcs,
       strategy,
-      scopeRefreshConfig,
+      scopeFeed,
       collIsKtoken,
       {
         preActionIxs: [],
@@ -1171,7 +1163,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       currentSlot,
       calcs,
       strategy,
-      scopeRefreshConfig,
+      scopeFeed,
       collIsKtoken,
       {
         preActionIxs: [],
@@ -1259,7 +1251,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
   slippagePct,
   budgetAndPriorityFeeIxs,
   kamino,
-  scopeRefreshConfig,
+  scopeFeed,
   quoteBufferBps,
   priceAinB,
   isKtoken,
@@ -1283,7 +1275,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
     slippagePct,
     budgetAndPriorityFeeIxs,
     kamino,
-    scopeRefreshConfig,
+    scopeFeed,
     quoteBufferBps,
     priceAinB,
     isKtoken,
@@ -1329,7 +1321,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
       currentSlot,
       initialInputs.calcs,
       initialInputs.strategy,
-      scopeRefreshConfig,
+      scopeFeed,
       initialInputs.collIsKtoken,
       {
         preActionIxs: [],
@@ -1376,7 +1368,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
       currentSlot,
       initialInputs.calcs,
       initialInputs.strategy,
-      scopeRefreshConfig,
+      scopeFeed,
       initialInputs.collIsKtoken,
       {
         preActionIxs: [],
@@ -1409,7 +1401,7 @@ async function buildIncreaseLeverageIxns(
   currentSlot: number,
   calcs: AdjustLeverageCalcsResult,
   strategy: StrategyWithAddress | undefined,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeFeed: string | undefined,
   collIsKtoken: boolean,
   swapQuoteIxs: SwapIxs,
   budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined,
@@ -1481,17 +1473,9 @@ async function buildIncreaseLeverageIxns(
 
   const atasAndCreateIxns = createAtasIdempotent(owner, mintsToCreateAtas);
 
-  const scopeRefreshIxn = await getScopeRefreshIx(
-    kaminoMarket,
-    collReserve!,
-    debtReserve!,
-    obligation,
-    scopeRefreshConfig
-  );
-
   // 2. Create borrow flash loan instruction
   const { flashBorrowIxn, flashRepayIxn } = getFlashLoanInstructions({
-    borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0), // TODO: how about user metadata ixns
+    borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length, // TODO: how about user metadata ixns
     walletPublicKey: owner,
     lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
     lendingMarketAddress: kaminoMarket.getAddress(),
@@ -1514,14 +1498,14 @@ async function buildIncreaseLeverageIxns(
     owner,
     obligation,
     useV2Ixs,
-    undefined,
     0,
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
-    currentSlot
+    currentSlot,
+    { includeScopeRefresh: true, scopeFeed: scopeFeed! }
   );
 
   // 4. Borrow tokens in borrow token reserve that will be swapped to repay flash loan
@@ -1532,37 +1516,43 @@ async function buildIncreaseLeverageIxns(
     owner,
     obligation,
     useV2Ixs,
-    undefined,
     0,
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
-    currentSlot
+    currentSlot,
+    { includeScopeRefresh: true, scopeFeed: scopeFeed! }
   );
 
   const swapInstructions = removeBudgetAndAtaIxns(swapQuoteIxs.swapIxs, []);
 
   const ixs = !collIsKtoken
     ? [
-        ...scopeRefreshIxn,
         ...budgetIxns,
         ...atasAndCreateIxns.map((x) => x.createAtaIx),
         ...[flashBorrowIxn],
-        ...KaminoAction.actionToIxs(depositAction),
-        ...KaminoAction.actionToIxs(borrowAction),
+        ...depositAction.setupIxs,
+        ...depositAction.lendingIxs,
+        ...depositAction.cleanupIxs,
+        ...borrowAction.setupIxs,
+        ...borrowAction.lendingIxs,
+        ...borrowAction.cleanupIxs,
         ...swapInstructions,
         ...[flashRepayIxn],
       ]
     : [
-        ...scopeRefreshIxn,
         ...budgetIxns,
         ...atasAndCreateIxns.map((x) => x.createAtaIx),
         ...[flashBorrowIxn],
         ...swapInstructions,
-        ...KaminoAction.actionToIxs(depositAction),
-        ...KaminoAction.actionToIxs(borrowAction),
+        ...depositAction.setupIxs,
+        ...depositAction.lendingIxs,
+        ...depositAction.cleanupIxs,
+        ...borrowAction.setupIxs,
+        ...borrowAction.lendingIxs,
+        ...borrowAction.cleanupIxs,
         ...[flashRepayIxn],
       ];
 
@@ -1582,7 +1572,7 @@ async function buildDecreaseLeverageIxns(
   currentSlot: number,
   calcs: AdjustLeverageCalcsResult,
   strategy: StrategyWithAddress | undefined,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeFeed: string | undefined,
   collIsKtoken: boolean,
   swapQuoteIxs: SwapIxs,
   budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined,
@@ -1663,18 +1653,9 @@ async function buildDecreaseLeverageIxns(
     );
   }
 
-  const scopeRefreshIxn = await getScopeRefreshIx(
-    kaminoMarket,
-    collReserve!,
-    debtReserve!,
-    obligation,
-    scopeRefreshConfig
-  );
-
   // 3. Flash borrow & repay amount to repay (debt)
   const { flashBorrowIxn, flashRepayIxn } = getFlashLoanInstructions({
-    borrowIxnIndex:
-      budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
     walletPublicKey: owner,
     lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
     lendingMarketAddress: kaminoMarket.getAddress(),
@@ -1688,6 +1669,7 @@ async function buildDecreaseLeverageIxns(
   });
 
   // 4. Actually do the repay of the flash borrowed amounts
+  const scopeRefresh = scopeFeed ? { includeScopeRefresh: true, scopeFeed: scopeFeed } : undefined;
   const repayAction = await KaminoAction.buildRepayTxns(
     kaminoMarket,
     toLamports(Decimal.abs(calcs.adjustBorrowPosition), debtReserve!.stats.decimals).floor().toString(),
@@ -1695,7 +1677,6 @@ async function buildDecreaseLeverageIxns(
     owner,
     obligation,
     useV2Ixs,
-    undefined,
     currentSlot,
     undefined,
     0,
@@ -1703,7 +1684,8 @@ async function buildDecreaseLeverageIxns(
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
-    referrer
+    referrer,
+    scopeRefresh
   );
 
   // 6. Withdraw collateral (a little bit more to be able to pay for the slippage on swap)
@@ -1714,26 +1696,29 @@ async function buildDecreaseLeverageIxns(
     owner,
     obligation,
     useV2Ixs,
-    undefined,
     0,
     false,
     false,
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     false, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
-    currentSlot
+    currentSlot,
+    { includeScopeRefresh: true, scopeFeed: scopeFeed! }
   );
 
   const swapInstructions = removeBudgetAndAtaIxns(swapQuoteIxs.swapIxs, []);
 
   const ixns = [
-    ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndCreateIxns.map((x) => x.createAtaIx),
     ...fillWsolAtaIxns,
     ...[flashBorrowIxn],
-    ...KaminoAction.actionToIxs(repayAction),
-    ...KaminoAction.actionToIxs(withdrawAction),
+    ...repayAction.setupIxs,
+    ...repayAction.lendingIxs,
+    ...repayAction.cleanupIxs,
+    ...withdrawAction.setupIxs,
+    ...withdrawAction.lendingIxs,
+    ...withdrawAction.cleanupIxs,
     ...swapInstructions,
     ...[flashRepayIxn],
     ...closeWsolAtaIxns,
@@ -1741,36 +1726,3 @@ async function buildDecreaseLeverageIxns(
 
   return ixns;
 }
-
-export const getScopeRefreshIx = async (
-  market: KaminoMarket,
-  collReserve: KaminoReserve,
-  debtReserve: KaminoReserve,
-  obligation: KaminoObligation | ObligationType | undefined,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined
-): Promise<TransactionInstruction[]> => {
-  const allReserves =
-    obligation && isKaminoObligation(obligation)
-      ? new PublicKeySet<PublicKey>([
-          ...obligation.getDeposits().map((x) => x.reserveAddress),
-          ...obligation.getBorrows().map((x) => x.reserveAddress),
-          collReserve.address,
-          debtReserve.address,
-        ]).toArray()
-      : new PublicKeySet<PublicKey>([collReserve.address, debtReserve.address]).toArray();
-  const tokenIds = getTokenIdsForScopeRefresh(market, allReserves);
-
-  const scopeRefreshIxns: TransactionInstruction[] = [];
-  if (tokenIds.length > 0 && scopeRefreshConfig) {
-    scopeRefreshIxns.push(
-      await scopeRefreshConfig.scope.refreshPriceListIx(
-        {
-          feed: scopeRefreshConfig.scopeFeed,
-        },
-        tokenIds
-      )
-    );
-  }
-
-  return scopeRefreshIxns;
-};

package/src/leverage/types.ts

@@ -2,7 +2,7 @@ import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@s
 import Decimal from 'decimal.js';
 import { KaminoMarket, KaminoObligation } from '../classes';
 import { InstructionsWithLookupTables, Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
-import { ObligationType, ObligationTypeTag, ScopePriceRefreshConfig } from '../utils';
+import { ObligationType, ObligationTypeTag } from '../utils';
 
 export type SwapQuoteProvider<QuoteResponse> = (
   inputs: SwapInputs,
@@ -82,7 +82,7 @@ export interface DepositWithLeverageSwapInputsProps<QuoteResponse> {
   selectedTokenMint: PublicKey;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
   kamino: Kamino | undefined;
-  scopeRefreshConfig?: ScopePriceRefreshConfig;
+  scopeFeed: string | undefined;
   quoteBufferBps: Decimal;
   priceAinB: PriceAinBProvider;
   isKtoken: IsKtokenProvider;
@@ -143,7 +143,7 @@ export interface WithdrawWithLeverageSwapInputsProps<QuoteResponse> {
   selectedTokenMint: PublicKey;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
   kamino: Kamino | undefined;
-  scopeRefreshConfig?: ScopePriceRefreshConfig;
+  scopeFeed: string | undefined;
   quoteBufferBps: Decimal;
   isKtoken: IsKtokenProvider;
   quoter: SwapQuoteProvider<QuoteResponse>;
@@ -196,7 +196,7 @@ export interface AdjustLeverageSwapInputsProps<QuoteResponse> {
   slippagePct: Decimal;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
   kamino: Kamino | undefined;
-  scopeRefreshConfig?: ScopePriceRefreshConfig;
+  scopeFeed: string | undefined;
   quoteBufferBps: Decimal;
   priceAinB: PriceAinBProvider;
   isKtoken: IsKtokenProvider;

package/src/utils/ObligationType.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 import { KaminoMarket, KaminoObligation } from '../classes';
 
-export type ObligationType = VanillaObligation | MultiplyObligation | LendingObligation | LeverageObligation;
+export type ObligationType = VanillaObligation | MultiplyObligation | LendingObligation;
 
 export enum ObligationTypeTag {
   Vanilla = 0,

package/src/utils/constants.ts

@@ -85,4 +85,3 @@ export const DEFAULT_MAX_COMPUTE_UNITS = 1_400_000;
  * Minimum initial deposit required for the initialization of a reserve
  */
 export const MIN_INITIAL_DEPOSIT = 100_000;
-export const MIN_VAULT_INITIAL_DEPOSIT = 1_000_000_000;

package/src/utils/managerTypes.ts

@@ -397,17 +397,59 @@ export function getReserveOracleConfigs(priceFeed: PriceFeed | null): {
   };
 }
 
-const ORACLE_TYPE_MAP = Object.fromEntries(
-  Object.values(OracleType)
-    // Filter for oracle types that have a discriminator property
-    // This ensures we only include actual oracle implementations in the mapping
-    // Pyth is used as a type assertion here but actually any oracle type with a discriminator will pass
-    .filter((T): T is typeof OracleType.Pyth => 'discriminator' in T)
-    .map((T) => [T.discriminator, T.name])
-);
-
 export function parseOracleType(type: number): string {
-  return ORACLE_TYPE_MAP[type] || 'Unknown';
+  switch (type) {
+    case new OracleType.Pyth().discriminator:
+      return 'Pyth';
+    case new OracleType.SwitchboardV2().discriminator:
+      return 'SwitchboardV2';
+    case new OracleType.CToken().discriminator:
+      return 'CToken';
+    case new OracleType.KToken().discriminator:
+      return 'KToken';
+    case new OracleType.SplStake().discriminator:
+      return 'SplStake';
+    case new OracleType.PythEMA().discriminator:
+      return 'PythEMA';
+    case new OracleType.DeprecatedPlaceholder1().discriminator:
+      return 'DeprecatedPlaceholder1';
+    case new OracleType.DeprecatedPlaceholder2().discriminator:
+      return 'DeprecatedPlaceholder2';
+    case new OracleType.MsolStake().discriminator:
+      return 'MsolStake';
+    case new OracleType.KTokenToTokenA().discriminator:
+      return 'KTokenToTokenA';
+    case new OracleType.KTokenToTokenB().discriminator:
+      return 'KTokenToTokenB';
+    case new OracleType.JupiterLpFetch().discriminator:
+      return 'JupiterLpFetch';
+    case new OracleType.ScopeTwap().discriminator:
+      return 'ScopeTwap';
+    case new OracleType.OrcaWhirlpoolAtoB().discriminator:
+      return 'OrcaWhirlpoolAtoB';
+    case new OracleType.OrcaWhirlpoolBtoA().discriminator:
+      return 'OrcaWhirlpoolBtoA';
+    case new OracleType.RaydiumAmmV3AtoB().discriminator:
+      return 'RaydiumAmmV3AtoB';
+    case new OracleType.RaydiumAmmV3BtoA().discriminator:
+      return 'RaydiumAmmV3BtoA';
+    case new OracleType.JupiterLpCompute().discriminator:
+      return 'JupiterLpCompute';
+    case new OracleType.MeteoraDlmmAtoB().discriminator:
+      return 'MeteoraDlmmAtoB';
+    case new OracleType.MeteoraDlmmBtoA().discriminator:
+      return 'MeteoraDlmmBtoA';
+    case new OracleType.JupiterLpScope().discriminator:
+      return 'JupiterLpScope';
+    case new OracleType.PythPullBased().discriminator:
+      return 'PythPullBased';
+    case new OracleType.PythPullBasedEMA().discriminator:
+      return 'PythPullBasedEMA';
+    case new OracleType.FixedPrice().discriminator:
+      return 'FixedPrice';
+    default:
+      return 'Unknown';
+  }
 }
 
 export type MarketWithAddress = {

package/src/utils/oracle.ts

@@ -35,8 +35,8 @@ export type CandidatePrice = {
   valid: boolean;
 };
 
-export type ScopePriceRefreshConfig = {
-  scope: Scope;
+export type ScopeRefresh = {
+  includeScopeRefresh: boolean;
   scopeFeed: string;
 };
 
@@ -170,11 +170,10 @@ export function cacheOrGetPythPrices(
         const { price, exponent, conf: confidence, publishTime: timestamp, emaPrice } = priceMessage;
         if (price) {
           const px = new Decimal(price.toString()).div(10 ** Math.abs(exponent));
-          const conf = new Decimal(confidence.toString());
           prices.spot = {
             price: px,
             timestamp: BigInt(timestamp.toString()),
-            valid: validatePythPx(px, conf),
+            valid: validatePythPx(px, confidence.toNumber()),
           };
         }
         if (emaPrice !== undefined && emaPrice !== null) {
@@ -298,9 +297,9 @@ function isBetterPrice(current: CandidatePrice | undefined, next: CandidatePrice
   return next.timestamp > current.timestamp;
 }
 
-function validatePythPx(price: Decimal, confidence: Decimal): boolean {
-  const conf50x = confidence.mul(CONFIDENCE_FACTOR);
-  return !price.isZero() && price.gt(conf50x);
+function validatePythPx(price: Decimal, confidence: number | undefined): boolean {
+  const conf50x = new Decimal(confidence || 0).mul(CONFIDENCE_FACTOR);
+  return price.gt(conf50x);
 }
 
 function validateSwitchboardV2Px(agg: any): boolean {