fix: handle RunMigrationBeginBlock error #17372
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
686
to
+700
|
|
||
| if app.beginBlocker != nil { | ||
| ctx := app.finalizeBlockState.ctx | ||
| if app.migrationModuleManager != nil && app.migrationModuleManager.RunMigrationBeginBlock(ctx) { | ||
| cp := ctx.ConsensusParams() | ||
| // Manager skips this step if Block is non-nil since upgrade module is expected to set this params | ||
| // and consensus parameters should not be overwritten. | ||
| if cp.Block == nil { | ||
| if cp = app.GetConsensusParams(ctx); cp.Block != nil { | ||
| ctx = ctx.WithConsensusParams(cp) | ||
| if app.migrationModuleManager != nil { | ||
| if success, err := app.migrationModuleManager.RunMigrationBeginBlock(ctx); success { | ||
| cp := ctx.ConsensusParams() | ||
| // Manager skips this step if Block is non-nil since upgrade module is expected to set this params | ||
| // and consensus parameters should not be overwritten. | ||
| if cp.Block == nil { | ||
| if cp = app.GetConsensusParams(ctx); cp.Block != nil { | ||
| ctx = ctx.WithConsensusParams(cp) | ||
| } | ||
| } | ||
| } else if err != nil { | ||
| return sdk.BeginBlock{}, err |
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).beginBlock (baseapp/baseapp.go:681)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/baseapp.go:658)
mmsqe
changed the title
julienrbrt
approved these changes
Aug 11, 2023
| @@ -61,7 +61,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ | |||
| * (x/group) [#17146](https://github.com/cosmos/cosmos-sdk/pull/17146) Rename x/group legacy ORM package's error codespace from "orm" to "legacy_orm", preventing collisions with ORM's error codespace "orm". | |||
| * (x/bank) [#17170](https://github.com/cosmos/cosmos-sdk/pull/17170) Avoid empty spendable error message on send coins. | |||
| * (x/distribution) [#17236](https://github.com/cosmos/cosmos-sdk/pull/17236) Using "validateCommunityTax" in "Params.ValidateBasic", preventing panic when field "CommunityTax" is nil. | |||
| * (migrations) [#16583](https://github.com/cosmos/cosmos-sdk/pull/16583) Add `MigrationModuleManager` to handle migration of upgrade module before other modules, ensuring access to the updated context with consensus parameters within the same block that executes the migration. | |||
| * (x/upgrade) [#16583](https://github.com/cosmos/cosmos-sdk/pull/16583) Add `MigrationModuleManager` to handle migration of upgrade module before other modules, ensuring access to the updated context with consensus parameters within the same block that executes the migration. | |||
| @@ -61,7 +61,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ | |||
| * (x/group) [#17146](https://github.com/cosmos/cosmos-sdk/pull/17146) Rename x/group legacy ORM package's error codespace from "orm" to "legacy_orm", preventing collisions with ORM's error codespace "orm". | |||
| * (x/bank) [#17170](https://github.com/cosmos/cosmos-sdk/pull/17170) Avoid empty spendable error message on send coins. | |||
| * (x/distribution) [#17236](https://github.com/cosmos/cosmos-sdk/pull/17236) Using "validateCommunityTax" in "Params.ValidateBasic", preventing panic when field "CommunityTax" is nil. | |||
| * (migrations) [#16583](https://github.com/cosmos/cosmos-sdk/pull/16583) Add `MigrationModuleManager` to handle migration of upgrade module before other modules, ensuring access to the updated context with consensus parameters within the same block that executes the migration. | |||
| * (x/upgrade) [#16583](https://github.com/cosmos/cosmos-sdk/pull/16583) Add `MigrationModuleManager` to handle migration of upgrade module before other modules, ensuring access to the updated context with consensus parameters within the same block that executes the migration. | |||
| * (x/upgrade) [#17372](https://github.com/cosmos/cosmos-sdk/pull/17372) Stop state machine when `RunMigrationBeginBlock` has error. | |||
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
This change should have been included in 0c1f6fc
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.mdmake lintandmake testReviewers 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