refactor(x/distribution): audit changes (backport #16785) #16799
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 ec1f0c5) # Conflicts: # tests/integration/distribution/keeper/grpc_query_test.go # tests/integration/distribution/keeper/msg_server_test.go
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -23,11 +23,12 @@ | |||
| // TODO this is Tendermint-dependent | |||
| // ref https://github.com/cosmos/cosmos-sdk/issues/3095 | |||
| if ctx.BlockHeight() > 1 { | |||
| k.AllocateTokens(ctx, previousTotalPower, ctx.VoteInfos()) | |||
| if err := k.AllocateTokens(ctx, previousTotalPower, ctx.VoteInfos()); err != nil { | |||
Check warning
Code scanning / CodeQL
Panic in BeginBock or EndBlock consensus methods
| } | ||
|
|
||
| // record the proposer for when we payout on the next block | ||
| consAddr := sdk.ConsAddress(ctx.BlockHeader().ProposerAddress) | ||
| k.SetPreviousProposerConsAddr(ctx, consAddr) | ||
| return nil | ||
| return k.SetPreviousProposerConsAddr(ctx, consAddr) |
Check warning
Code scanning / CodeQL
Panic in BeginBock or EndBlock consensus methods
julienrbrt
approved these changes
Jun 30, 2023
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 #16785 done by Mergify.
Cherry-pick of ec1f0c5 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
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