Skip to content
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

Fix,Aura,HandlingError + Rewards map #1170

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Fix,Aura,HandlingError + Rewards map #1170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions src/adapters/aura/common/extraReward.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { Balance, BalancesContext, Contract } from '@lib/adapter'
import { mapSuccessFilter } from '@lib/array'
import { multicall } from '@lib/multicall'

const abi = {
Expand All @@ -24,12 +23,12 @@ type AuraBalance = Balance & {
}

export const getExtraRewardsBalances = async (ctx: BalancesContext, poolBalance: AuraBalance[]): Promise<Balance[]> => {
const balanceWithStandardRewards: Balance[] = poolBalance.filter((poolBalance) => {
return !poolBalance.rewards || poolBalance.rewarders.length === 0
const balanceWithStandardRewards: AuraBalance[] = poolBalance.filter((poolBalance) => {
return !poolBalance.rewards || (poolBalance.rewarders && poolBalance.rewarders.length === 0)
})

const balanceWithExtraRewards: Balance[] = poolBalance.filter((poolBalance) => {
return poolBalance.rewards && poolBalance.rewarders.length > 0
const balanceWithExtraRewards: AuraBalance[] = poolBalance.filter((poolBalance) => {
return poolBalance.rewards && poolBalance.rewarders && poolBalance.rewarders.length > 0
})

const extraRewardsBalancesRes = await multicall({
Expand All @@ -42,16 +41,17 @@ export const getExtraRewardsBalances = async (ctx: BalancesContext, poolBalance:
abi: abi.earned,
})

let resultIndex = 0
balanceWithExtraRewards.forEach((pool) => {
const rewards = pool.rewards as Contract[]
const extraRewards = rewards.slice(1)

const extraRewardsBalances = mapSuccessFilter(extraRewardsBalancesRes, (res, index) => {
return { ...extraRewards[index], amount: res.output }
const extraRewardsBalances = pool.rewarders.map((_, rewarderIndex) => {
const res = extraRewardsBalancesRes[resultIndex]
resultIndex++
return { ...extraRewards[rewarderIndex], amount: res.output }
})

pool.rewards = [pool.rewards![0], ...extraRewardsBalances]
pool.rewards = [pool.rewards![0], ...(extraRewardsBalances as Balance[])]
})

return [...balanceWithExtraRewards, ...balanceWithStandardRewards]
return [...balanceWithStandardRewards, ...balanceWithExtraRewards]
}
Loading