@scallop-io/sui-scallop-sdk 0.44.15 → 0.44.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +5 -45
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +5 -45
- package/dist/index.mjs.map +1 -1
- package/dist/types/query/borrowIncentive.d.ts +0 -5
- package/dist/types/query/spool.d.ts +0 -7
- package/package.json +1 -1
- package/src/queries/spoolQuery.ts +3 -47
- package/src/types/query/borrowIncentive.ts +0 -5
- package/src/types/query/spool.ts +0 -7
- package/src/utils/query.ts +0 -18
package/dist/index.mjs
CHANGED
|
@@ -899,8 +899,6 @@ var parseOriginSpoolRewardPoolData = (originSpoolRewardPoolData) => {
|
|
|
899
899
|
exchangeRateNumerator: Number(
|
|
900
900
|
originSpoolRewardPoolData.exchange_rate_numerator
|
|
901
901
|
),
|
|
902
|
-
feeRateDenominator: Number(originSpoolRewardPoolData.fee_rate_denominator),
|
|
903
|
-
feeRateNumerator: Number(originSpoolRewardPoolData.fee_rate_numerator),
|
|
904
902
|
rewards: Number(originSpoolRewardPoolData.rewards),
|
|
905
903
|
spoolId: String(originSpoolRewardPoolData.spool_id)
|
|
906
904
|
};
|
|
@@ -925,7 +923,6 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
|
|
|
925
923
|
const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
|
|
926
924
|
const rewardValueForYear = BigNumber(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
|
|
927
925
|
const rewardRate = rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).toNumber() : Infinity;
|
|
928
|
-
const rewardFeeRate = BigNumber(parsedSpoolRewardPoolData.feeRateNumerator).dividedBy(parsedSpoolRewardPoolData.feeRateDenominator).toNumber();
|
|
929
926
|
return {
|
|
930
927
|
rewardApr: rewardRate,
|
|
931
928
|
totalRewardAmount: totalRewardAmount.toNumber(),
|
|
@@ -937,8 +934,7 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
|
|
|
937
934
|
claimedRewardAmount: claimedRewardAmount.toNumber(),
|
|
938
935
|
claimedRewardCoin: claimedRewardCoin.toNumber(),
|
|
939
936
|
claimedRewardValue: claimedRewardValue.toNumber(),
|
|
940
|
-
rewardPerSec: rewardPerSec.toNumber()
|
|
941
|
-
rewardFee: rewardFeeRate
|
|
937
|
+
rewardPerSec: rewardPerSec.toNumber()
|
|
942
938
|
};
|
|
943
939
|
};
|
|
944
940
|
var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
|
|
@@ -1013,12 +1009,6 @@ var parseOriginBorrowIncentiveRewardPoolData = (originBorrowIncentiveRewardPoolD
|
|
|
1013
1009
|
exchangeRateDenominator: Number(
|
|
1014
1010
|
originBorrowIncentiveRewardPoolData.exchange_rate_denominator
|
|
1015
1011
|
),
|
|
1016
|
-
rewardsFeeRateNumerator: Number(
|
|
1017
|
-
originBorrowIncentiveRewardPoolData.rewards_fee_rate_numerator
|
|
1018
|
-
),
|
|
1019
|
-
rewardsFeeRateDenominator: Number(
|
|
1020
|
-
originBorrowIncentiveRewardPoolData.rewards_fee_rate_denominator
|
|
1021
|
-
),
|
|
1022
1012
|
remainingRewards: Number(
|
|
1023
1013
|
originBorrowIncentiveRewardPoolData.remaining_reward
|
|
1024
1014
|
)
|
|
@@ -1048,9 +1038,6 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
|
|
|
1048
1038
|
const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
|
|
1049
1039
|
const rewardValueForYear = BigNumber(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
|
|
1050
1040
|
const rewardRate = rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).toNumber() : Infinity;
|
|
1051
|
-
const rewardFeeRate = BigNumber(
|
|
1052
|
-
parsedBorrowIncentiveRewardPoolData.rewardsFeeRateNumerator
|
|
1053
|
-
).dividedBy(parsedBorrowIncentiveRewardPoolData.rewardsFeeRateDenominator).toNumber();
|
|
1054
1041
|
return {
|
|
1055
1042
|
rewardApr: rewardRate,
|
|
1056
1043
|
totalRewardAmount: totalRewardAmount.toNumber(),
|
|
@@ -1062,8 +1049,7 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
|
|
|
1062
1049
|
claimedRewardAmount: claimedRewardAmount.toNumber(),
|
|
1063
1050
|
claimedRewardCoin: claimedRewardCoin.toNumber(),
|
|
1064
1051
|
claimedRewardValue: claimedRewardValue.toNumber(),
|
|
1065
|
-
rewardPerSec: rewardPerSec.toNumber()
|
|
1066
|
-
rewardFee: rewardFeeRate
|
|
1052
|
+
rewardPerSec: rewardPerSec.toNumber()
|
|
1067
1053
|
};
|
|
1068
1054
|
};
|
|
1069
1055
|
var parseOriginBorrowIncentiveAccountData = (originBorrowIncentiveAccountData) => {
|
|
@@ -1844,7 +1830,6 @@ var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
|
|
|
1844
1830
|
var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPrices) => {
|
|
1845
1831
|
const coinName = query.utils.parseCoinName(marketCoinName);
|
|
1846
1832
|
marketPool = marketPool || await query.getMarketPool(coinName, indexer);
|
|
1847
|
-
const spoolPkgId = query.address.get(`spool.id`);
|
|
1848
1833
|
const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
|
|
1849
1834
|
const rewardPoolId = query.address.get(
|
|
1850
1835
|
`spool.pools.${marketCoinName}.rewardPoolId`
|
|
@@ -1865,19 +1850,11 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
|
|
|
1865
1850
|
showContent: true
|
|
1866
1851
|
}
|
|
1867
1852
|
});
|
|
1868
|
-
const spoolRewardFeeDynamicFieldsResponse = await query.suiKit.client().getDynamicFieldObject({
|
|
1869
|
-
parentId: rewardPoolId,
|
|
1870
|
-
name: {
|
|
1871
|
-
type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
|
|
1872
|
-
value: { dummy_field: false }
|
|
1873
|
-
}
|
|
1874
|
-
});
|
|
1875
1853
|
if (marketPool && spoolObjectResponse[0].data && spoolObjectResponse[1].data) {
|
|
1876
1854
|
const rewardCoinName = query.utils.getSpoolRewardCoinName(marketCoinName);
|
|
1877
1855
|
coinPrices = coinPrices || await query.utils.getCoinPrices([coinName, rewardCoinName]);
|
|
1878
1856
|
const spoolObject = spoolObjectResponse[0].data;
|
|
1879
1857
|
const rewardPoolObject = spoolObjectResponse[1].data;
|
|
1880
|
-
const rewardFeeObject = spoolRewardFeeDynamicFieldsResponse.data;
|
|
1881
1858
|
if (spoolObject.content && "fields" in spoolObject.content) {
|
|
1882
1859
|
const spoolFields = spoolObject.content.fields;
|
|
1883
1860
|
const parsedSpoolData = parseOriginSpoolData({
|
|
@@ -1899,15 +1876,12 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
|
|
|
1899
1876
|
marketCoinPrice,
|
|
1900
1877
|
marketCoinDecimal
|
|
1901
1878
|
);
|
|
1902
|
-
if (rewardPoolObject.content &&
|
|
1879
|
+
if (rewardPoolObject.content && "fields" in rewardPoolObject.content) {
|
|
1903
1880
|
const rewardPoolFields = rewardPoolObject.content.fields;
|
|
1904
|
-
const rewardFeeFields = rewardFeeObject.content.fields.value.fields;
|
|
1905
1881
|
const parsedSpoolRewardPoolData = parseOriginSpoolRewardPoolData({
|
|
1906
1882
|
claimed_rewards: rewardPoolFields.claimed_rewards,
|
|
1907
1883
|
exchange_rate_numerator: rewardPoolFields.exchange_rate_numerator,
|
|
1908
1884
|
exchange_rate_denominator: rewardPoolFields.exchange_rate_denominator,
|
|
1909
|
-
fee_rate_numerator: rewardFeeFields.fee_rate_numerator,
|
|
1910
|
-
fee_rate_denominator: rewardFeeFields.fee_rate_denominator,
|
|
1911
1885
|
rewards: rewardPoolFields.rewards,
|
|
1912
1886
|
spool_id: rewardPoolFields.spool_id
|
|
1913
1887
|
});
|
|
@@ -2115,7 +2089,6 @@ var getStakePool = async (query, marketCoinName) => {
|
|
|
2115
2089
|
return stakePool;
|
|
2116
2090
|
};
|
|
2117
2091
|
var getStakeRewardPool = async (query, marketCoinName) => {
|
|
2118
|
-
const spoolPkgId = query.address.get("spool.id");
|
|
2119
2092
|
const poolId = query.address.get(
|
|
2120
2093
|
`spool.pools.${marketCoinName}.rewardPoolId`
|
|
2121
2094
|
);
|
|
@@ -2127,21 +2100,12 @@ var getStakeRewardPool = async (query, marketCoinName) => {
|
|
|
2127
2100
|
showType: true
|
|
2128
2101
|
}
|
|
2129
2102
|
});
|
|
2130
|
-
|
|
2131
|
-
parentId: poolId,
|
|
2132
|
-
name: {
|
|
2133
|
-
type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
|
|
2134
|
-
value: { dummy_field: false }
|
|
2135
|
-
}
|
|
2136
|
-
});
|
|
2137
|
-
if (stakeRewardPoolObjectResponse.data && stakeRewardFeeDynamicFieldsResponse.data) {
|
|
2103
|
+
if (stakeRewardPoolObjectResponse.data) {
|
|
2138
2104
|
const stakeRewardPoolObject = stakeRewardPoolObjectResponse.data;
|
|
2139
|
-
const stakeRewardFeeDynamicFieldObject = stakeRewardFeeDynamicFieldsResponse.data;
|
|
2140
2105
|
const id = stakeRewardPoolObject.objectId;
|
|
2141
2106
|
const type = stakeRewardPoolObject.type;
|
|
2142
|
-
if (stakeRewardPoolObject.content &&
|
|
2107
|
+
if (stakeRewardPoolObject.content && "fields" in stakeRewardPoolObject.content) {
|
|
2143
2108
|
const rewardPoolFields = stakeRewardPoolObject.content.fields;
|
|
2144
|
-
const rewardFeeFields = stakeRewardFeeDynamicFieldObject.content.fields.value.fields;
|
|
2145
2109
|
const stakePoolId = String(rewardPoolFields.spool_id);
|
|
2146
2110
|
const ratioNumerator = Number(rewardPoolFields.exchange_rate_numerator);
|
|
2147
2111
|
const ratioDenominator = Number(
|
|
@@ -2149,16 +2113,12 @@ var getStakeRewardPool = async (query, marketCoinName) => {
|
|
|
2149
2113
|
);
|
|
2150
2114
|
const rewards = Number(rewardPoolFields.rewards);
|
|
2151
2115
|
const claimedRewards = Number(rewardPoolFields.claimed_rewards);
|
|
2152
|
-
const feeRateNumerator = Number(rewardFeeFields.fee_rate_numerator);
|
|
2153
|
-
const feeRateDenominator = Number(rewardFeeFields.fee_rate_denominator);
|
|
2154
2116
|
stakeRewardPool = {
|
|
2155
2117
|
id,
|
|
2156
2118
|
type: normalizeStructTag3(type),
|
|
2157
2119
|
stakePoolId,
|
|
2158
2120
|
ratioNumerator,
|
|
2159
2121
|
ratioDenominator,
|
|
2160
|
-
feeRateNumerator,
|
|
2161
|
-
feeRateDenominator,
|
|
2162
2122
|
rewards,
|
|
2163
2123
|
claimedRewards
|
|
2164
2124
|
};
|