Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge branch 'develop' into feature/son-for-hive

Browse source
This commit is contained in:
serkixenos 2021-09-11 04:22:36 +02:00 committed by serki.xenos@gmail.com
commit 2bd26f5ae3
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/chain/db_maint.cpp
View file

@ -2033,7 +2033,7 @@ void database::perform_son_tasks()
} }
} }
void update_son_asset(database& db) void update_son_params(database& db)
{ {
if( db.head_block_time() >= HARDFORK_SON2_TIME ) if( db.head_block_time() >= HARDFORK_SON2_TIME )
{ {
@ -2045,6 +2045,9 @@ void update_son_asset(database& db)
asset_issuer_permission_flags::override_authority; asset_issuer_permission_flags::override_authority;
}); });
} }
db.modify( gpo, []( global_property_object& gpo ) {
gpo.parameters.extensions.value.maximum_son_count = 7;
});
} }
} }
@ -2059,7 +2062,7 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
rolling_period_start(*this); rolling_period_start(*this);
update_son_asset(*this); update_son_params(*this);
struct vote_tally_helper { struct vote_tally_helper {
database& d; database& d;

2
programs/witness_node/genesis.json
View file

@ -392,7 +392,7 @@
"son_deregister_time": 43200, "son_deregister_time": 43200,
"son_heartbeat_frequency": 180, "son_heartbeat_frequency": 180,
"son_down_time": 360, "son_down_time": 360,
"maximum_son_count": 15 "maximum_son_count": 7
} }
}, },
"initial_bts_accounts": [], "initial_bts_accounts": [],

2
tests/cli/son.cpp
View file

@ -345,7 +345,7 @@ BOOST_FIXTURE_TEST_CASE( select_top_fifteen_sons, cli_fixture )
BOOST_TEST_MESSAGE("gpo: " << gpo.active_sons.size()); BOOST_TEST_MESSAGE("gpo: " << gpo.active_sons.size());
BOOST_CHECK(generate_maintenance_block()); BOOST_CHECK(generate_maintenance_block());
BOOST_CHECK(gpo.active_sons.size() == 15); BOOST_CHECK(gpo.active_sons.size() == gpo.parameters.maximum_son_count());
} catch( fc::exception& e ) { } catch( fc::exception& e ) {
BOOST_TEST_MESSAGE("SON cli wallet tests exception"); BOOST_TEST_MESSAGE("SON cli wallet tests exception");