@gearbox-protocol/sdk 3.0.2 → 3.0.3

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.
@@ -233,32 +233,32 @@ class GearboxRewardsApi {
233
233
  acc[p.dieselToken] = p.address;
234
234
  return acc;
235
235
  }, {});
236
- const extraRewards = (merkleXYZLm || []).reduce(
237
- (acc, chainRewards) => {
238
- chainRewards.rewards.forEach((reward) => {
239
- const rewardToken = reward.token.address.toLowerCase();
240
- reward.breakdowns.forEach((reason) => {
241
- const poolToken = ((reason.reason || "").split("_")[1] || "").toLowerCase();
242
- const pool = (baseRewardPoolsInfo[poolToken]?.pool || poolToken || "").toLowerCase();
243
- if (poolByItsToken[poolToken] && poolByItsToken[pool]) {
244
- const total = (0, import_utils.toBigInt)(reason.amount || 0);
245
- const claimed = (0, import_utils.toBigInt)(reason.claimed || 0);
246
- acc.push({
247
- pool,
248
- poolToken,
249
- rewardToken,
250
- rewardTokenSymbol: reward.token.symbol,
251
- rewardTokenDecimals: reward.token.decimals || 18,
252
- amount: import_math.BigIntMath.max(total - claimed, 0n),
253
- type: "extraMerkle"
254
- });
255
- }
256
- });
236
+ const extraRewards = (merkleXYZLm || []).reduce((acc, chainRewards) => {
237
+ chainRewards.rewards.forEach((reward) => {
238
+ const rewardToken = reward.token.address.toLowerCase();
239
+ reward.breakdowns.forEach((reason) => {
240
+ const poolToken = ((reason.reason || "").split("_").find((part) => part.startsWith("0x")) || "").toLowerCase();
241
+ const pool = poolByItsToken[poolToken];
242
+ const total = (0, import_utils.toBigInt)(reason.amount || 0);
243
+ const claimed = (0, import_utils.toBigInt)(reason.claimed || 0);
244
+ const claimable = import_math.BigIntMath.max(total - claimed, 0n);
245
+ const key = [pool, poolToken, rewardToken].join("_");
246
+ if (pool && claimable > 0n) {
247
+ const prevAmount = acc[key]?.amount || 0n;
248
+ acc[key] = {
249
+ pool,
250
+ poolToken,
251
+ rewardToken,
252
+ rewardTokenSymbol: reward.token.symbol,
253
+ rewardTokenDecimals: reward.token.decimals || 18,
254
+ amount: prevAmount + claimable,
255
+ type: "extraMerkle"
256
+ };
257
+ }
257
258
  });
258
- return acc;
259
- },
260
- []
261
- );
259
+ });
260
+ return acc;
261
+ }, {});
262
262
  const gearboxLmRewards = poolTokens.map((address, i) => {
263
263
  const info = baseRewardPoolsInfo[address];
264
264
  const rewardToken = currentTokenData[info.symbol];
@@ -285,7 +285,7 @@ class GearboxRewardsApi {
285
285
  { nonZero: [], zero: [] }
286
286
  );
287
287
  return {
288
- rewards: [...nonZero, ...extraRewards, zero]
288
+ rewards: [...nonZero, ...Object.values(extraRewards), zero]
289
289
  };
290
290
  }
291
291
  static extractFulfilled(r, reportError, description) {
@@ -200,32 +200,32 @@ class GearboxRewardsApi {
200
200
  acc[p.dieselToken] = p.address;
201
201
  return acc;
202
202
  }, {});
203
- const extraRewards = (merkleXYZLm || []).reduce(
204
- (acc, chainRewards) => {
205
- chainRewards.rewards.forEach((reward) => {
206
- const rewardToken = reward.token.address.toLowerCase();
207
- reward.breakdowns.forEach((reason) => {
208
- const poolToken = ((reason.reason || "").split("_")[1] || "").toLowerCase();
209
- const pool = (baseRewardPoolsInfo[poolToken]?.pool || poolToken || "").toLowerCase();
210
- if (poolByItsToken[poolToken] && poolByItsToken[pool]) {
211
- const total = toBigInt(reason.amount || 0);
212
- const claimed = toBigInt(reason.claimed || 0);
213
- acc.push({
214
- pool,
215
- poolToken,
216
- rewardToken,
217
- rewardTokenSymbol: reward.token.symbol,
218
- rewardTokenDecimals: reward.token.decimals || 18,
219
- amount: BigIntMath.max(total - claimed, 0n),
220
- type: "extraMerkle"
221
- });
222
- }
223
- });
203
+ const extraRewards = (merkleXYZLm || []).reduce((acc, chainRewards) => {
204
+ chainRewards.rewards.forEach((reward) => {
205
+ const rewardToken = reward.token.address.toLowerCase();
206
+ reward.breakdowns.forEach((reason) => {
207
+ const poolToken = ((reason.reason || "").split("_").find((part) => part.startsWith("0x")) || "").toLowerCase();
208
+ const pool = poolByItsToken[poolToken];
209
+ const total = toBigInt(reason.amount || 0);
210
+ const claimed = toBigInt(reason.claimed || 0);
211
+ const claimable = BigIntMath.max(total - claimed, 0n);
212
+ const key = [pool, poolToken, rewardToken].join("_");
213
+ if (pool && claimable > 0n) {
214
+ const prevAmount = acc[key]?.amount || 0n;
215
+ acc[key] = {
216
+ pool,
217
+ poolToken,
218
+ rewardToken,
219
+ rewardTokenSymbol: reward.token.symbol,
220
+ rewardTokenDecimals: reward.token.decimals || 18,
221
+ amount: prevAmount + claimable,
222
+ type: "extraMerkle"
223
+ };
224
+ }
224
225
  });
225
- return acc;
226
- },
227
- []
228
- );
226
+ });
227
+ return acc;
228
+ }, {});
229
229
  const gearboxLmRewards = poolTokens.map((address, i) => {
230
230
  const info = baseRewardPoolsInfo[address];
231
231
  const rewardToken = currentTokenData[info.symbol];
@@ -252,7 +252,7 @@ class GearboxRewardsApi {
252
252
  { nonZero: [], zero: [] }
253
253
  );
254
254
  return {
255
- rewards: [...nonZero, ...extraRewards, zero]
255
+ rewards: [...nonZero, ...Object.values(extraRewards), zero]
256
256
  };
257
257
  }
258
258
  static extractFulfilled(r, reportError, description) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gearbox-protocol/sdk",
3
- "version": "3.0.2",
3
+ "version": "3.0.3",
4
4
  "description": "Gearbox SDK",
5
5
  "license": "MIT",
6
6
  "main": "./dist/cjs/sdk/index.js",