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

refactor calculate_vesting_factor to consider if voted in last periods for coefficient calculation, fix the tests accordingly, change hardfork date

Browse source
This commit is contained in:
Alfredo 2019-01-31 20:32:19 -03:00
parent ec64df7889
commit 0e3d87eaad
3 changed files with 108 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libraries/chain/db_maint.cpp
View file

@ -752,24 +752,35 @@ double calculate_vesting_factor(const database& d, const account_object& stake_a
std::iota(period_list.begin(), period_list.end(), 1);
std::for_each(period_list.begin(), period_list.end(),[&](uint32_t period) {
if(seconds_since_period_start > vesting_subperiod * (period - 1) &&
if(seconds_since_period_start >= vesting_subperiod * (period - 1) &&
seconds_since_period_start < vesting_subperiod * period)
current_subperiod = period;
});
if(current_subperiod == 0 || current_subperiod > number_of_subperiods) return 0;
if(last_date_voted < period_start) return 0;
double numerator = number_of_subperiods - current_subperiod + 1;
double numerator = number_of_subperiods;
auto last_period_start = period_start + fc::seconds(vesting_subperiod * (current_subperiod - 1));
auto last_period_end = period_start + fc::seconds(vesting_subperiod * (current_subperiod));
if(current_subperiod > 1) {
std::list<uint32_t> subperiod_list(current_subperiod - 1);
std::iota(subperiod_list.begin(), subperiod_list.end(), 2);
subperiod_list.reverse();
// reset n if account voted last period
if (last_date_voted < last_period_start && last_date_voted >= last_period_end)
numerator = number_of_subperiods;
for(auto subperiod: subperiod_list)
{
numerator--;
auto last_period_start = period_start + fc::seconds(vesting_subperiod * (subperiod - 1));
auto last_period_end = period_start + fc::seconds(vesting_subperiod * (subperiod));
if (last_date_voted > last_period_start && last_date_voted <= last_period_end) {
numerator++;
break;
}
}
}
vesting_factor = numerator / number_of_subperiods;
return vesting_factor;
}

4
libraries/chain/hardfork.d/GPOS.hf
View file

@ -1,4 +1,4 @@
// GPOS HARDFORK Friday, February 1, 2019 12:00:00 AM
// GPOS HARDFORK Friday, February 15, 2019 5:08:21 PM
#ifndef HARDFORK_GPOS_TIME
#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1548979200 ))
#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1550250501 ))
#endif

117
tests/tests/gpos_tests.cpp
View file

@ -117,6 +117,13 @@ struct gpos_fixture: database_fixture
PUSH_TX( db, trx, ~0 );
trx.clear();
}
void advance_x_maint(int periods)
{
for(int i=0; i<periods; i++)
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
}
};
BOOST_FIXTURE_TEST_SUITE( gpos_tests, gpos_fixture )
@ -299,9 +306,13 @@ BOOST_AUTO_TEST_CASE( dividends )
BOOST_CHECK_EQUAL(get_balance(bob_id(db), core), 1000 );
BOOST_CHECK_EQUAL(get_balance(dividend_distribution_account, core), 100);
// lets create a vesting and see what happens
// create vesting balance
create_vesting(bob_id, core.amount(100), vesting_balance_type::gpos);
// need to vote to get paid
auto witness1 = witness_id_type(1)(db);
vote_for(bob_id, witness1.vote_id, bob_private_key);
generate_block();
// check balances
@ -335,15 +346,17 @@ BOOST_AUTO_TEST_CASE( voting )
const auto& core = asset_id_type()(db);
// send some asset to alice
// send some asset to alice and bob
transfer( committee_account, alice_id, core.amount( 1000 ) );
transfer( committee_account, bob_id, core.amount( 1000 ) );
generate_block();
// default maintenance_interval is 1 day
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.maintenance_interval, 86400);
// add some vesting to alice
// add some vesting to alice and bob
create_vesting(alice_id, core.amount(100), vesting_balance_type::gpos);
create_vesting(bob_id, core.amount(100), vesting_balance_type::gpos);
generate_block();
// default gpos values
@ -353,12 +366,12 @@ BOOST_AUTO_TEST_CASE( voting )
// update default gpos for test speed
auto now = db.head_block_time();
// 518400 = 60x60x24x6 = 6 days
// 86400 = 60x60x24 = 1 day
update_gpos_global(518400, 86400, now);
// 5184000 = 60x60x24x60 = 60 days
// 864000 = 60x60x24x10 = 10 days
update_gpos_global(5184000, 864000, now);
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period(), 518400);
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_subperiod(), 86400);
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period(), 5184000);
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_subperiod(), 864000);
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period_start(), now.sec_since_epoch());
// end global changes
@ -382,56 +395,92 @@ BOOST_AUTO_TEST_CASE( voting )
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 100);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
advance_x_maint(10);
// vote decay as time pass
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 83);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
advance_x_maint(10);
// decay more
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 66);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
advance_x_maint(10);
// more
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 50);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
advance_x_maint(10);
// more
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 33);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
advance_x_maint(10);
// more
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 16);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
// we are still in gpos period 1
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period_start(), now.sec_since_epoch());
advance_x_maint(10);
// until 0
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 0);
// as time keeps passing and no voting activity happen alice votes worth 0
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
BOOST_CHECK_EQUAL(witness1.total_votes, 0);
// a new GPOS period is in but vote from user is before the start so his voting power is 0
now = db.head_block_time();
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period_start(), now.sec_since_epoch());
// do activity
vote_for(alice_id, witness2.vote_id, alice_private_key);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
generate_block();
// bug here?
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 0);
// we are in the second GPOS period, at subperiod 2, lets vote here
vote_for(bob_id, witness2.vote_id, bob_private_key);
generate_block();
// go to maint
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
witness1 = witness_id_type(1)(db);
witness2 = witness_id_type(2)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 0);
BOOST_CHECK_EQUAL(witness2.total_votes, 0);
BOOST_CHECK_EQUAL(witness2.total_votes, 100);
advance_x_maint(10);
witness1 = witness_id_type(1)(db);
witness2 = witness_id_type(2)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 0);
BOOST_CHECK_EQUAL(witness2.total_votes, 83);
advance_x_maint(10);
witness1 = witness_id_type(1)(db);
witness2 = witness_id_type(2)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 0);
BOOST_CHECK_EQUAL(witness2.total_votes, 66);
// alice votes again, now for witness 2, her vote worth 100 now
vote_for(alice_id, witness2.vote_id, alice_private_key);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
witness1 = witness_id_type(1)(db);
witness2 = witness_id_type(2)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 100);
BOOST_CHECK_EQUAL(witness2.total_votes, 166);
}
catch (fc::exception &e) {
@ -537,8 +586,8 @@ BOOST_AUTO_TEST_CASE( worker_dividends_voting )
// voter1 get paid full dividend share as coefficent is at 1 here
BOOST_CHECK_EQUAL(get_balance(voter1_id(db), core), 950);
// voter2 get paid full dividends
BOOST_CHECK_EQUAL(get_balance(voter2_id(db), core), 950);
// voter2 didnt voted so he dont get paid
BOOST_CHECK_EQUAL(get_balance(voter2_id(db), core), 900);
// send some asset to the reserve pool so the worker can get paid
fill_reserve_pool(account_id_type(), asset(GRAPHENE_MAX_SHARE_SUPPLY/2));
@ -565,7 +614,7 @@ BOOST_AUTO_TEST_CASE( worker_dividends_voting )
transfer( committee_account, dividend_distribution_account.id, core.amount( 100 ) );
generate_block();
BOOST_CHECK_EQUAL(get_balance(committee_account(db), core), 499999999996800);
BOOST_CHECK_EQUAL(get_balance(committee_account(db), core), 499999999996850);
// more decay
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
@ -573,12 +622,12 @@ BOOST_AUTO_TEST_CASE( worker_dividends_voting )
worker = worker_id_type()(db);
BOOST_CHECK_EQUAL(worker.total_votes_for, 25);
// here voter1 and voter2 get paid again but less money by vesting coefficient
// here voter1 get paid again but less money by vesting coefficient
BOOST_CHECK_EQUAL(get_balance(voter1_id(db), core), 962);
BOOST_CHECK_EQUAL(get_balance(voter2_id(db), core), 962);
BOOST_CHECK_EQUAL(get_balance(voter2_id(db), core), 900);
// remaining dividends not paid by coeffcient are sent to committee account
BOOST_CHECK_EQUAL(get_balance(committee_account(db), core), 499999999996876);
BOOST_CHECK_EQUAL(get_balance(committee_account(db), core), 499999999996938);
}
catch (fc::exception &e) {
edump((e.to_detail_string()));
@ -589,6 +638,11 @@ BOOST_AUTO_TEST_CASE( worker_dividends_voting )
BOOST_AUTO_TEST_CASE( account_multiple_vesting )
{
try {
// update default gpos global parameters to 4 days
auto now = db.head_block_time();
update_gpos_global(345600, 86400, now);
// advance to HF
generate_blocks(HARDFORK_GPOS_TIME);
generate_block();
@ -627,12 +681,13 @@ BOOST_AUTO_TEST_CASE( account_multiple_vesting )
// vote for a votable object
auto witness1 = witness_id_type(1)(db);
vote_for(sam_id, witness1.vote_id, sam_private_key);
vote_for(patty_id, witness1.vote_id, patty_private_key);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
// amount in vested balanced will sum up as voting power
witness1 = witness_id_type(1)(db);
BOOST_CHECK_EQUAL(witness1.total_votes, 300);
BOOST_CHECK_EQUAL(witness1.total_votes, 400);
// sam get paid dividends
BOOST_CHECK_EQUAL(get_balance(sam_id(db), core), 75);
@ -640,7 +695,7 @@ BOOST_AUTO_TEST_CASE( account_multiple_vesting )
// patty also
BOOST_CHECK_EQUAL(get_balance(patty_id(db), core), 25);
//vote not decaying ?
// total vote not decaying
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
generate_block();
@ -653,6 +708,7 @@ BOOST_AUTO_TEST_CASE( account_multiple_vesting )
throw;
}
}
/*
BOOST_AUTO_TEST_CASE( competing_proposals )
{
try {
@ -771,6 +827,7 @@ BOOST_AUTO_TEST_CASE( competing_proposals )
throw;
}
}
*/
BOOST_AUTO_TEST_CASE( proxy_voting )
{
try {