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 Initgenesis bug in tokenfactory, when the denom creation fee para… (backport #2011) #2020

Merged
merged 6 commits into from
Jul 11, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 11, 2022

This is an automatic backport of pull request #2011 done by Mergify.
Cherry-pick of 938f9bd has failed:

On branch mergify/bp/v10.x/pr-2011
Your branch is up to date with 'origin/v10.x'.

You are currently cherry-picking commit 938f9bdb.
  (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:   .gitignore
	modified:   x/tokenfactory/keeper/genesis.go
	modified:   x/tokenfactory/types/errors.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/tokenfactory/keeper/createdenom.go
	both modified:   x/tokenfactory/keeper/createdenom_test.go
	both modified:   x/tokenfactory/keeper/genesis_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

#2011)

* Fix Initgenesis bug in tokenfactory, when the denom creation fee param is set

* Add more to genesis test that would've caught this

* Update changelog

* Fix remaining bug adam pointed out

* Make test account for this

* Update code comment

(cherry picked from commit 938f9bd)

# Conflicts:
#	CHANGELOG.md
#	x/tokenfactory/keeper/createdenom.go
#	x/tokenfactory/keeper/createdenom_test.go
#	x/tokenfactory/keeper/genesis_test.go
@mergify mergify bot requested a review from a team July 11, 2022 20:24
@mergify mergify bot added the conflicts label Jul 11, 2022
@ValarDragon ValarDragon merged commit 6d37b96 into v10.x Jul 11, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v10.x/pr-2011 branch July 11, 2022 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant