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

package/dist/types/query/borrowIncentive.d.ts

@@ -59,8 +59,6 @@ export type OriginBorrowIncentiveRewardPoolData = {
     claimed_rewards: string;
     exchange_rate_denominator: string;
     exchange_rate_numerator: string;
-    rewards_fee_rate_denominator: string;
-    rewards_fee_rate_numerator: string;
     remaining_reward: string;
     reward_type: {
         name: string;
@@ -71,8 +69,6 @@ export type ParsedBorrowIncentiveRewardPoolData = {
     claimedRewards: number;
     exchangeRateDenominator: number;
     exchangeRateNumerator: number;
-    rewardsFeeRateDenominator: number;
-    rewardsFeeRateNumerator: number;
     remainingRewards: number;
 };
 export type CalculatedBorrowIncentiveRewardPoolData = {
@@ -87,7 +83,6 @@ export type CalculatedBorrowIncentiveRewardPoolData = {
     claimedRewardCoin: number;
     claimedRewardValue: number;
     rewardPerSec: number;
-    rewardFee: number;
 };
 export type BorrowIncentiveAccounts = OptionalKeys<Record<SupportBorrowIncentiveCoins, ParsedBorrowIncentiveAccountData>>;
 export type OriginBorrowIncentiveAccountData = {

package/dist/types/query/spool.d.ts

@@ -59,8 +59,6 @@ export type OriginSpoolRewardPoolData = {
     claimed_rewards: string;
     exchange_rate_denominator: string;
     exchange_rate_numerator: string;
-    fee_rate_denominator: string;
-    fee_rate_numerator: string;
     rewards: string;
     spool_id: string;
 };
@@ -68,8 +66,6 @@ export type ParsedSpoolRewardPoolData = {
     claimedRewards: number;
     exchangeRateDenominator: number;
     exchangeRateNumerator: number;
-    feeRateDenominator: number;
-    feeRateNumerator: number;
     rewards: number;
     spoolId: string;
 };
@@ -85,7 +81,6 @@ export type CalculatedSpoolRewardPoolData = {
     claimedRewardCoin: number;
     claimedRewardValue: number;
     rewardPerSec: number;
-    rewardFee: number;
 };
 export type StakePools = OptionalKeys<Record<SupportStakeMarketCoins, StakePool>>;
 export type StakeRewardPools = OptionalKeys<Record<SupportStakeMarketCoins, StakeRewardPool>>;
@@ -120,8 +115,6 @@ export interface StakeRewardPool {
     stakePoolId: string;
     ratioDenominator: number;
     ratioNumerator: number;
-    feeRateDenominator: number;
-    feeRateNumerator: number;
     rewards: number;
     claimedRewards: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.44.15",
+  "version": "0.44.16",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/queries/spoolQuery.ts

@@ -111,7 +111,6 @@ export const getSpool = async (
 ) => {
   const coinName = query.utils.parseCoinName<SupportStakeCoins>(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`
@@ -140,15 +139,6 @@ export const getSpool = async (
       showContent: true,
     },
   });
-  const spoolRewardFeeDynamicFieldsResponse = await query.suiKit
-    .client()
-    .getDynamicFieldObject({
-      parentId: rewardPoolId,
-      name: {
-        type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
-        value: { dummy_field: false },
-      },
-    });
 
   if (
     marketPool &&
@@ -162,7 +152,6 @@ export const getSpool = async (
 
     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 as any;
       const parsedSpoolData = parseOriginSpoolData({
@@ -187,21 +176,12 @@ export const getSpool = async (
         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 as any;
-        const rewardFeeFields = (rewardFeeObject.content.fields as any).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,
         });
@@ -473,7 +453,6 @@ export const getStakeRewardPool = async (
   query: ScallopQuery,
   marketCoinName: SupportStakeMarketCoins
 ) => {
-  const spoolPkgId = query.address.get('spool.id');
   const poolId = query.address.get(
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
@@ -485,34 +464,15 @@ export const getStakeRewardPool = async (
       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
+      'fields' in stakeRewardPoolObject.content
     ) {
       const rewardPoolFields = stakeRewardPoolObject.content.fields as any;
-      const rewardFeeFields = (
-        stakeRewardFeeDynamicFieldObject.content.fields as any
-      ).value.fields;
       const stakePoolId = String(rewardPoolFields.spool_id);
       const ratioNumerator = Number(rewardPoolFields.exchange_rate_numerator);
       const ratioDenominator = Number(
@@ -520,8 +480,6 @@ export const getStakeRewardPool = async (
       );
       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,
@@ -529,8 +487,6 @@ export const getStakeRewardPool = async (
         stakePoolId,
         ratioNumerator,
         ratioDenominator,
-        feeRateNumerator,
-        feeRateDenominator,
         rewards,
         claimedRewards,
       };

package/src/types/query/borrowIncentive.ts

@@ -83,8 +83,6 @@ export type OriginBorrowIncentiveRewardPoolData = {
   claimed_rewards: string;
   exchange_rate_denominator: string;
   exchange_rate_numerator: string;
-  rewards_fee_rate_denominator: string;
-  rewards_fee_rate_numerator: string;
   remaining_reward: string;
   reward_type: {
     name: string;
@@ -96,8 +94,6 @@ export type ParsedBorrowIncentiveRewardPoolData = {
   claimedRewards: number;
   exchangeRateDenominator: number;
   exchangeRateNumerator: number;
-  rewardsFeeRateDenominator: number;
-  rewardsFeeRateNumerator: number;
   remainingRewards: number;
 };
 
@@ -113,7 +109,6 @@ export type CalculatedBorrowIncentiveRewardPoolData = {
   claimedRewardCoin: number;
   claimedRewardValue: number;
   rewardPerSec: number;
-  rewardFee: number;
 };
 
 export type BorrowIncentiveAccounts = OptionalKeys<

package/src/types/query/spool.ts

@@ -73,8 +73,6 @@ export type OriginSpoolRewardPoolData = {
   claimed_rewards: string;
   exchange_rate_denominator: string;
   exchange_rate_numerator: string;
-  fee_rate_denominator: string;
-  fee_rate_numerator: string;
   rewards: string;
   spool_id: string;
 };
@@ -83,8 +81,6 @@ export type ParsedSpoolRewardPoolData = {
   claimedRewards: number;
   exchangeRateDenominator: number;
   exchangeRateNumerator: number;
-  feeRateDenominator: number;
-  feeRateNumerator: number;
   rewards: number;
   spoolId: string;
 };
@@ -101,7 +97,6 @@ export type CalculatedSpoolRewardPoolData = {
   claimedRewardCoin: number;
   claimedRewardValue: number;
   rewardPerSec: number;
-  rewardFee: number;
 };
 
 export type StakePools = OptionalKeys<
@@ -144,8 +139,6 @@ export interface StakeRewardPool {
   stakePoolId: string;
   ratioDenominator: number;
   ratioNumerator: number;
-  feeRateDenominator: number;
-  feeRateNumerator: number;
   rewards: number;
   claimedRewards: number;
 }

package/src/utils/query.ts

@@ -320,8 +320,6 @@ export const parseOriginSpoolRewardPoolData = (
     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),
   };
@@ -366,9 +364,6 @@ export const calculateSpoolRewardPoolData = (
     .isFinite()
     ? rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).toNumber()
     : Infinity;
-  const rewardFeeRate = BigNumber(parsedSpoolRewardPoolData.feeRateNumerator)
-    .dividedBy(parsedSpoolRewardPoolData.feeRateDenominator)
-    .toNumber();
 
   return {
     rewardApr: rewardRate,
@@ -382,7 +377,6 @@ export const calculateSpoolRewardPoolData = (
     claimedRewardCoin: claimedRewardCoin.toNumber(),
     claimedRewardValue: claimedRewardValue.toNumber(),
     rewardPerSec: rewardPerSec.toNumber(),
-    rewardFee: rewardFeeRate,
   };
 };
 
@@ -498,12 +492,6 @@ export const parseOriginBorrowIncentiveRewardPoolData = (
     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
     ),
@@ -555,11 +543,6 @@ export const calculateBorrowIncentiveRewardPoolData = (
         .dividedBy(calculatedBorrowIncentivePoolData.stakedValue)
         .toNumber()
     : Infinity;
-  const rewardFeeRate = BigNumber(
-    parsedBorrowIncentiveRewardPoolData.rewardsFeeRateNumerator
-  )
-    .dividedBy(parsedBorrowIncentiveRewardPoolData.rewardsFeeRateDenominator)
-    .toNumber();
 
   return {
     rewardApr: rewardRate,
@@ -573,7 +556,6 @@ export const calculateBorrowIncentiveRewardPoolData = (
     claimedRewardCoin: claimedRewardCoin.toNumber(),
     claimedRewardValue: claimedRewardValue.toNumber(),
     rewardPerSec: rewardPerSec.toNumber(),
-    rewardFee: rewardFeeRate,
   };
 };