@scallop-io/sui-scallop-sdk 1.3.41 → 1.4.0

package/src/queries/coreQuery.ts

@@ -305,222 +305,217 @@ 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]))?.[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,
+  };
 };
 
 /**

package/src/queries/portfolioQuery.ts

@@ -51,10 +51,12 @@ export const getLendings = async (
   ) as SupportStakeMarketCoins[];
 
   const coinPrices = await query.utils.getCoinPrices(poolCoinNames);
-  const marketPools = await query.getMarketPools(poolCoinNames, indexer, {
+  const marketPools = await query.getMarketPools(poolCoinNames, {
+    indexer,
     coinPrices,
   });
-  const spools = await query.getSpools(stakeMarketCoinNames, indexer, {
+  const spools = await query.getSpools(stakeMarketCoinNames, {
+    indexer,
     marketPools,
     coinPrices,
   });
@@ -128,7 +130,8 @@ export const getLending = async (
 
   marketPool =
     marketPool ??
-    (await query.getMarketPool(poolCoinName, indexer, {
+    (await query.getMarketPool(poolCoinName, {
+      indexer,
       coinPrice,
     }));
 
@@ -138,16 +141,13 @@ export const getLending = async (
   spool =
     (spool ??
     (SUPPORT_SPOOLS as readonly SupportMarketCoins[]).includes(marketCoinName))
-      ? await query.getSpool(
-          marketCoinName as SupportStakeMarketCoins,
+      ? await query.getSpool(marketCoinName as SupportStakeMarketCoins, {
           indexer,
-          {
-            marketPool,
-            coinPrices: {
-              [poolCoinName]: coinPrice,
-            },
-          }
-        )
+          marketPool,
+          coinPrices: {
+            [poolCoinName]: coinPrice,
+          },
+        })
       : undefined;
   // some pool does not have spool
   // if (!spool) throw new Error(`Failed to fetch spool for ${poolCoinName}`);
@@ -311,7 +311,7 @@ export const getObligationAccounts = async (
   indexer: boolean = false
 ) => {
   const coinPrices = await query.utils.getCoinPrices();
-  const market = await query.queryMarket(indexer, { coinPrices });
+  const market = await query.queryMarket({ indexer, coinPrices });
   const [coinAmounts, obligations] = await Promise.all([
     query.getCoinAmounts(undefined, ownerAddress),
     query.getObligations(ownerAddress),
@@ -357,7 +357,7 @@ export const getObligationAccount = async (
   ];
   coinPrices =
     coinPrices ?? (await query.utils.getCoinPrices(collateralAssetCoinNames));
-  market = market ?? (await query.queryMarket(indexer, { coinPrices }));
+  market = market ?? (await query.queryMarket({ indexer, coinPrices }));
   coinAmounts =
     coinAmounts ||
     (await query.getCoinAmounts(collateralAssetCoinNames, ownerAddress));
@@ -365,8 +365,9 @@ export const getObligationAccount = async (
   const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] =
     await Promise.all([
       query.queryObligation(obligationId),
-      query.getBorrowIncentivePools(undefined, indexer, {
+      query.getBorrowIncentivePools(undefined, {
         coinPrices,
+        indexer,
       }),
       query.getBorrowIncentiveAccounts(obligationId),
     ]);
@@ -770,7 +771,7 @@ export const getTotalValueLocked = async (
   query: ScallopQuery,
   indexer: boolean = false
 ) => {
-  const market = await query.queryMarket(indexer);
+  const market = await query.queryMarket({ indexer });
 
   let supplyValue = BigNumber(0);
   let borrowValue = BigNumber(0);

package/src/queries/sCoinQuery.ts

@@ -139,8 +139,8 @@ export const getSCoinSwapRate = async (
 
   // Get lending data for both sCoin A and sCoin B
   const marketPools = await Promise.all([
-    query.getMarketPool(fromCoinName, false),
-    query.getMarketPool(toCoinName, false),
+    query.getMarketPool(fromCoinName),
+    query.getMarketPool(toCoinName),
   ]);
   if (marketPools.some((pool) => !pool))
     throw new Error('Failed to fetch the lendings data');

package/src/queries/spoolQuery.ts

@@ -43,7 +43,7 @@ export const getSpools = async (
   coinPrices = coinPrices ?? (await query.utils.getCoinPrices()) ?? {};
 
   marketPools =
-    marketPools ?? (await query.getMarketPools(stakeCoinNames, indexer));
+    marketPools ?? (await query.getMarketPools(stakeCoinNames, { indexer }));
   if (!marketPools)
     throw new Error(`Fail to fetch marketPools for ${stakeCoinNames}`);
 
@@ -112,7 +112,7 @@ export const getSpool = async (
   coinPrices?: CoinPrices
 ) => {
   const coinName = query.utils.parseCoinName<SupportStakeCoins>(marketCoinName);
-  marketPool = marketPool || (await query.getMarketPool(coinName, indexer));
+  marketPool = marketPool || (await query.getMarketPool(coinName, { indexer }));
   if (!marketPool) {
     throw new Error(`Failed to fetch marketPool for ${marketCoinName}`);
   }

package/src/utils/indexer.ts

@@ -11,14 +11,20 @@ export async function callMethodWithIndexerFallback(
   context: any,
   ...args: any[]
 ) {
-  const indexer = args[args.length - 1]; // Assume last argument is always `indexer`
+  const lastArgs = args[args.length - 1]; // Assume last argument is always `indexer`
 
-  if (indexer) {
+  if (typeof lastArgs === 'object' && lastArgs.indexer) {
     try {
       return await method.apply(context, args);
     } catch (e: any) {
       console.warn(`Indexer requests failed: ${e}. Retrying without indexer..`);
-      return await method.apply(context, [...args.slice(0, -1), false]);
+      return await method.apply(context, [
+        ...args.slice(0, -1),
+        {
+          ...lastArgs,
+          indexer: false,
+        },
+      ]);
     }
   }
   return await method.apply(context, args);

package/src/utils/tokenBucket.ts

@@ -38,8 +38,8 @@ const callWithRateLimit = async <T>(
   tokenBucket: TokenBucket,
   fn: () => Promise<T>,
   retryDelayInMs = DEFAULT_INTERVAL_IN_MS,
-  maxRetries = 30,
-  backoffFactor = 1.25 // The factor by which to increase the delay
+  maxRetries = 15,
+  backoffFactor = 2 // The factor by which to increase the delay
 ): Promise<T | null> => {
   let retries = 0;