fix: Revert 16794 (backport #16895) #16896
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
(cherry picked from commit ebe97e5)
github-prbot
requested review from
a team,
alexanderbez and
facundomedica
and removed request for
a team
facundomedica
approved these changes
Jul 10, 2023
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
677
to
709
|
|
||
| // app.finalizeBlockState.ctx will already be initialized | ||
| // by InitChain or by ProcessProposal. Context is now updated with Header information. | ||
| // Initialize the FinalizeBlock state. If this is the first block, it should | ||
| // already be initialized in InitChain. Otherwise app.finalizeBlockState will be | ||
| // nil, since it is reset on Commit. | ||
| if app.finalizeBlockState == nil { | ||
| app.setState(execModeFinalize, header) | ||
| } else { | ||
| // In the first block, app.finalizeBlockState.ctx will already be initialized | ||
| // by InitChain. Context is now updated with Header information. | ||
| app.finalizeBlockState.ctx = app.finalizeBlockState.ctx. | ||
| WithBlockHeader(header). | ||
| WithBlockHeight(req.Height). | ||
| WithHeaderInfo(coreheader.Info{ | ||
| ChainID: app.chainID, | ||
| Height: req.Height, | ||
| Time: req.Time, | ||
| Hash: req.Hash, | ||
| AppHash: app.LastCommitID().Hash, | ||
| }) | ||
| } | ||
|
|
||
| gasMeter := app.getBlockGasMeter(app.finalizeBlockState.ctx) | ||
|
|
||
| app.finalizeBlockState.ctx = app.finalizeBlockState.ctx. | ||
| WithBlockHeader(header). | ||
| WithBlockGasMeter(gasMeter). | ||
| WithHeaderHash(req.Hash). | ||
| WithConsensusParams(app.GetConsensusParams(app.finalizeBlockState.ctx)). | ||
| WithVoteInfos(req.DecidedLastCommit.Votes). | ||
| WithExecMode(sdk.ExecModeFinalize). | ||
| WithHeaderInfo(coreheader.Info{ | ||
| ChainID: app.chainID, | ||
| Height: req.Height, | ||
| Time: req.Time, |
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/abci.go:654)
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -140,8 +140,7 @@ | |||
| require.False(t, finalizeSuccess) | |||
| } | |||
|
|
|||
| _, err = app.Commit() | |||
| require.NoError(t, err) | |||
| app.Commit() | |||
Check warning
Code scanning / gosec
Errors unhandled.
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.
This is an automatic backport of pull request #16895 done by Mergify.
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com