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

set_finalizers host function (#1511) #1561

Merged
merged 19 commits into from
Aug 30, 2023
Merged

set_finalizers host function (#1511) #1561

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dcb04cb
set_finalizers host function (#1511)
fcecin Aug 25, 2023
e27c827
Fixes & get finalizer info to pacemaker
fcecin Aug 25, 2023
5aaad89
Placeholder fix for bls_public_key operators
fcecin Aug 25, 2023
ee8eff1
controller::get_finalizer returns finalizer info
fcecin Aug 26, 2023
1cc704b
Remove vector copy
fcecin Aug 26, 2023
83183dd
Small fixes
fcecin Aug 26, 2023
c9fec69
Refactor finalizer_authority
fcecin Aug 26, 2023
3b3f55a
Refactor finalizer_authority
fcecin Aug 26, 2023
02841ab
Misc fixes
fcecin Aug 26, 2023
dba1f3a
GH-1541 Add thread safety to chain_pacemaker access of chain state
heifner Aug 28, 2023
cb8bc49
GH-1541 minor cleanup
heifner Aug 28, 2023
a7fc539
GH-1541 minor cleanup
heifner Aug 28, 2023
7f4bcf8
GH-1541 make sure head_block_state is initialized
heifner Aug 28, 2023
7447c15
GH-1541 make sure head_block_state is initialized
heifner Aug 29, 2023
9b6fbdc
Merge pull request #1574 from AntelopeIO/GH-1541-threading-part-2
heifner Aug 29, 2023
255e2b0
Merge remote-tracking branch 'origin/hotstuff_integration' into hotst…
heifner Aug 29, 2023
8735839
Merge remote-tracking branch 'origin/hotstuff_integration' into hotst…
heifner Aug 29, 2023
683750a
chain_pacemaker now created in startup.
heifner Aug 29, 2023
36a60e1
Remove unneeded/unused shared versions
heifner Aug 30, 2023
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
5 changes: 2 additions & 3 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1999,9 +1999,8 @@ struct controller_impl {
this->finalizers = std::move(finalizers);
}

void get_finalizers_impl(uint64_t& fthreshold, vector<finalizer_authority>& finalizers) {
fthreshold = this->fthreshold;
finalizers = this->finalizers;
std::pair<uint64_t, vector<finalizer_authority>> get_finalizers_impl() {
fcecin marked this conversation as resolved.
Show resolved Hide resolved
return { fthreshold, finalizers };
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/include/eosio/chain/controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ namespace eosio { namespace chain {
int64_t set_proposed_producers( vector<producer_authority> producers );

void set_finalizers( uint64_t fthreshold, vector<finalizer_authority> finalizers );
void get_finalizers( uint64_t& fthreshold, vector<finalizer_authority>& finalizers );
std::pair<uint64_t, vector<finalizer_authority>> get_finalizers() const;

bool light_validation_allowed() const;
bool skip_auth_check()const;
Expand Down
4 changes: 1 addition & 3 deletions libraries/hotstuff/chain_pacemaker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,7 @@ namespace eosio { namespace hotstuff {
// - list of string finalizer descriptions instead of eosio name now
// - also return the keys for each finalizer, not just name/description so qc_chain can use them
//
uint64_t fthreshold;
vector<finalizer_authority> finalizers;
_chain->get_finalizers(fthreshold, finalizers);
auto [threshold, finalizers] = _chain->get_finalizers();

// Old code: get eosio::name from the producer schedule
const block_state_ptr& hbs = _chain->head_block_state();
Expand Down
3 changes: 1 addition & 2 deletions libraries/libfc/include/fc/crypto/bls_public_key.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <fc/reflect/variant.hpp>
#include <fc/static_variant.hpp>
#include <bls12-381/bls12-381.hpp>
#include <bls12-381/scalar.hpp>

namespace fc { namespace crypto { namespace blslib {

Expand Down Expand Up @@ -63,7 +62,7 @@ namespace fc { namespace crypto { namespace blslib {
friend std::ostream& operator<< (std::ostream& s, const bls_public_key& k);
friend bool operator == ( const bls_public_key& p1, const bls_public_key& p2) { return p1._pkey.equal(p2._pkey); }
friend bool operator != ( const bls_public_key& p1, const bls_public_key& p2) { return !p1._pkey.equal(p2._pkey); }
friend bool operator < ( const bls_public_key& p1, const bls_public_key& p2) { return bls12_381::scalar::cmp(p1._pkey.x.d, p2._pkey.x.d) < 0; }
friend bool operator < ( const bls_public_key& p1, const bls_public_key& p2) { return p1._pkey.affine().x.cmp(p2._pkey.affine().x) < 0; }
friend struct reflector<bls_public_key>;
friend class bls_private_key;
}; // bls_public_key
Expand Down
Loading