@scallop-io/sui-scallop-sdk 0.46.64 → 0.46.66

package/dist/constants/common.d.ts

@@ -7,6 +7,7 @@ export declare const PROTOCOL_OBJECT_ID: "0xc9f859f98ca352a11b97a038c4b4162bee43
 export declare const BORROW_FEE_PROTOCOL_ID: "0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778" | "0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da";
 export declare const SCA_COIN_TYPE: "0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524::sca::SCA" | "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA";
 export declare const OLD_BORROW_INCENTIVE_PROTOCOL_ID: "0xc63072e7f5f4983a2efaf5bdba1480d5e7d74d57948e1c7cc436f8e22cbeb410";
+export declare const NATIVE_USDC: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC";
 export declare const SUPPORT_POOLS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus", "afsui", "hasui", "vsui", "sca"];
 export declare const SUPPORT_COLLATERALS: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus", "afsui", "hasui", "vsui", "sca"];
 export declare const SUPPORT_SPOOLS: readonly ["seth", "ssui", "susdc", "susdt", "scetus", "safsui", "shasui", "svsui"];

package/dist/index.js

@@ -39,6 +39,7 @@ __export(src_exports, {
   MAX_LOCK_ROUNDS: () => MAX_LOCK_ROUNDS,
   MIN_INITIAL_LOCK_AMOUNT: () => MIN_INITIAL_LOCK_AMOUNT,
   MIN_TOP_UP_AMOUNT: () => MIN_TOP_UP_AMOUNT,
+  NATIVE_USDC: () => NATIVE_USDC,
   OLD_BORROW_INCENTIVE_PROTOCOL_ID: () => OLD_BORROW_INCENTIVE_PROTOCOL_ID,
   PROTOCOL_OBJECT_ID: () => PROTOCOL_OBJECT_ID,
   SCA_COIN_TYPE: () => SCA_COIN_TYPE,
@@ -86,6 +87,7 @@ var PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST ? "0xc9f859f98ca352a11b97a038c4b4162bee4
 var BORROW_FEE_PROTOCOL_ID = IS_VE_SCA_TEST ? "0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778" : "0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da";
 var SCA_COIN_TYPE = IS_VE_SCA_TEST ? `0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524::sca::SCA` : "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA";
 var OLD_BORROW_INCENTIVE_PROTOCOL_ID = "0xc63072e7f5f4983a2efaf5bdba1480d5e7d74d57948e1c7cc436f8e22cbeb410";
+var NATIVE_USDC = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC";
 var SUPPORT_POOLS = [
   "eth",
   "btc",
@@ -2309,19 +2311,21 @@ var queryMarket = async (query, indexer = false) => {
   const collaterals = {};
   if (indexer) {
     const marketIndexer = await query.indexer.getMarket();
-    for (const pool of Object.values(marketIndexer.pools)) {
-      pool.coinPrice = coinPrices[pool.coinName] || pool.coinPrice;
-      pool.coinWrappedType = query.utils.getCoinWrappedType(pool.coinName);
-    }
-    for (const collateral of Object.values(marketIndexer.collaterals)) {
-      collateral.coinPrice = coinPrices[collateral.coinName] || collateral.coinPrice;
-      collateral.coinWrappedType = query.utils.getCoinWrappedType(
-        collateral.coinName
-      );
-    }
+    const updatePools = (item) => {
+      item.coinPrice = coinPrices[item.coinName] || item.coinPrice;
+      item.coinWrappedType = query.utils.getCoinWrappedType(item.coinName);
+      pools[item.coinName] = item;
+    };
+    const updateCollaterals = (item) => {
+      item.coinPrice = coinPrices[item.coinName] || item.coinPrice;
+      item.coinWrappedType = query.utils.getCoinWrappedType(item.coinName);
+      collaterals[item.coinName] = item;
+    };
+    Object.values(marketIndexer.pools).forEach(updatePools);
+    Object.values(marketIndexer.collaterals).forEach(updateCollaterals);
     return {
-      pools: marketIndexer.pools,
-      collaterals: marketIndexer.collaterals
+      pools,
+      collaterals
     };
   }
   const packageId = query.address.get("core.packages.query.id");
@@ -2332,6 +2336,8 @@ var queryMarket = async (query, indexer = false) => {
   const marketData = queryResult?.events[0].parsedJson;
   for (const pool of marketData?.pools ?? []) {
     const coinType = (0, import_utils3.normalizeStructTag)(pool.type.name);
+    if (coinType === NATIVE_USDC)
+      continue;
     const poolCoinName = query.utils.parseCoinNameFromType(coinType);
     const coinPrice = coinPrices[poolCoinName] ?? 0;
     if (!SUPPORT_POOLS.includes(poolCoinName)) {
@@ -2431,25 +2437,25 @@ var queryMarket = async (query, indexer = false) => {
     data: marketData
   };
 };
-var getMarketPools = async (query, poolCoinNames, indexer = false) => {
-  poolCoinNames = poolCoinNames || [...SUPPORT_POOLS];
+var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer = false) => {
   const marketId = query.address.get("core.market");
   const marketObjectResponse = await query.cache.queryGetObject(marketId, {
     showContent: true
   });
-  const coinPrices = await query.utils.getCoinPrices(poolCoinNames ?? []);
+  const coinPrices = await query.utils.getCoinPrices(poolCoinNames) ?? {};
   const marketPools = {};
   if (indexer) {
     const marketPoolsIndexer = await query.indexer.getMarketPools();
-    for (const marketPool of Object.values(marketPoolsIndexer)) {
+    const updateMarketPool = (marketPool) => {
       if (!poolCoinNames.includes(marketPool.coinName))
-        continue;
+        return;
       marketPool.coinPrice = coinPrices[marketPool.coinName] || marketPool.coinPrice;
       marketPool.coinWrappedType = query.utils.getCoinWrappedType(
         marketPool.coinName
       );
       marketPools[marketPool.coinName] = marketPool;
-    }
+    };
+    Object.values(marketPoolsIndexer).forEach(updateMarketPool);
     return marketPools;
   }
   await Promise.allSettled(
@@ -2474,6 +2480,7 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
   let borrowIndex;
   let interestModel;
   let borrowFeeRate;
+  coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
   if (indexer) {
     const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
     marketPoolIndexer.coinPrice = coinPrice || marketPoolIndexer.coinPrice;
@@ -2486,7 +2493,6 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
   marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
     showContent: true
   }))?.data;
-  coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
   if (marketObject) {
     if (marketObject.content && "fields" in marketObject.content) {
       const fields = marketObject.content.fields;
@@ -2616,29 +2622,27 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
   }
   return marketPool;
 };
-var getMarketCollaterals = async (query, collateralCoinNames, indexer = false) => {
-  collateralCoinNames = collateralCoinNames || [...SUPPORT_COLLATERALS];
+var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLATERALS], indexer = false) => {
   const marketId = query.address.get("core.market");
-  const [marketObjectResponse, coinPrices] = await Promise.all([
-    await query.cache.queryGetObject(marketId, {
-      showContent: true
-    }),
-    await query.utils.getCoinPrices(collateralCoinNames ?? [])
-  ]);
+  const coinPrices = await query.utils.getCoinPrices(collateralCoinNames) ?? {};
   const marketCollaterals = {};
   if (indexer) {
     const marketCollateralsIndexer = await query.indexer.getMarketCollaterals();
-    for (const marketCollateral of Object.values(marketCollateralsIndexer)) {
+    const updateMarketCollateral = (marketCollateral) => {
       if (!collateralCoinNames.includes(marketCollateral.coinName))
-        continue;
+        return;
       marketCollateral.coinPrice = coinPrices[marketCollateral.coinName] || marketCollateral.coinPrice;
       marketCollateral.coinWrappedType = query.utils.getCoinWrappedType(
         marketCollateral.coinName
       );
       marketCollaterals[marketCollateral.coinName] = marketCollateral;
-    }
+    };
+    Object.values(marketCollateralsIndexer).forEach(updateMarketCollateral);
     return marketCollaterals;
   }
+  const marketObjectResponse = await query.cache.queryGetObject(marketId, {
+    showContent: true
+  });
   await Promise.allSettled(
     collateralCoinNames.map(async (collateralCoinName) => {
       const marketCollateral = await getMarketCollateral(
@@ -2656,6 +2660,7 @@ var getMarketCollaterals = async (query, collateralCoinNames, indexer = false) =
   return marketCollaterals;
 };
 var getMarketCollateral = async (query, collateralCoinName, indexer = false, marketObject, coinPrice) => {
+  coinPrice = coinPrice || (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName];
   if (indexer) {
     const marketCollateralIndexer = await query.indexer.getMarketCollateral(collateralCoinName);
     marketCollateralIndexer.coinPrice = coinPrice || marketCollateralIndexer.coinPrice;
@@ -2671,7 +2676,6 @@ var getMarketCollateral = async (query, collateralCoinName, indexer = false, mar
   marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
     showContent: true
   }))?.data;
-  coinPrice = coinPrice || (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName];
   if (marketObject) {
     if (marketObject.content && "fields" in marketObject.content) {
       const fields = marketObject.content.fields;
@@ -2921,8 +2925,7 @@ var getFlashLoanFees = async (query, assetNames) => {
 
 // src/queries/spoolQuery.ts
 var import_utils5 = require("@mysten/sui.js/utils");
-var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
-  stakeMarketCoinNames = stakeMarketCoinNames || [...SUPPORT_SPOOLS];
+var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexer = false) => {
   const stakeCoinNames = stakeMarketCoinNames.map(
     (stakeMarketCoinName) => query.utils.parseCoinName(stakeMarketCoinName)
   );
@@ -2930,16 +2933,16 @@ var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
     const rewardCoinName = query.utils.getSpoolRewardCoinName(stakeMarketCoinName);
     return rewardCoinName;
   });
-  const coinPrices = await query.utils.getCoinPrices(
-    [.../* @__PURE__ */ new Set([...stakeCoinNames, ...rewardCoinNames])]
-  );
+  const coinPrices = await query.utils.getCoinPrices([
+    .../* @__PURE__ */ new Set([...stakeCoinNames, ...rewardCoinNames])
+  ]) ?? {};
   const marketPools = await query.getMarketPools(stakeCoinNames, indexer);
   const spools = {};
   if (indexer) {
     const spoolsIndexer = await query.indexer.getSpools();
-    for (const spool of Object.values(spoolsIndexer)) {
+    const updateSpools = (spool) => {
       if (!stakeMarketCoinNames.includes(spool.marketCoinName))
-        continue;
+        return;
       const coinName = query.utils.parseCoinName(
         spool.marketCoinName
       );
@@ -2951,7 +2954,8 @@ var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
       spool.marketCoinPrice = (coinPrices[coinName] ?? 0) * (marketPool ? marketPool.conversionRate : 0) || spool.marketCoinPrice;
       spool.rewardCoinPrice = coinPrices[rewardCoinName] || spool.rewardCoinPrice;
       spools[spool.marketCoinName] = spool;
-    }
+    };
+    Object.values(spoolsIndexer).forEach(updateSpools);
     return spools;
   }
   for (const stakeMarketCoinName of stakeMarketCoinNames) {
@@ -2977,6 +2981,7 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
   let spool = void 0;
+  coinPrices = coinPrices || await query.utils.getCoinPrices([coinName]);
   if (indexer) {
     const spoolIndexer = await query.indexer.getSpool(marketCoinName);
     const coinName2 = query.utils.parseCoinName(marketCoinName);
@@ -3305,29 +3310,27 @@ var getStakeRewardPool = async ({
 // src/queries/borrowIncentiveQuery.ts
 var import_utils7 = require("@mysten/sui.js/utils");
 var import_bignumber3 = __toESM(require("bignumber.js"));
-var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer = false) => {
-  borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
-    ...SUPPORT_BORROW_INCENTIVE_POOLS
-  ];
+var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
+  ...SUPPORT_BORROW_INCENTIVE_POOLS
+], indexer = false) => {
   const borrowIncentivePools = {};
-  const coinPrices = await query.utils.getCoinPrices(
-    [
-      .../* @__PURE__ */ new Set([
-        ...borrowIncentiveCoinNames,
-        ...SUPPORT_BORROW_INCENTIVE_REWARDS
-      ])
-    ]
-  );
+  const coinPrices = await query.utils.getCoinPrices([
+    .../* @__PURE__ */ new Set([
+      ...borrowIncentiveCoinNames,
+      ...SUPPORT_BORROW_INCENTIVE_REWARDS
+    ])
+  ]) ?? {};
   if (indexer) {
     const borrowIncentivePoolsIndexer = await query.indexer.getBorrowIncentivePools();
-    for (const borrowIncentivePool of Object.values(
-      borrowIncentivePoolsIndexer
-    )) {
-      if (!borrowIncentiveCoinNames.includes(borrowIncentivePool.coinName))
-        continue;
-      borrowIncentivePool.coinPrice = coinPrices[borrowIncentivePool.coinName] || borrowIncentivePool.coinPrice;
-      borrowIncentivePools[borrowIncentivePool.coinName] = borrowIncentivePool;
-    }
+    const updateBorrowIncentivePool = (pool) => {
+      if (!borrowIncentiveCoinNames.includes(pool.coinName))
+        return;
+      pool.coinPrice = coinPrices[pool.coinName] || pool.coinPrice;
+      borrowIncentivePools[pool.coinName] = pool;
+    };
+    Object.values(borrowIncentivePoolsIndexer).forEach(
+      updateBorrowIncentivePool
+    );
     return borrowIncentivePools;
   }
   const queryPkgId = query.address.get("borrowIncentive.query");
@@ -5207,7 +5210,7 @@ var generateCoreQuickMethod = ({
       const obligationCoinNames = await builder.utils.getObligationCoinNames(
         obligationInfo.obligationId
       ) ?? [];
-      const updateCoinNames = [...obligationCoinNames ?? [], poolCoinName];
+      const updateCoinNames = [...obligationCoinNames, poolCoinName];
       await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.borrow(
         obligationInfo.obligationId,
@@ -8036,6 +8039,7 @@ var Scallop = class {
   MAX_LOCK_ROUNDS,
   MIN_INITIAL_LOCK_AMOUNT,
   MIN_TOP_UP_AMOUNT,
+  NATIVE_USDC,
   OLD_BORROW_INCENTIVE_PROTOCOL_ID,
   PROTOCOL_OBJECT_ID,
   SCA_COIN_TYPE,