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 bug in pool incentives linking NoLock gauges and PoolIDs (backport #6644) #6648

Merged
merged 5 commits into from
Oct 8, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 8, 2023

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

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

You are currently cherry-picking commit ab93bb25.
  (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/osmosis/pool-incentives/v1beta1/genesis.proto
	modified:   proto/osmosis/pool-incentives/v1beta1/incentives.proto
	modified:   x/pool-incentives/keeper/genesis.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/pool-incentives/keeper/genesis_test.go
	both modified:   x/pool-incentives/types/genesis.pb.go
	both modified:   x/pool-incentives/types/incentives.pb.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

…#6644)

* fix: genesis bug in pool incentives

* changelog

* lint

* add clarifying comment

* merge main

* Revert "merge main"

This reverts commit a0ed7a0.

---------

Co-authored-by: Adam Tucker <[email protected]>
Co-authored-by: Adam Tucker <[email protected]>
(cherry picked from commit ab93bb2)

# Conflicts:
#	CHANGELOG.md
#	x/pool-incentives/keeper/genesis_test.go
#	x/pool-incentives/types/genesis.pb.go
#	x/pool-incentives/types/incentives.pb.go
@czarcas7ic czarcas7ic merged commit bd75d76 into v18.x Oct 8, 2023
1 check passed
@czarcas7ic czarcas7ic deleted the mergify/bp/v18.x/pr-6644 branch October 8, 2023 18:49
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.

2 participants