Skip to content

[Backport #1175]: remove logic to unlock block on +2/3 prevote for nil#19

Merged
teddyding merged 3 commits intodydx-fork-v0.37.2from
td/CORE-514-exp
Sep 6, 2023
Merged

[Backport #1175]: remove logic to unlock block on +2/3 prevote for nil#19
teddyding merged 3 commits intodydx-fork-v0.37.2from
td/CORE-514-exp

Conversation

@teddyding
Copy link

@teddyding teddyding commented Sep 5, 2023

CORE-514

Port over changes from cometbft#1175: consensus: remove logic to unlock block on +2/3 prevote for nil

@linear
Copy link

linear bot commented Sep 5, 2023

CORE-514 Bring in upstream consensus change in CometBFT

https://github.com/cometbft/cometbft/commits/8e6e6ca0bcc732747e10020be2c5e9f3779e6b0c/consensus/state.go

From 1e0cf136d395db94728883355a136e4e34e693db to 68c10d2ad0bb1015a7fb3e1283c50fb2e933fb9a

Key changes:

  • Brendan's fix (also include IsZero → IsNil name change)
  • Avoid process proposal when correct validator has validated

@teddyding teddyding changed the title cp #1175: remove logic to unlock block on +2/3 prevote for nil [Cherry-pick #1175]: remove logic to unlock block on +2/3 prevote for nil Sep 5, 2023
@teddyding teddyding merged commit c72272c into dydx-fork-v0.37.2 Sep 6, 2023
@teddyding teddyding deleted the td/CORE-514-exp branch September 6, 2023 01:52
@teddyding teddyding changed the title [Cherry-pick #1175]: remove logic to unlock block on +2/3 prevote for nil [Backport #1175]: remove logic to unlock block on +2/3 prevote for nil Sep 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants