Merge pull request #453 from GolosChain/452-recalculate-rshares2-on-switch-to-hf17

Recalculate rshares2 on switch to hf17 #452

Author: kotbegemot

libraries/chain/database.cpp

@@ -1991,8 +1991,7 @@ namespace golos {
                          claim_rshare_reward(
                              comment.net_rshares,
                              comment.reward_weight,
-                             to_steem(comment.max_accepted_payout),
-                             comment.curve));
+                             to_steem(comment.max_accepted_payout)));
 
                     asset total_payout;
                     if (reward_tokens > 0) {
@@ -2061,7 +2060,7 @@ namespace golos {
 
                     }
 
-                    fc::uint128_t old_rshares2 = calculate_vshares(comment.net_rshares.value, comment.curve);
+                    fc::uint128_t old_rshares2 = calculate_vshares(comment.net_rshares.value);
                     adjust_rshares2(comment, old_rshares2, 0);
                 }
 
@@ -2430,14 +2429,11 @@ namespace golos {
             return (rshares + s) * (rshares + s) - s * s;
         }
 
-        uint128_t database::calculate_vshares(uint128_t rshares, reward_curve curve) const {
-            switch (curve) {
-                case reward_curve::linear:
-                    return calculate_vshares_linear(rshares);
-
-                case reward_curve::quadratic:
-                default:
-                    return calculate_vshares_quadratic(rshares, get_content_constant_s());
+        uint128_t database::calculate_vshares(uint128_t rshares) const {
+            if (has_hardfork(STEEMIT_HARDFORK_0_17__433)) {
+                return calculate_vshares_linear(rshares);
+            } else {
+                return calculate_vshares_quadratic(rshares, get_content_constant_s());
             }
         }
 
@@ -2510,9 +2506,7 @@ namespace golos {
  *  This method reduces the rshare^2 supply and returns the number of tokens are
  *  redeemed.
  */
-        share_type database::claim_rshare_reward(
-                share_type rshares, uint16_t reward_weight, asset max_steem, reward_curve curve
-        ) {
+        share_type database::claim_rshare_reward(share_type rshares, uint16_t reward_weight, asset max_steem) {
         try {
                 FC_ASSERT(rshares > 0);
 
@@ -2522,7 +2516,7 @@ namespace golos {
                 u256 rf(props.total_reward_fund_steem.amount.value);
                 u256 total_rshares2 = to256(props.total_reward_shares2);
 
-                u256 rs2 = to256(calculate_vshares(rshares.value, curve));
+                u256 rs2 = to256(calculate_vshares(rshares.value));
                 rs2 = (rs2 * reward_weight) / STEEMIT_100_PERCENT;
 
                 u256 payout_u256 = (rf * rs2) / total_rshares2;
@@ -4260,6 +4254,15 @@ namespace golos {
                     const auto &by_root_idx = get_index<comment_index, by_root>();
                     const auto max_cashout_time = head_block_time();
 
+                    auto recalc_rshares2 = [&](const comment_object &c) {
+                        if (c.net_rshares.value > 0) {
+                            auto old_rshares2 = calculate_vshares_quadratic(
+                                    c.net_rshares.value, get_content_constant_s());
+                            auto new_rshares2 = calculate_vshares_linear(c.net_rshares.value);
+                            adjust_rshares2(c, old_rshares2, new_rshares2);
+                        }
+                    };
+
                     std::vector<comment_object::id_type> root_posts;
                     root_posts.reserve(STEEMIT_HF_17_NUM_POSTS);
 
@@ -4279,12 +4282,16 @@ namespace golos {
                             c.cashout_time = std::max(c.created + STEEMIT_CASHOUT_WINDOW_SECONDS, max_cashout_time);
                         });
 
+                        recalc_rshares2(*itr);
+
                         auto reply_itr = by_root_idx.lower_bound(id);
                         for (; reply_itr != by_root_idx.end() && reply_itr->root_comment == id; ++reply_itr) {
                             modify(*reply_itr, [&](comment_object &c) {
                                 // limit second cashout window to 1 week, or a current block time
                                 c.cashout_time = std::max(c.created + STEEMIT_CASHOUT_WINDOW_SECONDS, max_cashout_time);
                             });
+
+                            recalc_rshares2(*reply_itr);
                         }
                     }}
                     break;
@@ -4411,7 +4418,7 @@ namespace golos {
                 for (auto itr = comment_idx.begin();
                      itr != comment_idx.end(); ++itr) {
                     if (itr->net_rshares.value > 0) {
-                        auto delta = calculate_vshares(itr->net_rshares.value, itr->curve);
+                        auto delta = calculate_vshares(itr->net_rshares.value);
                         total_rshares2 += delta;
                     }
                     if (itr->parent_author == STEEMIT_ROOT_POST_PARENT) {
@@ -4486,7 +4493,7 @@ namespace golos {
 
                 for (const auto &c : comments) {
                     if (c.net_rshares.value > 0) {
-                        adjust_rshares2(c, 0, calculate_vshares(c.net_rshares.value, c.curve));
+                        adjust_rshares2(c, 0, calculate_vshares(c.net_rshares.value));
                     }
                 }
 

libraries/chain/include/golos/chain/comment_object.hpp

@@ -5,7 +5,6 @@
 
 #include <golos/chain/steem_object_types.hpp>
 #include <golos/chain/witness_objects.hpp>
-#include <golos/chain/reward_curve.hpp>
 
 #include <boost/multi_index/composite_key.hpp>
 
@@ -163,7 +162,6 @@ namespace golos {
             int32_t net_votes = 0;
 
             id_type root_comment;
-            reward_curve curve;
 
             comment_mode mode = first_payout;
 
@@ -342,7 +340,7 @@ FC_REFLECT((golos::chain::comment_object),
                 (net_rshares)(abs_rshares)(vote_rshares)
                 (children_abs_rshares)(cashout_time)(max_cashout_time)
                 (total_vote_weight)(reward_weight)(total_payout_value)(curator_payout_value)(beneficiary_payout_value)
-                (author_rewards)(net_votes)(root_comment)(curve)(mode)
+                (author_rewards)(net_votes)(root_comment)(mode)
                 (max_accepted_payout)(percent_steem_dollars)(allow_replies)(allow_votes)(allow_curation_rewards)
                 (beneficiaries)
 )

libraries/chain/include/golos/chain/database.hpp

@@ -402,7 +402,7 @@ namespace golos {
 
             void update_median_feed();
 
-            share_type claim_rshare_reward(share_type rshares, uint16_t reward_weight, asset max_steem, reward_curve);
+            share_type claim_rshare_reward(share_type rshares, uint16_t reward_weight, asset max_steem);
 
             asset get_liquidity_reward() const;
 
@@ -418,7 +418,7 @@ namespace golos {
 
             uint128_t get_content_constant_s() const;
 
-            uint128_t calculate_vshares(uint128_t rshares, reward_curve curve) const;
+            uint128_t calculate_vshares(uint128_t rshares) const;
 
             void pay_liquidity_reward();
 

libraries/chain/include/golos/chain/reward_curve.hpp

@@ -10,7 +10,6 @@
 
 #include <golos/protocol/types.hpp>
 #include <golos/protocol/authority.hpp>
-#include <golos/chain/reward_curve.hpp>
 
 
 namespace golos {

libraries/chain/include/golos/chain/steem_object_types.hpp

@@ -552,12 +552,6 @@ namespace golos {
                             com.cashout_time = com.created + STEEMIT_CASHOUT_WINDOW_SECONDS;
                         }
 
-                        if (_db.has_hardfork(STEEMIT_HARDFORK_0_17__433)) {
-                            com.curve = reward_curve::linear;
-                        } else {
-                            com.curve = reward_curve::quadratic;
-                        }
-
 #ifndef IS_LOW_MEM
                         from_string(com.title, o.title);
                         if (o.body.size() < 1024 * 1024 * 128) {
@@ -1305,8 +1299,8 @@ namespace golos {
                     fc::uint128_t new_rshares = std::max(comment.net_rshares.value, int64_t(0));
 
                     /// calculate rshares2 value
-                    new_rshares = _db.calculate_vshares(new_rshares, comment.curve);
-                    old_rshares = _db.calculate_vshares(old_rshares, comment.curve);
+                    new_rshares = _db.calculate_vshares(new_rshares);
+                    old_rshares = _db.calculate_vshares(old_rshares);
 
                     const auto &cat = _db.get_category(comment.category);
                     _db.modify(cat, [&](category_object &c) {
@@ -1515,8 +1509,8 @@ namespace golos {
                     fc::uint128_t new_rshares = std::max(comment.net_rshares.value, int64_t(0));
 
                     /// calculate rshares2 value
-                    new_rshares = _db.calculate_vshares(new_rshares, comment.curve);
-                    old_rshares = _db.calculate_vshares(old_rshares, comment.curve);
+                    new_rshares = _db.calculate_vshares(new_rshares);
+                    old_rshares = _db.calculate_vshares(old_rshares);
 
                     _db.modify(comment, [&](comment_object &c) {
                         c.total_vote_weight -= itr->weight;

libraries/chain/steem_evaluator.cpp

@@ -22,7 +22,7 @@ namespace golos {
                         total_vote_weight(o.total_vote_weight), reward_weight(o.reward_weight),
                         total_payout_value(o.total_payout_value), curator_payout_value(o.curator_payout_value),
                         author_rewards(o.author_rewards), net_votes(o.net_votes), root_comment(o.root_comment),
-                        curve(o.curve), max_accepted_payout(o.max_accepted_payout),
+                        max_accepted_payout(o.max_accepted_payout),
                         percent_steem_dollars(o.percent_steem_dollars), allow_replies(o.allow_replies),
                         allow_votes(o.allow_votes), allow_curation_rewards(o.allow_curation_rewards) {
 
@@ -74,8 +74,6 @@ namespace golos {
 
                 comment_object::id_type root_comment;
 
-                reward_curve curve;
-
                 protocol::asset max_accepted_payout;
                 uint16_t percent_steem_dollars;
                 bool allow_replies;
@@ -94,6 +92,6 @@ FC_REFLECT((golos::plugins::social_network::comment_api_object),
                    created)(active)(last_payout)(depth)(children)(children_rshares2)(net_rshares)(abs_rshares)(
                    vote_rshares)(children_abs_rshares)(cashout_time)(max_cashout_time)(total_vote_weight)(
                    reward_weight)(total_payout_value)(curator_payout_value)(author_rewards)(net_votes)(root_comment)(
-                   curve)(max_accepted_payout)(percent_steem_dollars)(allow_replies)(allow_votes)(
+                   max_accepted_payout)(percent_steem_dollars)(allow_replies)(allow_votes)(
                    allow_curation_rewards)(beneficiaries))
 #endif //GOLOS_COMMENT_API_OBJ_H

plugins/social_network/include/golos/plugins/social_network/api_object/comment_api_object.hpp

@@ -376,8 +376,7 @@ namespace golos {
                 u256 total_r2 = to256(props.total_reward_shares2);
 
                 if (props.total_reward_shares2 > 0) {
-                    auto vshares = database().calculate_vshares(
-                            d.net_rshares.value > 0 ? d.net_rshares.value : 0, d.curve);
+                    auto vshares = database().calculate_vshares(d.net_rshares.value > 0 ? d.net_rshares.value : 0);
 
                     //int64_t abs_net_rshares = llabs(d.net_rshares.value);
 

plugins/social_network/social_network.cpp

@@ -529,19 +529,19 @@ BOOST_FIXTURE_TEST_SUITE(operation_tests, clean_database_fixture)
             db->modify(mod_sam_comment, [&](comment_object &com) {
                 com.net_rshares = 10;
                 com.abs_rshares = 10;
-                com.children_rshares2 = db->calculate_vshares(10, com.curve);
+                com.children_rshares2 = db->calculate_vshares(10);
             });
 
             db->modify(mod_bob_comment, [&](comment_object &com) {
-                com.children_rshares2 = db->calculate_vshares(10, com.curve);
+                com.children_rshares2 = db->calculate_vshares(10);
             });
 
             db->modify(mod_alice_comment, [&](comment_object &com) {
-                com.children_rshares2 = db->calculate_vshares(10, com.curve);
+                com.children_rshares2 = db->calculate_vshares(10);
             });
 
             db->modify(db->get_dynamic_global_properties(), [&](dynamic_global_property_object &o) {
-                o.total_reward_shares2 = db->calculate_vshares(10, mod_alice_comment.curve);
+                o.total_reward_shares2 = db->calculate_vshares(10);
             });
 
             tx.signatures.clear();