From 973dd925ff3029c7b00db63c77288c970e48a0cc Mon Sep 17 00:00:00 2001 From: Thomas Bruyelle Date: Fri, 30 Aug 2024 15:26:14 +0200 Subject: [PATCH 1/2] feat(gov): disable validator vote inheritance --- x/gov/keeper/tally.go | 2 ++ x/gov/keeper/tally_test.go | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/x/gov/keeper/tally.go b/x/gov/keeper/tally.go index 2d06d9451..830dfc314 100644 --- a/x/gov/keeper/tally.go +++ b/x/gov/keeper/tally.go @@ -73,6 +73,7 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal v1.Proposal) (passes bool, return false }) + /* DISABLED on AtomOne - Voting can only be done with your own stake // iterate over the validators again to tally their voting power for _, val := range currValidators { if len(val.Vote) == 0 { @@ -89,6 +90,7 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal v1.Proposal) (passes bool, } totalVotingPower = totalVotingPower.Add(votingPower) } + */ params := keeper.GetParams(ctx) tallyResults = v1.NewTallyResultFromMap(results) diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go index fad8ad21e..29cabb1c5 100644 --- a/x/gov/keeper/tally_test.go +++ b/x/gov/keeper/tally_test.go @@ -213,18 +213,18 @@ func TestTally(t *testing.T) { }, }, { - name: "validator votes yes, inherit delegations", + name: "validator votes yes, don't inherit delegations", setup: func(s *tallyFixture) { s.delegate(s.delAddrs[0], s.valAddrs[0], 2) s.delegate(s.delAddrs[1], s.valAddrs[0], 2) s.validatorVote(s.valAddrs[0], v1.VoteOption_VOTE_OPTION_NO) }, expectedPass: false, - expectedBurn: false, + expectedBurn: true, // burn because quorum not reached expectedTally: v1.TallyResult{ YesCount: "0", AbstainCount: "0", - NoCount: "5", + NoCount: "1", NoWithVetoCount: "0", }, }, From c35523aa05917ffd2317a405a4c3e5bc28da9759 Mon Sep 17 00:00:00 2001 From: Thomas Bruyelle Date: Tue, 10 Sep 2024 11:51:25 +0200 Subject: [PATCH 2/2] Update x/gov/keeper/tally_test.go Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com> --- x/gov/keeper/tally_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go index 29cabb1c5..15720db8d 100644 --- a/x/gov/keeper/tally_test.go +++ b/x/gov/keeper/tally_test.go @@ -213,7 +213,7 @@ func TestTally(t *testing.T) { }, }, { - name: "validator votes yes, don't inherit delegations", + name: "validator votes yes, doesn't inherit delegations", setup: func(s *tallyFixture) { s.delegate(s.delAddrs[0], s.valAddrs[0], 2) s.delegate(s.delAddrs[1], s.valAddrs[0], 2)