@scallop-io/sui-scallop-sdk 0.47.0-alpha.4 → 0.47.0-alpha.6

package/dist/constants/common.d.ts

@@ -12,7 +12,7 @@ export declare const SUPPORT_COLLATERALS: readonly ["usdc", "weth", "wbtc", "wus
 export declare const SUPPORT_SPOOLS: readonly ["susdc", "sweth", "ssui", "swusdc", "swusdt", "scetus", "safsui", "shasui", "svsui"];
 export declare const SUPPORT_SCOIN: readonly ["susdc", "ssui", "swusdc", "swusdt", "safsui", "shasui", "svsui", "sweth", "ssca", "scetus", "swsol", "swbtc"];
 export declare const SUPPORT_SPOOLS_REWARDS: readonly ["sui"];
-export declare const SUPPORT_BORROW_INCENTIVE_POOLS: readonly ["sui", "wusdc", "wusdt", "afsui", "hasui", "vsui", "weth", "sca"];
+export declare const SUPPORT_BORROW_INCENTIVE_POOLS: readonly ["sui", "wusdc", "wusdt", "afsui", "hasui", "vsui", "weth", "sca", "usdc"];
 export declare const SUPPORT_BORROW_INCENTIVE_REWARDS: readonly ["sui", "sca"];
 export declare const SUPPORT_ORACLES: readonly ["supra", "switchboard", "pyth"];
 export declare const SUPPORT_PACKAGES: readonly ["coinDecimalsRegistry", "math", "whitelist", "x", "protocol", "protocolWhitelist", "query", "supra", "pyth", "switchboard", "xOracle", "testCoin"];

package/dist/index.js

@@ -151,7 +151,8 @@ var SUPPORT_BORROW_INCENTIVE_POOLS = [
   "hasui",
   "vsui",
   "weth",
-  "sca"
+  "sca",
+  "usdc"
 ];
 var SUPPORT_BORROW_INCENTIVE_REWARDS = ["sui", "sca"];
 var SUPPORT_ORACLES = ["supra", "switchboard", "pyth"];
@@ -266,6 +267,7 @@ var spoolRewardCoins = {
   susdc: "sui"
 };
 var borrowIncentiveRewardCoins = {
+  usdc: ["sui", "sca"],
   sui: ["sui", "sca"],
   wusdc: ["sui", "sca"],
   wusdt: ["sui", "sca"],
@@ -302,8 +304,7 @@ var voloCoinIds = {
   vsui: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55"
 };
 var sCoinIds = {
-  susdc: "",
-  // TODO: sCoin contract
+  susdc: "0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC",
   ssui: "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI",
   scetus: "0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS",
   ssca: "0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA",
@@ -715,7 +716,8 @@ var parseOriginBorrowIncentivesPoolPointData = (originBorrowIncentivePoolPointDa
     index: Number(originBorrowIncentivePoolPointData.index),
     baseWeight: Number(originBorrowIncentivePoolPointData.base_weight),
     weightedAmount: Number(originBorrowIncentivePoolPointData.weighted_amount),
-    lastUpdate: Number(originBorrowIncentivePoolPointData.last_update)
+    lastUpdate: Number(originBorrowIncentivePoolPointData.last_update),
+    createdAt: Number(originBorrowIncentivePoolPointData.created_at)
   };
 };
 var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
@@ -724,7 +726,6 @@ var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
     minStakes: Number(originBorrowIncentivePoolData.min_stakes),
     maxStakes: Number(originBorrowIncentivePoolData.max_stakes),
     staked: Number(originBorrowIncentivePoolData.stakes),
-    createdAt: Number(originBorrowIncentivePoolData.created_at),
     poolPoints: originBorrowIncentivePoolData.points.reduce(
       (acc, point) => {
         const parsed = parseOriginBorrowIncentivesPoolPointData(point);
@@ -2457,7 +2458,7 @@ var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer =
   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();
@@ -2639,7 +2640,7 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
 };
 var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLATERALS], indexer = false) => {
   const marketId = query.address.get("core.market");
-  const coinPrices = await query.utils.getCoinPrices(collateralCoinNames ?? []);
+  const coinPrices = await query.utils.getCoinPrices(collateralCoinNames) ?? {};
   const marketCollaterals = {};
   if (indexer) {
     const marketCollateralsIndexer = await query.indexer.getMarketCollaterals();
@@ -2831,8 +2832,7 @@ var queryObligation = async ({
   );
   return queryResult?.events[0]?.parsedJson;
 };
-var getCoinAmounts = async (query, assetCoinNames, ownerAddress) => {
-  assetCoinNames = assetCoinNames || [...SUPPORT_POOLS];
+var getCoinAmounts = async (query, assetCoinNames = [...SUPPORT_POOLS], ownerAddress) => {
   const owner = ownerAddress || query.suiKit.currentAddress();
   const assetCoins2 = {};
   await Promise.allSettled(
@@ -2948,9 +2948,9 @@ var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexe
     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) {
@@ -3326,18 +3326,28 @@ 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 = [
+var queryBorrowIncentivePools = async (address) => {
+  const queryPkgId = address.get("borrowIncentive.query");
+  const incentivePoolsId = address.get("borrowIncentive.incentivePools");
+  const queryTarget = `${queryPkgId}::incentive_pools_query::incentive_pools_data`;
+  const args = [incentivePoolsId];
+  const queryResult = await address.cache.queryInspectTxn({
+    queryTarget,
+    args
+  });
+  const borrowIncentivePoolsQueryData = queryResult?.events[0].parsedJson;
+  return borrowIncentivePoolsQueryData;
+};
+var getBorrowIncentivePools = 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();
     const updateBorrowIncentivePool = (pool) => {
@@ -3351,12 +3361,9 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
     );
     return borrowIncentivePools;
   }
-  const queryPkgId = query.address.get("borrowIncentive.query");
-  const incentivePoolsId = query.address.get("borrowIncentive.incentivePools");
-  const queryTarget = `${queryPkgId}::incentive_pools_query::incentive_pools_data`;
-  const args = [incentivePoolsId];
-  const queryResult = await query.cache.queryInspectTxn({ queryTarget, args });
-  const borrowIncentivePoolsQueryData = queryResult?.events[0].parsedJson;
+  const borrowIncentivePoolsQueryData = await queryBorrowIncentivePools(
+    query.address
+  );
   for (const pool of borrowIncentivePoolsQueryData?.incentive_pools ?? []) {
     const borrowIncentivePoolPoints = {};
     const parsedBorrowIncentivePoolData = parseOriginBorrowIncentivePoolData(pool);
@@ -3419,10 +3426,9 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
 };
 var queryBorrowIncentiveAccounts = async ({
   utils
-}, obligationId, borrowIncentiveCoinNames) => {
-  borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
-    ...SUPPORT_BORROW_INCENTIVE_POOLS
-  ];
+}, obligationId, borrowIncentiveCoinNames = [
+  ...SUPPORT_BORROW_INCENTIVE_POOLS
+]) => {
   const queryPkgId = utils.address.get("borrowIncentive.query");
   const incentiveAccountsId = utils.address.get(
     "borrowIncentive.incentiveAccounts"
@@ -4644,10 +4650,9 @@ var ScallopUtils = class {
    * @param assetCoinNames - Specific an array of support asset coin name.
    * @return  Asset coin price.
    */
-  async getCoinPrices(assetCoinNames) {
-    assetCoinNames = assetCoinNames || [
-      .../* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
-    ];
+  async getCoinPrices(assetCoinNames = [
+    .../* @__PURE__ */ new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS])
+  ]) {
     const coinPrices = {};
     const existPricesCoinNames = [];
     const lackPricesCoinNames = [];
@@ -5228,7 +5233,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,
@@ -6583,8 +6588,7 @@ var getSCoinTotalSupply = async ({
 };
 var getSCoinAmounts = async ({
   utils
-}, sCoinNames, ownerAddress) => {
-  sCoinNames = sCoinNames || [...SUPPORT_SCOIN];
+}, sCoinNames = [...SUPPORT_SCOIN], ownerAddress) => {
   const owner = ownerAddress || utils.suiKit.currentAddress();
   const sCoins2 = {};
   await Promise.allSettled(
@@ -6948,7 +6952,7 @@ var ScallopQuery = class {
    * @return Borrow incentive pools data.
    */
   async getBorrowIncentivePools(coinNames, indexer = false) {
-    return await queryBorrowIncentivePools(this, coinNames, indexer);
+    return await getBorrowIncentivePools(this, coinNames, indexer);
   }
   /**
    * Get borrow incentive accounts data.