@scallop-io/sui-scallop-sdk 1.4.16 → 1.4.18

package/src/queries/objectsQuery.ts

@@ -3,10 +3,10 @@ import { partitionArray } from 'src/utils';
 
 export const queryMultipleObjects = async (
   cache: ScallopCache,
-  objectIds: string[],
+  rawObjectIds: string[],
   partitionSize = 50
 ) => {
-  const objectIdsPartition = partitionArray(objectIds, partitionSize);
+  const objectIdsPartition = partitionArray(rawObjectIds, partitionSize);
 
   const objects = [];
   for (const objectIds of objectIdsPartition) {

package/src/queries/poolAddressesQuery.ts

@@ -7,12 +7,16 @@ export const getAllAddresses = async (query: ScallopQuery) => {
     Record<
       SupportPoolCoins,
       {
+        coinName: string;
+        symbol: string;
         lendingPoolAddress?: string;
         collateralPoolAddress?: string; // not all pool has collateral
         borrowDynamic?: string;
         spoolReward?: string;
         spool?: string;
         sCoinType?: string;
+        sCoinName?: string;
+        sCoinSymbol?: string;
         sCoinTreasury?: string;
         interestModel?: string;
         riskModel?: string;
@@ -23,6 +27,8 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         coinMetadataId?: string;
         borrowIncentivePoolId?: string;
         coinType?: string;
+        sCoinMetadataId?: string;
+        spoolName?: string;
       }
     >
   > = {};
@@ -116,6 +122,12 @@ export const getAllAddresses = async (query: ScallopQuery) => {
       );
       // @ts-ignore
       const sCoinType = query.address.get(`scoin.coins.s${coinName}.coinType`);
+      const sCoinName = sCoinType
+        ? query.utils.parseSCoinName(coinName)
+        : undefined;
+      const sCoinSymbol = sCoinName
+        ? query.utils.parseSymbol(sCoinName)
+        : undefined;
       const sCoinTreasury = query.address.get(
         // @ts-ignore
         `scoin.coins.s${coinName}.treasury`
@@ -123,7 +135,14 @@ export const getAllAddresses = async (query: ScallopQuery) => {
       const coinMetadataId = query.address.get(
         `core.coins.${coinName}.metaData`
       );
+      const sCoinMetadataId = query.address.get(
+        // @ts-ignore
+        `scoin.coins.s${coinName}.metaData`
+      );
+      const spoolName = spool ? `s${coinName}` : undefined;
       results[coinName as SupportPoolCoins] = {
+        coinName,
+        symbol: query.utils.parseSymbol(coinName),
         lendingPoolAddress: addresses[0],
         collateralPoolAddress: addresses[1],
         borrowDynamic: addresses[2],
@@ -137,8 +156,12 @@ export const getAllAddresses = async (query: ScallopQuery) => {
         spoolReward: rewardPool,
         sCoinTreasury,
         sCoinType,
+        sCoinName,
+        sCoinSymbol,
         coinMetadataId,
         coinType: `0x${coinType}`,
+        sCoinMetadataId,
+        spoolName,
       };
 
       await new Promise((resolve) => setTimeout(resolve, 500));

package/src/queries/portfolioQuery.ts

@@ -650,7 +650,10 @@ export const getObligationAccount = async (
   }
 
   let riskLevel = totalRequiredCollateralValue.isZero()
-    ? BigNumber(0)
+    ? // Note: when there is no collateral and debt is not zero, then it's a bad-debt situation.
+      totalBorrowedValueWithWeight.isGreaterThan(0)
+      ? BigNumber(100)
+      : BigNumber(0)
     : totalBorrowedValueWithWeight.dividedBy(totalRequiredCollateralValue);
   // Note: 100% represents the safety upper limit. Even if it exceeds 100% before it is liquidated, it will only display 100%.
   riskLevel = riskLevel.isLessThan(1) ? riskLevel : BigNumber(1);