@scallop-io/sui-scallop-sdk 0.47.3 → 0.47.5

package/src/queries/spoolQuery.ts

@@ -272,18 +272,13 @@ export const getStakeAccounts = async (
     }
   } while (hasNextPage);
 
-  const stakeAccounts: StakeAccounts = {
-    susdc: [],
-    sweth: [],
-    ssui: [],
-    swusdc: [],
-    swusdt: [],
-    scetus: [],
-    safsui: [],
-    shasui: [],
-    svsui: [],
-    // ssca: [],
-  };
+  const stakeAccounts: StakeAccounts = SUPPORT_SPOOLS.reduce(
+    (acc, stakeName) => {
+      acc[stakeName] = [];
+      return acc;
+    },
+    {} as StakeAccounts
+  );
 
   const stakeMarketCoinTypes: Record<SupportStakeMarketCoins, string> =
     Object.keys(stakeAccounts).reduce(
@@ -300,6 +295,16 @@ export const getStakeAccounts = async (
       {} as Record<SupportStakeMarketCoins, string>
     );
 
+  // Reverse the mapping
+  const reversedStakeMarketCoinTypes: Record<string, SupportStakeMarketCoins> =
+    Object.entries(stakeMarketCoinTypes).reduce(
+      (reversedTypes, [key, value]) => {
+        reversedTypes[value] = key as SupportStakeMarketCoins;
+        return reversedTypes;
+      },
+      {} as Record<string, SupportStakeMarketCoins>
+    );
+
   const stakeObjectIds: string[] = stakeObjectsResponse
     .map((ref: any) => ref?.data?.objectId)
     .filter((id: any) => id !== undefined);
@@ -318,98 +323,30 @@ export const getStakeAccounts = async (
       const index = Number(fields.index);
       const points = Number(fields.points);
       const totalPoints = Number(fields.total_points);
-      if (normalizeStructTag(type) === stakeMarketCoinTypes.sweth) {
-        stakeAccounts.sweth.push({
-          id,
-          type: normalizeStructTag(type),
-          stakePoolId,
-          stakeType: normalizeStructTag(stakeType),
-          staked,
-          index,
-          points,
-          totalPoints,
-        });
-      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.ssui) {
-        stakeAccounts.ssui.push({
-          id,
-          type: normalizeStructTag(type),
-          stakePoolId,
-          stakeType: normalizeStructTag(stakeType),
-          staked,
-          index,
-          points,
-          totalPoints,
-        });
-      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.swusdc) {
-        stakeAccounts.swusdc.push({
-          id,
-          type: normalizeStructTag(type),
-          stakePoolId,
-          stakeType: normalizeStructTag(stakeType),
-          staked,
-          index,
-          points,
-          totalPoints,
-        });
-      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.swusdt) {
-        stakeAccounts.swusdt.push({
-          id,
-          type: normalizeStructTag(type),
-          stakePoolId,
-          stakeType: normalizeStructTag(stakeType),
-          staked,
-          index,
-          points,
-          totalPoints,
-        });
-      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.scetus) {
-        stakeAccounts.scetus.push({
-          id,
-          type: normalizeStructTag(type),
-          stakePoolId,
-          stakeType: normalizeStructTag(stakeType),
-          staked,
-          index,
-          points,
-          totalPoints,
-        });
-      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.safsui) {
-        stakeAccounts.safsui.push({
-          id,
-          type: normalizeStructTag(type),
-          stakePoolId,
-          stakeType: normalizeStructTag(stakeType),
-          staked,
-          index,
-          points,
-          totalPoints,
-        });
-      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.shasui) {
-        stakeAccounts.shasui.push({
-          id,
-          type: normalizeStructTag(type),
-          stakePoolId,
-          stakeType: normalizeStructTag(stakeType),
-          staked,
-          index,
-          points,
-          totalPoints,
-        });
-      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.svsui) {
-        stakeAccounts.svsui.push({
-          id,
-          type: normalizeStructTag(type),
-          stakePoolId,
-          stakeType: normalizeStructTag(stakeType),
-          staked,
-          index,
-          points,
-          totalPoints,
-        });
-      } else if (normalizeStructTag(type) === stakeMarketCoinTypes.susdc) {
-        stakeAccounts.susdc.push({
+
+      const stakeMarketCoinTypeMap: Record<
+        SupportStakeMarketCoins,
+        StakeAccounts[SupportStakeMarketCoins]
+      > = {
+        sweth: stakeAccounts.sweth,
+        ssui: stakeAccounts.ssui,
+        swusdc: stakeAccounts.swusdc,
+        swusdt: stakeAccounts.swusdt,
+        scetus: stakeAccounts.scetus,
+        safsui: stakeAccounts.safsui,
+        shasui: stakeAccounts.shasui,
+        svsui: stakeAccounts.svsui,
+        susdc: stakeAccounts.susdc,
+      };
+
+      const normalizedType = normalizeStructTag(type);
+      const stakeAccountArray =
+        stakeMarketCoinTypeMap[reversedStakeMarketCoinTypes[normalizedType]];
+
+      if (stakeAccountArray) {
+        stakeAccountArray.push({
           id,
-          type: normalizeStructTag(type),
+          type: normalizedType,
           stakePoolId,
           stakeType: normalizeStructTag(stakeType),
           staked,

package/src/queries/vescaQuery.ts

@@ -70,7 +70,8 @@ export const getVeScas = async (
   }: {
     utils: ScallopUtils;
   },
-  ownerAddress?: string
+  ownerAddress?: string,
+  excludeEmpty?: boolean
 ) => {
   const keyObjectDatas = await getVescaKeys(utils, ownerAddress);
 
@@ -83,9 +84,14 @@ export const getVeScas = async (
   });
   await Promise.allSettled(tasks);
 
-  return veScas
+  const result = veScas
     .filter(Boolean)
     .sort((a, b) => b!.currentVeScaBalance - a!.currentVeScaBalance);
+
+  if (excludeEmpty) {
+    return result.filter((v) => v.lockedScaAmount !== '0');
+  }
+  return result;
 };
 
 const SuiObjectRefZod = zod.object({

package/src/types/constant/common.ts

@@ -8,6 +8,8 @@ import {
   SUPPORT_BORROW_INCENTIVE_POOLS,
   SUPPORT_BORROW_INCENTIVE_REWARDS,
   SUPPORT_SCOIN,
+  SUPPORT_SUI_BRIDGE,
+  SUPPORT_WORMHOLE,
 } from '../../constants';
 
 type ParseMarketCoins<T extends string> = `s${T}`;
@@ -29,6 +31,8 @@ export type SupportMarketCoins =
   | ParseMarketCoins<SupportPoolCoins>
   | SupportStakeMarketCoins;
 export type SupportStakeMarketCoins = (typeof SUPPORT_SPOOLS)[number];
+export type SupportSuiBridgeCoins = (typeof SUPPORT_SUI_BRIDGE)[number];
+export type SupportWormholeCoins = (typeof SUPPORT_WORMHOLE)[number];
 export type SupportStakeCoins = Extract<
   SupportPoolCoins,
   ParseCoins<SupportStakeMarketCoins>

package/src/types/constant/enum.ts

@@ -7,6 +7,7 @@ import {
   SupportBorrowIncentiveCoins,
   SupportBorrowIncentiveRewardCoins,
   SupportSCoin,
+  SupportSuiBridgeCoins,
 } from './common';
 
 export type Coins = {
@@ -33,6 +34,10 @@ export type StakeRewardCoins = {
   [key in SupportStakeMarketCoins]: SupportStakeRewardCoins;
 };
 
+export type SuiBridgeCoins = {
+  [K in SupportSuiBridgeCoins]: K;
+};
+
 export type BorrowIncentiveRewardCoins = {
   [key in SupportBorrowIncentiveCoins]: SupportBorrowIncentiveRewardCoins[];
 };
@@ -65,3 +70,7 @@ export type WormholeCoinIds = {
 export type VoloCoinIds = {
   [key in PickFromUnion<SupportAssetCoins, 'vsui'>]: string;
 };
+
+export type SuiBridgedCoinPackageIds = {
+  [key in SupportSuiBridgeCoins]: string;
+};

package/src/utils/util.ts

@@ -6,12 +6,16 @@ import {
   MAX_LOCK_DURATION,
   SUPPORT_BORROW_INCENTIVE_REWARDS,
   SUPPORT_SCOIN,
+  SUPPORT_SUI_BRIDGE,
+  SUPPORT_WORMHOLE,
 } from '../constants';
 import type { ScallopAddress } from '../models';
 import type {
   SupportAssetCoins,
   SupportCoins,
   SupportMarketCoins,
+  SupportSuiBridgeCoins,
+  SupportWormholeCoins,
 } from '../types';
 
 const COIN_SET = Array.from(
@@ -33,11 +37,29 @@ export const isMarketCoin = (
   );
 };
 
-export const parseAssetSymbol = (coinName: SupportAssetCoins): string => {
-  const isWormhole = coinName.charAt(0) === 'w';
-  if (isWormhole) {
+export const isSuiBridgeAsset = (
+  coinName: any
+): coinName is SupportSuiBridgeCoins => {
+  return SUPPORT_SUI_BRIDGE.includes(coinName);
+};
+
+export const isWormholeAsset = (
+  coinName: any
+): coinName is SupportWormholeCoins => {
+  return SUPPORT_WORMHOLE.includes(coinName);
+};
+
+export const parseAssetSymbol = (coinName: SupportCoins): string => {
+  if (isWormholeAsset(coinName)) {
     return `w${coinName.slice(1).toUpperCase()}`;
   }
+  if (isSuiBridgeAsset(coinName)) {
+    return `sb${coinName.slice(2).toUpperCase()}`;
+  }
+  if (isMarketCoin(coinName)) {
+    const assetCoinName = coinName.slice(1).toLowerCase() as SupportAssetCoins;
+    return coinName.slice(0, 1).toLowerCase() + parseAssetSymbol(assetCoinName);
+  }
   switch (coinName) {
     case 'afsui':
       return 'afSUI';