Skip to content

feat(proto): add SyncingToHeight to FinalizeBlockRequest (backport #3134)#3146

Merged
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-3134
May 30, 2024
Merged

feat(proto): add SyncingToHeight to FinalizeBlockRequest (backport #3134)#3146
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-3134

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 30, 2024

to let the ABCI app know if CometBFT is syncing or not. If the node is syncing/replaying blocks, the value is the maximum known height. If not, SyncingToHeight equals Height in FinalizeBlockRequest.

Closes #1247

PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec
This is an automatic backport of pull request #3134 done by [Mergify](https://mergify.com).

@melekes @mergify
feat(proto): add SyncingToHeight to FinalizeBlockRequest (#3134)
f548892 
to let the ABCI app know if CometBFT is syncing or not. If the node is
syncing/replaying blocks, the value is the maximum known height. If not,
`SyncingToHeight` equals `Height` in `FinalizeBlockRequest`.

Closes #1247

---

#### PR checklist

- [ ] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

---------

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
(cherry picked from commit 68e5e1b)

# Conflicts:
#	api/cometbft/abci/v1/types.pb.go
#	internal/blocksync/reactor.go
#	state/execution.go
@mergify mergify bot requested a review from a team as a code owner May 30, 2024 05:24
@mergify mergify bot added the conflicts label May 30, 2024
@mergify mergify bot requested a review from a team as a code owner May 30, 2024 05:24
@mergify mergify bot requested a review from a team May 30, 2024 05:24
@mergify
Copy link
Contributor Author

mergify bot commented May 30, 2024

Cherry-pick of 68e5e1b has failed:

On branch mergify/bp/v1.x/pr-3134
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 68e5e1b4e.
  (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/features/1247-sync-flag.md
	modified:   internal/blocksync/reactor_test.go
	modified:   internal/consensus/replay.go
	modified:   internal/consensus/replay_test.go
	modified:   internal/consensus/state.go
	modified:   proto/cometbft/abci/v1/types.proto
	modified:   spec/abci/abci++_methods.md
	modified:   state/execution_test.go
	modified:   state/helpers_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   api/cometbft/abci/v1/types.pb.go
	both modified:   internal/blocksync/reactor.go
	both modified:   state/execution.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

@melekes melekes merged commit ae27f7e into v1.x May 30, 2024
@melekes melekes deleted the mergify/bp/v1.x/pr-3134 branch May 30, 2024 05:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@melekes melekes melekes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@melekes @sergio-mena