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

Jump to bottom

BLOCKBACK- 174 Roll in GPOS votes from 6th sub-period #202

Merged
merged 4 commits into from
Oct 28, 2019
Merged

BLOCKBACK- 174 Roll in GPOS votes from 6th sub-period #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f1436b
Fix to roll in GPOS rules, carry votes from 6th sub-period
pbattu123 Oct 27, 2019
ac3554e
check was already modified
pbattu123 Oct 27, 2019
9f0b231
comments updated
pbattu123 Oct 28, 2019
3f8ac21
updated comments to the benefit of reviewer
pbattu123 Oct 28, 2019
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
10 changes: 10 additions & 0 deletions libraries/chain/db_maint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,16 @@ double database::calculate_vesting_factor(const account_object& stake_account)
uint32_t current_subperiod = get_gpos_current_subperiod();

if(current_subperiod == 0 || current_subperiod > number_of_subperiods) return 0;

// On starting new vesting period, all votes become zero until someone votes, To avoid a situation of zero votes,
// changes were done to roll in GPOS rules, the vesting factor will be 1 for whoever votes in 6th sub-period of last vesting period
// BLOCKBACK-174 fix
if(current_subperiod == 1 && this->head_block_time() >= HARDFORK_GPOS_TIME + vesting_period) //Applicable only from 2nd vesting period
{
if(last_date_voted > period_start - vesting_subperiod)
return 1;
}

if(last_date_voted < period_start) return 0;

double numerator = number_of_subperiods;
Expand Down
3 changes: 0 additions & 3 deletions libraries/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,9 +2193,6 @@ class wallet_api_impl
FC_THROW("Account ${account} was already voting for witness ${witness} in the current GPOS sub-period", ("account", voting_account)("witness", witness));
else
update_vote_time = true; //Allow user to vote in each sub-period(Update voting time, which is reference in calculating VF)

if (!insert_result.second)
FC_THROW("Account ${account} has already voted for witness ${witness}", ("account", voting_account)("witness", witness));
}
else
{
Expand Down
29 changes: 18 additions & 11 deletions tests/tests/gpos_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ struct gpos_fixture: database_fixture
op.account = account_id;
op.new_options = account_id(db).options;
op.new_options->votes.insert(vote_for);
op.extensions.value.update_last_voting_time = true;
trx.operations.push_back(op);
set_expiration(db, trx);
trx.validate();
Expand Down Expand Up @@ -567,7 +568,7 @@ BOOST_AUTO_TEST_CASE( voting )
auto witness2 = witness_id_type(2)(db);
BOOST_CHECK_EQUAL(witness2.total_votes, 0);

// vote for witness1
// vote for witness1 and witness2 - sub-period 1
vote_for(alice_id, witness1.vote_id, alice_private_key);
vote_for(bob_id, witness2.vote_id, bob_private_key);

Expand All @@ -582,7 +583,7 @@ BOOST_AUTO_TEST_CASE( voting )

advance_x_maint(10);

//vote bob tot witness2 in each subperiod and verify votes
//Bob votes for witness2 - sub-period 2
vote_for(bob_id, witness2.vote_id, bob_private_key);
// go to maint
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
Expand All @@ -594,6 +595,7 @@ BOOST_AUTO_TEST_CASE( voting )
BOOST_CHECK_EQUAL(witness2.total_votes, 100);

advance_x_maint(10);
//Bob votes for witness2 - sub-period 3
vote_for(bob_id, witness2.vote_id, bob_private_key);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
// decay more
Expand All @@ -604,7 +606,7 @@ BOOST_AUTO_TEST_CASE( voting )

advance_x_maint(10);

// more
// Bob votes for witness2 - sub-period 4
vote_for(bob_id, witness2.vote_id, bob_private_key);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
// decay more
Expand All @@ -615,7 +617,7 @@ BOOST_AUTO_TEST_CASE( voting )

advance_x_maint(10);

// more
// Bob votes for witness2 - sub-period 5
vote_for(bob_id, witness2.vote_id, bob_private_key);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
// decay more
Expand All @@ -627,7 +629,7 @@ BOOST_AUTO_TEST_CASE( voting )

advance_x_maint(10);

// more
// Bob votes for witness2 - sub-period 6
vote_for(bob_id, witness2.vote_id, bob_private_key);
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);
// decay more
Expand All @@ -640,18 +642,23 @@ BOOST_AUTO_TEST_CASE( voting )
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period_start(), now.sec_since_epoch());

advance_x_maint(5);
// a new GPOS period is in but vote from user is before the start so his voting power is 0
// a new GPOS period is in but vote from user is before the start. Whoever votes in 6th sub-period, votes will carry
now = db.head_block_time();
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period_start(), now.sec_since_epoch());

generate_block();

// we are in the second GPOS period, at subperiod 1,
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);
//It's critical here, since bob votes in 6th sub-period of last vesting period, witness2 should retain his votes
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For clarity. Can you add some comment in the place where bob is voting in the 6th period ? I cant find where this is happening. Thanks.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added for all sub-periods

BOOST_CHECK_EQUAL(witness2.total_votes, 100);


// we are in the second GPOS period, at subperiod 2, lets vote here
// lets vote here from alice to generate votes for witness 1
//vote from bob to reatin VF 1
vote_for(alice_id, witness1.vote_id, alice_private_key);
vote_for(bob_id, witness2.vote_id, bob_private_key);
generate_block();

Expand All @@ -661,15 +668,15 @@ BOOST_AUTO_TEST_CASE( voting )
witness1 = witness_id_type(1)(db);
witness2 = witness_id_type(2)(db);

BOOST_CHECK_EQUAL(witness1.total_votes, 0);
BOOST_CHECK_EQUAL(witness1.total_votes, 100);
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(witness1.total_votes, 83);
BOOST_CHECK_EQUAL(witness2.total_votes, 83);

vote_for(bob_id, witness2.vote_id, bob_private_key);
Expand All @@ -680,7 +687,7 @@ BOOST_AUTO_TEST_CASE( voting )
witness1 = witness_id_type(1)(db);
witness2 = witness_id_type(2)(db);

BOOST_CHECK_EQUAL(witness1.total_votes, 0);
BOOST_CHECK_EQUAL(witness1.total_votes, 66);
BOOST_CHECK_EQUAL(witness2.total_votes, 83);

// alice votes again, now for witness 2, her vote worth 100 now
Expand Down