Merge pull request #1079 from GolosChain/golos-v0.20.0

Golos v0.20.0
GolosChain · Jan 17, 2019 · 82edada · 82edada
2 parents a88d70e + 824cab7
commit 82edada
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 10 deletions.
diff --git a/libraries/chain/database.cpp b/libraries/chain/database.cpp
@@ -2290,8 +2290,11 @@ namespace golos { namespace chain {
             uint64_t delegators_reward = 0;
             const auto& vdo_idx = get_index<vesting_delegation_index>().indices().get<by_received>();
             for (auto& dvir : cvo.delegator_vote_interest_rates) {
+                if (dvir.interest_rate > STEEMIT_100_PERCENT) {
+                    wlog("Skip bad delegator's interest rate: ${r}", ("r", dvir.interest_rate));
+                    continue;
+                }
                 auto delegator_claim = claim * dvir.interest_rate / STEEMIT_100_PERCENT;
-
                 if (delegator_claim == 0) {
                     continue;
                 }
@@ -4506,6 +4509,9 @@ namespace golos { namespace chain {
             FC_ASSERT(STEEMIT_HARDFORK_0_19 == 19, "Invalid hardfork configuration");
             _hardfork_times[STEEMIT_HARDFORK_0_19] = fc::time_point_sec(STEEMIT_HARDFORK_0_19_TIME);
             _hardfork_versions[STEEMIT_HARDFORK_0_19] = STEEMIT_HARDFORK_0_19_VERSION;
+            FC_ASSERT(STEEMIT_HARDFORK_0_20 == 20, "Invalid hardfork configuration");
+            _hardfork_times[STEEMIT_HARDFORK_0_20] = fc::time_point_sec(STEEMIT_HARDFORK_0_20_TIME);
+            _hardfork_versions[STEEMIT_HARDFORK_0_20] = STEEMIT_HARDFORK_0_20_VERSION;
 
             const auto &hardforks = get_hardfork_property_object();
             FC_ASSERT(
@@ -4761,6 +4767,8 @@ namespace golos { namespace chain {
                     break;
                 case STEEMIT_HARDFORK_0_19:
                     break;
+                case STEEMIT_HARDFORK_0_20:
+                    break;
                 default:
                     break;
             }

diff --git a/libraries/chain/hardfork.d/0-preamble.hf b/libraries/chain/hardfork.d/0-preamble.hf
@@ -51,4 +51,4 @@ FC_REFLECT((golos::chain::hardfork_property_object),
                 (next_hardfork)(next_hardfork_time))
 CHAINBASE_SET_INDEX_TYPE( golos::chain::hardfork_property_object, golos::chain::hardfork_property_index)
 
-#define STEEMIT_NUM_HARDFORKS 19
+#define STEEMIT_NUM_HARDFORKS 20
diff --git a/libraries/chain/hardfork.d/0_20.hf b/libraries/chain/hardfork.d/0_20.hf
@@ -0,0 +1,14 @@
+#ifndef STEEMIT_HARDFORK_0_20
+#define STEEMIT_HARDFORK_0_20 20
+#define STEEMIT_HARDFORK_0_20__1074 (STEEMIT_HARDFORK_0_20) // Blockchain stopped due to negative payment of curator reward
+#define STEEMIT_HARDFORK_0_20__1075 (STEEMIT_HARDFORK_0_20) // Author can change curation percent after voting on post
+
+#ifdef STEEMIT_BUILD_TESTNET
+#define STEEMIT_HARDFORK_0_20_TIME  1547701200 // 17 jan 2019 12:00:00 MSK
+#else
+#define STEEMIT_HARDFORK_0_20_TIME  1547787600 // 18 jan 2019 12:00:00 MSK
+#endif
+
+#define STEEMIT_HARDFORK_0_20_VERSION hardfork_version( 0, 20 )
+
+#endif
diff --git a/libraries/chain/steem_evaluator.cpp b/libraries/chain/steem_evaluator.cpp
@@ -543,6 +543,12 @@ namespace golos { namespace chain {
 
                 const auto& mprops = _db.get_witness_schedule_object().median_props;
 
+                if (_db.has_hardfork(STEEMIT_HARDFORK_0_20__1075)) {
+                    GOLOS_CHECK_LOGIC(_c.abs_rshares == 0,
+                            logic_exception::comment_must_not_have_been_voted,
+                            "Comment must not have been voted on changing auction window reward destination.");
+                }
+
                 GOLOS_CHECK_PARAM(cawrd.destination, {
                     GOLOS_CHECK_VALUE(cawrd.destination != to_reward_fund || mprops.allow_return_auction_reward_to_fund,
                         "Returning to reward fund is disallowed."
@@ -566,6 +572,12 @@ namespace golos { namespace chain {
                 const auto& mprops = _db.get_witness_schedule_object().median_props;
 
                 auto percent = ccrp.percent; // Workaround for correct param name in GOLOS_CHECK_PARAM
+
+                if (_db.has_hardfork(STEEMIT_HARDFORK_0_20__1075)) {
+                    GOLOS_CHECK_LOGIC(_c.abs_rshares == 0,
+                            logic_exception::comment_must_not_have_been_voted,
+                            "Comment must not have been voted on changing curation rewards percent.");
+                }
 
                 GOLOS_CHECK_PARAM(percent, {
                     GOLOS_CHECK_VALUE(mprops.min_curation_percent <= ccrp.percent && ccrp.percent <= mprops.max_curation_percent,
@@ -1516,8 +1528,13 @@ namespace golos { namespace chain {
                         for (; vdo_itr != vdo_idx.end() && vdo_itr->delegatee == voter.name; ++vdo_itr) {
                             delegator_vote_interest_rate dvir;
                             dvir.account = vdo_itr->delegator;
-                            dvir.interest_rate = vdo_itr->vesting_shares.amount.value * vdo_itr->interest_rate
-                                                 / voter.effective_vesting_shares().amount.value;
+                            if (_db.head_block_num() < GOLOS_BUG1074_BLOCK && !_db.has_hardfork(STEEMIT_HARDFORK_0_20__1074)) {
+                                dvir.interest_rate = vdo_itr->vesting_shares.amount.value * vdo_itr->interest_rate /
+                                    voter.effective_vesting_shares().amount.value;
+                            } else {
+                                dvir.interest_rate = (uint128_t(vdo_itr->vesting_shares.amount.value) *
+                                    vdo_itr->interest_rate / voter.effective_vesting_shares().amount.value).to_uint64();
+                            }
                             dvir.payout_strategy = vdo_itr->payout_strategy;
                             if (dvir.interest_rate > 0) {
                                 delegator_vote_interest_rates.emplace_back(std::move(dvir));

diff --git a/libraries/protocol/include/golos/protocol/config.hpp b/libraries/protocol/include/golos/protocol/config.hpp
@@ -3,9 +3,13 @@
  */
 #pragma once
 
-#define STEEMIT_BLOCKCHAIN_VERSION              (version(0, 19, 1))
+
+#define STEEMIT_BLOCKCHAIN_VERSION              (version(0, 20, 0))
 #define STEEMIT_BLOCKCHAIN_HARDFORK_VERSION     (hardfork_version(STEEMIT_BLOCKCHAIN_VERSION))
 
+
+#define GOLOS_BUG1074_BLOCK 23569125
+
 #ifdef STEEMIT_BUILD_TESTNET
 #define BLOCKCHAIN_NAME "GOLOSTEST"
 

diff --git a/libraries/protocol/steem_operations.cpp b/libraries/protocol/steem_operations.cpp
@@ -276,7 +276,7 @@ namespace golos { namespace protocol {
 
         void chain_properties_19::validate() const {
             chain_properties_18::validate();
-            GOLOS_CHECK_VALUE_LE(auction_window_size, STEEMIT_MAX_AUCTION_WINDOW_SIZE_SECONDS);
+            // GOLOS_CHECK_VALUE_LE(auction_window_size, STEEMIT_MAX_AUCTION_WINDOW_SIZE_SECONDS); // auction_window_size is limited by 16bit
             GOLOS_CHECK_VALUE_LE(max_referral_interest_rate, GOLOS_MAX_REFERRAL_INTEREST_RATE);
             GOLOS_CHECK_VALUE_LE(max_referral_term_sec, GOLOS_MAX_REFERRAL_TERM_SEC);
 

diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -2204,12 +2204,8 @@ fc::ecc::private_key wallet_api::derive_private_key(const std::string& prefix_st
         ) {
             WALLET_CHECK_UNLOCKED();
 
-            const auto hf = my->_remote_database_api->get_hardfork_version();
-            const auto has_hf18 = hf >= hardfork_version(0, STEEMIT_HARDFORK_0_18__673);
-
             signed_transaction tx;
             witness_update_operation op;
-
             if (url.empty()) {
                 auto wit = my->_remote_witness_api->get_witness_by_account(witness_account_name);
                 if (wit.valid()) {