@kamino-finance/kliquidity-sdk 8.4.7-beta.0 → 8.4.8-beta.0

package/dist/models/EnrichedScopePrice.d.ts

@@ -1,6 +1,7 @@
 import Decimal from 'decimal.js';
 import { OraclePrices } from '@kamino-finance/scope-sdk';
 import { CollateralInfo } from '../kamino-client/types';
+import { PublicKey } from '@solana/web3.js';
 export interface EnrichedScopePrice {
     /**
      * Price in USD
@@ -23,7 +24,7 @@ export interface KaminoPrices {
 }
 export type MintToPriceMap = Record<string, EnrichedScopePrice>;
 export interface OraclePricesAndCollateralInfos {
-    oraclePrices: OraclePrices;
+    oraclePrices: [PublicKey, OraclePrices][];
     collateralInfos: CollateralInfo[];
 }
 //# sourceMappingURL=EnrichedScopePrice.d.ts.map

package/dist/models/EnrichedScopePrice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnrichedScopePrice.d.ts","sourceRoot":"","sources":["../../src/models/EnrichedScopePrice.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,IAAI,EAAE,cAAc,CAAC;IACrB;;OAEG;IACH,IAAI,EAAE,cAAc,CAAC;CACtB;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAEhE,MAAM,WAAW,8BAA8B;IAC7C,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC"}
+{"version":3,"file":"EnrichedScopePrice.d.ts","sourceRoot":"","sources":["../../src/models/EnrichedScopePrice.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,IAAI,EAAE,cAAc,CAAC;IACrB;;OAEG;IACH,IAAI,EAAE,cAAc,CAAC;CACtB;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAEhE,MAAM,WAAW,8BAA8B;IAC7C,YAAY,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,CAAC;IAC1C,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/kliquidity-sdk",
-  "version": "8.4.7-beta.0",
+  "version": "8.4.8-beta.0",
   "description": "Typescript SDK for interacting with the Kamino Liquidity (kliquidity) protocol",
   "repository": {
     "type": "git",
@@ -50,7 +50,7 @@
     "@coral-xyz/borsh": "^0.30.1",
     "@hubbleprotocol/hubble-config": "^5.0.0",
     "@jup-ag/api": "^6.0.38",
-    "@kamino-finance/scope-sdk": "^8.0.2",
+    "@kamino-finance/scope-sdk": "^8.1.0-beta.4",
     "@orca-so/whirlpool-client-sdk": "^0.0.8",
     "@orca-so/whirlpool-sdk": "^0.4.2",
     "@raydium-io/raydium-sdk-v2": "=0.1.111-alpha",

package/src/Kamino.ts

@@ -349,6 +349,9 @@ import {
 
 export const KAMINO_IDL = KaminoIdl;
 
+export const HUBBLE_SCOPE_FEED_ID = new PublicKey('3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C');
+export const KAMINO_SCOPE_FEED_ID = new PublicKey('3t4JZcueEzTbVP6kLxXrL3VpWx45jDer4eqysweBchNH');
+
 export class Kamino {
   private readonly _cluster: SolanaCluster;
   private readonly _connection: Connection;
@@ -2150,7 +2153,8 @@ export class Kamino {
     };
   };
 
-  getAllOraclePrices = (): Promise<OraclePrices> => this._scope.getOraclePrices();
+  getAllOraclePrices = (prices: PublicKey[]): Promise<[PublicKey, OraclePrices][]> =>
+    this._scope.getOraclePrices(prices);
 
   /**
    * Get all Kamino token spot and twap prices
@@ -2167,15 +2171,21 @@ export class Kamino {
     const twaps: MintToPriceMap = {};
 
     const disabledTokens: PublicKey[] = [];
-    ({ oraclePrices, collateralInfos } = await this.getOraclePricesAndCollateralInfos(oraclePrices, collateralInfos));
-    for (const collateralInfo of collateralInfos) {
+    const oraclePricesAndCollateralInfos = await this.getOraclePricesAndCollateralInfos(
+      oraclePrices ? [[HUBBLE_SCOPE_FEED_ID, oraclePrices]] : undefined,
+      collateralInfos,
+      true
+    );
+    const { oraclePrices: allOraclePrices, collateralInfos: hubbleCollateralInfos } = oraclePricesAndCollateralInfos;
+    for (const collateralInfo of hubbleCollateralInfos) {
       if (
         collateralInfo.scopePriceChain &&
         Scope.isScopeChainValid(collateralInfo.scopePriceChain) &&
         collateralInfo.disabled === 0
       ) {
         const collInfoMintString = collateralInfo.mint.toString();
-        const spotPrice = await this._scope.getPriceFromChain(collateralInfo.scopePriceChain, oraclePrices);
+        const hubbleOraclePrices = allOraclePrices?.find((x) => x[0].equals(HUBBLE_SCOPE_FEED_ID))?.[1];
+        const spotPrice = await this._scope.getPriceFromChain(collateralInfo.scopePriceChain, hubbleOraclePrices!);
         spotPrices[collInfoMintString] = {
           price: spotPrice.price,
           name: getTokenNameFromCollateralInfo(collateralInfo),
@@ -2183,7 +2193,7 @@ export class Kamino {
 
         const filteredTwapChain = collateralInfo?.scopeTwapPriceChain?.filter((x) => x > 0);
         if (filteredTwapChain && Scope.isScopeChainValid(filteredTwapChain)) {
-          const twap = await this._scope.getPriceFromChain(filteredTwapChain, oraclePrices);
+          const twap = await this._scope.getPriceFromChain(filteredTwapChain, hubbleOraclePrices!);
           twaps[collInfoMintString] = {
             price: twap.price,
             name: getTokenNameFromCollateralInfo(collateralInfo),
@@ -2202,7 +2212,7 @@ export class Kamino {
         ? disabledTokensPrices
         : await JupService.getDollarPrices(disabledTokens, this._jupBaseAPI);
       for (const [token, price] of tokensPrices) {
-        const collInfo = collateralInfos.find((x) => x.mint.equals(token));
+        const collInfo = hubbleCollateralInfos.find((x) => x.mint.equals(token));
         if (!collInfo) {
           console.log(`Could not find collateral info for token ${token.toString()}`);
           continue;
@@ -2224,11 +2234,13 @@ export class Kamino {
   };
 
   private async getOraclePricesAndCollateralInfos(
-    oraclePrices?: OraclePrices,
-    collateralInfos?: CollateralInfo[]
+    oraclePrices?: [PublicKey, OraclePrices][],
+    collateralInfos?: CollateralInfo[],
+    readAllFeeds: boolean = false
   ): Promise<OraclePricesAndCollateralInfos> {
     if (!oraclePrices) {
-      oraclePrices = await this.getAllOraclePrices();
+      const allFeeds = readAllFeeds ? [HUBBLE_SCOPE_FEED_ID, KAMINO_SCOPE_FEED_ID] : [HUBBLE_SCOPE_FEED_ID];
+      oraclePrices = await this.getAllOraclePrices(allFeeds);
     }
     if (!collateralInfos) {
       collateralInfos = await this.getCollateralInfos();
@@ -2258,7 +2270,7 @@ export class Kamino {
     if (scopePrices) {
       prices = scopePrices;
     } else {
-      prices = await this._scope.getOraclePrices({ prices: strategy.scopePrices });
+      prices = (await this._scope.getOraclePrices([strategy.scopePrices]))[0][1];
     }
 
     let jupPrices: PubkeyHashMap<PublicKey, Decimal> = new PubkeyHashMap();

package/src/models/EnrichedScopePrice.ts

@@ -1,6 +1,7 @@
 import Decimal from 'decimal.js';
 import { OraclePrices } from '@kamino-finance/scope-sdk';
 import { CollateralInfo } from '../kamino-client/types';
+import { PublicKey } from '@solana/web3.js';
 
 export interface EnrichedScopePrice {
   /**
@@ -27,6 +28,6 @@ export interface KaminoPrices {
 export type MintToPriceMap = Record<string, EnrichedScopePrice>;
 
 export interface OraclePricesAndCollateralInfos {
-  oraclePrices: OraclePrices;
+  oraclePrices: [PublicKey, OraclePrices][];
   collateralInfos: CollateralInfo[];
 }