@scallop-io/sui-scallop-sdk 2.0.3 → 2.0.5

package/package.json

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

package/src/queries/portfolioQuery.ts

@@ -852,7 +852,7 @@ export const getUserPortfolio = async (
   walletAddress: string,
   indexer: boolean = false
 ) => {
-  const coinPrices = await query.utils.getCoinPrices();
+  const coinPrices = await query.getAllCoinPrices({ indexer });
   const market = await query.getMarketPools(undefined, { indexer, coinPrices });
 
   const [lendings, obligationAccounts, borrowIncentivePools, veScas] =
@@ -908,6 +908,20 @@ export const getUserPortfolio = async (
           obligationAccount.totalAvailableCollateralValue,
         totalUnhealthyCollateralInUsd:
           obligationAccount.totalUnhealthyCollateralValue,
+        collaterals: Object.values(obligationAccount.collaterals)
+          .filter(
+            (collateral): collateral is NonNullable<typeof collateral> =>
+              !!collateral && collateral.depositedCoin > 0
+          )
+          .map((collateral) => ({
+            coinName: collateral.coinName,
+            symbol: collateral.symbol,
+            coinDecimals: collateral.coinDecimal,
+            coinType: collateral.coinType,
+            coinPrice: collateral.coinPrice,
+            depositedCoin: collateral.depositedCoin,
+            depositedValueInUsd: collateral.depositedValue,
+          })),
         borrowedPools: Object.values(obligationAccount.debts)
           .filter(
             (debt): debt is NonNullable<typeof debt> =>
@@ -939,19 +953,22 @@ export const getUserPortfolio = async (
       };
     });
 
+  const LENDING_SPOOL_REWARD_COIN_NAME = 'sui' as const;
+  const LENDING_SPOOL_REWARD_COIN_SYMBOL = 'SUI' as const;
   const pendingLendingRewards = Object.values(lendings).reduce(
     (acc, reward) => {
       if (reward) {
         if (reward.availableClaimCoin === 0) return acc;
-        if (!acc[reward.symbol]) {
-          acc[reward.symbol] = {
-            symbol: reward.symbol,
+        if (!acc[LENDING_SPOOL_REWARD_COIN_NAME]) {
+          acc[LENDING_SPOOL_REWARD_COIN_NAME] = {
+            symbol: LENDING_SPOOL_REWARD_COIN_SYMBOL,
             coinType: normalizeStructTag(SUI_TYPE_ARG), // @TODO: for now lending reward is all in SUI
-            coinPrice: reward.coinPrice,
+            coinPrice: coinPrices[LENDING_SPOOL_REWARD_COIN_NAME] ?? 0,
             pendingRewardInCoin: reward.availableClaimCoin,
           };
         } else {
-          acc[reward.symbol].pendingRewardInCoin += reward.availableClaimCoin;
+          acc[LENDING_SPOOL_REWARD_COIN_NAME].pendingRewardInCoin +=
+            reward.availableClaimCoin;
         }
       }
       return acc;
@@ -1040,10 +1057,10 @@ export const getUserPortfolio = async (
     borrowings: parsedObligationAccounts,
     pendingRewards: {
       lendings: Object.entries(pendingLendingRewards).reduce(
-        (acc, [key, value]) => {
+        (acc, [_, value]) => {
           acc.push({
             ...value,
-            coinName: key,
+            coinName: 'sui',
             pendingRewardInUsd: value.coinPrice * value.pendingRewardInCoin,
           });
           return acc;