@scallop-io/sui-scallop-sdk 0.44.3 → 0.44.4

package/dist/index.mjs

@@ -648,7 +648,7 @@ import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui.js/util
 import { SuiKit as SuiKit4 } from "@scallop-io/sui-kit";
 
 // src/models/scallopUtils.ts
-import { SUI_TYPE_ARG, normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
+import { SUI_TYPE_ARG, normalizeStructTag as normalizeStructTag5 } from "@mysten/sui.js/utils";
 import { SuiKit as SuiKit2 } from "@scallop-io/sui-kit";
 import { SuiPriceServiceConnection } from "@pythnetwork/pyth-sui-js";
 
@@ -656,6 +656,7 @@ import { SuiPriceServiceConnection } from "@pythnetwork/pyth-sui-js";
 import { SuiKit } from "@scallop-io/sui-kit";
 
 // src/queries/coreQuery.ts
+import { normalizeStructTag as normalizeStructTag2 } from "@mysten/sui.js/utils";
 import { SuiTxBlock as SuiKitTxBlock } from "@scallop-io/sui-kit";
 import BigNumber2 from "bignumber.js";
 
@@ -673,7 +674,7 @@ import BigNumber from "bignumber.js";
 import { normalizeStructTag } from "@mysten/sui.js/utils";
 var parseOriginMarketPoolData = (originMarketPoolData) => {
   return {
-    coinType: "0x" + originMarketPoolData.type.name,
+    coinType: normalizeStructTag(originMarketPoolData.type.name),
     // Parse origin data required for basic calculations.
     maxBorrowRate: Number(originMarketPoolData.maxBorrowRate.value) / 2 ** 32,
     borrowRate: Number(originMarketPoolData.interestRate.value) / 2 ** 32,
@@ -767,7 +768,7 @@ var calculateMarketPoolData = (utils, parsedMarketPoolData) => {
 };
 var parseOriginMarketCollateralData = (originMarketCollateralData) => {
   return {
-    coinType: "0x" + originMarketCollateralData.type.name,
+    coinType: normalizeStructTag(originMarketCollateralData.type.name),
     collateralFactor: Number(originMarketCollateralData.collateralFactor.value) / 2 ** 32,
     liquidationFactor: Number(originMarketCollateralData.liquidationFactor.value) / 2 ** 32,
     liquidationDiscount: Number(originMarketCollateralData.liquidationDiscount.value) / 2 ** 32,
@@ -799,7 +800,7 @@ var calculateMarketCollateralData = (utils, parsedMarketCollateralData) => {
 };
 var parseOriginSpoolData = (originSpoolData) => {
   return {
-    stakeType: "0x" + originSpoolData.stakeType.fields.name,
+    stakeType: normalizeStructTag(originSpoolData.stakeType.fields.name),
     maxPoint: Number(originSpoolData.maxDistributedPoint),
     distributedPoint: Number(originSpoolData.distributedPoint),
     pointPerPeriod: Number(originSpoolData.distributedPointPerPeriod),
@@ -1088,7 +1089,7 @@ var queryMarket = async (query) => {
   const pools = {};
   const collaterals = {};
   for (const pool of marketData.pools) {
-    const coinType = "0x" + pool.type.name;
+    const coinType = normalizeStructTag2(pool.type.name);
     const poolCoinName = query.utils.parseCoinNameFromType(coinType);
     const coinPrice = (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName] ?? 0;
     if (!SUPPORT_POOLS.includes(poolCoinName)) {
@@ -1136,7 +1137,7 @@ var queryMarket = async (query) => {
     };
   }
   for (const collateral of marketData.collaterals) {
-    const coinType = "0x" + collateral.type.name;
+    const coinType = normalizeStructTag2(collateral.type.name);
     const collateralCoinName = query.utils.parseCoinNameFromType(coinType);
     const coinPrice = (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName] ?? 0;
     if (!SUPPORT_COLLATERALS.includes(collateralCoinName)) {
@@ -1637,7 +1638,7 @@ var getMarketCoinAmount = async (query, marketCoinName, ownerAddress) => {
 };
 
 // src/queries/spoolQuery.ts
-import { normalizeStructTag as normalizeStructTag2 } from "@mysten/sui.js/utils";
+import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
 var getSpools = async (query, stakeMarketCoinNames) => {
   stakeMarketCoinNames = stakeMarketCoinNames || [...SUPPORT_SPOOLS];
   const stakeCoinNames = stakeMarketCoinNames.map(
@@ -1793,34 +1794,34 @@ var getStakeAccounts = async (query, ownerAddress) => {
       const index = Number(fields.index);
       const points = Number(fields.points);
       const totalPoints = Number(fields.total_points);
-      if (normalizeStructTag2(type) === stakeMarketCoinTypes.ssui) {
+      if (normalizeStructTag3(type) === stakeMarketCoinTypes.ssui) {
         stakeAccounts.ssui.push({
           id,
-          type,
+          type: normalizeStructTag3(type),
           stakePoolId,
-          stakeType,
+          stakeType: normalizeStructTag3(stakeType),
           staked,
           index,
           points,
           totalPoints
         });
-      } else if (normalizeStructTag2(type) === stakeMarketCoinTypes.susdc) {
+      } else if (normalizeStructTag3(type) === stakeMarketCoinTypes.susdc) {
         stakeAccounts.susdc.push({
           id,
-          type,
+          type: normalizeStructTag3(type),
           stakePoolId,
-          stakeType,
+          stakeType: normalizeStructTag3(stakeType),
           staked,
           index,
           points,
           totalPoints
         });
-      } else if (normalizeStructTag2(type) === stakeMarketCoinTypes.susdt) {
+      } else if (normalizeStructTag3(type) === stakeMarketCoinTypes.susdt) {
         stakeAccounts.susdt.push({
           id,
-          type,
+          type: normalizeStructTag3(type),
           stakePoolId,
-          stakeType,
+          stakeType: normalizeStructTag3(stakeType),
           staked,
           index,
           points,
@@ -1859,13 +1860,13 @@ var getStakePool = async (query, marketCoinName) => {
       const lastUpdate = Number(fields.last_update);
       stakePool = {
         id,
-        type,
+        type: normalizeStructTag3(type),
         maxPoint,
         distributedPoint,
         pointPerPeriod,
         period,
         maxStake,
-        stakeType,
+        stakeType: normalizeStructTag3(stakeType),
         totalStaked,
         index,
         createdAt,
@@ -1900,7 +1901,7 @@ var getStakeRewardPool = async (query, marketCoinName) => {
       const claimedRewards = Number(fields.claimed_rewards);
       stakeRewardPool = {
         id,
-        type,
+        type: normalizeStructTag3(type),
         stakePoolId,
         ratioNumerator,
         ratioDenominator,
@@ -1913,6 +1914,7 @@ var getStakeRewardPool = async (query, marketCoinName) => {
 };
 
 // src/queries/borrowIncentiveQuery.ts
+import { normalizeStructTag as normalizeStructTag4 } from "@mysten/sui.js/utils";
 import { SuiTxBlock as SuiKitTxBlock2 } from "@scallop-io/sui-kit";
 var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames) => {
   borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
@@ -1931,7 +1933,7 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames) => {
   const rewardCoinType = parsedBorrowIncentiveRewardPoolData.rewardType;
   const borrowIncentivePools = {};
   for (const pool of borrowIncentivePoolsQueryData.incentive_pools) {
-    const coinType = "0x" + pool.pool_type.name;
+    const coinType = normalizeStructTag4(pool.pool_type.name);
     const coinName = query.utils.parseCoinNameFromType(coinType);
     const rewardCoinName = query.utils.parseCoinNameFromType(rewardCoinType);
     if (!borrowIncentiveCoinNames.includes(coinName)) {
@@ -2129,15 +2131,19 @@ var getLending = async (query, poolCoinName, ownerAddress, marketPool, spool, st
       availableUnstakeAmount = availableUnstakeAmount.plus(
         accountStakedMarketCoinAmount
       );
-      availableUnstakeCoin = availableUnstakeAmount.shiftedBy(-1 * coinDecimal);
+      availableUnstakeCoin = availableUnstakeAmount.shiftedBy(
+        -1 * spool.coinDecimal
+      );
       const baseIndexRate = 1e9;
       const increasedPointRate = spool?.currentPointIndex ? BigNumber3(spool.currentPointIndex - stakeAccount.index).dividedBy(
         baseIndexRate
       ) : 1;
       availableClaimAmount = availableClaimAmount.plus(
-        BigNumber3(stakeAccount.staked).multipliedBy(increasedPointRate).plus(stakeAccount.points).multipliedBy(spool.exchangeRateNumerator).dividedBy(spool.exchangeRateDenominator)
+        accountStakedMarketCoinAmount.multipliedBy(increasedPointRate).plus(stakeAccount.points).multipliedBy(spool.exchangeRateNumerator).dividedBy(spool.exchangeRateDenominator)
+      );
+      availableClaimCoin = availableClaimAmount.shiftedBy(
+        -1 * spool.rewardCoinDecimal
       );
-      availableClaimCoin = availableClaimAmount.shiftedBy(-1 * coinDecimal);
     }
   }
   const suppliedAmount = BigNumber3(marketCoinAmount).multipliedBy(
@@ -2222,10 +2228,13 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
     ])
   ];
   const obligationQuery = await query.queryObligation(obligationId);
+  const borrowIncentivePools = await query.getBorrowIncentivePools();
+  const borrowIncentiveAccounts = await query.getBorrowIncentiveAccounts(obligationId);
   coinPrices = coinPrices || await query.utils.getCoinPrices(assetCoinNames);
   coinAmounts = coinAmounts || await query.getCoinAmounts(assetCoinNames, ownerAddress);
   const collaterals = {};
   const debts = {};
+  const borrowIncentives = {};
   let totalDepositedPools = 0;
   let totalDepositedValue = BigNumber3(0);
   let totalBorrowCapacityValue = BigNumber3(0);
@@ -2327,6 +2336,41 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
       };
     }
   }
+  for (const [poolCoinName, borrowIncentiveAccount] of Object.entries(
+    borrowIncentiveAccounts
+  )) {
+    const coinName = poolCoinName;
+    const borrowIncentivePool = borrowIncentivePools[coinName];
+    let availableClaimAmount = BigNumber3(0);
+    let availableClaimCoin = BigNumber3(0);
+    if (borrowIncentivePool) {
+      const accountBorrowedAmount = BigNumber3(borrowIncentiveAccount.amount);
+      const baseIndexRate = 1e9;
+      const increasedPointRate = borrowIncentivePool.currentPointIndex ? BigNumber3(
+        borrowIncentivePool.currentPointIndex - borrowIncentiveAccount.index
+      ).dividedBy(baseIndexRate) : 1;
+      availableClaimAmount = availableClaimAmount.plus(
+        accountBorrowedAmount.multipliedBy(increasedPointRate).plus(borrowIncentiveAccount.points).multipliedBy(borrowIncentivePool.exchangeRateNumerator).dividedBy(borrowIncentivePool.exchangeRateDenominator)
+      );
+      availableClaimCoin = availableClaimAmount.shiftedBy(
+        -1 * borrowIncentivePool.rewardCoinDecimal
+      );
+      if (availableClaimAmount.isGreaterThan(0)) {
+        borrowIncentives[coinName] = {
+          coinName: borrowIncentivePool.coinName,
+          coinType: borrowIncentivePool.coinType,
+          rewardCoinType: borrowIncentivePool.rewardCoinType,
+          symbol: borrowIncentivePool.symbol,
+          coinDecimal: borrowIncentivePool.coinDecimal,
+          rewardCoinDecimal: borrowIncentivePool.rewardCoinDecimal,
+          coinPrice: borrowIncentivePool.coinPrice,
+          rewardCoinPrice: borrowIncentivePool.rewardCoinPrice,
+          availableClaimAmount: availableClaimAmount.toNumber(),
+          availableClaimCoin: availableClaimCoin.toNumber()
+        };
+      }
+    }
+  }
   let riskLevel = totalRequiredCollateralValue.isZero() && totalBorrowedValueWithWeight.isZero() ? BigNumber3(0) : totalBorrowedValueWithWeight.dividedBy(totalRequiredCollateralValue);
   riskLevel = riskLevel.isFinite() ? riskLevel.isLessThan(1) ? riskLevel : BigNumber3(1) : BigNumber3(1);
   const accountBalanceValue = totalDepositedValue.minus(totalBorrowedValue).isGreaterThan(0) ? totalDepositedValue.minus(totalBorrowedValue) : BigNumber3(0);
@@ -2355,7 +2399,8 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
     totalDepositedPools,
     totalBorrowedPools,
     collaterals,
-    debts
+    debts,
+    borrowIncentives
   };
   for (const [collateralCoinName, obligationCollateral] of Object.entries(
     obligationAccount.collaterals
@@ -2371,10 +2416,10 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
       obligationCollateral.availableWithdrawCoin = availableWithdrawAmount.shiftedBy(-1 * obligationCollateral.coinDecimal).toNumber();
     }
   }
-  for (const [assetCoinName, obligationDebt] of Object.entries(
+  for (const [poolCoinName, obligationDebt] of Object.entries(
     obligationAccount.debts
   )) {
-    const marketPool = market.pools[assetCoinName];
+    const marketPool = market.pools[poolCoinName];
     if (marketPool) {
       const availableRepayAmount = BigNumber3(
         obligationDebt.availableRepayAmount
@@ -2829,7 +2874,7 @@ var ScallopUtils = class {
       throw Error(`Coin ${coinName} is not supported`);
     }
     if (coinName === "sui")
-      return normalizeStructTag3(`${coinPackageId}::sui::SUI`);
+      return normalizeStructTag5(`${coinPackageId}::sui::SUI`);
     const wormHolePckageIds = [
       this._address.get("core.coins.usdc.id") ?? wormholeCoinIds.usdc,
       this._address.get("core.coins.usdt.id") ?? wormholeCoinIds.usdt,
@@ -2861,7 +2906,7 @@ var ScallopUtils = class {
     return `${PROTOCOL_OBJECT_ID}::reserve::MarketCoin<${coinType}>`;
   }
   parseCoinNameFromType(coinType) {
-    coinType = normalizeStructTag3(coinType);
+    coinType = normalizeStructTag5(coinType);
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes("reserve::MarketCoin");