@scallop-io/sui-scallop-sdk 1.3.3-alpha.2 → 1.3.3

package/src/queries/spoolQuery.ts

@@ -114,7 +114,7 @@ export const getSpool = async (
   const coinName = query.utils.parseCoinName<SupportStakeCoins>(marketCoinName);
   marketPool = marketPool || (await query.getMarketPool(coinName, indexer));
   if (!marketPool) {
-    throw new Error(`Failed to fetch marketPool for ${marketCoinName}`);
+    throw new Error('Fail to fetch marketPool');
   }
 
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
@@ -210,6 +210,7 @@ export const getSpool = async (
         rewardCoinType: isMarketCoin(rewardCoinName)
           ? query.utils.parseMarketCoinType(rewardCoinName)
           : query.utils.parseCoinType(rewardCoinName),
+        sCoinType: marketPool.sCoinType,
         coinDecimal: query.utils.getCoinDecimal(coinName),
         rewardCoinDecimal: query.utils.getCoinDecimal(rewardCoinName),
         coinPrice: coinPrices?.[coinName] ?? 0,

package/src/queries/vescaQuery.ts

@@ -72,7 +72,7 @@ export const getVeScas = async (
   }: {
     utils: ScallopUtils;
   },
-  ownerAddress?: string,
+  ownerAddress: string,
   excludeEmpty?: boolean
 ) => {
   const keyObjectDatas = await getVescaKeys(utils, ownerAddress);
@@ -88,7 +88,7 @@ export const getVeScas = async (
 
   const result = veScas
     .filter(Boolean)
-    .sort((a, b) => b!.currentVeScaBalance - a!.currentVeScaBalance);
+    .sort((a, b) => b.currentVeScaBalance - a.currentVeScaBalance);
 
   if (excludeEmpty) {
     return result.filter((v) => v.lockedScaAmount !== '0');
@@ -113,11 +113,9 @@ type SuiObjectRefType = zod.infer<typeof SuiObjectRefZod>;
  */
 export const getVeSca = async (
   utils: ScallopUtils,
-  veScaKey?: string | SuiObjectData,
-  ownerAddress?: string
+  veScaKey: string | SuiObjectData
 ) => {
   const tableId = utils.address.get(`vesca.tableId`);
-  veScaKey = veScaKey || (await getVescaKeys(utils, ownerAddress))[0];
 
   if (!veScaKey) return undefined;
   if (typeof veScaKey === 'object') {
@@ -168,7 +166,7 @@ export const getVeSca = async (
       lockedScaCoin,
       currentVeScaBalance,
       unlockAt: BigNumber(dynamicFields.unlock_at * 1000).toNumber(),
-    } as Vesca;
+    };
   }
 
   return vesca;

package/src/types/query/core.ts

@@ -153,7 +153,6 @@ export type MarketCollateral = {
   coinWrappedType: CoinWrappedType;
   coinDecimal: number;
   coinPrice: number;
-  isIsolated: boolean;
 } & Required<
   Pick<
     ParsedMarketCollateralData,

package/src/types/query/portfolio.ts

@@ -22,6 +22,7 @@ export type Lending = Required<
     | 'symbol'
     | 'coinType'
     | 'marketCoinType'
+    | 'sCoinType'
     | 'coinDecimal'
     | 'coinPrice'
     | 'conversionRate'

package/src/types/query/spool.ts

@@ -12,6 +12,7 @@ export type Spool = {
   coinType: string;
   marketCoinType: string;
   rewardCoinType: string;
+  sCoinType: string;
   coinDecimal: number;
   rewardCoinDecimal: number;
   coinPrice: number;

package/src/types/query/vesca.ts

@@ -4,7 +4,7 @@ export type Vesca = {
   id: string;
   keyId: string;
   keyObject?: SuiObjectRef;
-  object?: SuiObjectRef;
+  object: SuiObjectRef;
   lockedScaAmount: string;
   lockedScaCoin: number;
   currentVeScaBalance: number;