From d6da2963dcb2267ce7a924a6a876f56180b1b71f Mon Sep 17 00:00:00 2001 From: pbattu123 Date: Wed, 23 Oct 2019 22:15:26 -0300 Subject: [PATCH] resolve merge conflict --- libraries/chain/db_maint.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 7eab5cf8..aee9d451 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -728,12 +728,6 @@ void deprecate_annual_members( database& db ) uint32_t database::get_gpos_current_subperiod() { fc::time_point_sec last_date_voted; - // get last time voted form account stats - // check last_vote_time of proxy voting account if proxy is set - if (stake_account.options.voting_account == GRAPHENE_PROXY_TO_SELF_ACCOUNT) - last_date_voted = stake_account.statistics(*this).last_vote_time; - else - last_date_voted = stake_account.options.voting_account(*this).statistics(*this).last_vote_time; const auto &gpo = this->get_global_properties(); const auto vesting_period = gpo.parameters.gpos_period(); @@ -764,9 +758,13 @@ uint32_t database::get_gpos_current_subperiod() double database::calculate_vesting_factor(const account_object& stake_account) { - // get last time voted form stats - const auto &stats = stake_account.statistics(*this); - fc::time_point_sec last_date_voted = stats.last_vote_time; + fc::time_point_sec last_date_voted; + // get last time voted form account stats + // check last_vote_time of proxy voting account if proxy is set + if (stake_account.options.voting_account == GRAPHENE_PROXY_TO_SELF_ACCOUNT) + last_date_voted = stake_account.statistics(*this).last_vote_time; + else + last_date_voted = stake_account.options.voting_account(*this).statistics(*this).last_vote_time; // get global data related to gpos const auto &gpo = this->get_global_properties();