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: gas sim (backport #129) #130

Merged
merged 2 commits into from
Jul 15, 2024
Merged

fix: gas sim (backport #129) #130

merged 2 commits into from
Jul 15, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 15, 2024

Closes BLO-1518


This is an automatic backport of pull request #129 done by Mergify.

* small updates

* protect

* update ante

* testing

* lint fix

(cherry picked from commit efe52f2)

# Conflicts:
#	x/feemarket/post/fee_test.go
Copy link
Author

mergify bot commented Jul 15, 2024

Cherry-pick of efe52f2 has failed:

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

You are currently cherry-picking commit efe52f2.
  (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:   .github/workflows/ictest.yml
	modified:   .github/workflows/lint.yml
	modified:   .github/workflows/test.yml
	modified:   x/feemarket/ante/fee.go
	modified:   x/feemarket/ante/suite/suite.go
	modified:   x/feemarket/post/fee.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/feemarket/post/fee_test.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 davidterpay as a code owner July 15, 2024 18:01
@mergify mergify bot added the conflicts label Jul 15, 2024
@aljo242 aljo242 merged commit ad2bdcb into sdk-47 Jul 15, 2024
8 checks passed
@aljo242 aljo242 deleted the mergify/bp/sdk-47/pr-129 branch July 15, 2024 19:33
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