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

package/dist/models/scallopUtils.d.ts

@@ -59,12 +59,13 @@ export declare class ScallopUtils {
      */
     parseSCoinName<T extends SupportSCoin>(coinName: SupportCoins | SupportMarketCoins): T | undefined;
     /**
-     * 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: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep";
+    parseSCoinTypeNameToMarketCoinName(coinName: string): "susdc" | "ssbeth" | "sweth" | "swbtc" | "swusdc" | "swusdt" | "ssui" | "swsol" | "scetus" | "safsui" | "shasui" | "svsui" | "ssca" | "sfud" | "sdeep";
     /**
      * Convert sCoin name into sCoin type
      * @param sCoinName
@@ -110,6 +111,7 @@ export declare class ScallopUtils {
     parseCoinNameFromType<T extends SupportAssetCoins>(coinType: string): T extends SupportAssetCoins ? T : SupportAssetCoins;
     parseCoinNameFromType<T extends SupportMarketCoins>(coinType: string): T extends SupportMarketCoins ? T : SupportMarketCoins;
     parseCoinNameFromType<T extends SupportCoins>(coinType: string): T extends SupportCoins ? T : SupportCoins;
+    parseCoinNameFromType<T extends SupportSCoin>(coinType: string): T extends SupportSCoin ? T : SupportSCoin;
     /**
      * Convert market coin name to coin name.
      *

package/dist/utils/query.d.ts

@@ -40,7 +40,7 @@ export declare const parseOriginBorrowIncentivesPoolPointData: (originBorrowInce
  * @param originBorrowIncentivePoolData - Origin borrow incentive pool data
  * @return Parsed borrow incentive pool data
  */
-export declare const parseOriginBorrowIncentivePoolData: (originBorrowIncentivePoolData: OriginBorrowIncentivePoolData) => ParsedBorrowIncentivePoolData;
+export declare const parseOriginBorrowIncentivePoolData: (utils: ScallopUtils, originBorrowIncentivePoolData: OriginBorrowIncentivePoolData) => ParsedBorrowIncentivePoolData;
 export declare const calculateBorrowIncentivePoolPointData: (parsedBorrowIncentivePoolPointData: ParsedBorrowIncentivePoolPointData, rewardCoinPrice: number, rewardCoinDecimal: number, poolCoinPrice: number, poolCoinDecimal: number) => CalculatedBorrowIncentivePoolPointData;
 export declare const parseOriginBorrowIncentiveAccountPoolPointData: (originBorrowIncentiveAccountPoolPointData: OriginBorrowIncentiveAccountPoolData) => ParsedBorrowIncentiveAccountPoolData;
 /**

package/package.json

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

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);

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';
@@ -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/portfolioQuery.ts

@@ -532,7 +532,7 @@ export const getObligationAccount = async (
         ([key, accountPoint]) => {
           const poolPoint =
             borrowIncentivePool.points[
-              key as SupportBorrowIncentiveRewardCoins
+              query.utils.parseSCoinTypeNameToMarketCoinName(key)
             ];
 
           if (accountPoint && poolPoint) {
@@ -577,6 +577,11 @@ export const getObligationAccount = async (
                   .toNumber()
               : 1;
 
+            // console.log({
+            //   availableClaimAmount: availableClaimAmount.toString(),
+            //   coinName: poolPoint.coinName,
+            //   coinType: poolPoint.coinType,
+            // });
             if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
               rewards.push({
                 coinName: poolPoint.coinName,

package/src/utils/query.ts

@@ -27,7 +27,6 @@ import type {
   ParsedBorrowIncentiveAccountPoolData,
   SupportBorrowIncentiveRewardCoins,
 } from '../types';
-import { sCoinRawNameToName } from 'src/constants';
 
 /**
  *  Parse origin market pool data to a more readable format.
@@ -424,6 +423,7 @@ export const parseOriginBorrowIncentivesPoolPointData = (
  * @return Parsed borrow incentive pool data
  */
 export const parseOriginBorrowIncentivePoolData = (
+  utils: ScallopUtils,
   originBorrowIncentivePoolData: OriginBorrowIncentivePoolData
 ): ParsedBorrowIncentivePoolData => {
   return {
@@ -434,12 +434,10 @@ export const parseOriginBorrowIncentivePoolData = (
     poolPoints: originBorrowIncentivePoolData.points.reduce(
       (acc, point) => {
         const parsed = parseOriginBorrowIncentivesPoolPointData(point);
-        let name = parseStructTag(
-          parsed.pointType
-        ).name.toLowerCase() as SupportBorrowIncentiveRewardCoins;
-        if (sCoinRawNameToName[name]) {
-          name = sCoinRawNameToName[name];
-        }
+        const name = utils.parseSCoinTypeNameToMarketCoinName(
+          parseStructTag(parsed.pointType).name.toLowerCase()
+        ) as SupportBorrowIncentiveRewardCoins;
+
         acc[name] = parsed;
         return acc;
       },