Skip to content

fix: pool apy #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
essserrr merged 2 commits into from
Feb 1, 2025
Merged

fix: pool apy #330

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa91019
fix: pool rewards info returns extra info for diesel tokens
essserrr Feb 1, 2025
2130b3a
fix: remove usused prop
essserrr Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 82 additions & 49 deletions src/gearboxRewards/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,12 @@ export interface FarmInfo {
symbol: SupportedToken;
}

type PoolsWithExtraRewardsList = Record<NetworkType, Array<SupportedToken>>;
type PoolsWithExtraRewardsList = Record<NetworkType, Array<Address>>;

const DEFAULT_POOLS_WITH_EXTRA_REWARDS: PoolsWithExtraRewardsList = {
Mainnet: ["dtBTCV3"],
Mainnet: [
"0x7354EC6E852108411e681D13E11185c3a2567981", // dtBTCV3
],
Arbitrum: [],
Optimism: [],
Base: [],
Expand All @@ -110,7 +112,6 @@ type ReportHandler = (e: unknown, description?: string) => void;

export interface GetLmRewardsInfoProps {
pools: Record<Address, PoolData>;
currentTokenData: Record<SupportedToken, Address>;
tokensList: Record<Address, TokenData>;
provider: PublicClient;

Expand Down Expand Up @@ -151,7 +152,6 @@ export interface ClaimLmRewardsV3Props {
export class GearboxRewardsApi {
static async getLmRewardsInfo({
pools,
currentTokenData,
provider,
multicallAddress,
tokensList,
Expand All @@ -160,7 +160,7 @@ export class GearboxRewardsApi {
network,
reportError,
}: GetLmRewardsInfoProps) {
const poolByStakedToken = Object.values(pools).reduce<
const poolByStakedDiesel = Object.values(pools).reduce<
Record<Address, Address>
>((acc, p) => {
p.stakedDieselToken.forEach(t => {
Expand All @@ -173,36 +173,48 @@ export class GearboxRewardsApi {
return acc;
}, {});

const poolTokens = TypedObjectUtils.keys(poolByStakedToken);
const poolByDiesel = Object.values(pools).reduce<Record<Address, Address>>(
(acc, p) => {
acc[p.dieselToken] = p.address;

return acc;
},
{},
);

const poolByItsToken = { ...poolByStakedDiesel, ...poolByDiesel };

const poolStakedTokens = TypedObjectUtils.keys(poolByStakedDiesel);
const allPoolTokens = TypedObjectUtils.keys(poolByItsToken);

const chainId = CHAINS[network];
const poolTokensWithExtraReward = (
poolsWithExtraRewards[network] || []
).filter(symbol => {
const addr = currentTokenData[symbol];
).filter(p => {
const token = tokensList[p.toLowerCase() as Address];

if (!addr) {
console.error(`Pool staked token not found ${symbol}`);
if (!token) {
console.error(`Pool token not found ${p}`);
return false;
}
return true;
});

const farmInfoCalls = poolTokens.map(address => ({
const farmInfoCalls = poolStakedTokens.map(address => ({
address,
abi: iFarmingPoolAbi,
functionName: "farmInfo",
args: [],
}));

const farmSupplyCalls = poolTokens.map(address => ({
const farmSupplyCalls = allPoolTokens.map(address => ({
address,
abi: iFarmingPoolAbi,
functionName: "totalSupply",
args: [],
}));

const rewardTokenCalls = poolTokens.map(address => ({
const rewardTokenCalls = poolStakedTokens.map(address => ({
address,
abi: POOL_REWARDS_ABI,
functionName: "rewardsToken",
Expand All @@ -227,14 +239,12 @@ export class GearboxRewardsApi {
],
}),

...poolTokensWithExtraReward.map(symbol => {
const addr = currentTokenData[symbol];

...poolTokensWithExtraReward.map(t => {
return axios.get<MerkleXYZRewardsCampaignsResponse>(
MerkleXYZApi.getRewardsCampaignsUrl({
params: {
chainId,
mainParameter: getAddress(addr),
mainParameter: getAddress(t),
},
}),
);
Expand Down Expand Up @@ -264,14 +274,38 @@ export class GearboxRewardsApi {
rewardTokenCallsEnd,
) as Array<Address>;

const infoByPool = poolStakedTokens.reduce<Record<Address, FarmInfoOutput>>(
(acc, p, index) => {
const info = farmInfo[index];

if (info) acc[p] = info;

return acc;
},
{},
);

const rewardTokenPool = poolStakedTokens.reduce<Record<Address, Address>>(
(acc, p, index) => {
const token = rewardTokens[index];

if (token) {
acc[p] = token.toLowerCase() as Address;
}

return acc;
},
{},
);

const extraRewards = extra.reduce<Record<string, Array<FarmInfo>>>(
(acc, r, index) => {
const stakedSymbol = poolTokensWithExtraReward[index];
const p = poolTokensWithExtraReward[index].toLowerCase() as Address;

const safeResp = this.extractFulfilled(
r,
reportError,
`merkleCampaign: ${stakedSymbol}`,
`merkleCampaign: ${p}`,
);

const l = safeResp?.data.reduce<Array<FarmInfo>>((infos, d) => {
Expand All @@ -290,7 +324,7 @@ export class GearboxRewardsApi {

if (rewardTokenData && reward > 0) {
infos.push({
pool: poolByStakedToken[currentTokenData[stakedSymbol]],
pool: poolByItsToken[p],
duration: toBigInt(d.endTimestamp - d.startTimestamp),
finished,
reward,
Expand All @@ -304,49 +338,48 @@ export class GearboxRewardsApi {
}, []);

if (l) {
acc[currentTokenData[stakedSymbol]] = l;
acc[p] = l;
}

return acc;
},
{},
);

const rewardPoolsInfo = poolTokens.reduce<{
const stakedTokenRewards = allPoolTokens.reduce<{
base: Record<string, FarmInfo>;
extra: Record<string, Array<FarmInfo>>;
all: Record<string, Array<FarmInfo>>;
}>(
(acc, address, i) => {
const currentInfo = farmInfo[i];
const poolBaseRewardTokenLc = (
rewardTokens[i] || ""
).toLowerCase() as Address;
const tokenData = tokensList[poolBaseRewardTokenLc];

if (tokenData) {
const baseReward: FarmInfo = {
pool: poolByStakedToken[address],
duration: BigInt(currentInfo.duration),
finished: BigInt(currentInfo.finished),
reward: currentInfo.reward,
balance: currentInfo.balance,
symbol: tokenData.symbol,
};

const extra = extraRewards[address] || [];

acc.base[address] = baseReward;
acc.extra[address] = extra;
acc.all[address] = [baseReward, ...extra];
}
(acc, pool) => {
const info = infoByPool[pool];
const token = rewardTokenPool[pool];
const tokenData = tokensList[token];

const baseReward: FarmInfo | undefined =
info && tokenData
? {
pool: poolByItsToken[pool],
duration: BigInt(info.duration),
finished: BigInt(info.finished),
reward: info.reward,
balance: info.balance,
symbol: tokenData.symbol,
}
: undefined;

const extra = extraRewards[pool] || [];

if (baseReward) acc.base[pool] = baseReward;
acc.extra[pool] = extra;
acc.all[pool] = [...(baseReward ? [baseReward] : []), ...extra];

return acc;
},
{ base: {}, extra: {}, all: {} },
);

const rewardPoolsSupply = poolTokens.reduce<Record<string, bigint>>(
const rewardPoolsSupply = allPoolTokens.reduce<Record<string, bigint>>(
(acc, address, i) => {
acc[address] = farmSupply[i] || 0n;

Expand All @@ -356,9 +389,9 @@ export class GearboxRewardsApi {
);

return {
rewardPoolsInfo: rewardPoolsInfo.all,
baseRewardPoolsInfo: rewardPoolsInfo.base,
extraRewardPoolsInfo: rewardPoolsInfo.extra,
rewardPoolsInfo: stakedTokenRewards.all,
baseRewardPoolsInfo: stakedTokenRewards.base,
extraRewardPoolsInfo: stakedTokenRewards.extra,
rewardPoolsSupply,
};
}
Expand Down