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: don't fail post handler on simulate tx with no fee (backport #122) #123

Merged
merged 2 commits into from
Jun 17, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 16, 2024

* ok

* ok

* format

* ok

* clean readme

* retract

* mod bump

(cherry picked from commit 9a2a3ee)

# Conflicts:
#	go.mod
#	go.sum
#	x/feemarket/post/fee.go
@mergify mergify bot added the conflicts label Jun 16, 2024
Copy link
Author

mergify bot commented Jun 16, 2024

Cherry-pick of 9a2a3ee has failed:

On branch mergify/bp/sdk-47/pr-122
Your branch is up to date with 'origin/sdk-47'.

You are currently cherry-picking commit 9a2a3ee.
  (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:   README.md
	modified:   x/feemarket/ante/fee.go
	modified:   x/feemarket/ante/fee_test.go
	modified:   x/feemarket/post/fee_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   x/feemarket/post/fee.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from Eric-Warehime as a code owner June 16, 2024 15:47
@aljo242 aljo242 merged commit 651e8f1 into sdk-47 Jun 17, 2024
8 checks passed
@aljo242 aljo242 deleted the mergify/bp/sdk-47/pr-122 branch June 17, 2024 14:50
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