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: check tx gas limit against block gas limit (backport #16547) #17161

Merged
merged 6 commits into from
Aug 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 27, 2023

This is an automatic backport of pull request #16547 done by Mergify.
Cherry-pick of 75b4918 has failed:

On branch mergify/bp/release/v0.47.x/pr-16547
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit 75b4918b9.
  (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:   docs/docs/building-apps/02-app-mempool.md
	modified:   testutil/sims/app_helpers.go
	modified:   x/auth/ante/setup.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   baseapp/abci_test.go
	deleted by us:   baseapp/abci_utils.go
	both modified:   baseapp/block_gas_test.go
	both modified:   baseapp/utils_test.go
	both modified:   x/auth/ante/setup_test.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

Co-authored-by: Facundo Medica <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>
(cherry picked from commit 75b4918)

# Conflicts:
#	CHANGELOG.md
#	baseapp/abci_test.go
#	baseapp/abci_utils.go
#	baseapp/block_gas_test.go
#	baseapp/utils_test.go
#	x/auth/ante/setup_test.go
@mergify mergify bot requested a review from a team as a code owner July 27, 2023 12:16
@mergify mergify bot added the conflicts label Jul 27, 2023
@@ -39,6 +39,14 @@ func (sud SetUpContextDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate

newCtx = SetGasMeter(simulate, ctx, gasTx.GetGas())

if cp := ctx.ConsensusParams(); cp != nil && cp.Block != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This differs from the original PR (#16547)

@facundomedica facundomedica enabled auto-merge (squash) August 3, 2023 13:56
@facundomedica facundomedica merged commit 4c18ff6 into release/v0.47.x Aug 3, 2023
24 of 25 checks passed
@facundomedica facundomedica deleted the mergify/bp/release/v0.47.x/pr-16547 branch August 3, 2023 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

4 participants