Merge pull request #1366 from GolosChain/master-with-22-hardfork

Golos v0.22.0 - add HF-21 commits

Author: afalaleev

libraries/api/include/golos/api/witness_api_object.hpp

@@ -32,6 +32,7 @@ namespace golos { namespace api {
         version running_version;
         hardfork_version hardfork_version_vote;
         time_point_sec hardfork_time_vote;
+        time_point_sec transit_to_cyberway_vote = STEEMIT_GENESIS_TIME;
     };
 
 } } // golos::api
@@ -42,4 +43,4 @@ FC_REFLECT(
     (id)(owner)(created)(url)(votes)(virtual_last_update)(virtual_position)(virtual_scheduled_time)
     (total_missed)(last_aslot)(last_confirmed_block_num)(pow_worker)(signing_key)(props)
     (sbd_exchange_rate)(last_sbd_exchange_update)(last_work)(running_version)(hardfork_version_vote)
-    (hardfork_time_vote))
+    (hardfork_time_vote)(transit_to_cyberway_vote))

libraries/api/witness_api_object.cpp

@@ -10,6 +10,6 @@ namespace golos { namespace api {
           virtual_last_update(w.virtual_last_update), virtual_position(w.virtual_position),
           virtual_scheduled_time(w.virtual_scheduled_time), last_work(w.last_work),
           running_version(w.running_version), hardfork_version_vote(w.hardfork_version_vote),
-          hardfork_time_vote(w.hardfork_time_vote) {
+          hardfork_time_vote(w.hardfork_time_vote), transit_to_cyberway_vote(w.transit_to_cyberway_vote) {
     }
 } } // golos::api

libraries/chain/chain_properties_evaluators.cpp

@@ -94,4 +94,24 @@ namespace golos { namespace chain {
         }
     }
 
+    void transit_to_cyberway_evaluator::do_apply(const transit_to_cyberway_operation& o) {
+        ASSERT_REQ_HF(STEEMIT_HARDFORK_0_21__1348, "transit_to_cyberway");
+
+        _db.get_account(o.owner); // verify owner exists
+        auto& witness = _db.get_witness(o.owner);
+
+        GOLOS_CHECK_OP_PARAM(o, vote_to_transit, {
+            GOLOS_CHECK_VALUE(o.vote_to_transit != (witness.transit_to_cyberway_vote != STEEMIT_GENESIS_TIME),
+                "You should change your vote.");
+        });
+
+        _db.modify(witness, [&](witness_object& w) {
+            if (o.vote_to_transit) {
+                w.transit_to_cyberway_vote = _db.head_block_time();
+            } else {
+                w.transit_to_cyberway_vote = STEEMIT_GENESIS_TIME;
+            }
+        });
+    }
+
 } } // golos::chain

libraries/chain/database.cpp

@@ -52,5 +52,3 @@ FC_REFLECT((golos::chain::hardfork_property_object),
 CHAINBASE_SET_INDEX_TYPE( golos::chain::hardfork_property_object, golos::chain::hardfork_property_index)
 
 #define STEEMIT_NUM_HARDFORKS 22
-
-

libraries/chain/hardfork.d/0-preamble.hf

@@ -1,10 +1,13 @@
 #ifndef STEEMIT_HARDFORK_0_21
 #define STEEMIT_HARDFORK_0_21 21
 
+#define STEEMIT_HARDFORK_0_21__1348 (STEEMIT_HARDFORK_0_21) // Transit to CyberWay
+
+
 #ifdef STEEMIT_BUILD_TESTNET
-#define STEEMIT_HARDFORK_0_21_TIME  1563613200 // 20 jul 2019 12:00:00 MSK
+#define STEEMIT_HARDFORK_0_21_TIME  1563958800 // 24 jul 2019 12:00:00 MSK
 #else
-#define STEEMIT_HARDFORK_0_21_TIME  1565254800 // 08 aug 2019 12:00:00 MSK
+#define STEEMIT_HARDFORK_0_21_TIME  1565859600 // 15 aug 2019 12:00:00 MSK
 #endif
 
 #define STEEMIT_HARDFORK_0_21_VERSION hardfork_version( 0, 21 )

libraries/chain/hardfork.d/0_21.hf

@@ -11,9 +11,9 @@
 #define STEEMIT_HARDFORK_0_22__820 (STEEMIT_HARDFORK_0_22) // Voting with stake for witnesses
 
 #ifdef STEEMIT_BUILD_TESTNET
-#define STEEMIT_HARDFORK_0_22_TIME  1547787600 // 18 jan 2019 12:00:00 MSK
+#define STEEMIT_HARDFORK_0_22_TIME  1563958800 // 24 jul 2019 12:00:00 MSK
 #else
-#define STEEMIT_HARDFORK_0_22_TIME  1565254800 // 08 aug 2019 12:00:00 MSK
+#define STEEMIT_HARDFORK_0_22_TIME  1565859600 // 15 aug 2019 12:00:00 MSK
 #endif
 
 #define STEEMIT_HARDFORK_0_22_VERSION hardfork_version( 0, 22 )

libraries/chain/hardfork.d/0_22.hf

@@ -59,10 +59,13 @@ namespace golos { namespace chain {
                 _is_generating = p;
             }
 
+            bool is_transit_enabled() const;
+
             bool _is_producing = false;
             bool _is_generating = false;
             bool _is_testing = false;           ///< set for tests to avoid low free memory spam
             bool _log_hardforks = true;
+            uint32_t _fixed_irreversible_block_num = UINT32_MAX;
 
             enum validation_steps {
                 skip_nothing = 0,
@@ -346,6 +349,11 @@ namespace golos { namespace chain {
              */
             fc::signal<void(const signed_transaction &)> on_applied_transaction;
 
+            /**
+             * This signal is emitted when required number of votes is reached to transit to CyberWay
+             */
+            fc::signal<void(const uint32_t, const uint32_t)> transit_to_cyberway;
+
             /**
              *  Emitted After a block has been applied and committed.  The callback
              *  should not yield and should execute quickly.
@@ -447,7 +455,7 @@ namespace golos { namespace chain {
 
             uint64_t pay_delegators(const account_object& delegatee, const comment_vote_object& cvo, uint64_t claim);
 
-            share_type pay_curators(const comment_curation_info& c, share_type max_rewards);
+            share_type pay_curators(const comment_curation_info& c, share_type max_rewards, share_type& actual_rewards);
 
             void cashout_comment_helper(const comment_object &comment);
 
@@ -606,6 +614,8 @@ namespace golos { namespace chain {
 
             void update_witness_schedule4();
 
+            void process_transit_to_cyberway(const signed_block& b, uint32_t skip);
+
             void update_median_witness_props();
 
             void clear_null_account_balance();
@@ -632,7 +642,7 @@ namespace golos { namespace chain {
 
             bool _resize(uint32_t block_num);
 
-            void pay_curator(const comment_vote_object& cvo, uint64_t claim, const account_name_type& author, const std::string& permlink);
+            uint64_t pay_curator(const comment_vote_object& cvo, uint64_t claim, const account_name_type& author, const std::string& permlink);
 
             void adjust_sbd_balance(const account_object &a, const asset &delta);
 

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

@@ -146,6 +146,9 @@ namespace golos {
 
             uint16_t custom_ops_bandwidth_multiplier = STEEMIT_CUSTOM_OPS_BANDWIDTH_MULTIPLIER;
 
+            uint32_t transit_block_num = UINT32_MAX;
+            fc::array<account_name_type, STEEMIT_MAX_WITNESSES> transit_witnesses;
+
             asset worker_revenue_per_day = asset(0, STEEM_SYMBOL);
             asset worker_consumption_per_day = asset(0, STEEM_SYMBOL);
         };
@@ -194,6 +197,8 @@ FC_REFLECT((golos::chain::dynamic_global_property_object),
                 (vote_regeneration_per_day)
                 (custom_ops_bandwidth_multiplier)
                 (is_forced_min_price)
+                (transit_block_num)
+                (transit_witnesses)
                 (worker_revenue_per_day)
                 (worker_consumption_per_day)
 )

libraries/chain/include/golos/chain/global_property_object.hpp

@@ -55,6 +55,7 @@ namespace golos { namespace chain {
         DEFINE_EVALUATOR(break_free_referral)
         DEFINE_EVALUATOR(delegate_vesting_shares_with_interest)
         DEFINE_EVALUATOR(reject_vesting_shares_delegation)
+        DEFINE_EVALUATOR(transit_to_cyberway)
         DEFINE_EVALUATOR(vote_options)
 
         class proposal_create_evaluator: public evaluator_impl<proposal_create_evaluator> {