Skip to content
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.

Sign up for GitHub

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: halt-height behavior is not deterministic #16639

Merged
merged 6 commits into from
Jun 27, 2023
Merged

fix: halt-height behavior is not deterministic #16639

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb767a1
Problem: halt-height behavior is not deterministic
yihuang Jun 21, 2023
eefd7bc
Update CHANGELOG.md
yihuang Jun 21, 2023
0fcb300
Merge branch 'main' into halt-height
yihuang Jun 22, 2023
d9c4161
cleanup and unit tests
yihuang Jun 27, 2023
757ec6d
Merge branch 'main' into halt-height
yihuang Jun 27, 2023
ed10cbd
Merge branch 'main' into halt-height
alexanderbez Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Bug Fixes

* [#16547](https://github.com/cosmos/cosmos-sdk/pull/16547) Ensure a transaction's gas limit cannot exceed the block gas limit.
* [#16639](https://github.com/cosmos/cosmos-sdk/pull/16639) Make sure we don't execute blocks beyond the halt height.

### Improvements

Expand Down
14 changes: 14 additions & 0 deletions baseapp/abci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,20 @@ func (app *BaseApp) VerifyVoteExtension(req *abci.RequestVerifyVoteExtension) (r
func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (*abci.ResponseFinalizeBlock, error) {
var events []abci.Event

// don't execute blocks beyond the halt height
var halt bool
switch {
case app.haltHeight > 0 && uint64(req.Height) > app.haltHeight:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change potentially affects state.

Call sequence:

(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/abci.go:648)

halt = true

case app.haltTime > 0 && req.Time.Unix() > int64(app.haltTime):
halt = true
}

if halt {
return nil, fmt.Errorf("halt per configuration height %d time %d", app.haltHeight, app.haltTime)
}

if err := app.validateFinalizeBlockHeight(req); err != nil {
return nil, err
}
Expand Down