Skip to content

feat(abci): move timeout_commit into FinalizeBlockResponse#22

Merged
abi87 merged 3 commits intoberachain:bera-v1.xfrom
melekes:2655-predictable-block-times-impl
Apr 17, 2025
Merged

feat(abci): move timeout_commit into FinalizeBlockResponse#22
abi87 merged 3 commits intoberachain:bera-v1.xfrom
melekes:2655-predictable-block-times-impl

Conversation

@melekes
Copy link
Copy Markdown

@melekes melekes commented Feb 11, 2025

Port of cometbft#3089

@melekes melekes changed the base branch from v1.x-bera to bera-v1.x February 12, 2025 04:40
melekes and others added 3 commits February 12, 2025 08:44
…bft#3089)

as `next_block_delay`

ADR-115: cometbft#2966
Closes cometbft#2655

---

- [ ] ~~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: Sergio Mena <sergio@informal.systems>
Comment thread config/config.go
// NOTE: when modifying, make sure to update time_iota_ms genesis parameter
// Set to 0 if you want to make progress as soon as the node has all the precommits.
// Deprecated: use `next_block_delay` in the ABCI application's `FinalizeBlockResponse`.
TimeoutCommit time.Duration `mapstructure:"timeout_commit"`
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I would leave these docs (with the "Deprecated:..." line as well), because in internal/consensus/state.go we set it if NextBlockDelay isn't set, and we also check its value when setting skipTimeoutCommit.

So someone might still want to know what this legacy value is.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

The more we diverge from the upstream v1.x, the harder it will be to keep up with it.

Comment thread config/config.toml.tpl
# though we already have +2/3).
# Set to 0 if you want to make progress as soon as the node has all the precommits.
# Deprecated: use `next_block_delay` in the ABCI application's `FinalizeBlockResponse`.
timeout_commit = "{{ .Consensus.TimeoutCommit }}"
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Same comment as above about the docs.

@melekes
Copy link
Copy Markdown
Author

melekes commented Apr 17, 2025

@abi87 can we merge this?

@abi87 abi87 merged commit 0cb22e1 into berachain:bera-v1.x Apr 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants