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

package/dist/index.mjs

@@ -952,7 +952,7 @@ var TEST_ADDRESSES = {
 
 // src/constants/tokenBucket.ts
 var DEFAULT_TOKENS_PER_INTERVAL = 50;
-var DEFAULT_INTERVAL_IN_MS = 300;
+var DEFAULT_INTERVAL_IN_MS = 100;
 
 // src/constants/vesca.ts
 var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
@@ -1556,7 +1556,7 @@ var TokenBucket = class {
     return false;
   }
 };
-var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 30, backoffFactor = 1.25) => {
+var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 15, backoffFactor = 2) => {
   let retries = 0;
   const tryRequest = async () => {
     if (tokenBucket.removeTokens(1)) {
@@ -1592,13 +1592,19 @@ var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVA
 
 // src/utils/indexer.ts
 async function callMethodWithIndexerFallback(method, context, ...args) {
-  const indexer = args[args.length - 1];
-  if (indexer) {
+  const lastArgs = args[args.length - 1];
+  if (typeof lastArgs === "object" && lastArgs.indexer) {
     try {
       return await method.apply(context, args);
     } catch (e) {
       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);
@@ -2971,150 +2977,146 @@ var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer =
   return marketPools;
 };
 var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, coinPrice) => {
-  try {
-    coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
-    if (indexer) {
-      const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
-      if (!marketPoolIndexer) {
-        return void 0;
+  coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
+  if (indexer) {
+    const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
+    if (!marketPoolIndexer) {
+      return void 0;
+    }
+    marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
+    marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
+      marketPoolIndexer.coinName
+    );
+    return marketPoolIndexer;
+  }
+  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;
+  const coinType = query.utils.parseCoinType(poolCoinName);
+  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)
       }
-      marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
-      marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
-        marketPoolIndexer.coinName
-      );
-      return marketPoolIndexer;
     }
-    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;
-    const coinType = query.utils.parseCoinType(poolCoinName);
-    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;
+  if (!(balanceSheetDynamicFieldObject && balanceSheetDynamicFieldObject.content && "fields" in balanceSheetDynamicFieldObject.content))
+    throw new Error(
+      `Failed to fetch balanceSheetDynamicFieldObject for ${poolCoinName}: ${balanceSheetDynamicFieldObjectResponse?.error?.code.toString()}`
+    );
+  const balanceSheet = balanceSheetDynamicFieldObject.content.fields.value.fields;
+  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 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 = balanceSheetDynamicFieldObject.content.fields.value.fields;
-    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))
+    throw new Error(
+      `Failed to fetch borrowIndexDynamicFieldObject for ${poolCoinName}`
+    );
+  const borrowIndex = borrowIndexDynamicFieldObject.content.fields.value.fields;
+  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 borrowIndexDynamicFieldObject = borrowIndexDynamicFieldObjectResponse?.data;
-    if (!(borrowIndexDynamicFieldObject && borrowIndexDynamicFieldObject.content && "fields" in borrowIndexDynamicFieldObject.content))
-      throw new Error(
-        `Failed to fetch borrowIndexDynamicFieldObject for ${poolCoinName}`
-      );
-    const borrowIndex = borrowIndexDynamicFieldObject.content.fields.value.fields;
-    const interestModelParentId = fields.interest_models.fields.table.fields.id.id;
-    const interestModelDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-      parentId: interestModelParentId,
+    }
+  });
+  const interestModelDynamicFieldObject = interestModelDynamicFieldObjectResponse?.data;
+  if (!(interestModelDynamicFieldObject && interestModelDynamicFieldObject.content && "fields" in interestModelDynamicFieldObject.content))
+    throw new Error(
+      `Failed to fetch interestModelDynamicFieldObject for ${poolCoinName}: ${interestModelDynamicFieldObject}`
+    );
+  const interestModel = interestModelDynamicFieldObject.content.fields.value.fields;
+  const getBorrowFee = async () => {
+    const borrowFeeDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+      parentId: marketId,
       name: {
-        type: "0x1::type_name::TypeName",
+        type: `${BORROW_FEE_PROTOCOL_ID}::market_dynamic_keys::BorrowFeeKey`,
         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 = interestModelDynamicFieldObject.content.fields.value.fields;
-    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)
-            }
+          type: {
+            name: coinType.substring(2)
           }
         }
-      });
-      const borrowFeeDynamicFieldObject = borrowFeeDynamicFieldObjectResponse?.data;
-      if (!(borrowFeeDynamicFieldObject && borrowFeeDynamicFieldObject.content && "fields" in borrowFeeDynamicFieldObject.content))
-        return { value: "0" };
-      return borrowFeeDynamicFieldObject.content.fields.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 calculatedMarketPoolData = calculateMarketPoolData(
-      query.utils,
-      parsedMarketPoolData
-    );
-    const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
-    const maxSupplyCoin = BigNumber3(
-      await getSupplyLimit(query.utils, poolCoinName) ?? "0"
-    ).shiftedBy(-coinDecimal).toNumber();
-    const maxBorrowCoin = BigNumber3(
-      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) {
-    console.error(e.message);
-  }
+    const borrowFeeDynamicFieldObject = borrowFeeDynamicFieldObjectResponse?.data;
+    if (!(borrowFeeDynamicFieldObject && borrowFeeDynamicFieldObject.content && "fields" in borrowFeeDynamicFieldObject.content))
+      return { value: "0" };
+    return borrowFeeDynamicFieldObject.content.fields.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 calculatedMarketPoolData = calculateMarketPoolData(
+    query.utils,
+    parsedMarketPoolData
+  );
+  const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
+  const maxSupplyCoin = BigNumber3(
+    await getSupplyLimit(query.utils, poolCoinName) ?? "0"
+  ).shiftedBy(-coinDecimal).toNumber();
+  const maxBorrowCoin = BigNumber3(
+    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
+  };
 };
 var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLATERALS], indexer = false) => {
   const marketId = query.address.get("core.market");
@@ -3471,10 +3473,12 @@ var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress
     (marketCoinName) => SUPPORT_SPOOLS.includes(marketCoinName)
   );
   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
   });
@@ -3509,21 +3513,19 @@ var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress
 var getLending = async (query, poolCoinName, ownerAddress, indexer = false, marketPool, spool, stakeAccounts, coinAmount, marketCoinAmount, coinPrice, sCoinAmount) => {
   const marketCoinName = query.utils.parseMarketCoinName(poolCoinName);
   coinPrice = coinPrice ?? (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName] ?? 0;
-  marketPool = marketPool ?? await query.getMarketPool(poolCoinName, indexer, {
+  marketPool = marketPool ?? await query.getMarketPool(poolCoinName, {
+    indexer,
     coinPrice
   });
   if (!marketPool)
     throw new Error(`Failed to fetch marketPool for ${poolCoinName}`);
-  spool = spool ?? SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getSpool(
-    marketCoinName,
+  spool = spool ?? SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getSpool(marketCoinName, {
     indexer,
-    {
-      marketPool,
-      coinPrices: {
-        [poolCoinName]: coinPrice
-      }
+    marketPool,
+    coinPrices: {
+      [poolCoinName]: coinPrice
     }
-  ) : void 0;
+  }) : void 0;
   stakeAccounts = stakeAccounts || SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getStakeAccounts(
     marketCoinName,
     ownerAddress
@@ -3643,7 +3645,7 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
 };
 var getObligationAccounts = async (query, ownerAddress, indexer = 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(void 0, ownerAddress),
     query.getObligations(ownerAddress)
@@ -3669,12 +3671,13 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     ...SUPPORT_COLLATERALS
   ];
   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);
   const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] = await Promise.all([
     query.queryObligation(obligationId),
-    query.getBorrowIncentivePools(void 0, indexer, {
-      coinPrices
+    query.getBorrowIncentivePools(void 0, {
+      coinPrices,
+      indexer
     }),
     query.getBorrowIncentiveAccounts(obligationId)
   ]);
@@ -3954,7 +3957,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   return obligationAccount;
 };
 var getTotalValueLocked = async (query, indexer = false) => {
-  const market = await query.queryMarket(indexer);
+  const market = await query.queryMarket({ indexer });
   let supplyValue = BigNumber5(0);
   let borrowValue = BigNumber5(0);
   if (indexer) {
@@ -4158,8 +4161,8 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
   const fromCoinName = query.utils.parseCoinName(fromSCoin);
   const toCoinName = query.utils.parseCoinName(toSCoin);
   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");
@@ -4189,7 +4192,7 @@ var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexe
     (stakeMarketCoinName) => query.utils.parseCoinName(stakeMarketCoinName)
   );
   coinPrices = coinPrices ?? await query.utils.getCoinPrices() ?? {};
-  marketPools = marketPools ?? await query.getMarketPools(stakeCoinNames, indexer);
+  marketPools = marketPools ?? await query.getMarketPools(stakeCoinNames, { indexer });
   if (!marketPools)
     throw new Error(`Fail to fetch marketPools for ${stakeCoinNames}`);
   const spools = {};
@@ -4230,7 +4233,7 @@ var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexe
 };
 var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPrices) => {
   const coinName = query.utils.parseCoinName(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}`);
   }
@@ -7025,8 +7028,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market data.
    */
-  async queryMarket(indexer = false, args) {
-    return await queryMarket(this, indexer, args?.coinPrices);
+  async queryMarket(args) {
+    return await queryMarket(this, args?.indexer, args?.coinPrices);
   }
   /**
    * Get market pools.
@@ -7039,8 +7042,13 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market pools data.
    */
-  async getMarketPools(poolCoinNames, indexer = false, args) {
-    return await getMarketPools(this, poolCoinNames, indexer, args?.coinPrices);
+  async getMarketPools(poolCoinNames, args) {
+    return await getMarketPools(
+      this,
+      poolCoinNames,
+      args?.indexer,
+      args?.coinPrices
+    );
   }
   /**
    * Get  market pool
@@ -7049,11 +7057,11 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market pool data.
    */
-  async getMarketPool(poolCoinName, indexer = false, args) {
+  async getMarketPool(poolCoinName, args) {
     return await getMarketPool(
       this,
       poolCoinName,
-      indexer,
+      args?.indexer,
       args?.marketObject,
       args?.coinPrice
     );
@@ -7069,8 +7077,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market collaterals data.
    */
-  async getMarketCollaterals(collateralCoinNames, indexer = false) {
-    return await getMarketCollaterals(this, collateralCoinNames, indexer);
+  async getMarketCollaterals(collateralCoinNames, args) {
+    return await getMarketCollaterals(this, collateralCoinNames, args?.indexer);
   }
   /**
    * Get market collateral
@@ -7079,8 +7087,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market collateral data.
    */
-  async getMarketCollateral(collateralCoinName, indexer = false) {
-    return await getMarketCollateral(this, collateralCoinName, indexer);
+  async getMarketCollateral(collateralCoinName, args) {
+    return await getMarketCollateral(this, collateralCoinName, args?.indexer);
   }
   /**
    * Get obligations data.
@@ -7166,11 +7174,11 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Spools data.
    */
-  async getSpools(stakeMarketCoinNames, indexer = false, args) {
+  async getSpools(stakeMarketCoinNames, args) {
     return await getSpools(
       this,
       stakeMarketCoinNames,
-      indexer,
+      args?.indexer,
       args?.marketPools,
       args?.coinPrices
     );
@@ -7182,11 +7190,11 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Spool data.
    */
-  async getSpool(stakeMarketCoinName, indexer = false, args) {
+  async getSpool(stakeMarketCoinName, args) {
     return await getSpool(
       this,
       stakeMarketCoinName,
-      indexer,
+      args?.indexer,
       args?.marketPool,
       args?.coinPrices
     );
@@ -7289,11 +7297,11 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Borrow incentive pools data.
    */
-  async getBorrowIncentivePools(coinNames, indexer = false, args) {
+  async getBorrowIncentivePools(coinNames, args) {
     return await getBorrowIncentivePools(
       this,
       coinNames,
-      indexer,
+      args?.indexer,
       args?.coinPrices
     );
   }
@@ -7315,8 +7323,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return All lending and spool infomation.
    */
-  async getLendings(poolCoinNames, ownerAddress = this.walletAddress, indexer = false) {
-    return await getLendings(this, poolCoinNames, ownerAddress, indexer);
+  async getLendings(poolCoinNames, ownerAddress = this.walletAddress, args) {
+    return await getLendings(this, poolCoinNames, ownerAddress, args?.indexer);
   }
   /**
    * Get user lending and spool information for specific pool.
@@ -7326,8 +7334,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Lending pool data.
    */
-  async getLending(poolCoinName, ownerAddress = this.walletAddress, indexer = false) {
-    return await getLending(this, poolCoinName, ownerAddress, indexer);
+  async getLending(poolCoinName, ownerAddress = this.walletAddress, args) {
+    return await getLending(this, poolCoinName, ownerAddress, args?.indexer);
   }
   /**
    * Get user all obligation accounts information.
@@ -7339,8 +7347,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return All obligation accounts information.
    */
-  async getObligationAccounts(ownerAddress = this.walletAddress, indexer = false) {
-    return await getObligationAccounts(this, ownerAddress, indexer);
+  async getObligationAccounts(ownerAddress = this.walletAddress, args) {
+    return await getObligationAccounts(this, ownerAddress, args?.indexer);
   }
   /**
    * Get obligation account information for specific id.
@@ -7353,12 +7361,12 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Borrowing and collateral information.
    */
-  async getObligationAccount(obligationId, ownerAddress = this.walletAddress, indexer = false) {
+  async getObligationAccount(obligationId, ownerAddress = this.walletAddress, args) {
     return await getObligationAccount(
       this,
       obligationId,
       ownerAddress,
-      indexer
+      args?.indexer
     );
   }
   /**
@@ -7370,8 +7378,8 @@ var ScallopQuery = class {
    *
    * @return Total value locked.
    */
-  async getTvl(indexer = false) {
-    return await getTotalValueLocked(this, indexer);
+  async getTvl(args) {
+    return await getTotalValueLocked(this, args?.indexer);
   }
   /**
    * Get veSca data.