Precalculate the fee at on_term_open #1900
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
remagpie
force-pushed
the
on-term-open
branch
from
4ad4a41 to
51630c5
Compare
foriequal0
reviewed
Nov 28, 2019
foriequal0
requested changes
Nov 28, 2019
majecty
approved these changes
Nov 28, 2019
foriequal0
reviewed
Nov 28, 2019
HoOngEe
approved these changes
Nov 28, 2019
remagpie
force-pushed
the
on-term-open
branch
2 times, most recently
from
f873804 to
66e8b2f
Compare
foriequal0
approved these changes
Nov 29, 2019
sgkim126
approved these changes
Nov 29, 2019
remagpie
added
do-not-merge
|
I tested it in the local network and found out that there is some problem with fee distribution. |
majecty
reviewed
Dec 2, 2019
| }; | ||
|
|
||
| let banned = stake::Banned::load_from_state(block.state())?; | ||
| let start_of_the_current_term_header = |
There was a problem hiding this comment.
Does the header contains seal here?
There was a problem hiding this comment.
I checked the related parts, and I'm pretty sure that the seal exists at this point.
`on_open_block` is called when the block is created, before processing any transactions included in the block.
remagpie
force-pushed
the
on-term-open
branch
from
66e8b2f to
f960800
Compare
remagpie
changed the title
At `on_term_close`, the term_common_params is not updated to the new parameters yet. But the parameters in the current block's state is updated, so we should get the `era` from there.
remagpie
force-pushed
the
on-term-open
branch
from
f960800 to
807ad63
Compare
remagpie
changed the title
|
Finished testing it on the local network, and the fee distribution is correctly working as I expected now. |
sgkim126
approved these changes
Dec 3, 2019
4 tasks
foriequal0
approved these changes
Dec 3, 2019
majecty
approved these changes
Dec 3, 2019
HoOngEe
approved these changes
Dec 3, 2019
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on #1895
This PR introduces
on_term_open, and calculates the final fee distribution there.The detailed design is as follows:
1. State structure
State leaf at
makeKey("IntermediateRewards")contains[previous, current]value, and they mean the previous and current intermediate reward that the validators collected.In era=1, it now contains
[current, calculated], and they mean the current intermediate reward, and the calculated result of (reward - penalty).2.
on_term_openon_term_openis called at the first block of the term, and before any of the transactions in the block is processed.The term start is detected by the following condition:
block_number == metadata.last_term_finished_block_num() + 1When the era is zero, it does nothing.
When the era is 1, it calculates the penalty that each validator should take, and substracts it from the current reward in the state, and saves the result in calculated part.
After that, it clears the current reward.
3.
on_term_closeWhen the era is 1, the calculated fee is read from the state and CCC is distributed according to that value.
Note that although it is not strictly required to do this, the calculated part is cleared to empty map here.