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-164 Eliminate time gap between two consecutive vesting periods #199

Merged
merged 2 commits into from
Oct 25, 2019
Merged

BLOCKBACK-164 Eliminate time gap between two consecutive vesting periods #199

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78787c2
eliminate time gap between two consecutive vesting periods
pbattu123 Oct 24, 2019
bdd1863
updated GPOS hf
pbattu123 Oct 25, 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
6 changes: 3 additions & 3 deletions libraries/chain/db_maint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ void rolling_period_start(database& db)
auto vesting_period = db.get_global_properties().parameters.gpos_period();

auto now = db.head_block_time();
if(now.sec_since_epoch() > (period_start + vesting_period))
if(now.sec_since_epoch() >= (period_start + vesting_period))
{
// roll
db.modify(db.get_global_properties(), [now](global_property_object& p) {
Expand Down Expand Up @@ -1390,10 +1390,10 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
distribute_fba_balances(*this);
create_buyback_orders(*this);

rolling_period_start(*this);

process_dividend_assets(*this);

rolling_period_start(*this);

struct vote_tally_helper {
database& d;
const global_property_object& props;
Expand Down
31 changes: 20 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 @@ -95,6 +95,15 @@ struct gpos_fixture: database_fixture
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_subperiod(), vesting_subperiod);
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period_start(), period_start.sec_since_epoch());
}

void update_maintenance_interval(uint32_t new_interval)
{
db.modify(db.get_global_properties(), [new_interval](global_property_object& p) {
p.parameters.maintenance_interval = new_interval;
});
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.maintenance_interval, new_interval);
}

void vote_for(const account_id_type account_id, const vote_id_type vote_for, const fc::ecc::private_key& key)
{
account_update_operation op;
Expand Down Expand Up @@ -497,26 +506,26 @@ BOOST_AUTO_TEST_CASE( rolling_period_start )
// period start rolls automatically after HF
try {
// advance to HF
generate_blocks(HARDFORK_GPOS_TIME);
generate_block();

// update default gpos global parameters to make this thing faster
auto now = db.head_block_time();
update_gpos_global(518400, 86400, now);
update_gpos_global(518400, 86400, HARDFORK_GPOS_TIME);
generate_blocks(HARDFORK_GPOS_TIME);
update_maintenance_interval(3600); //update maintenance interval to 1hr to evaluate sub-periods
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.maintenance_interval, 3600);

auto vesting_period_1 = db.get_global_properties().parameters.gpos_period_start();

auto now = db.head_block_time();
// moving outside period:
while( db.head_block_time() <= now + fc::days(6) )
{
generate_block();
}
generate_blocks(db.get_dynamic_global_properties().next_maintenance_time);

// rolling is here so getting the new now
now = db.head_block_time();
generate_block();

// period start rolled
BOOST_CHECK_EQUAL(db.get_global_properties().parameters.gpos_period_start(), now.sec_since_epoch());
auto vesting_period_2 = db.get_global_properties().parameters.gpos_period_start();

//difference between start of two consecutive vesting periods should be 6 days
BOOST_CHECK_EQUAL(vesting_period_1 + 518400, vesting_period_2);
}
catch (fc::exception &e) {
edump((e.to_detail_string()));
Expand Down