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

feat(staking)!: add consensus and validator address codec in staking (backport #16959) #16977

Merged
merged 3 commits into from
Jul 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 13, 2023

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

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

You are currently cherry-picking commit e0be2b80f.
  (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:   CHANGELOG.md
	modified:   client/v2/autocli/app.go
	modified:   go.mod
	modified:   go.sum
	modified:   simapp/app.go
	modified:   simapp/app_config.go
	modified:   simapp/app_test.go
	modified:   simapp/app_v2.go
	modified:   tests/integration/bank/keeper/deterministic_test.go
	modified:   tests/integration/distribution/keeper/msg_server_test.go
	modified:   tests/integration/evidence/keeper/infraction_test.go
	modified:   tests/integration/gov/keeper/keeper_test.go
	modified:   tests/integration/slashing/keeper/keeper_test.go
	modified:   tests/integration/staking/keeper/common_test.go
	modified:   tests/integration/staking/keeper/determinstic_test.go
	modified:   testutil/integration/example_test.go
	modified:   x/auth/ante/testutil_test.go
	modified:   x/auth/keeper/deterministic_test.go
	modified:   x/auth/keeper/keeper.go
	modified:   x/auth/keeper/keeper_test.go
	modified:   x/auth/module.go
	deleted:    x/auth/types/depinject_alias.go
	modified:   x/auth/vesting/msg_server_test.go
	modified:   x/auth/vesting/types/vesting_account_test.go
	modified:   x/group/migrations/v2/migrate_test.go
	modified:   x/staking/keeper/keeper.go
	modified:   x/staking/keeper/val_state_change.go
	modified:   x/staking/module.go
	modified:   x/staking/testutil/expected_keepers_mocks.go
	new file:   x/staking/types/depinject_alias.go
	modified:   x/staking/types/expected_keepers.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/v2/go.mod
	both modified:   client/v2/go.sum
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	both modified:   tests/go.mod
	both modified:   tests/go.sum
	both modified:   x/staking/keeper/keeper_test.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

…16959)

Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com>
(cherry picked from commit e0be2b8)

# Conflicts:
#	client/v2/go.mod
#	client/v2/go.sum
#	simapp/go.mod
#	simapp/go.sum
#	tests/go.mod
#	tests/go.sum
#	x/staking/keeper/keeper_test.go
@julienrbrt julienrbrt removed their assignment Jul 13, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) July 13, 2023 11:30
@julienrbrt julienrbrt merged commit 4076c6a into release/v0.50.x Jul 13, 2023
47 of 48 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16959 branch July 13, 2023 11:40
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