fix: use initialHeight correctly #15789
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
493
to
512
| return fmt.Errorf("invalid height: %d", req.Header.Height) | ||
| } | ||
|
|
||
| // expectedHeight holds the expected height to validate. | ||
| lastBlockHeight := app.LastBlockHeight() | ||
|
|
||
| // expectedHeight holds the expected height to validate | ||
| var expectedHeight int64 | ||
| if app.LastBlockHeight() == 0 && app.initialHeight > 1 { | ||
| // In this case, we're validating the first block of the chain (no | ||
| // previous commit). The height we're expecting is the initial height. | ||
| if lastBlockHeight == 0 && app.initialHeight > 1 { | ||
| // In this case, we're validating the first block of the chain, i.e no | ||
| // previous commit. The height we're expecting is the initial height. | ||
| expectedHeight = app.initialHeight | ||
| } else { | ||
| // This case can mean two things: | ||
| // - either there was already a previous commit in the store, in which | ||
| // case we increment the version from there, | ||
| // - or there was no previous commit, and initial version was not set, | ||
| // in which case we start at version 1. | ||
| expectedHeight = app.LastBlockHeight() + 1 | ||
| // | ||
| // - Either there was already a previous commit in the store, in which | ||
| // case we increment the version from there. | ||
| // - Or there was no previous commit, in which case we start at version 1. | ||
| expectedHeight = lastBlockHeight + 1 | ||
| } | ||
|
|
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).validateHeight (baseapp/baseapp.go:491)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).BeginBlock (baseapp/baseapp.go:162)
alexanderbez
added
the
backport/v0.47.x
github-prbot
requested review from
a team,
kocubinski and
tac0turtle
and removed request for
a team
This comment has been minimized.
This comment has been minimized.
| initHeader = cmtproto.Header{ChainID: req.ChainId, Height: req.InitialHeight, Time: req.Time} | ||
| err := app.cms.SetInitialVersion(req.InitialHeight) | ||
| if err != nil { | ||
| initHeader.Height = req.InitialHeight |
There was a problem hiding this comment.
any clues why we are doing this here and not above?
facundomedica
approved these changes
Apr 11, 2023
…cosmos-sdk into bez/baseapp-init-height-refactor
mergify bot
pushed a commit
that referenced
this pull request
Apr 11, 2023
(cherry picked from commit f95585b) # Conflicts: # CHANGELOG.md # baseapp/abci.go # baseapp/abci_test.go
facundomedica
added a commit
that referenced
this pull request
Apr 11, 2023
roy-dydx
pushed a commit
to dydxprotocol/cosmos-sdk
that referenced
this pull request
Jul 11, 2023
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: Facundo Medica <facundomedica@gmail.com>
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
Set
initialHeightinBaseAppalways. Use that ingetContextForProposalinstead of assuming first block == 1.This PR is a fix only for chains that are NEW and starting with
InitialHeight > 1...which is probably no one but it's good to fix anyway.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