Swap StakingPower and VotingPower, and modify from StakingPower to VotingWeight #449

tnasu · 2022-07-27T11:32:50Z

Description

Keeping tendermint's interface(abci, rpc, etc.) swap StakingPower and VotingPower.
And modify from StakingPower to VotingWeight

Here is the summary of the usage:

	Tendermint	Ostracon (Before)	Ostracon (After)
Proposer	One of ValidatorSet	One of ValidatorSet	One of ValidatorSet
Select a Proposer by	Validator.ProposerPriority	Validator.StakingPower	Validator.VotingPower
Voters	ValidatorSet	VoterSet (Part of ValidatorSet)	VoterSet (Part of ValidatorSet)
Select VoterSet by	-	Validator.StakingPower	Validator.VotingPower
Voting	Validator.VotingPower	Validator.VotingPower	*Validator.StakingPower* => *Validator.VotingWeight*

DuplicateVoteEvidence TotalVotingPower	ValidatorSet.TotalVotingPower	VoterSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*
DuplicateVoteEvidence ValidatorPower	Validator.VotingPower	Validator.StakingPower	Validator.VotingPower
DuplicateVoteEvidence added Power	-	Validator.VotingPower	*Validator.StakingPower* => *Validator.VotingWeight*
LightClientAttackEvidence TotalVotingPower	ValidatorSet.TotalVotingPower	VoterSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*

ValidatorSet TotalXxxPower	ValidatorSet.TotalVotingPower	VoterSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*
Validator VotingPower	Validator.VotingPower	Validator.StakingPower	Validator.VotingPower
Validator added Power	-	Validator.VotingPower	*Validator.StakingPower* => *Validator.VotingWeight*
VoterSet TotalXxxPower	-	VoterSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*

Proto Type DuplicateVoteEvidence TotalVotingPower	ValidatorSet.TotalVotingPower	VoterSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*
Proto Type DuplicateVoteEvidence Power	Validator.VotingPower	Validator.StakingPower	Validator.VotingPower
Proto Type DuplicateVoteEvidence added Power	-	Validator.VotingPower	*Validator.StakingPower* => *Validator.VotingWeight*
Proto Type LightClientAttackEvidence TotalVotingPower	ValidatorSet.TotalVotingPower	VoterSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*

Proto Type ValidatorSet TotalXxxPower	ValidatorSet.TotalVotingPower	VoterSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*
Proto Type Validator Power	Validator.VotingPower	Validator.StakingPower	Validator.VotingPower
Proto Type Validator added Power	-	Validator.VotingPower	*Validator.StakingPower* => *Validator.VotingWeight*
Proto Type SimpleValidator Power	Validator.VotingPower	Validator.StakingPower	Validator.VotingPower
Proto Type VoterSet TotalXxxPower	-	VoterSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*

Proto ABCI Validator Power	Validator.VotingPower	Validator.StakingPower	Validator.VotingPower
Proto ABCI Validator added Power	-	Validator.VotingPower	*Validator.StakingPower* => *Validator.VotingWeight*
Proto ABCI ValidatorUpdate Power	Validator.VotingPower	Validator.StakingPower	Validator.VotingPower
Proto ABCI Evidence TotalVotingPower	ValidatorSet.TotalVotingPower	VoteSet.TotalVotingPower	*VoterSet.TotalStakingPower* => *VoterSet.TotalVotingWeight*

RPC ValidatorInfo VotingPower	RPC ValidatorInfo VotingPower == Validator.VotingPower	RPC ValidatorInfo StakingPower == Validator.StakingPower	RPC ValidatorInfo VotingPower == Validator.VotingPower

Tendermint.Validator.VotingPower ==
- Ostracon(Before).Validator.StakingPower == Ostracon(After).Validator.VotingPower
Tendermint.Validator.VotingPower !=
- Ostracon(Before).Validator.VotingPower == Ostracon(After).Validator.StakingPower == Caluculated power value
Tendermint.Evidence.TotalVotingPower == Tendermint.ValidatorSet.TotalVotingPower !=
- Ostracon(Before).VoterSet.TotalVotingPower == Ostracon(After).VoterSet.TotalStakingPower == Caluculated power value

Relates:

codecov · 2022-07-27T18:40:10Z

Codecov Report

Merging #449 (5673e41) into main (81b4fb7) will increase coverage by 0.01%.
The diff coverage is 92.45%.

@@            Coverage Diff             @@
##             main     #449      +/-   ##
==========================================
+ Coverage   65.37%   65.38%   +0.01%     
==========================================
  Files         278      278              
  Lines       37920    37948      +28     
==========================================
+ Hits        24791    24814      +23     
- Misses      11316    11319       +3     
- Partials     1813     1815       +2

Impacted Files	Coverage Δ
light/errors.go	`75.00% <ø> (ø)`
rpc/core/consensus.go	`0.00% <0.00%> (ø)`
rpc/core/status.go	`0.00% <0.00%> (ø)`
rpc/core/types/responses.go	`35.71% <ø> (ø)`
types/vote_set.go	`49.75% <80.00%> (ø)`
evidence/verify.go	`78.84% <81.81%> (ø)`
types/validator.go	`82.90% <92.30%> (ø)`
types/voter_set.go	`85.62% <94.00%> (+1.44%)`	⬆️
consensus/state.go	`73.44% <100.00%> (+0.11%)`	⬆️
light/detector.go	`68.29% <100.00%> (ø)`
... and 24 more

tnasu · 2022-07-27T19:46:04Z

I'd like to change the name of Validator.StakingPower since it's a bad name.

tnasu · 2022-07-28T03:12:50Z

I'd like to change the name of Validator.StakingPower since it's a bad name.

I decide to use VotingWeight instead of StakingPower

zemyblue · 2022-07-28T09:04:48Z

VotingPower: Voting power based on deposited tokens of validator.
VotingWeight: Randomly allocated voting power when elected by VoterSet.

@tnasu, Is it right?

tnasu · 2022-07-28T10:12:45Z

@zemyblue Right.

Randomly allocated voting power when elected by VoterSet.

To explain it a little more carefully, the randomly selected Validator is the VoterSet from ValidatorSet, and when it is selected, the VotingWeight is calculated at the selection by using the VotingPower that the Validator has and the winning-point as a coefficient.

abci/cmd/abci-cli/abci-cli.go

torao

LGTM

…otingPower` and `StakingPower` with `VotingWeight`. Finschia/ostracon#449 Signed-off-by: zemyblue <[email protected]>

types/voter_set_test.go

…ngPower` and `VotingPower` with `VotingWeight`. (#614) * feat: apply the ostracon's change that replace `StakingPower` with `VotingPower` and `StakingPower` with `VotingWeight`. Finschia/ostracon#449 Signed-off-by: zemyblue <[email protected]> * docs: update swagger.yaml and statik.go Signed-off-by: zemyblue <[email protected]> * docs: update changelog Signed-off-by: zemyblue <[email protected]> * chore: update latest changes of ostracon. Signed-off-by: zemyblue <[email protected]> * chore: update latest changes of ostracon. Signed-off-by: zemyblue <[email protected]> * Update third_party/proto/ostracon/types/evidence.proto Co-authored-by: Sujong Lee <[email protected]> Co-authored-by: Sujong Lee <[email protected]>

…ngPower` and `VotingPower` with `VotingWeight`. (Finschia#614) * feat: apply the ostracon's change that replace `StakingPower` with `VotingPower` and `StakingPower` with `VotingWeight`. Finschia/ostracon#449 Signed-off-by: zemyblue <[email protected]> * docs: update swagger.yaml and statik.go Signed-off-by: zemyblue <[email protected]> * docs: update changelog Signed-off-by: zemyblue <[email protected]> * chore: update latest changes of ostracon. Signed-off-by: zemyblue <[email protected]> * chore: update latest changes of ostracon. Signed-off-by: zemyblue <[email protected]> * Update third_party/proto/ostracon/types/evidence.proto Co-authored-by: Sujong Lee <[email protected]> Co-authored-by: Sujong Lee <[email protected]>

tnasu force-pushed the main-swap branch from 18ce797 to fa0b611 Compare July 27, 2022 11:33

tnasu self-assigned this Jul 27, 2022

tnasu force-pushed the main-swap branch from 1fa1cfe to 90bffe2 Compare July 27, 2022 19:04

Swap StakingPower and VotingPower

42f6c1f

tnasu force-pushed the main-swap branch from 90bffe2 to 42f6c1f Compare July 27, 2022 19:47

tnasu changed the title ~~Swap StakingPower and VotingPower~~ Swap StakingPower and VotingPower, and modify from StakingPower to VotingWeight Jul 28, 2022

tnasu force-pushed the main-swap branch 2 times, most recently from 678f194 to d57e0f5 Compare July 28, 2022 08:32

Modify from StakingPower to VotingWeight

3c08605

tnasu force-pushed the main-swap branch from d57e0f5 to 3c08605 Compare July 28, 2022 08:38

tnasu marked this pull request as ready for review July 28, 2022 08:53

tnasu requested review from Kynea0b and torao as code owners July 28, 2022 08:53

tnasu requested a review from zemyblue July 28, 2022 08:53

zemyblue reviewed Jul 28, 2022

View reviewed changes

abci/cmd/abci-cli/abci-cli.go Outdated Show resolved Hide resolved

torao previously approved these changes Jul 28, 2022

View reviewed changes

torao added the C: enhancement Classification: New feature or its request, or improvement in maintainability of code label Jul 28, 2022

(fixup) flagVotingPower123456

feba108

tnasu dismissed torao’s stale review via feba108 July 28, 2022 11:18

zemyblue added a commit to zemyblue/finschia-sdk that referenced this pull request Jul 28, 2022

feat: apply the ostracon's change that replace StakingPower with `V…

9b22188

…otingPower` and `StakingPower` with `VotingWeight`. Finschia/ostracon#449 Signed-off-by: zemyblue <[email protected]>

zemyblue mentioned this pull request Jul 28, 2022

feat: apply Ostracon's changes that replace StakingPower with VotingPower and VotingPower with VotingWeight. Finschia/finschia-sdk#614

Merged

5 tasks

zemyblue previously approved these changes Jul 28, 2022

View reviewed changes

torao previously approved these changes Jul 29, 2022

View reviewed changes

Kynea0b previously approved these changes Jul 29, 2022

View reviewed changes

tnasu commented Jul 29, 2022

View reviewed changes

types/voter_set_test.go Outdated Show resolved Hide resolved

types/voter_set_test.go Outdated Show resolved Hide resolved

types/voter_set_test.go Outdated Show resolved Hide resolved

(fixup) Rollback the wrong changes from VotingPower to VotingWeight

749fce7

tnasu dismissed stale reviews from Kynea0b, torao, and zemyblue via 749fce7 July 29, 2022 03:16

(fixup) voting weight to voting power

5673e41

Kynea0b approved these changes Jul 29, 2022

View reviewed changes

torao approved these changes Jul 29, 2022

View reviewed changes

tnasu merged commit 2231684 into Finschia:main Jul 29, 2022

tnasu deleted the main-swap branch August 3, 2022 02:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swap StakingPower and VotingPower, and modify from StakingPower to VotingWeight #449

Swap StakingPower and VotingPower, and modify from StakingPower to VotingWeight #449

tnasu commented Jul 27, 2022 •

edited

Loading

codecov bot commented Jul 27, 2022 •

edited

Loading

tnasu commented Jul 27, 2022

tnasu commented Jul 28, 2022

zemyblue commented Jul 28, 2022

tnasu commented Jul 28, 2022

torao left a comment

Swap StakingPower and VotingPower, and modify from StakingPower to VotingWeight #449

Swap StakingPower and VotingPower, and modify from StakingPower to VotingWeight #449

Conversation

tnasu commented Jul 27, 2022 • edited Loading

Description

codecov bot commented Jul 27, 2022 • edited Loading

Codecov Report

tnasu commented Jul 27, 2022

tnasu commented Jul 28, 2022

zemyblue commented Jul 28, 2022

tnasu commented Jul 28, 2022

torao left a comment

Choose a reason for hiding this comment

tnasu commented Jul 27, 2022 •

edited

Loading

codecov bot commented Jul 27, 2022 •

edited

Loading