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

bug: send non osmo txfees to community pool instead of stakers (backport #6426) #6444

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2023

This is an automatic backport of pull request #6426 done by Mergify.
Cherry-pick of 2bb6be9 has failed:

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

You are currently cherry-picking commit 2bb6be9d.
  (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:   scripts/empty_upgrade_handler_gen.sh
	modified:   tests/e2e/README.md
	modified:   x/txfees/keeper/feedecorator.go
	modified:   x/txfees/keeper/feedecorator_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   tests/e2e/containers/config.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

* fix non osmo txfees to community pool instead of stakers

* update changelog

* update fee decorator test

* change version to alpine

* add comment

* uncomment test

* fix script to pull alpine image

* update README

* Update empty_upgrade_handler_gen.sh

---------

Co-authored-by: devbot-wizard <[email protected]>
(cherry picked from commit 2bb6be9)

# Conflicts:
#	CHANGELOG.md
#	tests/e2e/containers/config.go
@mergify mergify bot added the conflicts label Sep 19, 2023
@github-actions github-actions bot added C:docs Improvements or additions to documentation C:x/txfees T:build labels Sep 19, 2023
@p0mvn
Copy link
Member

p0mvn commented Sep 19, 2023

My bad - thought one of the changes here might be related to e2e failure on v19.x but it is not

@p0mvn p0mvn closed this Sep 19, 2023
@mergify mergify bot deleted the mergify/bp/v19.x/pr-6426 branch September 19, 2023 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:docs Improvements or additions to documentation C:x/txfees conflicts T:build
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants