Compare commits

...

4 commits

Author SHA1 Message Date
pbattu123
1691bcfa55 add comments 2020-03-18 23:04:27 -03:00
pbattu123
4b6305952f revert check, can be added later 2020-03-18 22:10:26 -03:00
pbattu123
598ee95621 updated genesis file for reference 2 2020-03-18 17:38:47 -03:00
pbattu123
39e4ebe92e updated genesis file for reference 2020-03-18 17:37:34 -03:00
3 changed files with 163 additions and 87 deletions

View file

@ -558,9 +558,6 @@ void database::update_active_sons()
} }
} }
//restrict below code snippet to sons functionality
if(cur_active_sons.size() || new_active_sons.size())
{
if (son_sets_equal) { if (son_sets_equal) {
ilog( "Active SONs set NOT CHANGED" ); ilog( "Active SONs set NOT CHANGED" );
} else { } else {
@ -651,7 +648,7 @@ void database::update_active_sons()
} }
} }
} }
}
modify(gpo, [&]( global_property_object& gp ){ modify(gpo, [&]( global_property_object& gp ){
gp.active_sons.clear(); gp.active_sons.clear();

View file

@ -1,5 +1,5 @@
{ {
"initial_timestamp": "2020-01-13T06:03:15", "initial_timestamp": "2020-03-16T20:35:24",
"max_core_supply": "1000000000000000", "max_core_supply": "1000000000000000",
"initial_parameters": { "initial_parameters": {
"current_fees": { "current_fees": {
@ -328,6 +328,78 @@
81,{ 81,{
"fee": 2000000 "fee": 2000000
} }
],[
82,{
"fee": 0
}
],[
83,{
"fee": 0
}
],[
84,{
"fee": 0
}
],[
85,{
"fee": 0
}
],[
86,{
"fee": 0
}
],[
87,{
"fee": 0
}
],[
88,{
"fee": 0
}
],[
89,{
"fee": 0
}
],[
90,{
"fee": 0
}
],[
91,{
"fee": 0
}
],[
92,{
"fee": 0
}
],[
93,{
"fee": 0
}
],[
94,{
"fee": 0
}
],[
95,{
"fee": 0
}
],[
96,{
"fee": 0
}
],[
97,{
"fee": 0
}
],[
98,{
"fee": 0
}
],[
99,{
"fee": 0
}
] ]
], ],
"scale": 10000 "scale": 10000
@ -344,6 +416,7 @@
"maximum_asset_feed_publishers": 10, "maximum_asset_feed_publishers": 10,
"maximum_witness_count": 1001, "maximum_witness_count": 1001,
"maximum_committee_count": 1001, "maximum_committee_count": 1001,
"maximum_son_count": 15,
"maximum_authority_membership": 10, "maximum_authority_membership": 10,
"reserve_percent_of_fee": 2000, "reserve_percent_of_fee": 2000,
"network_percent_of_fee": 2000, "network_percent_of_fee": 2000,
@ -374,17 +447,20 @@
"maximum_tournament_start_delay": 604800, "maximum_tournament_start_delay": 604800,
"maximum_tournament_number_of_wins": 100, "maximum_tournament_number_of_wins": 100,
"extensions": { "extensions": {
"min_bet_multiplier": 10100,
"max_bet_multiplier": 10000000,
"betting_rake_fee_percentage": 300,
"live_betting_delay_time": 5,
"sweeps_distribution_percentage": 200, "sweeps_distribution_percentage": 200,
"sweeps_distribution_asset": "1.3.0", "sweeps_distribution_asset": "1.3.0",
"sweeps_vesting_accumulator_account": "1.2.0", "sweeps_vesting_accumulator_account": "1.2.0",
"gpos_period": 15552000, "gpos_period": 15552000,
"gpos_subperiod": 2592000, "gpos_subperiod": 2592000,
"gpos_period_start": 1601528400, "gpos_period_start": 1584385200,
"gpos_vesting_lockin_period": 2592000 "gpos_vesting_lockin_period": 2592000,
"son_vesting_amount": 5000000,
"son_vesting_period": 172800,
"son_pay_daily_max": 20000000,
"son_pay_time": 86400,
"son_deregister_time": 43200,
"son_heartbeat_frequency": 180,
"son_down_time": 360
} }
}, },
"initial_bts_accounts": [], "initial_bts_accounts": [],
@ -523,6 +599,7 @@
"immutable_parameters": { "immutable_parameters": {
"min_committee_member_count": 11, "min_committee_member_count": 11,
"min_witness_count": 11, "min_witness_count": 11,
"min_son_count": 5,
"num_special_accounts": 0, "num_special_accounts": 0,
"num_special_assets": 0 "num_special_assets": 0
} }

View file

@ -332,6 +332,7 @@ BOOST_FIXTURE_TEST_CASE( select_top_fifteen_sons, cli_fixture )
BOOST_TEST_MESSAGE("Voting for SONs"); BOOST_TEST_MESSAGE("Voting for SONs");
for(unsigned int i = 0; i < son_number + 1; i++) for(unsigned int i = 0; i < son_number + 1; i++)
{ {
// It is mandatory to vest balance under GPOS policy to vote for SON account
con.wallet_api_ptr->transfer( con.wallet_api_ptr->transfer(
"nathan", "sonaccount" + fc::to_pretty_string(i), "1000", "1.3.0", "Here are some CORE tokens for your new account", true ); "nathan", "sonaccount" + fc::to_pretty_string(i), "1000", "1.3.0", "Here are some CORE tokens for your new account", true );
con.wallet_api_ptr->create_vesting_balance("sonaccount" + fc::to_pretty_string(i), "500", "1.3.0", vesting_balance_type::gpos, true); con.wallet_api_ptr->create_vesting_balance("sonaccount" + fc::to_pretty_string(i), "500", "1.3.0", vesting_balance_type::gpos, true);
@ -626,6 +627,7 @@ BOOST_FIXTURE_TEST_CASE( cli_list_active_sons, cli_fixture )
"http://son" + fc::to_pretty_string(i), "http://son" + fc::to_pretty_string(i),
sidechain_public_keys, sidechain_public_keys,
false); false);
// It is mandatory to vest balance under GPOS policy to vote for SON account
con.wallet_api_ptr->transfer( con.wallet_api_ptr->transfer(
"nathan", "sonaccount" + fc::to_pretty_string(i), "1000", "1.3.0", "Here are some CORE tokens for your new account", true ); "nathan", "sonaccount" + fc::to_pretty_string(i), "1000", "1.3.0", "Here are some CORE tokens for your new account", true );
con.wallet_api_ptr->create_vesting_balance("sonaccount" + fc::to_pretty_string(i), "500", "1.3.0", vesting_balance_type::gpos, true); con.wallet_api_ptr->create_vesting_balance("sonaccount" + fc::to_pretty_string(i), "500", "1.3.0", vesting_balance_type::gpos, true);