fix: make downgrade verification work again #13936
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
0Tech
commented
Nov 21, 2022
| // 2. If the plan is not ready. | ||
| // 3. If the plan is ready and skip upgrade height is set for current height. | ||
| if !found || !plan.ShouldExecute(ctx) || (plan.ShouldExecute(ctx) && k.IsSkipHeight(ctx.BlockHeight())) { | ||
| lastAppliedPlan, _ := k.GetLastCompletedUpgrade(ctx) |
There was a problem hiding this comment.
Now GetLastCompletedUpgrade() is inside of the if !found... block.
| } | ||
| } | ||
| } | ||
|
|
||
| if !found { | ||
| return |
There was a problem hiding this comment.
The function returns here, where no upgrade plan is on the chain.
julienrbrt
added
the
backport/v0.47.x
|
Can we add a test case? |
Of course, we can. I added the corresponding unit test. One can check whether the test works as expected:
|
mergify bot
pushed a commit
that referenced
this pull request
Nov 23, 2022
(cherry picked from commit b585d17) # Conflicts: # CHANGELOG.md
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.
Description
In the current
BeginBlocker()of x/upgrade, the downgrade verification logic would not work when no upgrade plan is on the state. It's because theif !foundcheck is in front of the validation, and if it is, the function returns.This patch would relocate the logic to the front again, but there is little difference from the previous logic. The
GetLastCompletedUpgrade()is now only invoked where the migration would not needed, so it would not cause the issue #12904 to recur.Author Checklist
All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.
I have...
!to the type prefix if API or client breaking changeCHANGELOG.mdReviewers Checklist
All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.
I have...
!in the type prefix if API or client breaking change