From 4cdb79fc762a1f6cc97defe5ba3925048c06f846 Mon Sep 17 00:00:00 2001 From: Vlad Dobromyslov Date: Tue, 14 Jun 2022 15:16:52 +0300 Subject: [PATCH] #387 - fix hardfork checks --- libraries/chain/db_maint.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index afe264916..39dc221f9 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -197,7 +197,7 @@ void database::pay_sons() } } const vector> sons = [this, &son_count]{ - if( (head_block_time() >= HARDFORK_SON2_TIME) && (head_block_time() < HARDFORK_SON3_TIME) ) + if(head_block_time() >= HARDFORK_SON3_TIME) return sort_votable_objects(std::max(son_count*2+1, (size_t)get_chain_properties().immutable_parameters.min_son_count)); else return sort_votable_objects(get_global_properties().parameters.maximum_son_count()); @@ -699,7 +699,7 @@ void database::update_active_sons() const global_property_object& gpo = get_global_properties(); const vector> sons = [this, &son_count]{ - if( (head_block_time() >= HARDFORK_SON2_TIME) && (head_block_time() < HARDFORK_SON3_TIME) ) + if(head_block_time() >= HARDFORK_SON3_TIME) return sort_votable_objects(std::max(son_count*2+1, (size_t)get_chain_properties().immutable_parameters.min_son_count)); else return sort_votable_objects(get_global_properties().parameters.maximum_son_count()); @@ -2064,13 +2064,6 @@ void update_son_params(database& db) gpo.parameters.extensions.value.maximum_son_count = 7; }); } - else - { - const auto& gpo = db.get_global_properties(); - db.modify( gpo, []( global_property_object& gpo ) { - gpo.parameters.extensions.value.maximum_son_count = GRAPHENE_DEFAULT_MAX_SONS; - }); - } } void database::perform_chain_maintenance(const signed_block& next_block, const global_property_object& global_props)