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

Jump to bottom

fix: reject query with block height in the future #11222

Merged
merged 9 commits into from
Feb 24, 2022
Merged

fix: reject query with block height in the future #11222

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ebde047
reject query with block height in the future
yihuang Feb 18, 2022
0524acd
unit tests
yihuang Feb 18, 2022
9745b95
changelog
yihuang Feb 18, 2022
3bfa1bc
Merge branch 'master' into query-future-height
tac0turtle Feb 18, 2022
ffe4e64
Merge branch 'master' into query-future-height
tac0turtle Feb 19, 2022
1140a81
Merge branch 'master' into query-future-height
tac0turtle Feb 21, 2022
40489e4
Merge branch 'master' into query-future-height
tac0turtle Feb 22, 2022
6a1f703
fix unit tests
yihuang Feb 23, 2022
b11a008
Merge branch 'master' into query-future-height
tac0turtle Feb 23, 2022
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
13 changes: 11 additions & 2 deletions baseapp/abci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,18 @@ func (app *BaseApp) createQueryContext(height int64, prove bool) (sdk.Context, e
return sdk.Context{}, err
}

lastBlockHeight := app.LastBlockHeight()
if height > lastBlockHeight {
return sdk.Context{},
sdkerrors.Wrap(
sdkerrors.ErrInvalidHeight,
"cannot query with height in the future; please provide a valid height",
)
}

// when a client did not provide a query height, manually inject the latest
if height == 0 {
height = app.LastBlockHeight()
height = lastBlockHeight
}

if height <= 1 && prove {
Expand All @@ -642,7 +651,7 @@ func (app *BaseApp) createQueryContext(height int64, prove bool) (sdk.Context, e
return sdk.Context{},
sdkerrors.Wrapf(
sdkerrors.ErrInvalidRequest,
"failed to load state at height %d; %s (latest height: %d)", height, err, app.LastBlockHeight(),
"failed to load state at height %d; %s (latest height: %d)", height, err, lastBlockHeight,
)
}

Expand Down