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(runtime): define address codec providers in runtime (backport #17037) #17043

Merged
merged 3 commits into from
Jul 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2023

This is an automatic backport of pull request #17037 done by Mergify.
Cherry-pick of 0c4f246 has failed:

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

You are currently cherry-picking commit 0c4f246d8.
  (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:   baseapp/utils_test.go
	modified:   client/v2/autocli/app.go
	modified:   crypto/armor_test.go
	modified:   crypto/keys/multisig/multisig_test.go
	modified:   runtime/module.go
	modified:   simapp/app.go
	modified:   simapp/app_test.go
	modified:   simapp/app_v2.go
	modified:   types/module/module.go
	modified:   x/auth/module.go
	modified:   x/auth/tx/config/config.go
	modified:   x/staking/module.go
	deleted:    x/staking/types/depinject_alias.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/v2/go.mod
	both modified:   client/v2/go.sum

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

(cherry picked from commit 0c4f246)

# Conflicts:
#	client/v2/go.mod
#	client/v2/go.sum
@mergify mergify bot requested a review from a team as a code owner July 18, 2023 12:45
@mergify mergify bot added the conflicts label Jul 18, 2023
@julienrbrt julienrbrt self-assigned this Jul 18, 2023
@github-actions github-actions bot added C:x/evidence C:x/upgrade C:x/feegrant C:Cosmovisor Issues and PR related to Cosmovisor C:Rosetta Issues and PR related to Rosetta C:x/nft C:orm C:collections C:Confix Issues and PR related to Confix C:x/circuit C:x/tx C:Hubl Tool: Hubl labels Jul 18, 2023
@julienrbrt julienrbrt merged commit 6ddf0af into release/v0.50.x Jul 18, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17037 branch July 18, 2023 14:38
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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.

1 participant