Fix account call for freeze/lock inconsistency #1276
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
ermalkaleci
reviewed
Jun 21, 2024
ermalkaleci
reviewed
Jun 21, 2024
ashutoshvarma
previously approved these changes
Jun 24, 2024
pallets/dapp-staking-v3/src/lib.rs
Outdated
| @@ -386,6 +386,8 @@ pub mod pallet { | |||
| NoExpiredEntries, | |||
| /// Force call is not allowed in production. | |||
| ForceNotAllowed, | |||
| /// Account doesn't have the freeze inconsistency | |||
| InvalidAccount, // TODO: can be removed after call `fix_account` is removed | |||
There was a problem hiding this comment.
nit: can be better named, AccountNotInconsistent ?
There was a problem hiding this comment.
I don't think there's the need for this. If account is inconsistent then there's noop tx paying just fee
There was a problem hiding this comment.
@ashutoshvarma sure. Believe it or not, that was the first name I choose, but decided to go with a more generic one later xD.
@ermalkaleci
I added it to make testing more clear.
It will be removed later anyways.
pallets/dapp-staking-v3/src/lib.rs
Outdated
| // 2. Execute the unlock call, clearing all of the unlocking chunks. | ||
| let result = Self::internal_claim_unlocked(account); | ||
|
|
||
| // 3. Adjust consumed weight to consume the max possible weight (as defined in the weight macro). |
There was a problem hiding this comment.
Suggested change
| // 3. Adjust consumed weight to consume the max possible weight (as defined in the weight macro). | |
| // 3. Adjust consumed weight to consume the max possible weight (as defined in `T::WeightInfo::claim_unlocked()`). |
nit: internal_claim_unlocked() has no weights macro, but use weights from claim_unlocked().
I was confused at first
There was a problem hiding this comment.
I mean the macro above the call: T::WeightInfo::claim_unlocked() + const.
ermalkaleci
reviewed
Jun 24, 2024
ermalkaleci
reviewed
Jun 24, 2024
ermalkaleci
reviewed
Jun 24, 2024
ermalkaleci
reviewed
Jun 24, 2024
ermalkaleci
approved these changes
Jun 24, 2024
Minimum allowed line rate is |
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.
Pull Request Summary
Provide an approach to fix the account within an incosistent freeze state.
The approach is as simple as possible, reusing the
claim_unlockedlogic to clear unlocking chunks which are forcefully set to be immediately claimable.