Skip to content

Commit

Permalink
Merge pull request EOSIO#115 from eosiosg/feature/dpos-pbft-bos-upgrade
Browse files Browse the repository at this point in the history 
Feature/dpos pbft bos upgrade:Bug Fixes & Performance Improvements
  • Loading branch information
@Thaipanda
Thaipanda authored Jul 16, 2019
2 parents e947062 + 0209353 commit fa2072c
Show file tree
Hide file tree
Showing 8 changed files with 665 additions and 219 deletions.
72 changes: 36 additions & 36 deletions libraries/chain/include/eosio/chain/pbft.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ namespace eosio {
return current;
}

void on_prepare(pbft_metadata_ptr<pbft_prepare> e);
void on_commit(pbft_metadata_ptr<pbft_commit> e);
void on_view_change(pbft_metadata_ptr<pbft_view_change> e);
void on_new_view(const pbft_metadata_ptr<pbft_new_view> &e);
void on_prepare(const pbft_metadata_ptr<pbft_prepare>& e);
void on_commit(const pbft_metadata_ptr<pbft_commit>& e);
void on_view_change(const pbft_metadata_ptr<pbft_view_change>& e);
void on_new_view(const pbft_metadata_ptr<pbft_new_view>& e);

void send_prepare();
void send_commit();
void send_view_change();

void transit_to_committed_state(psm_state_ptr s, bool to_new_view);
void transit_to_prepared_state(psm_state_ptr s);
void transit_to_view_change_state(psm_state_ptr s);
void transit_to_committed_state(const psm_state_ptr& s, bool to_new_view);
void transit_to_prepared_state(const psm_state_ptr& s);
void transit_to_view_change_state(const psm_state_ptr& s);
void transit_to_new_view(const pbft_metadata_ptr<pbft_new_view>& e, const psm_state_ptr& s);

void do_send_view_change();
Expand Down Expand Up @@ -106,13 +106,13 @@ namespace eosio {
psm_state();
~psm_state();

virtual void on_prepare(psm_machine_ptr m, pbft_metadata_ptr<pbft_prepare> e, pbft_database &pbft_db) = 0;
virtual void on_commit(psm_machine_ptr m, pbft_metadata_ptr<pbft_commit> e, pbft_database &pbft_db) = 0;
virtual void on_view_change(psm_machine_ptr m, pbft_metadata_ptr<pbft_view_change> e, pbft_database &pbft_db) = 0;
virtual void on_prepare(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_prepare>& e, pbft_database &pbft_db) = 0;
virtual void on_commit(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_commit>& e, pbft_database &pbft_db) = 0;
virtual void on_view_change(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_view_change>& e, pbft_database &pbft_db) = 0;

virtual void send_prepare(psm_machine_ptr m, pbft_database &pbft_db) = 0;
virtual void send_commit(psm_machine_ptr m, pbft_database &pbft_db) = 0;
virtual void send_view_change(psm_machine_ptr m, pbft_database &pbft_db) = 0;
virtual void send_prepare(const psm_machine_ptr& m, pbft_database &pbft_db) = 0;
virtual void send_commit(const psm_machine_ptr& m, pbft_database &pbft_db) = 0;
virtual void send_view_change(const psm_machine_ptr& m, pbft_database &pbft_db) = 0;

virtual const char* get_name() = 0;
std::shared_ptr<psm_state> get_self() { return shared_from_this(); };
Expand All @@ -124,13 +124,13 @@ namespace eosio {
psm_prepared_state();
~psm_prepared_state();

void on_prepare(psm_machine_ptr m, pbft_metadata_ptr<pbft_prepare> e, pbft_database &pbft_db) override;
void on_commit(psm_machine_ptr m, pbft_metadata_ptr<pbft_commit> e, pbft_database &pbft_db) override;
void on_view_change(psm_machine_ptr m, pbft_metadata_ptr<pbft_view_change> e, pbft_database &pbft_db) override;
void on_prepare(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_prepare>& e, pbft_database &pbft_db) override;
void on_commit(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_commit>& e, pbft_database &pbft_db) override;
void on_view_change(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_view_change>& e, pbft_database &pbft_db) override;

void send_prepare(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_commit(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_view_change(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_prepare(const psm_machine_ptr& m, pbft_database &pbft_db) override;
void send_commit(const psm_machine_ptr& m, pbft_database &pbft_db) override;
void send_view_change(const psm_machine_ptr& m, pbft_database &pbft_db) override;

bool pending_commit_local;

Expand All @@ -142,13 +142,13 @@ namespace eosio {
psm_committed_state();
~psm_committed_state();

void on_prepare(psm_machine_ptr m, pbft_metadata_ptr<pbft_prepare> e, pbft_database &pbft_db) override;
void on_commit(psm_machine_ptr m, pbft_metadata_ptr<pbft_commit> e, pbft_database &pbft_db) override;
void on_view_change(psm_machine_ptr m, pbft_metadata_ptr<pbft_view_change> e, pbft_database &pbft_db) override;
void on_prepare(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_prepare>& e, pbft_database &pbft_db) override;
void on_commit(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_commit>& e, pbft_database &pbft_db) override;
void on_view_change(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_view_change>& e, pbft_database &pbft_db) override;

void send_prepare(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_commit(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_view_change(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_prepare(const psm_machine_ptr& m, pbft_database &pbft_db) override;
void send_commit(const psm_machine_ptr& m, pbft_database &pbft_db) override;
void send_view_change(const psm_machine_ptr& m, pbft_database &pbft_db) override;

const char* get_name() override { return "{==== COMMITTED ====}"; }
};
Expand All @@ -158,13 +158,13 @@ namespace eosio {
psm_view_change_state();
~psm_view_change_state();

void on_prepare(psm_machine_ptr m, pbft_metadata_ptr<pbft_prepare> e, pbft_database &pbft_db) override;
void on_commit(psm_machine_ptr m, pbft_metadata_ptr<pbft_commit> e, pbft_database &pbft_db) override;
void on_view_change(psm_machine_ptr m, pbft_metadata_ptr<pbft_view_change> e, pbft_database &pbft_db) override;
void on_prepare(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_prepare>& e, pbft_database &pbft_db) override;
void on_commit(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_commit>& e, pbft_database &pbft_db) override;
void on_view_change(const psm_machine_ptr& m, const pbft_metadata_ptr<pbft_view_change>& e, pbft_database &pbft_db) override;

void send_prepare(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_commit(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_view_change(psm_machine_ptr m, pbft_database &pbft_db) override;
void send_prepare(const psm_machine_ptr& m, pbft_database &pbft_db) override;
void send_commit(const psm_machine_ptr& m, pbft_database &pbft_db) override;
void send_view_change(const psm_machine_ptr& m, pbft_database &pbft_db) override;

const char* get_name() override { return "{==== VIEW CHANGE ====}"; }
};
Expand All @@ -184,11 +184,11 @@ namespace eosio {
void maybe_pbft_view_change();
void maybe_pbft_checkpoint();

void on_pbft_prepare(pbft_metadata_ptr<pbft_prepare> p);
void on_pbft_commit(pbft_metadata_ptr<pbft_commit> c);
void on_pbft_view_change(pbft_metadata_ptr<pbft_view_change> vc);
void on_pbft_new_view(const pbft_metadata_ptr<pbft_new_view> &nv);
void on_pbft_checkpoint(const pbft_metadata_ptr<pbft_checkpoint> &cp);
void on_pbft_prepare(const pbft_metadata_ptr<pbft_prepare>& p);
void on_pbft_commit(const pbft_metadata_ptr<pbft_commit>& c);
void on_pbft_view_change(const pbft_metadata_ptr<pbft_view_change>& vc);
void on_pbft_new_view(const pbft_metadata_ptr<pbft_new_view>& nv);
void on_pbft_checkpoint(const pbft_metadata_ptr<pbft_checkpoint>& cp);

private:
fc::path datadir;
Expand Down
31 changes: 15 additions & 16 deletions libraries/chain/include/eosio/chain/pbft_database.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace eosio {

template<typename pbft_message_body>
struct pbft_message_metadata {
explicit pbft_message_metadata(pbft_message_body m, chain_id_type chain_id): msg{m} {
explicit pbft_message_metadata(pbft_message_body m, chain_id_type& chain_id): msg{m} {
try {
sender_key = crypto::public_key(msg.sender_signature, msg.digest(chain_id), true);
} catch (fc::exception & /*e*/) {
Expand Down Expand Up @@ -110,6 +110,8 @@ namespace eosio {
}
};

using pbft_prepare_ptr = std::shared_ptr<pbft_prepare>;

struct pbft_commit {
explicit pbft_commit() = default;

Expand Down Expand Up @@ -166,6 +168,8 @@ namespace eosio {
}
};

using pbft_checkpoint_ptr = std::shared_ptr<pbft_checkpoint>;

struct pbft_stable_checkpoint {
explicit pbft_stable_checkpoint() = default;

Expand Down Expand Up @@ -252,6 +256,8 @@ namespace eosio {
}
};

using pbft_view_change_ptr = std::shared_ptr<pbft_view_change>;

struct pbft_view_changed_certificate {
explicit pbft_view_changed_certificate() = default;

Expand Down Expand Up @@ -301,6 +307,8 @@ namespace eosio {
}
};

using pbft_new_view_ptr = std::shared_ptr<pbft_new_view>;

struct pbft_state {
block_id_type block_id;
block_num_type block_num = 0;
Expand Down Expand Up @@ -465,7 +473,7 @@ namespace eosio {
bool should_recv_pbft_msg(const public_key_type &pub_key);

bool pending_pbft_lib();
chain_id_type get_chain_id() {return chain_id;}
chain_id_type& get_chain_id() {return chain_id;}
pbft_stable_checkpoint get_stable_checkpoint_by_id(const block_id_type &block_id, bool incl_blk_extn = true);
pbft_stable_checkpoint fetch_stable_checkpoint_from_blk_extn(const signed_block_ptr &b);
block_info_type cal_pending_stable_checkpoint() const;
Expand All @@ -481,20 +489,11 @@ namespace eosio {
flat_map<public_key_type, uint32_t> get_pbft_fork_schedules() const;


signal<void(const pbft_prepare &)> pbft_outgoing_prepare;
signal<void(const pbft_prepare &)> pbft_incoming_prepare;

signal<void(const pbft_commit &)> pbft_outgoing_commit;
signal<void(const pbft_commit &)> pbft_incoming_commit;

signal<void(const pbft_view_change &)> pbft_outgoing_view_change;
signal<void(const pbft_view_change &)> pbft_incoming_view_change;

signal<void(const pbft_new_view &)> pbft_outgoing_new_view;
signal<void(const pbft_new_view &)> pbft_incoming_new_view;

signal<void(const pbft_checkpoint &)> pbft_outgoing_checkpoint;
signal<void(const pbft_checkpoint &)> pbft_incoming_checkpoint;
signal<void(const pbft_prepare_ptr &)> pbft_outgoing_prepare;
signal<void(const pbft_commit_ptr &)> pbft_outgoing_commit;
signal<void(const pbft_view_change_ptr &)> pbft_outgoing_view_change;
signal<void(const pbft_new_view_ptr &)> pbft_outgoing_new_view;
signal<void(const pbft_checkpoint_ptr &)> pbft_outgoing_checkpoint;

private:
controller &ctrl;
Expand Down
Loading

0 comments on commit fa2072c

Please sign in to comment.