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

Save gas on IsFeeEnabled (backport #2786) #2814

Merged
merged 2 commits into from
Nov 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 22, 2022

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

On branch mergify/bp/release/v4.1.x/pr-2786
Your branch is up to date with 'origin/release/v4.1.x'.

You are currently cherry-picking commit bbac2b1.
  (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:   modules/apps/29-fee/keeper/keeper.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

* Save gas on IsFeeEnabled

* add entry for #2786

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit bbac2b1)

# Conflicts:
#	CHANGELOG.md
@crodriguezvega crodriguezvega merged commit dd2c03e into release/v4.1.x Nov 23, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v4.1.x/pr-2786 branch November 23, 2022 08:32
colin-axner added a commit that referenced this pull request May 25, 2023
crodriguezvega pushed a commit that referenced this pull request May 25, 2023
* Revert "Save gas on IsFeeEnabled (backport #2786) (#2814)"

This reverts commit dd2c03e.

* remove additional change in changelog entry

* update CHANGELOG

* Update CHANGELOG.md

---------

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
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.

2 participants