@scallop-io/sui-scallop-sdk 0.44.14 → 0.44.16

package/dist/index.mjs

@@ -30,7 +30,14 @@ var SUPPORT_COLLATERALS = [
   "hasui",
   "vsui"
 ];
-var SUPPORT_SPOOLS = ["ssui", "susdc", "susdt"];
+var SUPPORT_SPOOLS = [
+  "ssui",
+  "susdc",
+  "susdt",
+  "safsui",
+  "shasui",
+  "svsui"
+];
 var SUPPORT_SPOOLS_REWARDS = ["sui"];
 var SUPPORT_BORROW_INCENTIVE_POOLS = ["sui", "usdc", "usdt"];
 var SUPPORT_BORROW_INCENTIVE_REWARDS = ["sui"];
@@ -104,12 +111,18 @@ var marketCoins = {
 var stakeMarketCoins = {
   ssui: "ssui",
   susdc: "susdc",
-  susdt: "susdt"
+  susdt: "susdt",
+  safsui: "safsui",
+  shasui: "shasui",
+  svsui: "svsui"
 };
 var spoolRewardCoins = {
   ssui: "sui",
   susdc: "sui",
-  susdt: "sui"
+  susdt: "sui",
+  safsui: "sui",
+  shasui: "sui",
+  svsui: "sui"
 };
 var borrowIncentiveRewardCoins = {
   sui: "sui",
@@ -337,6 +350,22 @@ var EMPTY_ADDRESSES = {
       susdc: {
         id: "",
         rewardPoolId: ""
+      },
+      susdt: {
+        id: "",
+        rewardPoolId: ""
+      },
+      safsui: {
+        id: "",
+        rewardPoolId: ""
+      },
+      shasui: {
+        id: "",
+        rewardPoolId: ""
+      },
+      svsui: {
+        id: "",
+        rewardPoolId: ""
       }
     }
   },
@@ -870,8 +899,6 @@ var parseOriginSpoolRewardPoolData = (originSpoolRewardPoolData) => {
     exchangeRateNumerator: Number(
       originSpoolRewardPoolData.exchange_rate_numerator
     ),
-    feeRateDenominator: Number(originSpoolRewardPoolData.fee_rate_denominator),
-    feeRateNumerator: Number(originSpoolRewardPoolData.fee_rate_numerator),
     rewards: Number(originSpoolRewardPoolData.rewards),
     spoolId: String(originSpoolRewardPoolData.spool_id)
   };
@@ -896,7 +923,6 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
   const rewardValueForYear = BigNumber(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
   const rewardRate = rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).toNumber() : Infinity;
-  const rewardFeeRate = BigNumber(parsedSpoolRewardPoolData.feeRateNumerator).dividedBy(parsedSpoolRewardPoolData.feeRateDenominator).toNumber();
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
@@ -908,8 +934,7 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
     claimedRewardAmount: claimedRewardAmount.toNumber(),
     claimedRewardCoin: claimedRewardCoin.toNumber(),
     claimedRewardValue: claimedRewardValue.toNumber(),
-    rewardPerSec: rewardPerSec.toNumber(),
-    rewardFee: rewardFeeRate
+    rewardPerSec: rewardPerSec.toNumber()
   };
 };
 var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
@@ -984,12 +1009,6 @@ var parseOriginBorrowIncentiveRewardPoolData = (originBorrowIncentiveRewardPoolD
     exchangeRateDenominator: Number(
       originBorrowIncentiveRewardPoolData.exchange_rate_denominator
     ),
-    rewardsFeeRateNumerator: Number(
-      originBorrowIncentiveRewardPoolData.rewards_fee_rate_numerator
-    ),
-    rewardsFeeRateDenominator: Number(
-      originBorrowIncentiveRewardPoolData.rewards_fee_rate_denominator
-    ),
     remainingRewards: Number(
       originBorrowIncentiveRewardPoolData.remaining_reward
     )
@@ -1019,9 +1038,6 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
   const rewardValueForYear = BigNumber(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
   const rewardRate = rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).toNumber() : Infinity;
-  const rewardFeeRate = BigNumber(
-    parsedBorrowIncentiveRewardPoolData.rewardsFeeRateNumerator
-  ).dividedBy(parsedBorrowIncentiveRewardPoolData.rewardsFeeRateDenominator).toNumber();
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
@@ -1033,8 +1049,7 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
     claimedRewardAmount: claimedRewardAmount.toNumber(),
     claimedRewardCoin: claimedRewardCoin.toNumber(),
     claimedRewardValue: claimedRewardValue.toNumber(),
-    rewardPerSec: rewardPerSec.toNumber(),
-    rewardFee: rewardFeeRate
+    rewardPerSec: rewardPerSec.toNumber()
   };
 };
 var parseOriginBorrowIncentiveAccountData = (originBorrowIncentiveAccountData) => {
@@ -1815,7 +1830,6 @@ var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
 var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPrices) => {
   const coinName = query.utils.parseCoinName(marketCoinName);
   marketPool = marketPool || await query.getMarketPool(coinName, indexer);
-  const spoolPkgId = query.address.get(`spool.id`);
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
   const rewardPoolId = query.address.get(
     `spool.pools.${marketCoinName}.rewardPoolId`
@@ -1836,19 +1850,11 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
       showContent: true
     }
   });
-  const spoolRewardFeeDynamicFieldsResponse = await query.suiKit.client().getDynamicFieldObject({
-    parentId: rewardPoolId,
-    name: {
-      type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
-      value: { dummy_field: false }
-    }
-  });
   if (marketPool && spoolObjectResponse[0].data && spoolObjectResponse[1].data) {
     const rewardCoinName = query.utils.getSpoolRewardCoinName(marketCoinName);
     coinPrices = coinPrices || await query.utils.getCoinPrices([coinName, rewardCoinName]);
     const spoolObject = spoolObjectResponse[0].data;
     const rewardPoolObject = spoolObjectResponse[1].data;
-    const rewardFeeObject = spoolRewardFeeDynamicFieldsResponse.data;
     if (spoolObject.content && "fields" in spoolObject.content) {
       const spoolFields = spoolObject.content.fields;
       const parsedSpoolData = parseOriginSpoolData({
@@ -1870,15 +1876,12 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
         marketCoinPrice,
         marketCoinDecimal
       );
-      if (rewardPoolObject.content && rewardFeeObject?.content && "fields" in rewardPoolObject.content && "fields" in rewardFeeObject.content) {
+      if (rewardPoolObject.content && "fields" in rewardPoolObject.content) {
         const rewardPoolFields = rewardPoolObject.content.fields;
-        const rewardFeeFields = rewardFeeObject.content.fields.value.fields;
         const parsedSpoolRewardPoolData = parseOriginSpoolRewardPoolData({
           claimed_rewards: rewardPoolFields.claimed_rewards,
           exchange_rate_numerator: rewardPoolFields.exchange_rate_numerator,
           exchange_rate_denominator: rewardPoolFields.exchange_rate_denominator,
-          fee_rate_numerator: rewardFeeFields.fee_rate_numerator,
-          fee_rate_denominator: rewardFeeFields.fee_rate_denominator,
           rewards: rewardPoolFields.rewards,
           spool_id: rewardPoolFields.spool_id
         });
@@ -1943,7 +1946,10 @@ var getStakeAccounts = async (query, ownerAddress) => {
   const stakeAccounts = {
     ssui: [],
     susdc: [],
-    susdt: []
+    susdt: [],
+    safsui: [],
+    shasui: [],
+    svsui: []
   };
   const stakeMarketCoinTypes = Object.keys(stakeAccounts).reduce(
     (types, stakeMarketCoinName) => {
@@ -2000,6 +2006,39 @@ var getStakeAccounts = async (query, ownerAddress) => {
           points,
           totalPoints
         });
+      } else if (normalizeStructTag3(type) === stakeMarketCoinTypes.safsui) {
+        stakeAccounts.safsui.push({
+          id,
+          type: normalizeStructTag3(type),
+          stakePoolId,
+          stakeType: normalizeStructTag3(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints
+        });
+      } else if (normalizeStructTag3(type) === stakeMarketCoinTypes.shasui) {
+        stakeAccounts.shasui.push({
+          id,
+          type: normalizeStructTag3(type),
+          stakePoolId,
+          stakeType: normalizeStructTag3(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints
+        });
+      } else if (normalizeStructTag3(type) === stakeMarketCoinTypes.svsui) {
+        stakeAccounts.svsui.push({
+          id,
+          type: normalizeStructTag3(type),
+          stakePoolId,
+          stakeType: normalizeStructTag3(stakeType),
+          staked,
+          index,
+          points,
+          totalPoints
+        });
       }
     }
   }
@@ -2050,7 +2089,6 @@ var getStakePool = async (query, marketCoinName) => {
   return stakePool;
 };
 var getStakeRewardPool = async (query, marketCoinName) => {
-  const spoolPkgId = query.address.get("spool.id");
   const poolId = query.address.get(
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
@@ -2062,21 +2100,12 @@ var getStakeRewardPool = async (query, marketCoinName) => {
       showType: true
     }
   });
-  const stakeRewardFeeDynamicFieldsResponse = await query.suiKit.client().getDynamicFieldObject({
-    parentId: poolId,
-    name: {
-      type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
-      value: { dummy_field: false }
-    }
-  });
-  if (stakeRewardPoolObjectResponse.data && stakeRewardFeeDynamicFieldsResponse.data) {
+  if (stakeRewardPoolObjectResponse.data) {
     const stakeRewardPoolObject = stakeRewardPoolObjectResponse.data;
-    const stakeRewardFeeDynamicFieldObject = stakeRewardFeeDynamicFieldsResponse.data;
     const id = stakeRewardPoolObject.objectId;
     const type = stakeRewardPoolObject.type;
-    if (stakeRewardPoolObject.content && stakeRewardFeeDynamicFieldObject.content && "fields" in stakeRewardPoolObject.content && "fields" in stakeRewardFeeDynamicFieldObject.content) {
+    if (stakeRewardPoolObject.content && "fields" in stakeRewardPoolObject.content) {
       const rewardPoolFields = stakeRewardPoolObject.content.fields;
-      const rewardFeeFields = stakeRewardFeeDynamicFieldObject.content.fields.value.fields;
       const stakePoolId = String(rewardPoolFields.spool_id);
       const ratioNumerator = Number(rewardPoolFields.exchange_rate_numerator);
       const ratioDenominator = Number(
@@ -2084,16 +2113,12 @@ var getStakeRewardPool = async (query, marketCoinName) => {
       );
       const rewards = Number(rewardPoolFields.rewards);
       const claimedRewards = Number(rewardPoolFields.claimed_rewards);
-      const feeRateNumerator = Number(rewardFeeFields.fee_rate_numerator);
-      const feeRateDenominator = Number(rewardFeeFields.fee_rate_denominator);
       stakeRewardPool = {
         id,
         type: normalizeStructTag3(type),
         stakePoolId,
         ratioNumerator,
         ratioDenominator,
-        feeRateNumerator,
-        feeRateDenominator,
         rewards,
         claimedRewards
       };
@@ -2354,6 +2379,9 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
   );
   const suppliedCoin = suppliedAmount.shiftedBy(-1 * coinDecimal);
   const suppliedValue = suppliedCoin.multipliedBy(coinPrice ?? 0);
+  const marketCoinPrice = BigNumber3(coinPrice ?? 0).multipliedBy(
+    marketPool?.conversionRate ?? 1
+  );
   const unstakedMarketAmount = BigNumber3(marketCoinAmount);
   const unstakedMarketCoin = unstakedMarketAmount.shiftedBy(-1 * coinDecimal);
   const availableSupplyAmount = BigNumber3(coinAmount);
@@ -2373,6 +2401,8 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
     marketCoinType: query.utils.parseMarketCoinType(poolCoinName),
     coinDecimal,
     coinPrice: coinPrice ?? 0,
+    conversionRate: marketPool?.conversionRate ?? 1,
+    marketCoinPrice: marketCoinPrice.toNumber(),
     supplyApr: marketPool?.supplyApr ?? 0,
     supplyApy: marketPool?.supplyApy ?? 0,
     rewardApr: spool?.rewardApr ?? 0,
@@ -4400,14 +4430,14 @@ var ScallopBuilder = class {
   /**
    * Request the scallop API to initialize data.
    *
-   * @param forece - Whether to force initialization.
+   * @param force - Whether to force initialization.
    */
-  async init(forece = false) {
-    if (forece || !this.address.getAddresses()) {
+  async init(force = false) {
+    if (force || !this.address.getAddresses()) {
       await this.address.read();
     }
-    await this.query.init(forece);
-    await this.utils.init(forece);
+    await this.query.init(force);
+    await this.utils.init(force);
   }
   /**
    * Create a scallop txBlock instance that enhances transaction block.