Skip to content

Fix negative value on node collector #1110

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

Open
0xfornax wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −10
Open

Fix negative value on node collector #1110

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
31 changes: 21 additions & 10 deletions rocketpool/node/collectors/node-collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,26 +650,37 @@ func (collector *NodeCollector) Collect(channel chan<- prometheus.Metric) {
megapoolPendingRewardsPDAO = eth.WeiToEth(mpPendingRewards.ProtocolDAORewards)
megapoolPendingRewardsReth = eth.WeiToEth(mpPendingRewards.RethRewards)

// Iterate over the megapool pubkeys
currentEpoch := state.BeaconConfig.SlotToEpoch(state.BeaconSlotNumber)
totalEffectiveBeaconBalance := big.NewInt(0)
for _, pubkey := range megapoolPubkeys {
info, infoExists := state.MegapoolValidatorInfo[pubkey]
if !infoExists {
continue
}
if !info.ValidatorInfo.Staked || info.ValidatorInfo.Exited || info.ValidatorInfo.Exiting {
continue
}
validator, exists := state.MegapoolValidatorDetails[pubkey]
if !exists {
continue
}
if validator.Balance > uint64(0) {
megapoolBeaconBalanceTotal.Add(megapoolBeaconBalanceTotal, eth.GweiToWei(float64(validator.Balance)))
// Skip validators that haven't activated yet
if currentEpoch <= validator.ActivationEpoch {
continue
}
megapoolBeaconBalanceTotal.Add(megapoolBeaconBalanceTotal, eth.GweiToWei(float64(validator.Balance)))
totalEffectiveBeaconBalance.Add(totalEffectiveBeaconBalance, eth.GweiToWei(float64(validator.EffectiveBalance)))
}

megapoolBeaconBalance = eth.WeiToEth(megapoolBeaconBalanceTotal)
// rewards = beacon balance total - node bond - user capital
rewardsBeaconBalance := big.NewInt(0).Sub(megapoolBeaconBalanceTotal, megapoolDetails.NodeBond)
rewardsBeaconBalance = big.NewInt(0).Sub(rewardsBeaconBalance, megapoolDetails.UserCapital)
rewardsSplit, err := mp.CalculateRewards(rewardsBeaconBalance, nil)
if err != nil {
return fmt.Errorf("Error calculating megapool rewards: %w", err)
if megapoolBeaconBalanceTotal.Cmp(totalEffectiveBeaconBalance) > 0 {
toBeSkimmed := big.NewInt(0).Sub(megapoolBeaconBalanceTotal, totalEffectiveBeaconBalance)
rewardsSplit, err := mp.CalculateRewards(toBeSkimmed, nil)
if err != nil {
return fmt.Errorf("Error calculating megapool rewards: %w", err)
}
nodeShareofBeaconBalance = eth.WeiToEth(big.NewInt(0).Add(rewardsSplit.NodeRewards, megapoolDetails.NodeBond))
}
nodeShareofBeaconBalance = eth.WeiToEth(rewardsSplit.NodeRewards.Add(rewardsSplit.NodeRewards, megapoolDetails.NodeBond))

return nil
})
Expand Down
Loading