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

fix: Add validation on create gentx (backport #11693) #11697

Merged
merged 3 commits into from
Apr 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 20, 2022

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

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

You are currently cherry-picking commit df6114203.
  (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:   types/coin.go
	modified:   x/genutil/client/cli/gentx.go
	modified:   x/genutil/client/testutil/suite.go
	modified:   x/genutil/gentx_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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 df61142)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Apr 20, 2022
@github-actions github-actions bot added C:CLI C:x/genutil genutil module issues labels Apr 20, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
* (migrations) [#1156](https://github.com/cosmos/cosmos-sdk/pull/11556#issuecomment-1091385011) Remove migration code from 0.42 and below. To use previous migrations, checkout previous versions of the cosmos-sdk.
>>>>>>> b8270fc9b (feat: add (re)delegation getters (#11596))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like some PR got merged without caring about this

@anilcse anilcse removed the conflicts label Apr 20, 2022
@alexanderbez alexanderbez merged commit e4a0cb2 into release/v0.46.x Apr 20, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.46.x/pr-11693 branch April 20, 2022 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:x/genutil genutil module issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants