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.

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

refactor: migrate away from using valBech32 globals (2/2) (backport #17157) #17379

Merged
merged 9 commits into from
Aug 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 14, 2023

This is an automatic backport of pull request #17157 done by Mergify.
Cherry-pick of e60c583 has failed:

On branch mergify/bp/release/v0.50.x/pr-17157
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit e60c583d2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tests/integration/staking/keeper/slash_test.go
	modified:   tests/integration/staking/keeper/validator_test.go
	modified:   tests/integration/staking/keeper/vote_extensions_test.go
	modified:   types/address.go
	modified:   x/distribution/keeper/delegation_test.go
	modified:   x/distribution/keeper/genesis.go
	modified:   x/distribution/keeper/invariants.go
	modified:   x/distribution/testutil/expected_keepers_mocks.go
	modified:   x/distribution/types/expected_keepers.go
	modified:   x/evidence/keeper/abci.go
	modified:   x/evidence/keeper/infraction.go
	modified:   x/evidence/types/evidence.go
	modified:   x/evidence/types/evidence_test.go
	modified:   x/gov/keeper/tally.go
	modified:   x/slashing/keeper/genesis.go
	modified:   x/slashing/keeper/grpc_query.go
	modified:   x/slashing/keeper/keeper_test.go
	modified:   x/slashing/simulation/operations.go
	modified:   x/slashing/testutil/expected_keepers_mocks.go
	modified:   x/slashing/types/expected_keepers.go
	modified:   x/staking/keeper/delegation_test.go
	modified:   x/staking/keeper/genesis.go
	modified:   x/staking/keeper/historical_info.go
	modified:   x/staking/keeper/invariants.go
	modified:   x/staking/keeper/msg_server.go
	modified:   x/staking/keeper/slash.go
	modified:   x/staking/keeper/test_common.go
	modified:   x/staking/keeper/val_state_change.go
	modified:   x/staking/keeper/validator_test.go
	modified:   x/staking/migrations/v2/store_test.go
	modified:   x/staking/simulation/genesis_test.go
	modified:   x/staking/simulation/operations.go
	modified:   x/staking/testutil/cmt.go
	modified:   x/staking/types/exported.go
	modified:   x/staking/types/historical_info.go
	modified:   x/staking/types/keys_test.go
	modified:   x/staking/types/validator.go
	modified:   x/staking/types/validator_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   simapp/export.go
	both modified:   tests/integration/distribution/keeper/grpc_query_test.go
	both modified:   tests/integration/distribution/keeper/msg_server_test.go
	both modified:   tests/integration/gov/keeper/tally_test.go
	both modified:   tests/integration/staking/keeper/determinstic_test.go
	both modified:   tests/integration/staking/keeper/grpc_query_test.go
	both modified:   x/distribution/keeper/allocation.go
	both modified:   x/distribution/keeper/allocation_test.go
	both modified:   x/distribution/keeper/delegation.go
	both modified:   x/distribution/keeper/validator.go
	both modified:   x/distribution/simulation/operations.go
	both modified:   x/distribution/simulation/operations_test.go
	both modified:   x/distribution/testutil/staking_helper.go
	both modified:   x/evidence/testutil/expected_keepers_mocks.go
	both modified:   x/evidence/types/expected_keepers.go
	both modified:   x/slashing/simulation/operations_test.go
	both modified:   x/staking/keeper/delegation.go
	both modified:   x/staking/keeper/grpc_query.go
	both modified:   x/staking/keeper/historical_info_test.go
	both modified:   x/staking/keeper/query_utils.go
	both modified:   x/staking/keeper/validator.go
	both modified:   x/staking/simulation/operations_test.go
	both modified:   x/staking/types/historical_info_test.go
	both modified:   x/staking/types/keys.go

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 refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: marbar3778 <marbar3778@yahoo.com>
(cherry picked from commit e60c583)

# Conflicts:
#	CHANGELOG.md
#	simapp/export.go
#	tests/integration/distribution/keeper/grpc_query_test.go
#	tests/integration/distribution/keeper/msg_server_test.go
#	tests/integration/gov/keeper/tally_test.go
#	tests/integration/staking/keeper/determinstic_test.go
#	tests/integration/staking/keeper/grpc_query_test.go
#	x/distribution/keeper/allocation.go
#	x/distribution/keeper/allocation_test.go
#	x/distribution/keeper/delegation.go
#	x/distribution/keeper/validator.go
#	x/distribution/simulation/operations.go
#	x/distribution/simulation/operations_test.go
#	x/distribution/testutil/staking_helper.go
#	x/evidence/testutil/expected_keepers_mocks.go
#	x/evidence/types/expected_keepers.go
#	x/slashing/simulation/operations_test.go
#	x/staking/keeper/delegation.go
#	x/staking/keeper/grpc_query.go
#	x/staking/keeper/historical_info_test.go
#	x/staking/keeper/query_utils.go
#	x/staking/keeper/validator.go
#	x/staking/simulation/operations_test.go
#	x/staking/types/historical_info_test.go
#	x/staking/types/keys.go
x/distribution/keeper/allocation.go Fixed Show fixed Hide fixed
x/distribution/keeper/delegation.go Fixed Show fixed Hide fixed
x/distribution/keeper/validator.go Fixed Show fixed Hide fixed
x/distribution/keeper/validator.go Fixed Show fixed Hide fixed
x/staking/keeper/delegation.go Fixed Show fixed Hide fixed
x/distribution/keeper/allocation.go Fixed Show fixed Hide fixed
x/distribution/simulation/operations.go Fixed Show fixed Hide fixed
x/distribution/testutil/staking_helper.go Fixed Show fixed Hide fixed
x/staking/keeper/query_utils.go Fixed Show fixed Hide fixed
x/staking/keeper/validator.go Fixed Show fixed Hide fixed
@@ -58,13 +58,18 @@
panic("stake should not be negative")
}

valBz, err := k.stakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator())
if err != nil {
panic(err)

Check warning

Code scanning / CodeQL

Panic in BeginBock or EndBlock consensus methods Warning

Possible panics in BeginBock- or EndBlock-related consensus methods could cause a chain halt
@julienrbrt julienrbrt self-assigned this Aug 14, 2023
@julienrbrt julienrbrt mentioned this pull request Aug 14, 2023
3 tasks
@julienrbrt julienrbrt merged commit e76102f into release/v0.50.x Aug 14, 2023
48 of 49 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17157 branch August 14, 2023 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants