@gearbox-protocol/sdk 3.0.0-next.251 → 3.0.0-next.252

package/lib/gearboxRewards/api.d.ts

@@ -1,20 +1,24 @@
 import { NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
 import { Address, PublicClient, WalletClient } from "viem";
+import { PoolData } from "../core/pool";
 import { TokenData } from "../tokens/tokenData";
 export interface GearboxExtraMerkleLmReward {
+    pool: Address;
     poolToken: Address;
     rewardToken: Address;
     amount: bigint;
     type: "extraMerkle";
 }
 export interface GearboxStakedV3LmReward {
+    pool: Address;
     poolToken: Address;
     rewardToken: Address;
     amount: bigint;
     type: "stakedV3";
 }
 export interface GearboxMerkleV2LmReward {
-    poolToken?: Address;
+    pool?: undefined;
+    poolToken?: undefined;
     rewardToken: Address;
     amount: bigint;
     type: "merkleV2";
@@ -30,6 +34,7 @@ export interface MerkleDistributorInfo {
     }>;
 }
 export interface FarmInfo {
+    pool: Address;
     finished: bigint;
     duration: bigint;
     reward: bigint;
@@ -39,6 +44,7 @@ export interface FarmInfo {
 type PoolsWithExtraRewardsList = Record<NetworkType, Array<SupportedToken>>;
 type ReportHandler = (e: unknown, description?: string) => void;
 export interface GetLmRewardsInfoProps {
+    pools: Record<Address, PoolData>;
     currentTokenData: Record<SupportedToken, Address>;
     tokensList: Record<Address, TokenData>;
     provider: PublicClient;
@@ -50,6 +56,7 @@ export interface GetLmRewardsInfoProps {
 export interface GetLmRewardsProps {
     baseRewardPoolsInfo: Record<string, FarmInfo>;
     currentTokenData: Record<SupportedToken, Address>;
+    tokensList: Record<Address, TokenData>;
     account: Address;
     provider: PublicClient;
     airdropDistributorAddress: Address | undefined;
@@ -69,7 +76,7 @@ export interface ClaimLmRewardsV3Props {
     signer: WalletClient;
 }
 export declare class GearboxRewardsApi {
-    static getLmRewardsInfo({ currentTokenData, provider, multicallAddress, tokensList, poolsWithExtraRewards, network, reportError, }: GetLmRewardsInfoProps): Promise<{
+    static getLmRewardsInfo({ pools, currentTokenData, provider, multicallAddress, tokensList, poolsWithExtraRewards, network, reportError, }: GetLmRewardsInfoProps): Promise<{
         rewardPoolsInfo: Record<string, FarmInfo[]>;
         baseRewardPoolsInfo: Record<string, FarmInfo>;
         extraRewardPoolsInfo: Record<string, FarmInfo[]>;
@@ -78,7 +85,7 @@ export declare class GearboxRewardsApi {
     static getLmRewardsV2({ provider, account, currentTokenData, network, airdropDistributorAddress, }: GetLmRewardsProps): Promise<{
         rewards: GearboxLmReward[];
     }>;
-    static getLmRewardsV3({ baseRewardPoolsInfo, currentTokenData, provider, account, network, reportError, }: GetLmRewardsProps): Promise<{
+    static getLmRewardsV3({ baseRewardPoolsInfo, currentTokenData, tokensList, provider, account, network, reportError, }: GetLmRewardsProps): Promise<{
         rewards: (GearboxLmReward | GearboxLmReward[])[];
     }>;
     private static extractFulfilled;

package/lib/gearboxRewards/api.js

@@ -19,28 +19,44 @@ const DEFAULT_POOLS_WITH_EXTRA_REWARDS = {
     Base: [],
 };
 class GearboxRewardsApi {
-    static async getLmRewardsInfo({ currentTokenData, provider, multicallAddress, tokensList, poolsWithExtraRewards = DEFAULT_POOLS_WITH_EXTRA_REWARDS, network, reportError, }) {
-        const poolTokens = sdk_gov_1.TypedObjectUtils.entries(currentTokenData).filter(([symbol]) => (0, sdk_gov_1.isDieselStakedToken)(symbol));
-        const farmInfoCalls = poolTokens.map(([, address]) => ({
+    static async getLmRewardsInfo({ pools, currentTokenData, provider, multicallAddress, tokensList, poolsWithExtraRewards = DEFAULT_POOLS_WITH_EXTRA_REWARDS, network, reportError, }) {
+        const poolByStakedToken = Object.values(pools).reduce((acc, p) => {
+            p.stakedDieselToken.forEach(t => {
+                acc[t] = p.address;
+            });
+            p.stakedDieselToken_old.forEach(t => {
+                acc[t] = p.address;
+            });
+            return acc;
+        }, {});
+        const poolTokens = sdk_gov_1.TypedObjectUtils.keys(poolByStakedToken);
+        const chainId = sdk_gov_1.CHAINS[network];
+        const poolTokensWithExtraReward = (poolsWithExtraRewards[network] || []).filter(symbol => {
+            const addr = currentTokenData[symbol];
+            if (!addr) {
+                console.error(`Pool staked token not found ${symbol}`);
+                return false;
+            }
+            return true;
+        });
+        const farmInfoCalls = poolTokens.map(address => ({
             address,
             abi: types_1.iFarmingPoolAbi,
             functionName: "farmInfo",
             args: [],
         }));
-        const farmSupplyCalls = poolTokens.map(([, address]) => ({
+        const farmSupplyCalls = poolTokens.map(address => ({
             address,
             abi: types_1.iFarmingPoolAbi,
             functionName: "totalSupply",
             args: [],
         }));
-        const rewardTokenCalls = poolTokens.map(([, address]) => ({
+        const rewardTokenCalls = poolTokens.map(address => ({
             address,
             abi: POOL_REWARDS_ABI,
             functionName: "rewardsToken",
             args: [],
         }));
-        const tokenWithExtraRewards = poolsWithExtraRewards[network] || [];
-        const chainId = sdk_gov_1.CHAINS[network];
         const [mc, ...extra] = await Promise.allSettled([
             provider.multicall({
                 allowFailure: false,
@@ -57,12 +73,8 @@ class GearboxRewardsApi {
                     ...rewardTokenCalls,
                 ],
             }),
-            ...tokenWithExtraRewards.map(symbol => {
+            ...poolTokensWithExtraReward.map(symbol => {
                 const addr = currentTokenData[symbol];
-                if (!addr)
-                    return (async () => {
-                        (0, viem_1.getAddress)(addr);
-                    })();
                 return axios_1.default.get(merklAPI_1.MerkleXYZApi.getRewardsCampaignsUrl({
                     params: {
                         chainId,
@@ -81,7 +93,7 @@ class GearboxRewardsApi {
         const rewardTokenCallsEnd = farmSupplyCallsEnd + rewardTokenCalls.length;
         const rewardTokens = restMCResponse.slice(farmSupplyCallsEnd, rewardTokenCallsEnd);
         const extraRewards = extra.reduce((acc, r, index) => {
-            const stakedSymbol = tokenWithExtraRewards[index];
+            const stakedSymbol = poolTokensWithExtraReward[index];
             const safeResp = this.extractFulfilled(r, reportError, `merkleCampaign: ${stakedSymbol}`);
             const l = safeResp?.data.reduce((infos, d) => {
                 const started = (0, sdk_gov_1.toBigInt)(d.startTimestamp || 0);
@@ -92,6 +104,7 @@ class GearboxRewardsApi {
                     const reward = (0, formatter_1.toBN)(d.amountDecimal, rewardTokenData?.decimals || 18);
                     if (rewardTokenData && reward > 0) {
                         infos.push({
+                            pool: poolByStakedToken[currentTokenData[stakedSymbol]],
                             duration: (0, sdk_gov_1.toBigInt)(d.endTimestamp - d.startTimestamp),
                             finished,
                             reward,
@@ -107,12 +120,13 @@ class GearboxRewardsApi {
             }
             return acc;
         }, {});
-        const rewardPoolsInfo = poolTokens.reduce((acc, [, address], i) => {
+        const rewardPoolsInfo = poolTokens.reduce((acc, address, i) => {
             const currentInfo = farmInfo[i];
             const poolBaseRewardTokenLc = (rewardTokens[i] || "").toLowerCase();
             const tokenData = tokensList[poolBaseRewardTokenLc];
             if (tokenData) {
                 const baseReward = {
+                    pool: poolByStakedToken[address],
                     duration: BigInt(currentInfo.duration),
                     finished: BigInt(currentInfo.finished),
                     reward: currentInfo.reward,
@@ -126,7 +140,7 @@ class GearboxRewardsApi {
             }
             return acc;
         }, { base: {}, extra: {}, all: {} });
-        const rewardPoolsSupply = poolTokens.reduce((acc, [, address], i) => {
+        const rewardPoolsSupply = poolTokens.reduce((acc, address, i) => {
             acc[address] = farmSupply[i] || 0n;
             return acc;
         }, {});
@@ -159,7 +173,7 @@ class GearboxRewardsApi {
         ];
         return { rewards: rewards };
     }
-    static async getLmRewardsV3({ baseRewardPoolsInfo, currentTokenData, provider, account, network, reportError, }) {
+    static async getLmRewardsV3({ baseRewardPoolsInfo, currentTokenData, tokensList, provider, account, network, reportError, }) {
         const poolTokens = Object.keys(baseRewardPoolsInfo);
         const [gearboxLmResponse, merkleXYZLMResponse] = await Promise.allSettled([
             provider.multicall({
@@ -191,8 +205,9 @@ class GearboxRewardsApi {
             const rewardToken = k.toLowerCase();
             Object.entries(v.reasons).forEach(([key, reason]) => {
                 const poolToken = REWARD_KEYS_RECORD[key];
-                if (poolToken && sdk_gov_1.tokenSymbolByAddress[rewardToken]) {
+                if (poolToken && tokensList[rewardToken]) {
                     acc.push({
+                        pool: baseRewardPoolsInfo[poolToken].pool,
                         poolToken,
                         rewardToken,
                         amount: (0, sdk_gov_1.toBigInt)(reason.unclaimed || 0n),
@@ -204,6 +219,7 @@ class GearboxRewardsApi {
         }, []);
         const gearboxLmRewards = poolTokens.map((address, i) => {
             return {
+                pool: baseRewardPoolsInfo[address].pool,
                 poolToken: address,
                 rewardToken: currentTokenData[baseRewardPoolsInfo[address].symbol],
                 amount: gearboxLm[i] || 0n,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.251",
+  "version": "3.0.0-next.252",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",