@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.js
CHANGED
|
@@ -963,8 +963,6 @@ var parseOriginSpoolRewardPoolData = (originSpoolRewardPoolData) => {
|
|
|
963
963
|
exchangeRateNumerator: Number(
|
|
964
964
|
originSpoolRewardPoolData.exchange_rate_numerator
|
|
965
965
|
),
|
|
966
|
-
feeRateDenominator: Number(originSpoolRewardPoolData.fee_rate_denominator),
|
|
967
|
-
feeRateNumerator: Number(originSpoolRewardPoolData.fee_rate_numerator),
|
|
968
966
|
rewards: Number(originSpoolRewardPoolData.rewards),
|
|
969
967
|
spoolId: String(originSpoolRewardPoolData.spool_id)
|
|
970
968
|
};
|
|
@@ -989,7 +987,6 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
|
|
|
989
987
|
const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
|
|
990
988
|
const rewardValueForYear = (0, import_bignumber.default)(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
|
|
991
989
|
const rewardRate = rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).toNumber() : Infinity;
|
|
992
|
-
const rewardFeeRate = (0, import_bignumber.default)(parsedSpoolRewardPoolData.feeRateNumerator).dividedBy(parsedSpoolRewardPoolData.feeRateDenominator).toNumber();
|
|
993
990
|
return {
|
|
994
991
|
rewardApr: rewardRate,
|
|
995
992
|
totalRewardAmount: totalRewardAmount.toNumber(),
|
|
@@ -1001,8 +998,7 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
|
|
|
1001
998
|
claimedRewardAmount: claimedRewardAmount.toNumber(),
|
|
1002
999
|
claimedRewardCoin: claimedRewardCoin.toNumber(),
|
|
1003
1000
|
claimedRewardValue: claimedRewardValue.toNumber(),
|
|
1004
|
-
rewardPerSec: rewardPerSec.toNumber()
|
|
1005
|
-
rewardFee: rewardFeeRate
|
|
1001
|
+
rewardPerSec: rewardPerSec.toNumber()
|
|
1006
1002
|
};
|
|
1007
1003
|
};
|
|
1008
1004
|
var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
|
|
@@ -1077,12 +1073,6 @@ var parseOriginBorrowIncentiveRewardPoolData = (originBorrowIncentiveRewardPoolD
|
|
|
1077
1073
|
exchangeRateDenominator: Number(
|
|
1078
1074
|
originBorrowIncentiveRewardPoolData.exchange_rate_denominator
|
|
1079
1075
|
),
|
|
1080
|
-
rewardsFeeRateNumerator: Number(
|
|
1081
|
-
originBorrowIncentiveRewardPoolData.rewards_fee_rate_numerator
|
|
1082
|
-
),
|
|
1083
|
-
rewardsFeeRateDenominator: Number(
|
|
1084
|
-
originBorrowIncentiveRewardPoolData.rewards_fee_rate_denominator
|
|
1085
|
-
),
|
|
1086
1076
|
remainingRewards: Number(
|
|
1087
1077
|
originBorrowIncentiveRewardPoolData.remaining_reward
|
|
1088
1078
|
)
|
|
@@ -1112,9 +1102,6 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
|
|
|
1112
1102
|
const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
|
|
1113
1103
|
const rewardValueForYear = (0, import_bignumber.default)(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
|
|
1114
1104
|
const rewardRate = rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).toNumber() : Infinity;
|
|
1115
|
-
const rewardFeeRate = (0, import_bignumber.default)(
|
|
1116
|
-
parsedBorrowIncentiveRewardPoolData.rewardsFeeRateNumerator
|
|
1117
|
-
).dividedBy(parsedBorrowIncentiveRewardPoolData.rewardsFeeRateDenominator).toNumber();
|
|
1118
1105
|
return {
|
|
1119
1106
|
rewardApr: rewardRate,
|
|
1120
1107
|
totalRewardAmount: totalRewardAmount.toNumber(),
|
|
@@ -1126,8 +1113,7 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
|
|
|
1126
1113
|
claimedRewardAmount: claimedRewardAmount.toNumber(),
|
|
1127
1114
|
claimedRewardCoin: claimedRewardCoin.toNumber(),
|
|
1128
1115
|
claimedRewardValue: claimedRewardValue.toNumber(),
|
|
1129
|
-
rewardPerSec: rewardPerSec.toNumber()
|
|
1130
|
-
rewardFee: rewardFeeRate
|
|
1116
|
+
rewardPerSec: rewardPerSec.toNumber()
|
|
1131
1117
|
};
|
|
1132
1118
|
};
|
|
1133
1119
|
var parseOriginBorrowIncentiveAccountData = (originBorrowIncentiveAccountData) => {
|
|
@@ -1908,7 +1894,6 @@ var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
|
|
|
1908
1894
|
var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPrices) => {
|
|
1909
1895
|
const coinName = query.utils.parseCoinName(marketCoinName);
|
|
1910
1896
|
marketPool = marketPool || await query.getMarketPool(coinName, indexer);
|
|
1911
|
-
const spoolPkgId = query.address.get(`spool.id`);
|
|
1912
1897
|
const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
|
|
1913
1898
|
const rewardPoolId = query.address.get(
|
|
1914
1899
|
`spool.pools.${marketCoinName}.rewardPoolId`
|
|
@@ -1929,19 +1914,11 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
|
|
|
1929
1914
|
showContent: true
|
|
1930
1915
|
}
|
|
1931
1916
|
});
|
|
1932
|
-
const spoolRewardFeeDynamicFieldsResponse = await query.suiKit.client().getDynamicFieldObject({
|
|
1933
|
-
parentId: rewardPoolId,
|
|
1934
|
-
name: {
|
|
1935
|
-
type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
|
|
1936
|
-
value: { dummy_field: false }
|
|
1937
|
-
}
|
|
1938
|
-
});
|
|
1939
1917
|
if (marketPool && spoolObjectResponse[0].data && spoolObjectResponse[1].data) {
|
|
1940
1918
|
const rewardCoinName = query.utils.getSpoolRewardCoinName(marketCoinName);
|
|
1941
1919
|
coinPrices = coinPrices || await query.utils.getCoinPrices([coinName, rewardCoinName]);
|
|
1942
1920
|
const spoolObject = spoolObjectResponse[0].data;
|
|
1943
1921
|
const rewardPoolObject = spoolObjectResponse[1].data;
|
|
1944
|
-
const rewardFeeObject = spoolRewardFeeDynamicFieldsResponse.data;
|
|
1945
1922
|
if (spoolObject.content && "fields" in spoolObject.content) {
|
|
1946
1923
|
const spoolFields = spoolObject.content.fields;
|
|
1947
1924
|
const parsedSpoolData = parseOriginSpoolData({
|
|
@@ -1963,15 +1940,12 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
|
|
|
1963
1940
|
marketCoinPrice,
|
|
1964
1941
|
marketCoinDecimal
|
|
1965
1942
|
);
|
|
1966
|
-
if (rewardPoolObject.content &&
|
|
1943
|
+
if (rewardPoolObject.content && "fields" in rewardPoolObject.content) {
|
|
1967
1944
|
const rewardPoolFields = rewardPoolObject.content.fields;
|
|
1968
|
-
const rewardFeeFields = rewardFeeObject.content.fields.value.fields;
|
|
1969
1945
|
const parsedSpoolRewardPoolData = parseOriginSpoolRewardPoolData({
|
|
1970
1946
|
claimed_rewards: rewardPoolFields.claimed_rewards,
|
|
1971
1947
|
exchange_rate_numerator: rewardPoolFields.exchange_rate_numerator,
|
|
1972
1948
|
exchange_rate_denominator: rewardPoolFields.exchange_rate_denominator,
|
|
1973
|
-
fee_rate_numerator: rewardFeeFields.fee_rate_numerator,
|
|
1974
|
-
fee_rate_denominator: rewardFeeFields.fee_rate_denominator,
|
|
1975
1949
|
rewards: rewardPoolFields.rewards,
|
|
1976
1950
|
spool_id: rewardPoolFields.spool_id
|
|
1977
1951
|
});
|
|
@@ -2179,7 +2153,6 @@ var getStakePool = async (query, marketCoinName) => {
|
|
|
2179
2153
|
return stakePool;
|
|
2180
2154
|
};
|
|
2181
2155
|
var getStakeRewardPool = async (query, marketCoinName) => {
|
|
2182
|
-
const spoolPkgId = query.address.get("spool.id");
|
|
2183
2156
|
const poolId = query.address.get(
|
|
2184
2157
|
`spool.pools.${marketCoinName}.rewardPoolId`
|
|
2185
2158
|
);
|
|
@@ -2191,21 +2164,12 @@ var getStakeRewardPool = async (query, marketCoinName) => {
|
|
|
2191
2164
|
showType: true
|
|
2192
2165
|
}
|
|
2193
2166
|
});
|
|
2194
|
-
|
|
2195
|
-
parentId: poolId,
|
|
2196
|
-
name: {
|
|
2197
|
-
type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
|
|
2198
|
-
value: { dummy_field: false }
|
|
2199
|
-
}
|
|
2200
|
-
});
|
|
2201
|
-
if (stakeRewardPoolObjectResponse.data && stakeRewardFeeDynamicFieldsResponse.data) {
|
|
2167
|
+
if (stakeRewardPoolObjectResponse.data) {
|
|
2202
2168
|
const stakeRewardPoolObject = stakeRewardPoolObjectResponse.data;
|
|
2203
|
-
const stakeRewardFeeDynamicFieldObject = stakeRewardFeeDynamicFieldsResponse.data;
|
|
2204
2169
|
const id = stakeRewardPoolObject.objectId;
|
|
2205
2170
|
const type = stakeRewardPoolObject.type;
|
|
2206
|
-
if (stakeRewardPoolObject.content &&
|
|
2171
|
+
if (stakeRewardPoolObject.content && "fields" in stakeRewardPoolObject.content) {
|
|
2207
2172
|
const rewardPoolFields = stakeRewardPoolObject.content.fields;
|
|
2208
|
-
const rewardFeeFields = stakeRewardFeeDynamicFieldObject.content.fields.value.fields;
|
|
2209
2173
|
const stakePoolId = String(rewardPoolFields.spool_id);
|
|
2210
2174
|
const ratioNumerator = Number(rewardPoolFields.exchange_rate_numerator);
|
|
2211
2175
|
const ratioDenominator = Number(
|
|
@@ -2213,16 +2177,12 @@ var getStakeRewardPool = async (query, marketCoinName) => {
|
|
|
2213
2177
|
);
|
|
2214
2178
|
const rewards = Number(rewardPoolFields.rewards);
|
|
2215
2179
|
const claimedRewards = Number(rewardPoolFields.claimed_rewards);
|
|
2216
|
-
const feeRateNumerator = Number(rewardFeeFields.fee_rate_numerator);
|
|
2217
|
-
const feeRateDenominator = Number(rewardFeeFields.fee_rate_denominator);
|
|
2218
2180
|
stakeRewardPool = {
|
|
2219
2181
|
id,
|
|
2220
2182
|
type: (0, import_utils4.normalizeStructTag)(type),
|
|
2221
2183
|
stakePoolId,
|
|
2222
2184
|
ratioNumerator,
|
|
2223
2185
|
ratioDenominator,
|
|
2224
|
-
feeRateNumerator,
|
|
2225
|
-
feeRateDenominator,
|
|
2226
2186
|
rewards,
|
|
2227
2187
|
claimedRewards
|
|
2228
2188
|
};
|