Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 13, 2023

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

On branch mergify/bp/v0.37.x/pr-496
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 2ab859860.
  (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/govulncheck.yml
	modified:   consensus/state.go
	modified:   state/execution.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v0.37.0/bug-fixes/496-error-on-applyblock-should-panic.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

…s and error (#496)

* Review call hierarchies of ABCI methods to make sure they panic on error

* Added changelog

* Trying 1.20.2 explicitly

(cherry picked from commit 2ab8598)

# Conflicts:
#	.changelog/v0.37.0/bug-fixes/496-error-on-applyblock-should-panic.md
@mergify mergify bot requested a review from a team as a code owner March 13, 2023 15:29
@mergify mergify bot added the conflicts label Mar 13, 2023
…ll itself reports and error (#496)

* Review call hierarchies of ABCI methods to make sure they panic on error

* Added changelog

* Trying 1.20.2 explicitly
@sergio-mena sergio-mena added abci Application blockchain interface and removed conflicts labels Mar 15, 2023
@sergio-mena sergio-mena self-assigned this Mar 15, 2023
@sergio-mena sergio-mena merged commit d722192 into v0.37.x Mar 16, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.37.x/pr-496 branch March 16, 2023 09:10
roy-dydx pushed a commit to dydxprotocol/cometbft that referenced this pull request Jul 11, 2023
…s and error (backport cometbft#496) (cometbft#519)

* ABCI calls should crash/exit in all cases when the call itself reports and error (cometbft#496)

* Review call hierarchies of ABCI methods to make sure they panic on error

* Added changelog

* Trying 1.20.2 explicitly

(cherry picked from commit 2ab8598)

# Conflicts:
#	.changelog/v0.37.0/bug-fixes/496-error-on-applyblock-should-panic.md

* Revert "ABCI calls should crash/exit in all cases when the call itself reports and error (cometbft#496)"

This reverts commit 825ac9e.

* [cherry-picked] ABCI calls should crash/exit in all cases when the call itself reports and error (cometbft#496)

* Review call hierarchies of ABCI methods to make sure they panic on error

* Added changelog

* Trying 1.20.2 explicitly

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
abci Application blockchain interface
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant