@scallop-io/sui-scallop-sdk 1.4.7 → 1.4.8

package/dist/index.mjs

@@ -4047,14 +4047,14 @@ var getLoyaltyProgramInformations = async (query, veScaKey) => {
 // src/queries/portfolioQuery.ts
 import BigNumber5 from "bignumber.js";
 import { normalizeStructTag as normalizeStructTag5, SUI_TYPE_ARG } from "@scallop-io/sui-kit";
-var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress, marketPools, indexer = false) => {
+var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress, marketPools, coinPrices, indexer = false) => {
   const marketCoinNames = poolCoinNames.map(
     (poolCoinName) => query.utils.parseMarketCoinName(poolCoinName)
   );
   const stakeMarketCoinNames = marketCoinNames.filter(
     (marketCoinName) => SUPPORT_SPOOLS.includes(marketCoinName)
   );
-  const coinPrices = await query.utils.getCoinPrices();
+  coinPrices = coinPrices ?? await query.utils.getCoinPrices();
   marketPools = marketPools ?? (await query.getMarketPools(poolCoinNames, {
     indexer,
     coinPrices
@@ -4225,9 +4225,9 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
   };
   return lending;
 };
-var getObligationAccounts = async (query, ownerAddress, market, indexer = false) => {
+var getObligationAccounts = async (query, ownerAddress, market, coinPrices, indexer = false) => {
   market = market ?? await query.getMarketPools(void 0, { indexer });
-  const coinPrices = await query.getAllCoinPrices({
+  coinPrices = coinPrices ?? await query.getAllCoinPrices({
     marketPools: market.pools
   });
   const [coinAmounts, obligations] = await Promise.all([
@@ -4587,19 +4587,24 @@ var getTotalValueLocked = async (query, indexer = false) => {
   return tvl;
 };
 var getUserPortfolio = async (query, walletAddress, indexer = false) => {
-  const market = await query.getMarketPools();
-  const [lendings, obligationAccounts, borrowIncentivePools] = await Promise.all([
+  const coinPrices = await query.utils.getCoinPrices();
+  const market = await query.getMarketPools(void 0, { indexer, coinPrices });
+  const [lendings, obligationAccounts, borrowIncentivePools, veScas] = await Promise.all([
     query.getLendings(void 0, walletAddress, {
       indexer,
-      marketPools: market.pools
+      marketPools: market.pools,
+      coinPrices
     }),
     query.getObligationAccounts(walletAddress, {
       indexer,
-      market
+      market,
+      coinPrices
     }),
     query.getBorrowIncentivePools(void 0, {
-      marketPools: market.pools
-    })
+      marketPools: market.pools,
+      coinPrices
+    }),
+    query.getVeScas({ walletAddress, excludeEmpty: true })
   ]);
   const parsedLendings = Object.values(lendings).filter((t) => t.availableWithdrawCoin > 0).map((lending) => ({
     suppliedCoin: lending.availableWithdrawCoin,
@@ -4686,28 +4691,39 @@ var getUserPortfolio = async (query, walletAddress, indexer = false) => {
     },
     {}
   );
+  const parsedVeScas = veScas.map(
+    ({ keyId, lockedScaCoin, currentVeScaBalance, unlockAt }) => ({
+      veScaKey: keyId,
+      coinPrice: coinPrices.sca ?? 0,
+      lockedScaInCoin: lockedScaCoin,
+      lockedScaInUsd: lockedScaCoin * (coinPrices.sca ?? 0),
+      currentVeScaBalance,
+      remainingLockPeriodInDays: unlockAt - Date.now() > 0 ? (unlockAt - Date.now()) / 864e5 : 0,
+      unlockAt
+    })
+  );
   return {
-    lendings: {
-      totalSupplyValue: parsedLendings.reduce((acc, curr) => {
-        acc += curr.suppliedValue;
+    totalSupplyValue: parsedLendings.reduce((acc, curr) => {
+      acc += curr.suppliedValue;
+      return acc;
+    }, 0),
+    ...parsedObligationAccounts.reduce(
+      (acc, curr) => {
+        acc.totalDebtValue += curr.totalDebtsInUsd;
+        acc.totalCollateralValue += curr.totalCollateralInUsd;
         return acc;
-      }, 0),
-      suppliedPools: parsedLendings
-    },
-    borrowings: {
-      ...parsedObligationAccounts.reduce(
-        (acc, curr) => {
-          acc.totalDebtValue += curr.totalDebtsInUsd;
-          acc.totalCollateralValue += curr.totalCollateralInUsd;
-          return acc;
-        },
-        {
-          totalDebtValue: 0,
-          totalCollateralValue: 0
-        }
-      ),
-      obligations: parsedObligationAccounts
-    },
+      },
+      {
+        totalDebtValue: 0,
+        totalCollateralValue: 0
+      }
+    ),
+    totalLockedScaValue: parsedVeScas.reduce((acc, curr) => {
+      acc += curr.lockedScaInUsd;
+      return acc;
+    }, 0),
+    lendings: parsedLendings,
+    borrowings: parsedObligationAccounts,
     pendingRewards: {
       lendings: Object.entries(pendingLendingRewards).reduce(
         (acc, [key, value]) => {
@@ -4731,7 +4747,8 @@ var getUserPortfolio = async (query, walletAddress, indexer = false) => {
         },
         []
       )
-    }
+    },
+    veScas: parsedVeScas
   };
 };
 
@@ -5572,7 +5589,7 @@ var getAllAddresses = async (query) => {
         sCoinTreasury,
         sCoinType,
         coinDecimalId,
-        coinType
+        coinType: `0x${coinType}`
       };
       await new Promise((resolve) => setTimeout(resolve, 200));
     })
@@ -8264,6 +8281,7 @@ var ScallopQuery = class {
       poolCoinNames,
       ownerAddress,
       args?.marketPools,
+      args?.coinPrices,
       args?.indexer
     );
   }
@@ -8293,6 +8311,7 @@ var ScallopQuery = class {
       this,
       ownerAddress,
       args?.market,
+      args?.coinPrices,
       args?.indexer
     );
   }