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

pbft optimise #123

Merged
merged 12 commits into from
Aug 29, 2019
Merged

pbft optimise #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f47911c
optimise for return value.
Jul 22, 2019
d47f250
reset timer upon state transition; refactor code;
Jul 25, 2019
99d2ed7
add global object to control pbft behavior; optimise checkpoint logic
Jul 30, 2019
239f484
refactor pbft db persistence
Jul 31, 2019
dac6102
fix tests
Aug 1, 2019
82f00a8
reset view change timer when global timeout is changed.
Aug 15, 2019
2840317
reserve prepare only if my_prepare is on forks
Aug 16, 2019
6efb1a9
reserve prepare only if my_prepare is on forks
Aug 16, 2019
6717cf2
Modify reserve prepare test case
Frank-AFN Aug 19, 2019
889161d
Modify reserve prepare test case
Frank-AFN Aug 19, 2019
b097d3e
avoid sending last prepare.
Aug 26, 2019
1b15193
Merge branch 'release/3.0.x' into feature/dpos-pbft-bos-optimise
oldcold Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion libraries/chain/pbft.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,9 @@ namespace eosio {
set_view_change_timer(0);

set_current(std::make_shared<psm_committed_state>(*this, pbft_db));
emit(pbft_transit_to_committed, true);
if (!get_prepare_cache().empty()) {
emit(pbft_transit_to_committed, true);
}
}

void psm_machine::transit_to_prepared_state() {
Expand Down
3 changes: 2 additions & 1 deletion libraries/chain/pbft_database.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ namespace eosio {

if (high_watermark_block_num <= lib) return prepares_to_be_cached;

if (auto hwbs = ctrl.fork_db().get_block_in_current_chain_by_num(high_watermark_block_num)) {
auto hwbs = ctrl.fork_db().get_block_in_current_chain_by_num(high_watermark_block_num);
if ( hwbs && hwbs->id != my_prepare) {
auto sent = false;
for (const auto& sp : my_sps) {
pbft_prepare new_p;
Expand Down