Skip to content
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

IF: Update fork database fork-choice rule - complex #2265

Merged
merged 28 commits into from
Mar 1, 2024
Merged

IF: Update fork database fork-choice rule - complex #2265

merged 28 commits into from
Mar 1, 2024

Conversation

heifner
Copy link
Member

@heifner heifner commented Feb 27, 2024 •
edited
Loading

Update fork_database for-choice rule.
Computed fields for index (in order):

  1. next_core_metadata.last_final_block_num
  2. next_core_metadata.latest_qc_claim_block_num
  3. block timestamp
  4. block ID (as final tie breaker to ensure uniqueness)

Potentially switches forks before starting to produce a block. Does not interrupt producing blocks once block production has started.

Includes some misc performance improvements to fork_database.

Resolves #2125

heifner added 14 commits February 8, 2024 14:10
@heifner
GH-2125 Optimize fetch_block_branch
472b1d4
@heifner
GH-2125 Update best fork logic of fork_database.
7c19670
@heifner
GH-2125 Update fork_database on strong vote
8101af0
@heifner
GH-2125 Make last_qc_block_num non-optional
5d2a839
@heifner
Merge remote-tracking branch 'origin/hotstuff_integration' into GH-2125…
29ddf49 
…-forkdb
@heifner
GH-2125 Move get_activated_protocol_features to block_header_state[_l…
57371bd 
…egacy]
@heifner
GH-2125 Remove fork database adaptors and use fork database accessors…
6ab1146 
… instead. Move current_core to block_state.
@heifner
Merge remote-tracking branch 'origin/hotstuff_integration' into GH-2125…
f8828ac 
…-forkdb
@heifner
Merge remote-tracking branch 'origin/hotstuff_integration' into GH-2125…
d0f7bf7 
…-forkdb
@heifner
GH-2125 Add updated_core and most_recent_ancestor_with_qc to block_st…
970528c 
…ate, use values for fork_database by_best_branch rule.
@heifner
GH-2125 Revert unneeded changes
9e0a226
@heifner
GH-2125 Potentially switch forks before beginning to produce a block
17274e2
@heifner
GH-2125 Can't have pending block when applying a block
842ed6c
@heifner
GH-2125 Use vector instead of deque
37a7a17
@heifner heifner added the OCI Work exclusive to OCI team label Feb 27, 2024
@heifner heifner requested review from greg7mdp and linh2931 February 27, 2024 14:51
@heifner heifner linked an issue Feb 27, 2024 that may be closed by this pull request
IF: Update fork-choice rule for fork database #2125
Closed
@ericpassmore
Copy link
Contributor

Note:start
group: IF
category: INTERNALS
summary: Update for database for-choice rules with the following computed fields, listed in order of importance, next_core_metadata.last_final_block_num, next_core_metadata.latest_qc_claim_block_num, block timestamp, block ID
Note:end

linh2931
linh2931 reviewed Feb 27, 2024
View reviewed changes
libraries/chain/include/eosio/chain/hotstuff/hotstuff.hpp Outdated Show resolved Hide resolved
libraries/chain/fork_database.cpp Outdated Show resolved Hide resolved
libraries/chain/fork_database.cpp Show resolved Hide resolved
libraries/chain/fork_database.cpp Outdated Show resolved Hide resolved
libraries/chain/fork_database.cpp Show resolved Hide resolved
greg7mdp
greg7mdp requested changes Feb 27, 2024
View reviewed changes
libraries/chain/controller.cpp Outdated Show resolved Hide resolved
libraries/chain/fork_database.cpp Outdated Show resolved Hide resolved
greg7mdp
greg7mdp requested changes Feb 27, 2024
View reviewed changes
libraries/chain/fork_database.cpp Outdated Show resolved Hide resolved
@heifner heifner marked this pull request as draft February 29, 2024 20:56
@heifner heifner changed the title IF: Update fork database fork-choice rule IF: Update fork database fork-choice rule - complex Feb 29, 2024
@heifner heifner merged commit bbe24e7 into hotstuff_integration Mar 1, 2024
26 checks passed
@heifner heifner deleted the GH-2125-forkdb branch March 1, 2024 19:29
@heifner
Copy link
Member Author

heifner commented Mar 1, 2024

This was not merged. Instead #2273 was merged. It was marked as merged because #2273 built off of it.

@heifner heifner restored the GH-2125-forkdb branch March 1, 2024 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@greg7mdp greg7mdp greg7mdp requested changes

@linh2931 linh2931 linh2931 approved these changes

Assignees
No one assigned
Labels
OCI Work exclusive to OCI team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

IF: Update fork-choice rule for fork database
4 participants
@heifner @ericpassmore @greg7mdp @linh2931