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(oracle): correctly handle misscount #2192

Merged
merged 2 commits into from
Feb 4, 2025
Merged

fix(oracle): correctly handle misscount #2192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b51e8d3
fix(oracle): correctly handle misscount
expertdicer Feb 3, 2025
c6ee9d7
Update changelog
expertdicer Feb 3, 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
7 changes: 6 additions & 1 deletion x/oracle/keeper/ballot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ func Tally(
rewardSpread = standardDeviation
}

missedValidators := make(map[string]bool)
for _, v := range votes {
// Filter votes winners & abstain voters
isInsideSpread := v.ExchangeRate.GTE(weightedMedian.Sub(rewardSpread)) &&
Expand All @@ -173,7 +174,11 @@ func Tally(
validatorPerformance.RewardWeight += v.Power
validatorPerformance.WinCount++
case isMiss:
validatorPerformance.MissCount++
// Only count a miss once per validator
if !missedValidators[v.Voter.String()] {
validatorPerformance.MissCount++
missedValidators[v.Voter.String()] = true
}
case isAbstainVote:
validatorPerformance.AbstainCount++
}
Expand Down
37 changes: 37 additions & 0 deletions x/oracle/keeper/ballot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,43 @@ func TestFuzzTally(t *testing.T) {
})
}

func TestTallyMissCount(t *testing.T) {
fixture := CreateTestFixture(t)

power := int64(100)
amt := sdk.TokensFromConsensusPower(power, sdk.DefaultPowerReduction)
sh := stakingkeeper.NewMsgServerImpl(&fixture.StakingKeeper)

// Validator created
_, err := sh.CreateValidator(fixture.Ctx, NewTestMsgCreateValidator(ValAddrs[0], ValPubKeys[0], amt))
require.NoError(t, err)
_, err = sh.CreateValidator(fixture.Ctx, NewTestMsgCreateValidator(ValAddrs[1], ValPubKeys[1], amt))
require.NoError(t, err)
_, err = sh.CreateValidator(fixture.Ctx, NewTestMsgCreateValidator(ValAddrs[2], ValPubKeys[2], amt))
require.NoError(t, err)
staking.EndBlocker(fixture.Ctx, &fixture.StakingKeeper)

pairBtc := asset.Registry.Pair(denoms.BTC, denoms.NUSD)
pairEth := asset.Registry.Pair(denoms.ETH, denoms.NUSD)
// Having validator2 to have 2 votes outside the spread
btcVotes := types.ExchangeRateVotes{
{Pair: pairBtc, ExchangeRate: math.LegacyNewDec(17), Voter: ValAddrs[0], Power: power},
{Pair: pairBtc, ExchangeRate: math.LegacyNewDec(10), Voter: ValAddrs[1], Power: power},
{Pair: pairBtc, ExchangeRate: math.LegacyNewDec(20000), Voter: ValAddrs[2], Power: power},
}
ethVotes := types.ExchangeRateVotes{
{Pair: pairEth, ExchangeRate: math.LegacyNewDec(1_000), Voter: ValAddrs[0], Power: power},
{Pair: pairEth, ExchangeRate: math.LegacyNewDec(1_300), Voter: ValAddrs[1], Power: power},
{Pair: pairEth, ExchangeRate: math.LegacyNewDec(1), Voter: ValAddrs[2], Power: power},
}

allVotes := append(btcVotes, ethVotes...)

claimMap := types.ValidatorPerformances{}
Tally(allVotes, math.LegacyNewDec(10), claimMap)
assert.Equal(t, int64(1), claimMap[ValAddrs[2].String()].MissCount)
}

type VoteMap = map[asset.Pair]types.ExchangeRateVotes

func TestRemoveInvalidBallots(t *testing.T) {
Expand Down
Loading