-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: use initialHeight correctly #15789
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7fce260
updates
alexanderbez 4a0dda0
updates
alexanderbez c55fa89
updates
alexanderbez 9f456c5
Merge branch 'main' into bez/baseapp-init-height-refactor
alexanderbez 82ca2a5
updates
alexanderbez 525f20b
Merge branch 'bez/baseapp-init-height-refactor' of github.com:cosmos/…
alexanderbez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -493,19 +493,21 @@ func (app *BaseApp) validateHeight(req abci.RequestBeginBlock) error { | |
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 | ||
} | ||
|
||
Comment on lines
493
to
512
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Change potentially affects state. Call sequence:
|
||
if req.Header.Height != expectedHeight { | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
any clues why we are doing this here and not above?