Skip to content

Add requirement for CheckTx in ABCI spec (backport #928)#965

Merged
sergio-mena merged 3 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-928
Jun 14, 2023
Merged

Add requirement for CheckTx in ABCI spec (backport #928)#965
sergio-mena merged 3 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-928

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2023

This is an automatic backport of pull request #928 done by Mergify.
Cherry-pick of 21e94a2 has failed:

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

You are currently cherry-picking commit 21e94a288.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   spec/abci/abci++_app_requirements.md

no changes added to commit (use "git add" and/or "git commit -a")

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

* Add requirement for `CheckTx` in ABCI spec

* Apply suggestions from code review

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>

* Added sentence from @jmalicevic's suggestion

* Addressed review comments

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: Daniel <daniel.cason@informal.systems>

* Addressed comment

* `CheckTx` requirements for the app, new version

* New version of `CheckTx` requirement, after yesterday's discussion

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>

* Addressed @josef-widder's comment

---------

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: Daniel <daniel.cason@informal.systems>
(cherry picked from commit 21e94a2)

# Conflicts:
#	spec/abci/abci++_app_requirements.md
@mergify mergify bot requested review from a team as code owners June 14, 2023 07:46
@mergify mergify bot added the conflicts label Jun 14, 2023
sergio-mena and others added 2 commits June 14, 2023 09:48
* Add requirement for `CheckTx` in ABCI spec

* Apply suggestions from code review

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>

* Added sentence from @jmalicevic's suggestion

* Addressed review comments

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: Daniel <daniel.cason@informal.systems>

* Addressed comment

* `CheckTx` requirements for the app, new version

* New version of `CheckTx` requirement, after yesterday's discussion

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>

* Addressed @josef-widder's comment

---------

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: Daniel <daniel.cason@informal.systems>
@sergio-mena sergio-mena self-assigned this Jun 14, 2023
@sergio-mena sergio-mena added the spec Specification-related label Jun 14, 2023
@sergio-mena sergio-mena merged commit 4f04b67 into v0.37.x Jun 14, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.37.x/pr-928 branch June 14, 2023 07:56
DongLieu pushed a commit to DongCoNY/cometbft that referenced this pull request May 13, 2024
…ometbft#965)

* Add requirement for `CheckTx` in ABCI spec (cometbft#928)

* Add requirement for `CheckTx` in ABCI spec

* Apply suggestions from code review

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>

* Added sentence from @jmalicevic's suggestion

* Addressed review comments

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: Daniel <daniel.cason@informal.systems>

* Addressed comment

* `CheckTx` requirements for the app, new version

* New version of `CheckTx` requirement, after yesterday's discussion

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>

* Addressed @josef-widder's comment

---------

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: Daniel <daniel.cason@informal.systems>
(cherry picked from commit 21e94a2)

# Conflicts:
#	spec/abci/abci++_app_requirements.md

* Revert "Add requirement for `CheckTx` in ABCI spec (cometbft#928)"

* Add requirement for `CheckTx` in ABCI spec (cometbft#928)

* Add requirement for `CheckTx` in ABCI spec

* Apply suggestions from code review

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>

* Added sentence from @jmalicevic's suggestion

* Addressed review comments

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: Daniel <daniel.cason@informal.systems>

* Addressed comment

* `CheckTx` requirements for the app, new version

* New version of `CheckTx` requirement, after yesterday's discussion

* Update spec/abci/abci++_app_requirements.md

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>

* Addressed @josef-widder's comment

---------

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: Daniel <daniel.cason@informal.systems>

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Lasaro <lasaro@informal.systems>
Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: Daniel <daniel.cason@informal.systems>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

spec Specification-related

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant