@scallop-io/sui-scallop-sdk 1.3.4-alpha.1 → 1.3.4-alpha.2

package/src/queries/coreQuery.ts

@@ -4,6 +4,7 @@ import {
   PROTOCOL_OBJECT_ID,
   SUPPORT_COLLATERALS,
   BORROW_FEE_PROTOCOL_ID,
+  USE_TEST_ADDRESS,
   FlashLoanFeeObjectMap,
 } from '../constants';
 import {
@@ -34,10 +35,10 @@ import {
   CollateralStat,
   SupportMarketCoins,
   OptionalKeys,
+  CoinPrices,
 } from '../types';
 import BigNumber from 'bignumber.js';
 import { getSupplyLimit } from './supplyLimit';
-import { isIsolatedAsset } from './isolatedAsset';
 // import { isIsolatedAsset } from './isolatedAsset';
 
 /**
@@ -52,9 +53,10 @@ import { isIsolatedAsset } from './isolatedAsset';
  */
 export const queryMarket = async (
   query: ScallopQuery,
-  indexer: boolean = false
+  indexer: boolean = false,
+  coinPrices?: CoinPrices
 ) => {
-  const coinPrices = await query.utils.getCoinPrices();
+  coinPrices = coinPrices ?? (await query.utils.getCoinPrices()) ?? {};
 
   const pools: MarketPools = {};
   const collaterals: MarketCollaterals = {};
@@ -63,13 +65,13 @@ export const queryMarket = async (
     const marketIndexer = await query.indexer.getMarket();
 
     const updatePools = (item: MarketPool) => {
-      item.coinPrice = coinPrices[item.coinName] || item.coinPrice;
+      item.coinPrice = coinPrices[item.coinName] ?? item.coinPrice;
       item.coinWrappedType = query.utils.getCoinWrappedType(item.coinName);
       pools[item.coinName] = item;
     };
 
     const updateCollaterals = (item: MarketCollateral) => {
-      item.coinPrice = coinPrices[item.coinName] || item.coinPrice;
+      item.coinPrice = coinPrices[item.coinName] ?? item.coinPrice;
       item.coinWrappedType = query.utils.getCoinWrappedType(item.coinName);
       collaterals[item.coinName] = item;
     };
@@ -156,8 +158,8 @@ export const queryMarket = async (
       borrowFee: parsedMarketPoolData.borrowFee,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
-      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
-      // isIsolated: false,
+      // isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+      isIsolated: false,
       maxSupplyCoin,
       ...calculatedMarketPoolData,
     };
@@ -204,7 +206,6 @@ export const queryMarket = async (
       liquidationPanelty: parsedMarketCollateralData.liquidationPanelty,
       liquidationReserveFactor:
         parsedMarketCollateralData.liquidationReserveFactor,
-      isIsolated: await isIsolatedAsset(query.utils, collateralCoinName),
       ...calculatedMarketCollateralData,
     };
   }
@@ -231,13 +232,14 @@ export const queryMarket = async (
 export const getMarketPools = async (
   query: ScallopQuery,
   poolCoinNames: SupportPoolCoins[] = [...SUPPORT_POOLS],
-  indexer: boolean = false
+  indexer: boolean = false,
+  coinPrices?: CoinPrices
 ) => {
   const marketId = query.address.get('core.market');
   const marketObjectResponse = await query.cache.queryGetObject(marketId, {
     showContent: true,
   });
-  const coinPrices = (await query.utils.getCoinPrices(poolCoinNames)) ?? {};
+  coinPrices = (await query.utils.getCoinPrices(poolCoinNames)) ?? {};
 
   const marketPools: MarketPools = {};
 
@@ -247,7 +249,7 @@ export const getMarketPools = async (
     const updateMarketPool = (marketPool: MarketPool) => {
       if (!poolCoinNames.includes(marketPool.coinName)) return;
       marketPool.coinPrice =
-        coinPrices[marketPool.coinName] || marketPool.coinPrice;
+        coinPrices[marketPool.coinName] ?? marketPool.coinPrice;
       marketPool.coinWrappedType = query.utils.getCoinWrappedType(
         marketPool.coinName
       );
@@ -294,129 +296,131 @@ export const getMarketPool = async (
   indexer: boolean = false,
   marketObject?: SuiObjectData | null,
   coinPrice?: number
-): Promise<MarketPool | undefined> => {
-  try {
-    coinPrice =
-      coinPrice ||
-      (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
-
-    if (indexer) {
-      const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
-      marketPoolIndexer.coinPrice = coinPrice || marketPoolIndexer.coinPrice;
-      marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
-        marketPoolIndexer.coinName
-      );
+) => {
+  let marketPool: MarketPool | undefined;
+  let balanceSheet: BalanceSheet | undefined;
+  let borrowIndex: BorrowIndex | undefined;
+  let interestModel: InterestModel | undefined;
+  let borrowFeeRate: { value: string } | undefined;
 
-      return marketPoolIndexer;
-    }
+  coinPrice =
+    coinPrice ??
+    (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
 
-    const marketId = query.address.get('core.market');
-    marketObject =
-      marketObject ||
-      (
-        await query.cache.queryGetObject(marketId, {
-          showContent: true,
-        })
-      )?.data;
-
-    if (!(marketObject && marketObject.content?.dataType === 'moveObject'))
-      throw new Error(`Failed to fetch marketObject`);
-
-    const fields = marketObject.content.fields as any;
-    const coinType = query.utils.parseCoinType(poolCoinName);
-    // Get balance sheet.
-    const balanceSheetParentId =
-      fields.vault.fields.balance_sheets.fields.table.fields.id.id;
-    const balanceSheetDynamicFieldObjectResponse =
-      await query.cache.queryGetDynamicFieldObject({
-        parentId: balanceSheetParentId,
-        name: {
-          type: '0x1::type_name::TypeName',
-          value: {
-            name: coinType.substring(2),
-          },
-        },
-      });
+  if (indexer) {
+    const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
+    marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
+    marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
+      marketPoolIndexer.coinName
+    );
 
-    const balanceSheetDynamicFieldObject =
-      balanceSheetDynamicFieldObjectResponse?.data;
+    return marketPoolIndexer;
+  }
 
-    if (
-      !(
+  const marketId = query.address.get('core.market');
+  marketObject =
+    marketObject ??
+    (
+      await query.cache.queryGetObject(marketId, {
+        showContent: true,
+      })
+    )?.data;
+
+  if (marketObject) {
+    if (marketObject.content && 'fields' in marketObject.content) {
+      const fields = marketObject.content.fields as any;
+      const coinType = query.utils.parseCoinType(poolCoinName);
+      // Get balance sheet.
+      const balanceSheetParentId =
+        fields.vault.fields.balance_sheets.fields.table.fields.id.id;
+      const balanceSheetDynamicFieldObjectResponse =
+        await query.cache.queryGetDynamicFieldObject({
+          parentId: balanceSheetParentId,
+          name: {
+            type: '0x1::type_name::TypeName',
+            value: {
+              name: coinType.substring(2),
+            },
+          },
+        });
+      if (!balanceSheetDynamicFieldObjectResponse)
+        throw new Error(
+          `Failed to fetch balanceSheetDynamicFieldObjectResponse for ${poolCoinName}`
+        );
+
+      const balanceSheetDynamicFieldObject =
+        balanceSheetDynamicFieldObjectResponse.data;
+      if (
         balanceSheetDynamicFieldObject &&
         balanceSheetDynamicFieldObject.content &&
         'fields' in balanceSheetDynamicFieldObject.content
-      )
-    )
-      throw new Error(
-        `Failed to fetch balanceSheetDynamicFieldObject for ${poolCoinName}: ${balanceSheetDynamicFieldObjectResponse?.error?.code.toString()}`
-      );
-    const balanceSheet: BalanceSheet = (
-      balanceSheetDynamicFieldObject.content.fields as any
-    ).value.fields;
-
-    // Get borrow index.
-    const borrowIndexParentId =
-      fields.borrow_dynamics.fields.table.fields.id.id;
-    const borrowIndexDynamicFieldObjectResponse =
-      await query.cache.queryGetDynamicFieldObject({
-        parentId: borrowIndexParentId,
-        name: {
-          type: '0x1::type_name::TypeName',
-          value: {
-            name: coinType.substring(2),
+      ) {
+        const dynamicFields = balanceSheetDynamicFieldObject.content
+          .fields as any;
+        balanceSheet = dynamicFields.value.fields;
+      }
+
+      // Get borrow index.
+      const borrowIndexParentId =
+        fields.borrow_dynamics.fields.table.fields.id.id;
+      const borrowIndexDynamicFieldObjectResponse =
+        await query.cache.queryGetDynamicFieldObject({
+          parentId: borrowIndexParentId,
+          name: {
+            type: '0x1::type_name::TypeName',
+            value: {
+              name: coinType.substring(2),
+            },
           },
-        },
-      });
+        });
+      if (!borrowIndexDynamicFieldObjectResponse)
+        throw new Error(
+          `Failed to fetch borrowIndexDynamicFieldObjectResponse for ${poolCoinName}`
+        );
 
-    const borrowIndexDynamicFieldObject =
-      borrowIndexDynamicFieldObjectResponse?.data;
-    if (
-      !(
+      const borrowIndexDynamicFieldObject =
+        borrowIndexDynamicFieldObjectResponse.data;
+      if (
         borrowIndexDynamicFieldObject &&
         borrowIndexDynamicFieldObject.content &&
         'fields' in borrowIndexDynamicFieldObject.content
-      )
-    )
-      throw new Error(
-        `Failed to fetch borrowIndexDynamicFieldObject for ${poolCoinName}`
-      );
-    const borrowIndex: BorrowIndex = (
-      borrowIndexDynamicFieldObject.content.fields as any
-    ).value.fields;
-
-    // Get interest models.
-    const interestModelParentId =
-      fields.interest_models.fields.table.fields.id.id;
-    const interestModelDynamicFieldObjectResponse =
-      await query.cache.queryGetDynamicFieldObject({
-        parentId: interestModelParentId,
-        name: {
-          type: '0x1::type_name::TypeName',
-          value: {
-            name: coinType.substring(2),
+      ) {
+        const dynamicFields = borrowIndexDynamicFieldObject.content
+          .fields as any;
+        borrowIndex = dynamicFields.value.fields;
+      }
+
+      // Get interest models.
+      const interestModelParentId =
+        fields.interest_models.fields.table.fields.id.id;
+      const interestModelDynamicFieldObjectResponse =
+        await query.cache.queryGetDynamicFieldObject({
+          parentId: interestModelParentId,
+          name: {
+            type: '0x1::type_name::TypeName',
+            value: {
+              name: coinType.substring(2),
+            },
           },
-        },
-      });
+        });
 
-    const interestModelDynamicFieldObject =
-      interestModelDynamicFieldObjectResponse?.data;
-    if (
-      !(
+      if (!interestModelDynamicFieldObjectResponse)
+        throw new Error(
+          `Failed to fetch interestModelDynamicFieldObjectResponse for ${poolCoinName}`
+        );
+      const interestModelDynamicFieldObject =
+        interestModelDynamicFieldObjectResponse.data;
+      if (
         interestModelDynamicFieldObject &&
         interestModelDynamicFieldObject.content &&
         'fields' in interestModelDynamicFieldObject.content
-      )
-    )
-      throw new Error(
-        `Failed to fetch interestModelDynamicFieldObject for ${poolCoinName}: ${interestModelDynamicFieldObject}`
-      );
-    const interestModel: InterestModel = (
-      interestModelDynamicFieldObject.content.fields as any
-    ).value.fields;
+      ) {
+        const dynamicFields = interestModelDynamicFieldObject.content
+          .fields as any;
+        interestModel = dynamicFields.value.fields;
+      }
 
-    // Get borrow fee.
-    const getBorrowFee = async () => {
+      // Get borrow fee.
       const borrowFeeDynamicFieldObjectResponse =
         await query.cache.queryGetDynamicFieldObject({
           parentId: marketId,
@@ -430,19 +434,29 @@ export const getMarketPool = async (
           },
         });
 
+      if (!borrowFeeDynamicFieldObjectResponse)
+        throw new Error(
+          `Failed to fetch borrowFeeDynamicFieldObjectResponse for ${poolCoinName}`
+        );
       const borrowFeeDynamicFieldObject =
-        borrowFeeDynamicFieldObjectResponse?.data;
+        borrowFeeDynamicFieldObjectResponse.data;
       if (
-        !(
-          borrowFeeDynamicFieldObject &&
-          borrowFeeDynamicFieldObject.content &&
-          'fields' in borrowFeeDynamicFieldObject.content
-        )
-      )
-        return { value: '0' };
-      return (borrowFeeDynamicFieldObject.content.fields as any).value.fields;
-    };
+        borrowFeeDynamicFieldObject &&
+        borrowFeeDynamicFieldObject.content &&
+        'fields' in borrowFeeDynamicFieldObject.content
+      ) {
+        const dynamicFields = borrowFeeDynamicFieldObject.content.fields as any;
+        borrowFeeRate = dynamicFields.value.fields;
+      }
+    }
+  }
 
+  if (
+    balanceSheet &&
+    borrowIndex &&
+    interestModel &&
+    (USE_TEST_ADDRESS || borrowFeeRate)
+  ) {
     const parsedMarketPoolData = parseOriginMarketPoolData({
       type: interestModel.type.fields,
       maxBorrowRate: interestModel.max_borrow_rate.fields,
@@ -456,7 +470,7 @@ export const getMarketPool = async (
       reserve: balanceSheet.revenue,
       reserveFactor: interestModel.revenue_factor.fields,
       borrowWeight: interestModel.borrow_weight.fields,
-      borrowFeeRate: await getBorrowFee(),
+      borrowFeeRate: borrowFeeRate ?? { value: '0' },
       baseBorrowRatePerSec: interestModel.base_borrow_rate_per_sec.fields,
       borrowRateOnHighKink: interestModel.borrow_rate_on_high_kink.fields,
       borrowRateOnMidKink: interestModel.borrow_rate_on_mid_kink.fields,
@@ -477,7 +491,7 @@ export const getMarketPool = async (
       .shiftedBy(-coinDecimal)
       .toNumber();
 
-    return {
+    marketPool = {
       coinName: poolCoinName,
       symbol: query.utils.parseSymbol(poolCoinName),
       coinType: query.utils.parseCoinType(poolCoinName),
@@ -496,13 +510,13 @@ export const getMarketPool = async (
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
       maxSupplyCoin,
-      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
-      // isIsolated: false,
+      // isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+      isIsolated: false,
       ...calculatedMarketPoolData,
     };
-  } catch (e) {
-    console.error(e);
   }
+
+  return marketPool;
 };
 
 /**
@@ -532,7 +546,7 @@ export const getMarketCollaterals = async (
     const updateMarketCollateral = (marketCollateral: MarketCollateral) => {
       if (!collateralCoinNames.includes(marketCollateral.coinName)) return;
       marketCollateral.coinPrice =
-        coinPrices[marketCollateral.coinName] || marketCollateral.coinPrice;
+        coinPrices[marketCollateral.coinName] ?? marketCollateral.coinPrice;
       marketCollateral.coinWrappedType = query.utils.getCoinWrappedType(
         marketCollateral.coinName
       );
@@ -580,7 +594,7 @@ export const getMarketCollateral = async (
   indexer: boolean = false,
   marketObject?: SuiObjectData | null,
   coinPrice?: number
-): Promise<MarketCollateral | undefined> => {
+) => {
   coinPrice =
     coinPrice ||
     (await query.utils.getCoinPrices([collateralCoinName]))?.[
@@ -591,7 +605,7 @@ export const getMarketCollateral = async (
     const marketCollateralIndexer =
       await query.indexer.getMarketCollateral(collateralCoinName);
     marketCollateralIndexer.coinPrice =
-      coinPrice || marketCollateralIndexer.coinPrice;
+      coinPrice ?? marketCollateralIndexer.coinPrice;
     marketCollateralIndexer.coinWrappedType = query.utils.getCoinWrappedType(
       marketCollateralIndexer.coinName
     );
@@ -599,9 +613,9 @@ export const getMarketCollateral = async (
     return marketCollateralIndexer;
   }
 
-  // let marketCollateral: MarketCollateral | undefined;
-  // let riskModel: RiskModel | undefined;
-  // let collateralStat: CollateralStat | undefined;
+  let marketCollateral: MarketCollateral | undefined;
+  let riskModel: RiskModel | undefined;
+  let collateralStat: CollateralStat | undefined;
 
   const marketId = query.address.get('core.market');
   marketObject =
@@ -612,106 +626,101 @@ export const getMarketCollateral = async (
       })
     )?.data;
 
-  if (!(marketObject && marketObject.content?.dataType === 'moveObject'))
-    throw new Error(`Failed to fetch marketObject`);
-
-  const fields = marketObject.content.fields as any;
-  const coinType = query.utils.parseCoinType(collateralCoinName);
-
-  // Get risk model.
-  const riskModelParentId = fields.risk_models.fields.table.fields.id.id;
-  const riskModelDynamicFieldObjectResponse =
-    await query.cache.queryGetDynamicFieldObject({
-      parentId: riskModelParentId,
-      name: {
-        type: '0x1::type_name::TypeName',
-        value: {
-          name: coinType.substring(2),
-        },
-      },
-    });
+  if (marketObject) {
+    if (marketObject.content && 'fields' in marketObject.content) {
+      const fields = marketObject.content.fields as any;
+      const coinType = query.utils.parseCoinType(collateralCoinName);
 
-  const riskModelDynamicFieldObject = riskModelDynamicFieldObjectResponse?.data;
-  if (
-    !(
-      riskModelDynamicFieldObject &&
-      riskModelDynamicFieldObject.content &&
-      'fields' in riskModelDynamicFieldObject.content
-    )
-  )
-    throw new Error(
-      `Failed to fetch riskModelDynamicFieldObject for ${riskModelDynamicFieldObjectResponse?.error?.code.toString()}: `
-    );
+      // Get risk model.
+      const riskModelParentId = fields.risk_models.fields.table.fields.id.id;
+      const riskModelDynamicFieldObjectResponse =
+        await query.cache.queryGetDynamicFieldObject({
+          parentId: riskModelParentId,
+          name: {
+            type: '0x1::type_name::TypeName',
+            value: {
+              name: coinType.substring(2),
+            },
+          },
+        });
 
-  const riskModel: RiskModel = (
-    riskModelDynamicFieldObject.content.fields as any
-  ).value.fields;
-
-  // Get collateral stat.
-  const collateralStatParentId =
-    fields.collateral_stats.fields.table.fields.id.id;
-  const collateralStatDynamicFieldObjectResponse =
-    await query.cache.queryGetDynamicFieldObject({
-      parentId: collateralStatParentId,
-      name: {
-        type: '0x1::type_name::TypeName',
-        value: {
-          name: coinType.substring(2),
-        },
-      },
-    });
+      if (!riskModelDynamicFieldObjectResponse) return undefined;
+      const riskModelDynamicFieldObject =
+        riskModelDynamicFieldObjectResponse.data;
+      if (
+        riskModelDynamicFieldObject &&
+        riskModelDynamicFieldObject.content &&
+        'fields' in riskModelDynamicFieldObject.content
+      ) {
+        const dynamicFields = riskModelDynamicFieldObject.content.fields as any;
+        riskModel = dynamicFields.value.fields;
+      }
 
-  const collateralStatDynamicFieldObject =
-    collateralStatDynamicFieldObjectResponse?.data;
+      // Get collateral stat.
+      const collateralStatParentId =
+        fields.collateral_stats.fields.table.fields.id.id;
+      const collateralStatDynamicFieldObjectResponse =
+        await query.cache.queryGetDynamicFieldObject({
+          parentId: collateralStatParentId,
+          name: {
+            type: '0x1::type_name::TypeName',
+            value: {
+              name: coinType.substring(2),
+            },
+          },
+        });
 
-  if (
-    !(
-      collateralStatDynamicFieldObject &&
-      collateralStatDynamicFieldObject.content &&
-      'fields' in collateralStatDynamicFieldObject.content
-    )
-  )
-    throw new Error(
-      `Failed to fetch collateralStatDynamicFieldObject for ${collateralCoinName}: ${collateralStatDynamicFieldObjectResponse?.error?.code.toString()}`
-    );
+      if (!collateralStatDynamicFieldObjectResponse) return undefined;
+      const collateralStatDynamicFieldObject =
+        collateralStatDynamicFieldObjectResponse.data;
+      if (
+        collateralStatDynamicFieldObject &&
+        collateralStatDynamicFieldObject.content &&
+        'fields' in collateralStatDynamicFieldObject.content
+      ) {
+        const dynamicFields = collateralStatDynamicFieldObject.content
+          .fields as any;
+        collateralStat = dynamicFields.value.fields;
+      }
+    }
+  }
 
-  const collateralStat: CollateralStat = (
-    collateralStatDynamicFieldObject.content.fields as any
-  ).value.fields;
-
-  const parsedMarketCollateralData = parseOriginMarketCollateralData({
-    type: riskModel.type.fields,
-    collateralFactor: riskModel.collateral_factor.fields,
-    liquidationFactor: riskModel.liquidation_factor.fields,
-    liquidationDiscount: riskModel.liquidation_discount.fields,
-    liquidationPanelty: riskModel.liquidation_penalty.fields,
-    liquidationReserveFactor: riskModel.liquidation_revenue_factor.fields,
-    maxCollateralAmount: riskModel.max_collateral_amount,
-    totalCollateralAmount: collateralStat.amount,
-  });
+  if (riskModel && collateralStat) {
+    const parsedMarketCollateralData = parseOriginMarketCollateralData({
+      type: riskModel.type.fields,
+      collateralFactor: riskModel.collateral_factor.fields,
+      liquidationFactor: riskModel.liquidation_factor.fields,
+      liquidationDiscount: riskModel.liquidation_discount.fields,
+      liquidationPanelty: riskModel.liquidation_penalty.fields,
+      liquidationReserveFactor: riskModel.liquidation_revenue_factor.fields,
+      maxCollateralAmount: riskModel.max_collateral_amount,
+      totalCollateralAmount: collateralStat.amount,
+    });
 
-  const calculatedMarketCollateralData = calculateMarketCollateralData(
-    query.utils,
-    parsedMarketCollateralData
-  );
+    const calculatedMarketCollateralData = calculateMarketCollateralData(
+      query.utils,
+      parsedMarketCollateralData
+    );
 
-  return {
-    coinName: collateralCoinName,
-    symbol: query.utils.parseSymbol(collateralCoinName),
-    coinType: query.utils.parseCoinType(collateralCoinName),
-    marketCoinType: query.utils.parseMarketCoinType(collateralCoinName),
-    coinWrappedType: query.utils.getCoinWrappedType(collateralCoinName),
-    coinDecimal: query.utils.getCoinDecimal(collateralCoinName),
-    coinPrice: coinPrice ?? 0,
-    collateralFactor: parsedMarketCollateralData.collateralFactor,
-    liquidationFactor: parsedMarketCollateralData.liquidationFactor,
-    liquidationDiscount: parsedMarketCollateralData.liquidationDiscount,
-    liquidationPanelty: parsedMarketCollateralData.liquidationPanelty,
-    liquidationReserveFactor:
-      parsedMarketCollateralData.liquidationReserveFactor,
-    isIsolated: await isIsolatedAsset(query.utils, collateralCoinName),
-    ...calculatedMarketCollateralData,
-  };
+    marketCollateral = {
+      coinName: collateralCoinName,
+      symbol: query.utils.parseSymbol(collateralCoinName),
+      coinType: query.utils.parseCoinType(collateralCoinName),
+      marketCoinType: query.utils.parseMarketCoinType(collateralCoinName),
+      coinWrappedType: query.utils.getCoinWrappedType(collateralCoinName),
+      coinDecimal: query.utils.getCoinDecimal(collateralCoinName),
+      coinPrice: coinPrice ?? 0,
+      collateralFactor: parsedMarketCollateralData.collateralFactor,
+      liquidationFactor: parsedMarketCollateralData.liquidationFactor,
+      liquidationDiscount: parsedMarketCollateralData.liquidationDiscount,
+      liquidationPanelty: parsedMarketCollateralData.liquidationPanelty,
+      liquidationReserveFactor:
+        parsedMarketCollateralData.liquidationReserveFactor,
+      ...calculatedMarketCollateralData,
+    };
+  }
+
+  return marketCollateral;
 };
 
 /**
@@ -730,7 +739,7 @@ export const getObligations = async (
   ownerAddress: string
 ) => {
   const owner = ownerAddress;
-  const protocolObjectId = address.get('core.object') || PROTOCOL_OBJECT_ID;
+  const protocolObjectId = address.get('core.object') ?? PROTOCOL_OBJECT_ID;
   const keyObjectsResponse: SuiObjectResponse[] = [];
   let hasNextPage = false;
   let nextCursor: string | null | undefined = null;
@@ -860,7 +869,7 @@ export const getCoinAmounts = async (
   assetCoinNames: SupportAssetCoins[] = [...SUPPORT_POOLS],
   ownerAddress?: string
 ) => {
-  const owner = ownerAddress || query.suiKit.currentAddress();
+  const owner = ownerAddress ?? query.suiKit.currentAddress();
   const assetCoins = {} as OptionalKeys<Record<SupportAssetCoins, number>>;
 
   await Promise.allSettled(
@@ -886,7 +895,7 @@ export const getCoinAmount = async (
   assetCoinName: SupportAssetCoins,
   ownerAddress?: string
 ) => {
-  const owner = ownerAddress || query.suiKit.currentAddress();
+  const owner = ownerAddress ?? query.suiKit.currentAddress();
   const coinType = query.utils.parseCoinType(assetCoinName);
   const amount = await query.cache.queryGetCoinBalance({
     owner,
@@ -913,7 +922,7 @@ export const getMarketCoinAmounts = async (
     [...SUPPORT_POOLS].map((poolCoinName) =>
       query.utils.parseMarketCoinName(poolCoinName)
     );
-  const owner = ownerAddress || query.suiKit.currentAddress();
+  const owner = ownerAddress ?? query.suiKit.currentAddress();
   const marketCoins = {} as OptionalKeys<Record<SupportMarketCoins, number>>;
 
   await Promise.allSettled(
@@ -943,7 +952,7 @@ export const getMarketCoinAmount = async (
   marketCoinName: SupportMarketCoins,
   ownerAddress?: string
 ) => {
-  const owner = ownerAddress || query.suiKit.currentAddress();
+  const owner = ownerAddress ?? query.suiKit.currentAddress();
   const marketCoinType = query.utils.parseMarketCoinType(marketCoinName);
   const amount = await query.cache.queryGetCoinBalance({
     owner,