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 genesis supply handling (backport #8930) #9252

Closed
wants to merge 11 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 3, 2021

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

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

You are currently cherry-picking commit e9e978d54.
  (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:   proto/cosmos/bank/v1beta1/genesis.proto
	modified:   x/bank/keeper/genesis_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/bank/keeper/genesis.go
	both modified:   x/bank/types/genesis.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

* Fix genesis supply handling

* Add test

* Fix nit

Co-authored-by: Amaury M <[email protected]>
Co-authored-by: Alessio Treglia <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit e9e978d)

# Conflicts:
#	x/bank/keeper/genesis.go
#	x/bank/types/genesis.go
@mergify mergify bot requested review from aaronc, alessio and alexanderbez as code owners May 3, 2021 14:34
@mergify mergify bot added the conflicts label May 3, 2021
@mergify mergify bot mentioned this pull request May 3, 2021
9 tasks
@amaury1093 amaury1093 added this to the v0.42.5 milestone May 3, 2021
Copy link
Contributor

@alessio alessio left a comment

Choose a reason for hiding this comment

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

Simulations are failing

@amaury1093
Copy link
Contributor

hmm ok, I can have a look into that.

@atheeshp
Copy link
Contributor

atheeshp commented May 17, 2021

I think these changes are dependent on #8473. May not be possible to backport this since #8473 changes are not here (that's why the sims are breaking).
cc: @AmauryM , @aaronc

Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

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

Why are we committing a bunch of commented-out code?

@amaury1093
Copy link
Contributor

I think these changes are dependent on #8473. May not be possible to backport this since #8473 are not here (that's why the sims are breaking).

Sounds good. No need to put more effort into backporting this then, the supply genesis check will only be in v0.43.

@amaury1093 amaury1093 closed this May 17, 2021
@amaury1093 amaury1093 deleted the mergify/bp/release/v0.42.x/pr-8930 branch May 17, 2021 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants