@kamino-finance/klend-sdk 6.0.5-beta.2 → 6.0.5-beta.21

package/src/leverage/types.ts

@@ -188,6 +188,7 @@ export interface AdjustLeverageSwapInputsProps<QuoteResponse> extends BaseLevera
   priceCollToDebt: Decimal;
   priceDebtToColl: Decimal;
   priceAinB: PriceAinBProvider;
+  withdrawSlotOffset?: number;
 }
 
 export interface AdjustLeverageProps<QuoteResponse> extends AdjustLeverageSwapInputsProps<QuoteResponse> {

package/src/utils/managerTypes.ts

@@ -13,7 +13,7 @@ import {
   WithdrawalCaps,
 } from '../idl_codegen/types';
 import Decimal from 'decimal.js';
-import { Fraction, ZERO_FRACTION } from '../classes/fraction';
+import { Fraction, ZERO_FRACTION } from '../classes';
 import BN from 'bn.js';
 import { numberToLamportsDecimal } from '../classes';
 import { NULL_PUBKEY } from './pubkey';
@@ -21,7 +21,6 @@ import { OracleType, U16_MAX } from '@kamino-finance/scope-sdk';
 import { LendingMarket } from '../lib';
 
 export type ScopeOracleConfig = {
-  scopePriceConfigAddress: PublicKey;
   name: string;
   oracleType: string;
   oracleId: number;

package/src/utils/obligations.ts

@@ -0,0 +1,69 @@
+import { KaminoMarket, KaminoObligation } from '../classes';
+import Decimal from 'decimal.js';
+import { Commitment, Connection, PublicKey } from '@solana/web3.js';
+import { PubkeyHashMap } from './pubkey';
+import bs58 from 'bs58';
+import { PROGRAM_ID } from '../idl_codegen/programId';
+import { Obligation } from '../idl_codegen/accounts';
+
+export async function getUserObligationsInMarkets(
+  connection: Connection,
+  user: PublicKey,
+  markets: PubkeyHashMap<PublicKey, KaminoMarket>,
+  slot: number,
+  commitment: Commitment = 'processed',
+  programId: PublicKey = PROGRAM_ID
+): Promise<KaminoObligation[]> {
+  const obligations = await connection.getProgramAccounts(programId, {
+    filters: [
+      {
+        dataSize: Obligation.layout.span + 8,
+      },
+      {
+        memcmp: {
+          offset: 0,
+          bytes: bs58.encode(Obligation.discriminator),
+        },
+      },
+      {
+        memcmp: {
+          offset: 64,
+          bytes: user.toBase58(),
+        },
+      },
+    ],
+    commitment,
+  });
+
+  const collateralExchangeRates = new PubkeyHashMap<PublicKey, Decimal>();
+  const cumulativeBorrowRates = new PubkeyHashMap<PublicKey, Decimal>();
+  const kaminoObligations: KaminoObligation[] = [];
+  for (const obligation of obligations) {
+    if (!obligation.account.owner.equals(programId)) {
+      throw new Error(`Account ${obligation.account.owner} doesn't belong to this program ${programId}`);
+    }
+
+    const obligationAccount = Obligation.decode(obligation.account.data);
+
+    if (!obligationAccount) {
+      throw Error('Could not parse obligation.');
+    }
+
+    const market = markets.get(obligationAccount.lendingMarket);
+    if (!market) {
+      continue;
+    }
+
+    KaminoObligation.addRatesForObligation(
+      market,
+      obligationAccount,
+      collateralExchangeRates,
+      cumulativeBorrowRates,
+      slot
+    );
+    kaminoObligations.push(
+      new KaminoObligation(market, obligation.pubkey, obligationAccount, collateralExchangeRates, cumulativeBorrowRates)
+    );
+  }
+  return kaminoObligations;
+}

package/src/utils/oracle.ts

@@ -1,6 +1,6 @@
 import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { OraclePrices, Scope } from '@kamino-finance/scope-sdk';
+import { Configuration, OraclePrices, Scope } from '@kamino-finance/scope-sdk';
 import { isNotNullPubkey, PubkeyHashMap, PublicKeySet } from './pubkey';
 import { parseTokenSymbol } from '../classes';
 import SwitchboardProgram from '@switchboard-xyz/sbv2-lite';
@@ -37,7 +37,7 @@ export type CandidatePrice = {
 
 export type ScopePriceRefreshConfig = {
   scope: Scope;
-  scopeFeed: string;
+  scopeConfigurations: [PublicKey, Configuration][];
 };
 
 export function getTokenOracleDataSync(
@@ -107,9 +107,10 @@ export function getTokenOracleDataSync(
 // TODO: Add freshness of the latest price to match sc logic
 export async function getTokenOracleData(
   connection: Connection,
-  reserves: Reserve[]
+  reserves: Reserve[],
+  oracleAccounts?: AllOracleAccounts
 ): Promise<Array<[Reserve, TokenOracleData | undefined]>> {
-  const allOracleAccounts = await getAllOracleAccounts(connection, reserves);
+  const allOracleAccounts = oracleAccounts ?? (await getAllOracleAccounts(connection, reserves));
   const switchboardV2 = await SwitchboardProgram.loadMainnet(connection);
   return getTokenOracleDataSync(allOracleAccounts, switchboardV2, reserves);
 }

package/src/utils/pubkey.ts

@@ -253,6 +253,15 @@ export class PubkeyHashMap<K extends PublicKey, V> implements Map<K, V> {
   }
 }
 
+export function setOrAppend<K, V>(map: Map<K, V[]>, key: K, value: V): void {
+  const existing = map.get(key);
+  if (existing) {
+    existing.push(value);
+  } else {
+    map.set(key, [value]);
+  }
+}
+
 export class HashablePublicKey extends PublicKey implements IEquality<HashablePublicKey> {
   // We only use the last 32 bits of the public key for hashing
   static MASK = new BN(1).shln(32).subn(1);