8000 Provide relevant block data in `ExtendVote` (backport #1270) by mergify[bot] · Pull Request #1310 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Provide relevant block data in ExtendVote (backport #1270) #1310

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Sep 11, 2023
Merged

Provide relevant block data in ExtendVote (backport #1270) #1310

merged 4 commits into from
Sep 11, 2023

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Sep 8, 2023

This is an automatic backport of pull request #1270 done by Mergify.
Cherry-pick of 843d5fe has failed:

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

You are currently cherry-picking commit 843d5fef3.
  (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:
	new file:   .changelog/unreleased/breaking-changes/1270-executor_extend_vote.md
	modified:   abci/types/types.pb.go
	modified:   consensus/byzantine_test.go
	modified:   consensus/state_test.go
	modified:   spec/abci/abci++_methods.md
	modified:   state/execution.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   consensus/state.go
	both modified:   proto/tendermint/abci/types.proto

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

@sergio-mena @mergify
Provide relevant block data in ExtendVote (#1270)
3ef90cc 
* proto changes

* make proto-gen

* Populate the new fields

* Fix UTs

* Adapted ABCI spec

* Added changelog to report on `BlocExecutor` API change

* Update .changelog/unreleased/breaking-changes/1270-executor_extend_vote.md

Co-authored-by: Thane Thomson <connect@thanethomson.com>

---------

Co-authored-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 843d5fe)

# Conflicts:
#	consensus/state.go
#	proto/tendermint/abci/types.proto
@mergify mergify bot requested review from a team as code owners September 8, 2023 16:54
@mergify mergify bot added the conflicts label Sep 8, 2023
sergio-mena and others added 2 commits September 8, 2023 18:56
@sergio-mena
Revert "Provide relevant block data in ExtendVote (#1270)"
1eaa571 
This reverts commit 3ef90cc.
@sergio-mena @thanethomson
Provide relevant block data in ExtendVote (#1270)
1e81bb1 
* proto changes

* make proto-gen

* Populate the new fields

* Fix UTs

* Adapted ABCI spec

* Added changelog to report on `BlocExecutor` API change

* Update .changelog/unreleased/breaking-changes/1270-executor_extend_vote.md

Co-authored-by: Thane Thomson <connect@thanethomson.com>

---------

Co-authored-by: Thane Thomson <connect@thanethomson.com>
@sergio-mena sergio-mena merged commit cea91ef into v0.38.x Sep 11, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.38.x/pr-1270 branch September 11, 2023 08:52
@faddat faddat mentioned this pull request Oct 15, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sergio-mena sergio-mena sergio-mena approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@sergio-mena
0