@scallop-io/sui-scallop-sdk 1.3.41 → 1.4.1-alpha.1

package/src/queries/borrowLimitQuery.ts

@@ -17,8 +17,9 @@ const borrowLimitZod = zod.object({
   }),
 });
 
-const borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
-// const borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
+// TODO: enable for production
+// const borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
+const borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils

package/src/queries/coreQuery.ts

@@ -247,7 +247,7 @@ export const getMarketPools = async (
   const marketObjectResponse = await query.cache.queryGetObject(marketId, {
     showContent: true,
   });
-  coinPrices = (await query.utils.getCoinPrices(poolCoinNames)) ?? {};
+  coinPrices = coinPrices ?? (await query.utils.getCoinPrices());
 
   const marketPools: MarketPools = {};
 
@@ -305,222 +305,215 @@ export const getMarketPool = async (
   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);
-      if (!marketPoolIndexer) {
-        return undefined;
-      }
-      marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
-      marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
-        marketPoolIndexer.coinName
-      );
+  coinPrice = coinPrice ?? (await query.utils.getCoinPrices())?.[poolCoinName];
 
-      return marketPoolIndexer;
+  if (indexer) {
+    const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
+    if (!marketPoolIndexer) {
+      return undefined;
     }
+    marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
+    marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
+      marketPoolIndexer.coinName
+    );
 
-    const marketId = query.address.get('core.market');
-    marketObject =
-      marketObject ||
-      (
-        await query.cache.queryGetObject(marketId, {
-          showContent: true,
-        })
-      )?.data;
+    return marketPoolIndexer;
+  }
 
-    if (!(marketObject && marketObject.content?.dataType === 'moveObject'))
-      throw new Error(`Failed to fetch marketObject`);
+  const marketId = query.address.get('core.market');
+  marketObject =
+    marketObject ||
+    (
+      await query.cache.queryGetObject(marketId, {
+        showContent: true,
+      })
+    )?.data;
 
-    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 (!(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),
         },
-      });
+      },
+    });
 
-    const balanceSheetDynamicFieldObject =
-      balanceSheetDynamicFieldObjectResponse?.data;
+  const balanceSheetDynamicFieldObject =
+    balanceSheetDynamicFieldObjectResponse?.data;
 
-    if (
-      !(
-        balanceSheetDynamicFieldObject &&
-        balanceSheetDynamicFieldObject.content &&
-        'fields' in balanceSheetDynamicFieldObject.content
-      )
+  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),
-          },
+  )
+    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 borrowIndexDynamicFieldObject =
-      borrowIndexDynamicFieldObjectResponse?.data;
-    if (
-      !(
-        borrowIndexDynamicFieldObject &&
-        borrowIndexDynamicFieldObject.content &&
-        'fields' in borrowIndexDynamicFieldObject.content
-      )
+  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 =
+  )
+    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 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;
+
+  // Get borrow fee.
+  const getBorrowFee = async () => {
+    const borrowFeeDynamicFieldObjectResponse =
       await query.cache.queryGetDynamicFieldObject({
-        parentId: interestModelParentId,
+        parentId: marketId,
         name: {
-          type: '0x1::type_name::TypeName',
+          type: `${BORROW_FEE_PROTOCOL_ID}::market_dynamic_keys::BorrowFeeKey`,
           value: {
-            name: coinType.substring(2),
+            type: {
+              name: coinType.substring(2),
+            },
           },
         },
       });
 
-    const interestModelDynamicFieldObject =
-      interestModelDynamicFieldObjectResponse?.data;
+    const borrowFeeDynamicFieldObject =
+      borrowFeeDynamicFieldObjectResponse?.data;
     if (
       !(
-        interestModelDynamicFieldObject &&
-        interestModelDynamicFieldObject.content &&
-        'fields' in interestModelDynamicFieldObject.content
+        borrowFeeDynamicFieldObject &&
+        borrowFeeDynamicFieldObject.content &&
+        'fields' in borrowFeeDynamicFieldObject.content
       )
     )
-      throw new Error(
-        `Failed to fetch interestModelDynamicFieldObject for ${poolCoinName}: ${interestModelDynamicFieldObject}`
-      );
-    const interestModel: InterestModel = (
-      interestModelDynamicFieldObject.content.fields as any
-    ).value.fields;
-
-    // Get borrow fee.
-    const getBorrowFee = async () => {
-      const borrowFeeDynamicFieldObjectResponse =
-        await query.cache.queryGetDynamicFieldObject({
-          parentId: marketId,
-          name: {
-            type: `${BORROW_FEE_PROTOCOL_ID}::market_dynamic_keys::BorrowFeeKey`,
-            value: {
-              type: {
-                name: coinType.substring(2),
-              },
-            },
-          },
-        });
-
-      const borrowFeeDynamicFieldObject =
-        borrowFeeDynamicFieldObjectResponse?.data;
-      if (
-        !(
-          borrowFeeDynamicFieldObject &&
-          borrowFeeDynamicFieldObject.content &&
-          'fields' in borrowFeeDynamicFieldObject.content
-        )
-      )
-        return { value: '0' };
-      return (borrowFeeDynamicFieldObject.content.fields as any).value.fields;
-    };
+      return { value: '0' };
+    return (borrowFeeDynamicFieldObject.content.fields as any).value.fields;
+  };
 
-    const parsedMarketPoolData = parseOriginMarketPoolData({
-      type: interestModel.type.fields,
-      maxBorrowRate: interestModel.max_borrow_rate.fields,
-      interestRate: borrowIndex.interest_rate.fields,
-      interestRateScale: borrowIndex.interest_rate_scale,
-      borrowIndex: borrowIndex.borrow_index,
-      lastUpdated: borrowIndex.last_updated,
-      cash: balanceSheet.cash,
-      debt: balanceSheet.debt,
-      marketCoinSupply: balanceSheet.market_coin_supply,
-      reserve: balanceSheet.revenue,
-      reserveFactor: interestModel.revenue_factor.fields,
-      borrowWeight: interestModel.borrow_weight.fields,
-      borrowFeeRate: await getBorrowFee(),
-      baseBorrowRatePerSec: interestModel.base_borrow_rate_per_sec.fields,
-      borrowRateOnHighKink: interestModel.borrow_rate_on_high_kink.fields,
-      borrowRateOnMidKink: interestModel.borrow_rate_on_mid_kink.fields,
-      highKink: interestModel.high_kink.fields,
-      midKink: interestModel.mid_kink.fields,
-      minBorrowAmount: interestModel.min_borrow_amount,
-    });
+  const parsedMarketPoolData = parseOriginMarketPoolData({
+    type: interestModel.type.fields,
+    maxBorrowRate: interestModel.max_borrow_rate.fields,
+    interestRate: borrowIndex.interest_rate.fields,
+    interestRateScale: borrowIndex.interest_rate_scale,
+    borrowIndex: borrowIndex.borrow_index,
+    lastUpdated: borrowIndex.last_updated,
+    cash: balanceSheet.cash,
+    debt: balanceSheet.debt,
+    marketCoinSupply: balanceSheet.market_coin_supply,
+    reserve: balanceSheet.revenue,
+    reserveFactor: interestModel.revenue_factor.fields,
+    borrowWeight: interestModel.borrow_weight.fields,
+    borrowFeeRate: await getBorrowFee(),
+    baseBorrowRatePerSec: interestModel.base_borrow_rate_per_sec.fields,
+    borrowRateOnHighKink: interestModel.borrow_rate_on_high_kink.fields,
+    borrowRateOnMidKink: interestModel.borrow_rate_on_mid_kink.fields,
+    highKink: interestModel.high_kink.fields,
+    midKink: interestModel.mid_kink.fields,
+    minBorrowAmount: interestModel.min_borrow_amount,
+  });
 
-    const calculatedMarketPoolData = calculateMarketPoolData(
-      query.utils,
-      parsedMarketPoolData
-    );
+  const calculatedMarketPoolData = calculateMarketPoolData(
+    query.utils,
+    parsedMarketPoolData
+  );
 
-    const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
-    const maxSupplyCoin = BigNumber(
-      (await getSupplyLimit(query.utils, poolCoinName)) ?? '0'
-    )
-      .shiftedBy(-coinDecimal)
-      .toNumber();
-    const maxBorrowCoin = BigNumber(
-      (await getBorrowLimit(query.utils, poolCoinName)) ?? '0'
-    )
-      .shiftedBy(-coinDecimal)
-      .toNumber();
+  const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
+  const maxSupplyCoin = BigNumber(
+    (await getSupplyLimit(query.utils, poolCoinName)) ?? '0'
+  )
+    .shiftedBy(-coinDecimal)
+    .toNumber();
+  const maxBorrowCoin = BigNumber(
+    (await getBorrowLimit(query.utils, poolCoinName)) ?? '0'
+  )
+    .shiftedBy(-coinDecimal)
+    .toNumber();
 
-    return {
-      coinName: poolCoinName,
-      symbol: query.utils.parseSymbol(poolCoinName),
-      coinType: query.utils.parseCoinType(poolCoinName),
-      marketCoinType: query.utils.parseMarketCoinType(poolCoinName),
-      sCoinType: query.utils.parseSCoinType(
-        query.utils.parseMarketCoinName(poolCoinName)
-      ),
-      coinWrappedType: query.utils.getCoinWrappedType(poolCoinName),
-      coinDecimal,
-      coinPrice: coinPrice ?? 0,
-      highKink: parsedMarketPoolData.highKink,
-      midKink: parsedMarketPoolData.midKink,
-      reserveFactor: parsedMarketPoolData.reserveFactor,
-      borrowWeight: parsedMarketPoolData.borrowWeight,
-      borrowFee: parsedMarketPoolData.borrowFee,
-      marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
-      minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
-      maxSupplyCoin,
-      maxBorrowCoin,
-      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
-      ...calculatedMarketPoolData,
-    };
-  } catch (e: any) {
-    console.error(e.message);
-  }
+  return {
+    coinName: poolCoinName,
+    symbol: query.utils.parseSymbol(poolCoinName),
+    coinType: query.utils.parseCoinType(poolCoinName),
+    marketCoinType: query.utils.parseMarketCoinType(poolCoinName),
+    sCoinType: query.utils.parseSCoinType(
+      query.utils.parseMarketCoinName(poolCoinName)
+    ),
+    coinWrappedType: query.utils.getCoinWrappedType(poolCoinName),
+    coinDecimal,
+    coinPrice: coinPrice ?? 0,
+    highKink: parsedMarketPoolData.highKink,
+    midKink: parsedMarketPoolData.midKink,
+    reserveFactor: parsedMarketPoolData.reserveFactor,
+    borrowWeight: parsedMarketPoolData.borrowWeight,
+    borrowFee: parsedMarketPoolData.borrowFee,
+    marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
+    minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
+    maxSupplyCoin,
+    maxBorrowCoin,
+    isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+    ...calculatedMarketPoolData,
+  };
 };
 
 /**
@@ -541,8 +534,7 @@ export const getMarketCollaterals = async (
   indexer: boolean = false
 ) => {
   const marketId = query.address.get('core.market');
-  const coinPrices =
-    (await query.utils.getCoinPrices(collateralCoinNames)) ?? {};
+  const coinPrices = (await query.utils.getCoinPrices()) ?? {};
   const marketCollaterals: MarketCollaterals = {};
 
   if (indexer) {
@@ -600,10 +592,7 @@ export const getMarketCollateral = async (
   coinPrice?: number
 ): Promise<MarketCollateral | undefined> => {
   coinPrice =
-    coinPrice ||
-    (await query.utils.getCoinPrices([collateralCoinName]))?.[
-      collateralCoinName
-    ];
+    coinPrice ?? (await query.utils.getCoinPrices())?.[collateralCoinName];
 
   if (indexer) {
     const marketCollateralIndexer =

package/src/queries/isolatedAssetQuery.ts

@@ -18,8 +18,9 @@ const isolatedAssetZod = zod.object({
   }),
 });
 
-const isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`; // prod
-// const isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
+// TODO: enable for production
+// const isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`; // prod
+const isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
 
 /**
  * Return list of isolated assets coin types