@scallop-io/sui-scallop-sdk 2.3.4 → 2.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/constants/queryKeys.ts

@@ -74,7 +74,7 @@ export const queryKeys = {
     },
   },
   oracle: {
-    getPythLatestPriceFeeds: (priceIds: string[], endpoint: string) => [
+    getPythLatestPriceFeeds: (endpoint?: string, priceIds?: string[]) => [
       'oracle',
       'getPythPriceIds',
       priceIds,

package/src/models/scallopUtils.ts

@@ -505,7 +505,7 @@ class ScallopUtils implements ScallopUtilsInterface {
    * Get asset coin price.
    *
    * @description
-   * The strategy for obtaining the price is to get it through API first,
+   * The strategy for obtaining the price is to get it through pyth API first,
    * and then on-chain data if API cannot be retrieved.
    * Currently, we only support obtaining from pyth protocol, other
    * oracles will be supported in the future.
@@ -519,16 +519,24 @@ class ScallopUtils implements ScallopUtilsInterface {
         ...this.constants.whitelist.lending,
         ...this.constants.whitelist.collateral,
       ]),
-    ] as string[]
+    ] as string[],
+    useOnChainObjects: boolean = false
   ) {
     const priceIdsMap = new Map(
-      coinNames.map((coinName) => [
-        coinName,
-        this.address.get(`core.coins.${coinName}.oracle.pyth.feed`),
-      ])
+      coinNames
+        .map((coinName) => {
+          const priceId = this.address.get(
+            `core.coins.${coinName}.oracle.pyth.feed`
+          );
+          return priceId
+            ? ([coinName, priceId] as [string, string])
+            : undefined;
+        })
+        .filter((entry): entry is [string, string] => !!entry)
     );
 
     const priceIds = Array.from(priceIdsMap.values());
+    const coinNamesMapped = Array.from(priceIdsMap.keys());
     const state = this.queryClient.getQueryState(
       queryKeys.oracle.getCoinPrices(priceIds)
     );
@@ -538,45 +546,48 @@ class ScallopUtils implements ScallopUtilsInterface {
     }
 
     let coinPrices: CoinPrices = {};
-    for (const endpoint of this.pythEndpoints) {
-      const pythConnection = new SuiPriceServiceConnection(endpoint, {
-        timeout: this.timeout,
-        httpRetries: 0,
-      });
 
-      try {
-        const feeds = await this.queryClient.fetchQuery({
-          queryKey: queryKeys.oracle.getPythLatestPriceFeeds(
-            priceIds,
-            endpoint
-          ),
-          queryFn: async () => {
-            return await pythConnection.getLatestPriceFeeds(priceIds);
-          },
-          retry: false,
-          staleTime: 30_000,
-          gcTime: 30_000,
+    if (!useOnChainObjects) {
+      for (const endpoint of this.pythEndpoints) {
+        const pythConnection = new SuiPriceServiceConnection(endpoint, {
+          timeout: this.timeout,
+          httpRetries: 0,
         });
-        if (!feeds) throw new Error('No feeds returned from pyth');
-
-        if (feeds.length !== priceIds.length)
-          throw new Error('Incomplete feeds returned from pyth');
 
-        feeds.forEach((feed, idx) => {
-          const coinName = coinNames[idx] as string;
-          const data = this.parseDataFromPythPriceFeed(feed);
-          coinPrices[coinName as string] = data.price;
-        });
-        this.queryClient.setQueryData(
-          queryKeys.oracle.getCoinPrices(priceIds),
-          coinPrices
-        );
-      } catch (e: any) {
-        if ('status' in e && e.status === 403) {
-          console.log(`trying next pyth endpoint`);
-          continue; // try next endpoint
+        try {
+          const feeds = await this.queryClient.fetchQuery({
+            queryKey: queryKeys.oracle.getPythLatestPriceFeeds(
+              endpoint,
+              priceIds
+            ),
+            queryFn: async () => {
+              return await pythConnection.getLatestPriceFeeds(priceIds);
+            },
+            retry: false,
+            staleTime: 30_000,
+            gcTime: 30_000,
+          });
+          if (!feeds) throw new Error('No feeds returned from pyth');
+
+          if (feeds.length !== priceIds.length)
+            throw new Error('Incomplete feeds returned from pyth');
+
+          feeds.forEach((feed, idx) => {
+            const coinName = coinNamesMapped[idx] as string;
+            const data = this.parseDataFromPythPriceFeed(feed);
+            coinPrices[coinName as string] = data.price;
+          });
+          this.queryClient.setQueryData(
+            queryKeys.oracle.getCoinPrices(priceIds),
+            coinPrices
+          );
+        } catch (e: any) {
+          if ('status' in e && e.status === 403) {
+            console.log(`trying next pyth endpoint`);
+            continue; // try next endpoint
+          }
+          console.error(e.message);
         }
-        console.error(e.message);
       }
     }
 
@@ -591,7 +602,13 @@ class ScallopUtils implements ScallopUtilsInterface {
       );
     }
 
-    return coinPrices;
+    return {
+      ...coinNames.reduce((prev, coinName) => {
+        prev[coinName as string] = coinPrices[coinName as string] || 0;
+        return prev;
+      }, {} as CoinPrices),
+      ...coinPrices,
+    };
   }
 
   /**

package/src/queries/spoolQuery.ts

@@ -42,8 +42,6 @@ const queryRequiredSpoolObjects = async (
   const objectDatas: SuiObjectData[] = [];
   const batches = partitionArray(allObjectIds, 50);
 
-  console.log('Fetching spool objects in batches:', batches.length);
-
   for (const batch of batches) {
     const responses = await query.scallopSuiKit.queryGetObjects(batch);
     if (responses.length > 0) {