R4R: Removal of Mandatory Self-Delegation Reward #2984

alexanderbez · 2018-12-03T14:51:20Z

closes: #2914

Targeted PR against correct branch (see CONTRIBUTING.md)
Linked to github-issue with discussion and accepted design OR link to spec that describes this work.
Wrote tests
Updated relevant documentation (docs/)
Added entries in PENDING.md with issue #
rereviewed Files changed in the github PR explorer

For Admin Use:

Added appropriate labels to PR (ex. wip, ready-for-review, docs)
Reviewers Assigned
Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

codecov · 2018-12-03T14:57:49Z

Codecov Report

Merging #2984 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop    #2984   +/-   ##
========================================
  Coverage    55.55%   55.55%           
========================================
  Files          120      120           
  Lines         8490     8490           
========================================
  Hits          4717     4717           
  Misses        3451     3451           
  Partials       322      322

alexanderbez · 2018-12-03T17:22:22Z

With #2982, the test_sim_gaia_simulation_after_import stage passes.

@rigelrozanski lmk if this is what you had in mind. I'm not sure if any documentation needs to be updated?

rigelrozanski

Biggest comment is need to investigate these failing tests - few other herein... thanks! :)

EDIT - should merge in the bug fixes from #2982 to this branch before merge to confirm the fixes

rigelrozanski · 2018-12-03T22:05:28Z

x/distribution/keeper/hooks.go

@@ -116,7 +125,6 @@ func (h Hooks) OnDelegationCreated(ctx sdk.Context, delAddr sdk.AccAddress, valA
 	h.k.onDelegationCreated(ctx, delAddr, valAddr)


The new hook route should also be called within the OnDelegationCreated hook here

I don't think there is a need now as I just moved the new call into onValidatorModified.

rigelrozanski · 2018-12-03T22:07:02Z

x/distribution/keeper/hooks.go

+	if bytes.Equal(delAddr.Bytes(), valAddr.Bytes()) {
+		// On updates to a self bond/unbond, we must update the validator's dist
+		// info without withdrawing any rewards.
+		k.UpdateValidatorDistInfoFromPool(ctx, valAddr)


this doesn't need to be exposed (should keep consistency)

Sure! Updated.

But consistency with what exactly? Everything in x/distribution/keeper/validator.go is exposed (which is where this lives). I wasn't able to find a consistent pattern for these methods. I think a large bulk of them should be unexposed.

rigelrozanski · 2018-12-03T22:09:40Z

x/distribution/keeper/hooks.go

+	if bytes.Equal(delAddr.Bytes(), valAddr.Bytes()) {
+		// On updates to a self bond/unbond, we must update the validator's dist
+		// info without withdrawing any rewards.
+		k.UpdateValidatorDistInfoFromPool(ctx, valAddr)


Also if you look at what's happening within onValidatorModified you'll see we skip running this at height of 0 - don't see why we wouldn't replicate this for the new function too

Ditto: I don't think there is a need now as I just moved the new call into onValidatorModified.

x/distribution/keeper/validator.go

cwgoes

This doesn't fix the problem - onValidatorModified is still called when another delegator (not the validator themself) changes the amount of their delegation, and onValidatorModified withdraws the validator's rewards.

I think we need to change onValidatorModified - when any delegation is updated, we should not need to withdraw rewards for any other delegation, we just need to move fees from the global pool to the validator-specific pool.

alexanderbez · 2018-12-04T13:52:24Z

@cwgoes I'm slightly confused. My interpretation was that this is only to be done when a validator bonds/unbonds their self-delegation. I guess I misunderstood the scope of the original issue. I will update.

alexanderbez · 2018-12-04T17:26:49Z

@cwgoes @rigelrozanski updated.

cwgoes · 2018-12-04T22:16:44Z

This looks good to me. Additional testcases would be nice, if only to clarify exactly what will happen in various scenarios.

I still think we should go through the exact hooks here again, maybe on a call, and make sure we're only doing the minimum amount of computation necessary. That doesn't need to happen in this PR; this PR just needs to fix the immediate issue, which I think it does.

rigelrozanski

Yeah this makes sense that we can avoid the validator withdrawal in all hook situations as you've done. nice!

* Some minor cleanup and reformatting to make things easier to understand * Update onDelegationSharesModified hook * Add pending log * Address PR comments * Fix linting

Fixes regression introduced by #2984. Continuiation of #3033 , which didn't fix the simulation issues. (candidate) Complete solution for #3019, 9002 halt bug. From #2984, it isn't sufficient to take the fee pool rewards of a validator. Since we don't track delegator accums (as we do with validator accums), and because onValidatorModified >updateValidatorDistInfoFromPool is also being called upon delegation updates (or at least I believe this is the reason), it is necessary to also withdraw self delegation. TODO: I don't think self-delegation should be required to be modified here... consider using a delegation hook to do the self-delegation withdraw part instead, e.g. splitting the updateValidatorDistInfoFromPool function into two. It might not result in cleaner code, however. Think hard.

Aleksandr Bezobchuk added 3 commits November 29, 2018 10:44

Some minor cleanup and reformatting to make things easier to understand

66d83fb

Merge branch 'develop' into bez/2914-val-withdraw-self-del

b91e6a8

Merge branch 'develop' into bez/2914-val-withdraw-self-del

841dec2

alexanderbez added wip C:x/distribution distribution module related labels Dec 3, 2018

alexanderbez requested review from cwgoes, ebuchman and rigelrozanski as code owners December 3, 2018 14:51

alexanderbez changed the title ~~WIP: Mandatory Self-Delegation Reward Withdraw Removal~~ WIP: Removal of Mandatory Self-Delegation Reward Withdraw Dec 3, 2018

Update onDelegationSharesModified hook

f72b7b5

alexanderbez changed the title ~~WIP: Removal of Mandatory Self-Delegation Reward Withdraw~~ WIP: Removal of Mandatory Self-Delegation Reward Dec 3, 2018

alexanderbez closed this Dec 3, 2018

alexanderbez reopened this Dec 3, 2018

Aleksandr Bezobchuk added 2 commits December 3, 2018 12:19

Merge branch 'develop' into bez/2914-val-withdraw-self-del

16866e2

Add pending log

9753d4f

alexanderbez changed the title ~~WIP: Removal of Mandatory Self-Delegation Reward~~ R4R: Removal of Mandatory Self-Delegation Reward Dec 3, 2018

alexanderbez added ready-for-review and removed wip labels Dec 3, 2018

jackzampolin mentioned this pull request Dec 3, 2018

R4R: Inflation bug fixes #2982

Merged

5 tasks

rigelrozanski suggested changes Dec 3, 2018

View reviewed changes

cwgoes suggested changes Dec 4, 2018

View reviewed changes

Aleksandr Bezobchuk added 3 commits December 4, 2018 11:52

Merge branch 'develop' into bez/2914-val-withdraw-self-del

b54fbc6

Address PR comments

8ee8d0a

Fix linting

e16c203

Merge branch 'develop' into bez/2914-val-withdraw-self-del

a6c3a33

cwgoes approved these changes Dec 4, 2018

View reviewed changes

rigelrozanski approved these changes Dec 4, 2018

View reviewed changes

rigelrozanski merged commit 6395e2a into develop Dec 4, 2018

rigelrozanski deleted the bez/2914-val-withdraw-self-del branch December 4, 2018 22:54

jaekwon mentioned this pull request Dec 8, 2018

Fix updateValidatorDistInfoFromPool #3046

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

R4R: Removal of Mandatory Self-Delegation Reward #2984

R4R: Removal of Mandatory Self-Delegation Reward #2984

alexanderbez commented Dec 3, 2018 •

edited

Loading

codecov bot commented Dec 3, 2018 •

edited

Loading

alexanderbez commented Dec 3, 2018 •

edited

Loading

rigelrozanski left a comment •

edited

Loading

rigelrozanski Dec 3, 2018

alexanderbez Dec 4, 2018

rigelrozanski Dec 3, 2018

alexanderbez Dec 4, 2018

rigelrozanski Dec 3, 2018

alexanderbez Dec 4, 2018

cwgoes left a comment

alexanderbez commented Dec 4, 2018

alexanderbez commented Dec 4, 2018

cwgoes commented Dec 4, 2018 •

edited

Loading

rigelrozanski left a comment

		@@ -116,7 +125,6 @@ func (h Hooks) OnDelegationCreated(ctx sdk.Context, delAddr sdk.AccAddress, valA
		h.k.onDelegationCreated(ctx, delAddr, valAddr)

R4R: Removal of Mandatory Self-Delegation Reward #2984

R4R: Removal of Mandatory Self-Delegation Reward #2984

Conversation

alexanderbez commented Dec 3, 2018 • edited Loading

codecov bot commented Dec 3, 2018 • edited Loading

Codecov Report

alexanderbez commented Dec 3, 2018 • edited Loading

rigelrozanski left a comment • edited Loading

Choose a reason for hiding this comment

rigelrozanski Dec 3, 2018

Choose a reason for hiding this comment

alexanderbez Dec 4, 2018

Choose a reason for hiding this comment

rigelrozanski Dec 3, 2018

Choose a reason for hiding this comment

alexanderbez Dec 4, 2018

Choose a reason for hiding this comment

rigelrozanski Dec 3, 2018

Choose a reason for hiding this comment

alexanderbez Dec 4, 2018

Choose a reason for hiding this comment

cwgoes left a comment

Choose a reason for hiding this comment

alexanderbez commented Dec 4, 2018

alexanderbez commented Dec 4, 2018

cwgoes commented Dec 4, 2018 • edited Loading

rigelrozanski left a comment

Choose a reason for hiding this comment

alexanderbez commented Dec 3, 2018 •

edited

Loading

codecov bot commented Dec 3, 2018 •

edited

Loading

alexanderbez commented Dec 3, 2018 •

edited

Loading

rigelrozanski left a comment •

edited

Loading

cwgoes commented Dec 4, 2018 •

edited

Loading