@scallop-io/sui-scallop-sdk 1.4.1 → 1.4.2-rc.1

package/src/models/scallopUtils.ts

@@ -232,13 +232,14 @@ export class ScallopUtils {
   }
 
   /**
-   * Convert sCoin name to coin name.
+   * Convert sCoin name to market coin name.
    * This function will parse new sCoin name `scallop_...` to its old market coin name which is shorter
    * e.g: `scallop_sui -> ssui
+   * if no `scallop_...` is encountered, return coinName
    * @return sCoin name
    */
-  public parseCoinNameFromSCoinName(coinName: string) {
-    return sCoinRawNameToName[coinName];
+  public parseSCoinTypeNameToMarketCoinName(coinName: string) {
+    return sCoinRawNameToName[coinName] ?? coinName;
   }
 
   /**
@@ -311,8 +312,14 @@ export class ScallopUtils {
   public parseCoinNameFromType<T extends SupportCoins>(
     coinType: string
   ): T extends SupportCoins ? T : SupportCoins;
+  public parseCoinNameFromType<T extends SupportSCoin>(
+    coinType: string
+  ): T extends SupportSCoin ? T : SupportSCoin;
   public parseCoinNameFromType(coinType: string) {
     coinType = normalizeStructTag(coinType);
+    if (sCoinTypeToName[coinType]) {
+      return sCoinTypeToName[coinType] as SupportSCoin;
+    }
 
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
@@ -553,7 +560,7 @@ export class ScallopUtils {
       const priceIds = priceIdPairs.map(([_, priceId]) => priceId);
 
       const pythConnection = new SuiPriceServiceConnection(endpoint, {
-        timeout: 2000,
+        timeout: 4000,
       });
 
       try {

package/src/queries/borrowIncentiveQuery.ts

@@ -1,6 +1,5 @@
 import { normalizeStructTag } from '@mysten/sui/utils';
 import {
-  sCoinRawNameToName,
   SUPPORT_BORROW_INCENTIVE_POOLS,
   SUPPORT_BORROW_INCENTIVE_REWARDS,
 } from '../constants';
@@ -66,7 +65,7 @@ export const getBorrowIncentivePools = async (
   const borrowIncentivePools: BorrowIncentivePools = {};
   marketPools =
     marketPools ??
-    (await query.getMarketPools(undefined, { coinPrices, indexer }));
+    (await query.getMarketPools(undefined, { coinPrices, indexer })).pools;
   coinPrices = coinPrices ?? (await query.getAllCoinPrices({ marketPools }));
 
   if (indexer) {
@@ -100,8 +99,10 @@ export const getBorrowIncentivePools = async (
     const borrowIncentivePoolPoints: OptionalKeys<
       Record<SupportBorrowIncentiveRewardCoins, BorrowIncentivePoolPoints>
     > = {};
-    const parsedBorrowIncentivePoolData =
-      parseOriginBorrowIncentivePoolData(pool);
+    const parsedBorrowIncentivePoolData = parseOriginBorrowIncentivePoolData(
+      query.utils,
+      pool
+    );
 
     const poolCoinType = normalizeStructTag(pool.pool_type.name);
     const poolCoinName =
@@ -121,13 +122,10 @@ export const getBorrowIncentivePools = async (
       parsedBorrowIncentivePoolData.poolPoints
     )) {
       const rewardCoinType = poolPoint.pointType;
-      let rewardCoinName = query.utils.parseCoinNameFromType(
+      const rewardCoinName = query.utils.parseCoinNameFromType(
         rewardCoinType
       ) as SupportBorrowIncentiveRewardCoins;
       // handle for scoin name
-      if (sCoinRawNameToName[rewardCoinName]) {
-        rewardCoinName = sCoinRawNameToName[rewardCoinName];
-      }
       const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
       const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
 

package/src/queries/borrowLimitQuery.ts

@@ -19,6 +19,7 @@ const borrowLimitZod = zod.object({
 
 const borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
 // const borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
+
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils