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(#patch); trader-joe; fix div by zero indexing error #2436

Merged
merged 3 commits into from
Dec 25, 2023
Merged

fix(#patch); trader-joe; fix div by zero indexing error #2436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ea8d92
fix div by zero
dhruv-chauhan Dec 5, 2023
925a3ee
Merge branch 'master' into trader-joe-indexing-err
dhruv-chauhan Dec 5, 2023
b882f19
Merge branch 'master' into trader-joe-indexing-err
dhruv-chauhan Dec 25, 2023
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
2 changes: 1 addition & 1 deletion deployment/deployment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5330,7 +5330,7 @@
"status": "prod",
"versions": {
"schema": "1.3.2",
"subgraph": "1.2.1",
"subgraph": "1.3.0",
"methodology": "1.0.0"
},
"files": {
Expand Down
2 changes: 2 additions & 0 deletions subgraphs/uniswap-forks/protocols/trader-joe/config/templates/trader.joe.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ description: ...
graft:
base: {{subgraphId}} # Subgraph ID of base subgraph
block: {{graftStartBlock}} # Block number
features:
- grafting
{{/graftEnabled}}
dataSources:
- kind: ethereum
Expand Down
13 changes: 8 additions & 5 deletions subgraphs/uniswap-forks/protocols/trader-joe/src/common/handlers/handleRewardV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
import {
convertTokenToDecimal,
roundToWholeNumber,
safeDiv,
} from "../../../../../src/common/utils/utils";
import { getPoolRewardsWithBonus } from "./handleRewarder";

Expand Down Expand Up @@ -46,11 +47,13 @@ export function updateMasterChef(

// Calculate Reward Emission per second to a specific pool
// Pools are allocated based on their fraction of the total allocation times the rewards emitted per second
const rewardAmountPerInterval = masterChefV2.adjustedRewardTokenRate
.times(masterChefV2Pool.poolAllocPoint)
.div(masterChefV2.totalAllocPoint);
const rewardAmountPerIntervalBigDecimal = BigDecimal.fromString(
rewardAmountPerInterval.toString()
const rewardAmountPerIntervalBigDecimal = safeDiv(
new BigDecimal(
masterChefV2.adjustedRewardTokenRate.times(
masterChefV2Pool.poolAllocPoint
)
),
new BigDecimal(masterChefV2.totalAllocPoint)
dhruv-chauhan marked this conversation as resolved.
Show resolved Hide resolved
);

// Based on the emissions rate for the pool, calculate the rewards per day for the pool.
Expand Down
13 changes: 8 additions & 5 deletions subgraphs/uniswap-forks/protocols/trader-joe/src/common/handlers/handleRewardV3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import {
convertTokenToDecimal,
roundToWholeNumber,
safeDiv,
} from "../../../../../src/common/utils/utils";
import { getPoolRewardsWithBonus } from "./handleRewarder";

Expand Down Expand Up @@ -57,11 +58,13 @@ export function updateMasterChef(

// Calculate Reward Emission per second to a specific pool
// Pools are allocated based on their fraction of the total allocation times the rewards emitted per second
const rewardAmountPerInterval = masterChefV3.adjustedRewardTokenRate
.times(masterChefV3Pool.poolAllocPoint)
.div(masterChefV3.totalAllocPoint);
const rewardAmountPerIntervalBigDecimal = BigDecimal.fromString(
rewardAmountPerInterval.toString()
const rewardAmountPerIntervalBigDecimal = safeDiv(
new BigDecimal(
masterChefV3.adjustedRewardTokenRate.times(
masterChefV3Pool.poolAllocPoint
)
),
new BigDecimal(masterChefV3.totalAllocPoint)
);

// Based on the emissions rate for the pool, calculate the rewards per day for the pool.
Expand Down
Loading