@scallop-io/sui-scallop-sdk 2.0.2 → 2.0.4

package/package.json

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

package/src/models/scallopConstants.ts

@@ -326,7 +326,9 @@ export class ScallopConstants {
     const resp = await this.queryClient.fetchQuery({
       queryKey,
       queryFn: async () => {
-        return await this._requestClient.get(url);
+        return await this._requestClient.get(url, {
+          timeout: 4000,
+        });
       },
     });
 

package/src/models/suiKit.ts

@@ -1,11 +1,26 @@
 import { SuiKit, SuiKitParams } from '@scallop-io/sui-kit';
 import { RPC_PROVIDERS } from 'src/constants/rpc';
 
-export const newSuiKit = (params: SuiKitParams) => {
+export const newSuiKit = (params: Partial<SuiKitParams>) => {
+  let initParams;
+  if (
+    'suiClients' in params &&
+    params.suiClients &&
+    params.suiClients?.length > 0
+  ) {
+    initParams = {
+      suiClients: params.suiClients,
+    };
+  } else {
+    initParams = {
+      fullnodeUrls:
+        'fullnodeUrls' in params
+          ? (params?.fullnodeUrls ?? RPC_PROVIDERS)
+          : RPC_PROVIDERS,
+    };
+  }
   return new SuiKit({
     ...params,
-    fullnodeUrls: Array.from(
-      new Set([...(params.fullnodeUrls ?? []), ...RPC_PROVIDERS])
-    ),
+    ...initParams,
   });
 };

package/src/queries/portfolioQuery.ts

@@ -896,7 +896,7 @@ export const getUserPortfolio = async (
   const parsedObligationAccounts = Object.values(obligationAccounts)
     .filter(
       (t): t is NonNullable<typeof t> =>
-        !!t && t.totalBorrowedValueWithWeight > 0
+        !!t && (t.totalBorrowedValueWithWeight > 0 || t.totalDepositedValue > 0)
     )
     .map((obligationAccount) => {
       return {
@@ -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> =>

package/src/types/model.ts

@@ -74,7 +74,7 @@ export type ScallopCacheParams = {
   walletAddress?: string;
   cacheOptions?: QueryClientConfig;
   config?: ScallopCacheConfig;
-} & SuiKitParams;
+} & Partial<SuiKitParams>;
 
 export type ScallopIndexerParams = ScallopCacheParams & {
   indexerApiUrl?: string;
@@ -109,7 +109,7 @@ export type ScallopBuilderParams = ScallopQueryParams & {
 };
 
 export type ScallopClientParams = ScallopBuilderParams;
-export type ScallopParams = SuiKitParams &
+export type ScallopParams = Partial<SuiKitParams> &
   ScallopAddressParams &
   ScallopConstantsParams & {
     walletAddress?: string;