@scallop-io/sui-scallop-sdk 1.4.13 → 1.4.14

package/dist/index.mjs

@@ -1352,7 +1352,7 @@ var parseOriginBorrowIncentivesPoolPointData = (originBorrowIncentivePoolPointDa
     createdAt: Number(originBorrowIncentivePoolPointData.created_at)
   };
 };
-var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
+var parseOriginBorrowIncentivePoolData = (utils, originBorrowIncentivePoolData) => {
   return {
     poolType: normalizeStructTag(originBorrowIncentivePoolData.pool_type.name),
     minStakes: Number(originBorrowIncentivePoolData.min_stakes),
@@ -1361,12 +1361,9 @@ var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
     poolPoints: originBorrowIncentivePoolData.points.reduce(
       (acc, point) => {
         const parsed = parseOriginBorrowIncentivesPoolPointData(point);
-        let name = parseStructTag(
-          parsed.pointType
-        ).name.toLowerCase();
-        if (sCoinRawNameToName[name]) {
-          name = sCoinRawNameToName[name];
-        }
+        const name = utils.parseSCoinTypeNameToMarketCoinName(
+          parseStructTag(parsed.pointType).name.toLowerCase()
+        );
         acc[name] = parsed;
         return acc;
       },
@@ -2523,7 +2520,10 @@ var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
   );
   for (const pool of borrowIncentivePoolsQueryData?.incentive_pools ?? []) {
     const borrowIncentivePoolPoints = {};
-    const parsedBorrowIncentivePoolData = parseOriginBorrowIncentivePoolData(pool);
+    const parsedBorrowIncentivePoolData = parseOriginBorrowIncentivePoolData(
+      query.utils,
+      pool
+    );
     const poolCoinType = normalizeStructTag3(pool.pool_type.name);
     const poolCoinName = query.utils.parseCoinNameFromType(
       poolCoinType
@@ -2537,12 +2537,9 @@ var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
       parsedBorrowIncentivePoolData.poolPoints
     )) {
       const rewardCoinType = poolPoint.pointType;
-      let rewardCoinName = query.utils.parseCoinNameFromType(
+      const rewardCoinName = query.utils.parseCoinNameFromType(
         rewardCoinType
       );
-      if (sCoinRawNameToName[rewardCoinName]) {
-        rewardCoinName = sCoinRawNameToName[rewardCoinName];
-      }
       const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
       const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
       const symbol = query.utils.parseSymbol(rewardCoinName);
@@ -3852,7 +3849,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
       const rewards = [];
       Object.entries(borrowIncentiveAccount.pointList).forEach(
         ([key, accountPoint]) => {
-          const poolPoint = borrowIncentivePool.points[key];
+          const poolPoint = borrowIncentivePool.points[query.utils.parseSCoinTypeNameToMarketCoinName(key)];
           if (accountPoint && poolPoint) {
             let availableClaimAmount = BigNumber5(0);
             let availableClaimCoin = BigNumber5(0);
@@ -4884,13 +4881,14 @@ var ScallopUtils = class {
     }
   }
   /**
-   * 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
    */
-  parseCoinNameFromSCoinName(coinName) {
-    return sCoinRawNameToName[coinName];
+  parseSCoinTypeNameToMarketCoinName(coinName) {
+    return sCoinRawNameToName[coinName] ?? coinName;
   }
   /**
    * Convert sCoin name into sCoin type
@@ -4939,6 +4937,9 @@ var ScallopUtils = class {
   }
   parseCoinNameFromType(coinType) {
     coinType = normalizeStructTag6(coinType);
+    if (sCoinTypeToName[coinType]) {
+      return sCoinTypeToName[coinType];
+    }
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes("reserve::MarketCoin");