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

R4R: Allow the undelegation of more coins than were delegated; More validity checks. #3717

Merged
merged 15 commits into from
Feb 27, 2019
Merged

R4R: Allow the undelegation of more coins than were delegated; More validity checks. #3717

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
da12165
Add altered random number generation
cwgoes Feb 22, 2019
b7d1d69
WIP Allow undelegation of more coins than delegated; Add more validit…
jaekwon Feb 22, 2019
2f9a0da
Fix tests
jaekwon Feb 22, 2019
c938039
Revert "Fix tests"
jaekwon Feb 22, 2019
066e11f
fix tests
jaekwon Feb 22, 2019
f7c3cc6
Add comment on new behavior
jaekwon Feb 22, 2019
637902d
Call AddCoins conditionally
jaekwon Feb 22, 2019
71774b8
Do not panic with unknown evidence
jaekwon Feb 23, 2019
d9b5071
update comments from bez's branch
jaekwon Feb 23, 2019
0c0b142
fixing more sim issues
jaekwon Feb 24, 2019
aca59ac
Ignore unknown proposer
jaekwon Feb 24, 2019
002e49f
Add bias to return 0 to RandomAmount
jaekwon Feb 25, 2019
c80e4ae
Address review comments
jaekwon Feb 27, 2019
2925cc8
docs updates
alexanderbez Feb 27, 2019
46e9d4b
Merge branch 'develop' into jae/undelegate_more
cwgoes Feb 27, 2019
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
12 changes: 10 additions & 2 deletions x/distribution/keeper/allocation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,17 @@ func (k Keeper) AllocateTokens(ctx sdk.Context, sumPrecommitPower, totalPower in
proposerReward := feesCollected.MulDec(proposerMultiplier)

// pay proposer
remaining := feesCollected
proposerValidator := k.stakingKeeper.ValidatorByConsAddr(ctx, proposer)
k.AllocateTokensToValidator(ctx, proposerValidator, proposerReward)
remaining := feesCollected.Sub(proposerReward)
if proposerValidator != nil {
k.AllocateTokensToValidator(ctx, proposerValidator, proposerReward)
remaining = feesCollected.Sub(proposerReward)
} else {
// proposer can be unknown if say, the unbonding period is 1 block, so
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the unbonding period is greater than 1 block, the proposer should never be unknown, right? Should we panic in that case (we can fetch the unbonding period from the params) - or at least log a warning?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto on at least a log here.

// e.g. a validator undelegates at block X, it's removed entirely by
// block X+1's endblock, then X+2 we need to refer to the previous
// proposer for X+1, but we've forgotten about them.
}

// calculate fraction allocated to validators
communityTax := k.GetCommunityTax(ctx)
Expand Down