@kamino-finance/kliquidity-sdk 8.5.1 → 8.5.2

package/dist/models/EnrichedScopePrice.d.ts

@@ -1,6 +1,7 @@
 import Decimal from 'decimal.js';
 import { OraclePrices } from '@kamino-finance/scope-sdk/dist/@codegen/scope/accounts/OraclePrices';
 import { CollateralInfo } from '../@codegen/kliquidity/types';
+import { Address } from '@solana/kit';
 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: [Address, 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,qEAAqE,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,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,qEAAqE,CAAC;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,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,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC;IACxC,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/kliquidity-sdk",
-  "version": "8.5.1",
+  "version": "8.5.2",
   "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.39",
-    "@kamino-finance/scope-sdk": "^10.0.4",
+    "@kamino-finance/scope-sdk": "^10.1.0",
     "@orca-so/common-sdk": "^0.6.11",
     "@orca-so/whirlpools": "^2.0.0",
     "@orca-so/whirlpools-core": "^2.0.0",

package/src/Kamino.ts

@@ -350,6 +350,9 @@ import { IncreaseLiquidityQuoteParam } from '@orca-so/whirlpools';
 
 const addressEncoder = getAddressEncoder();
 
+export const HUBBLE_SCOPE_FEED_ID = address('3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C');
+export const KAMINO_SCOPE_FEED_ID = address('3t4JZcueEzTbVP6kLxXrL3VpWx45jDer4eqysweBchNH');
+
 export class Kamino {
   private readonly _cluster: SolanaCluster;
   private readonly _rpc: Rpc<SolanaRpcApi>;
@@ -2139,8 +2142,7 @@ export class Kamino {
     };
   };
 
-  getAllOraclePrices = (): Promise<OraclePrices> =>
-    this._scope.getSingleOraclePrices({ prices: fromLegacyPublicKey(this._config.scope.oraclePrices) });
+  getAllOraclePrices = (prices: Address[]): Promise<[Address, OraclePrices][]> => this._scope.getOraclePrices(prices);
 
   /**
    * Get all Kamino token spot and twap prices
@@ -2157,15 +2159,21 @@ export class Kamino {
     const twaps: MintToPriceMap = {};
 
     const disabledTokens: Address[] = [];
-    ({ 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] === HUBBLE_SCOPE_FEED_ID)?.[1];
+        const spotPrice = await this._scope.getPriceFromChain(collateralInfo.scopePriceChain, hubbleOraclePrices!);
         spotPrices[collInfoMintString] = {
           price: spotPrice.price,
           name: getTokenNameFromCollateralInfo(collateralInfo),
@@ -2173,7 +2181,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),
@@ -2192,7 +2200,7 @@ export class Kamino {
         ? disabledTokensPrices
         : await JupService.getDollarPrices(disabledTokens, this._jupBaseAPI);
       for (const [token, price] of tokensPrices) {
-        const collInfo = collateralInfos.find((x) => x.mint === token);
+        const collInfo = hubbleCollateralInfos.find((x) => x.mint === token);
         if (!collInfo) {
           console.log(`Could not find collateral info for token ${token.toString()}`);
           continue;
@@ -2214,11 +2222,13 @@ export class Kamino {
   };
 
   private async getOraclePricesAndCollateralInfos(
-    oraclePrices?: OraclePrices,
-    collateralInfos?: CollateralInfo[]
+    oraclePrices?: [Address, 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();

package/src/models/EnrichedScopePrice.ts

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