Minor fix and refactoring to staking #3279
Merged
Conversation
This file contains 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
…r to the treasury Signed-off-by: linning <linningde25@gmail.com>
This field is used to temporarily hold the reward and then move to the current_total_stake, this commit directly move the reward to current_total_stake Signed-off-by: linning <linningde25@gmail.com>
Signed-off-by: linning <linningde25@gmail.com>
By using idiomatic Entry and remove the useless weight_balance_cache as there is no repeat opertator in the operator_weights BTreeMap Signed-off-by: linning <linningde25@gmail.com>
vedhavyas
reviewed
Dec 4, 2024
| @@ -141,6 +150,10 @@ pub(crate) fn operator_take_reward_tax_and_stake<T: Config>( | |||
| })?; | |||
| } | |||
|
|
|||
| if !to_treasury.is_zero() { | |||
| mint_into_treasury::<T>(to_treasury).ok_or(TransitionError::MintBalance)?; | |||
There was a problem hiding this comment.
can't we just make this function handle the edge case instead. Its easy to miss otherwise
| let share_price = SharePrice::new::<T>(total_shares, total_stake); | ||
|
|
||
| // calculate and subtract total withdrew shares from previous epoch | ||
| let (total_stake, total_shares) = if !operator.withdrawals_in_epoch.is_zero() { |
There was a problem hiding this comment.
I remeber @nazar-pc mentioning about preferring immutable vars over mutable one. easy to reason with IMHO
There was a problem hiding this comment.
I like immutable vars most of the time, but I don't think it is suitable for this particular case.
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The first commit fixes a minor issue by moving the epoch reward of the unlocked operator to the treasury instead of dropping silently.
The rest of the commits are refactoring to remove unnecessary logic and cleanup the code.
Code contributor checklist: