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 supply offsets to genesis (backport #253) #257

Merged
merged 1 commit into from
Jun 7, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 7, 2022

This is an automatic backport of pull request #253 done by Mergify.
Cherry-pick of 46bb624 has failed:

On branch mergify/bp/v0.45.0x-osmo-v7/pr-253
Your branch is up to date with 'origin/v0.45.0x-osmo-v7'.

You are currently cherry-picking commit 46bb6247d.
  (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:   docs/core/proto-docs.md
	modified:   proto/cosmos/bank/v1beta1/genesis.proto
	modified:   proto/cosmos/base/snapshots/v1beta1/snapshot.proto
	modified:   simapp/test_helpers.go
	modified:   x/bank/keeper/genesis.go
	modified:   x/bank/keeper/genesis_test.go
	modified:   x/bank/keeper/supply_offset.go
	modified:   x/bank/legacy/v040/migrate_test.go
	modified:   x/bank/legacy/v043/json_test.go
	modified:   x/bank/types/genesis.go
	modified:   x/bank/types/genesis.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   proto/cosmos/gov/v1beta1/gov.proto

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

* Add supply offsets to genesis

* Fix comments

* Fix migration test

* Fix test

Co-authored-by: mattverse <mattpark1028@gmail.com>
(cherry picked from commit 46bb624)

# Conflicts:
#	proto/cosmos/gov/v1beta1/gov.proto
@mergify mergify bot requested a review from alexanderbez as a code owner June 7, 2022 21:16
@mergify mergify bot added the conflicts label Jun 7, 2022
@ValarDragon ValarDragon merged commit 51108b6 into v0.45.0x-osmo-v7 Jun 7, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v0.45.0x-osmo-v7/pr-253 branch June 7, 2022 22:15
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