Remove min curation percent for witnesses #1009

GolosChain · Apr 7, 2019 · a818cae · a818cae
1 parent 22022e3
commit a818cae
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/libraries/chain/chain_properties_evaluators.cpp b/libraries/chain/chain_properties_evaluators.cpp
@@ -56,6 +56,11 @@ namespace golos { namespace chain {
                     auto max_delegated_vesting_interest_rate = props.max_delegated_vesting_interest_rate;
                     GOLOS_CHECK_VALUE_LE(max_delegated_vesting_interest_rate, STEEMIT_MAX_DELEGATED_VESTING_INTEREST_RATE_PRE_HF21);
                 }
+                if (!_db.has_hardfork(STEEMIT_HARDFORK_0_21__1009)) {
+                    auto min_curation_percent = props.min_curation_percent;
+                    auto max_curation_percent = props.max_curation_percent;
+                    GOLOS_CHECK_VALUE_LEGE(min_curation_percent, STEEMIT_MIN_CURATION_PERCENT_PRE_HF21, max_curation_percent);
+                }
             });
             _wprops = props;
         }

diff --git a/libraries/chain/hardfork.d/0_21.hf b/libraries/chain/hardfork.d/0_21.hf
@@ -2,6 +2,7 @@
 #define STEEMIT_HARDFORK_0_21 21
 #define STEEMIT_HARDFORK_0_21__1013 (STEEMIT_HARDFORK_0_21) // Workers
 #define STEEMIT_HARDFORK_0_21__1008 (STEEMIT_HARDFORK_0_21) // Remove limit on max delegate interest witness prop
+#define STEEMIT_HARDFORK_0_21__1009 (STEEMIT_HARDFORK_0_21) // Remove limit on min curation percent witness prop
 
 #ifdef STEEMIT_BUILD_TESTNET
 #define STEEMIT_HARDFORK_0_21_TIME  1547787600 // 18 jan 2019 12:00:00 MSK

diff --git a/libraries/chain/steem_evaluator.cpp b/libraries/chain/steem_evaluator.cpp
@@ -532,6 +532,12 @@ namespace golos { namespace chain {
                 }
 
                 GOLOS_CHECK_PARAM(percent, {
+                    if (!_db.has_hardfork(STEEMIT_HARDFORK_0_21__1009)) {
+                        GOLOS_CHECK_VALUE(STEEMIT_MIN_CURATION_PERCENT_PRE_HF21 <= percent && percent <= STEEMIT_MAX_CURATION_PERCENT,
+                            "Curation rewards percent must be between ${min} and ${max}.",
+                            ("min", STEEMIT_MIN_CURATION_PERCENT)("max", STEEMIT_MAX_CURATION_PERCENT));
+                    }
+
                     GOLOS_CHECK_VALUE(mprops.min_curation_percent <= ccrp.percent && ccrp.percent <= mprops.max_curation_percent,
                         "Curation rewards percent must be between ${min} and ${max}.",
                         ("min", mprops.min_curation_percent)("max", mprops.max_curation_percent));

diff --git a/libraries/protocol/include/golos/protocol/config.hpp b/libraries/protocol/include/golos/protocol/config.hpp
@@ -162,7 +162,8 @@
 #define STEEMIT_MIN_POW_REWARD                  STEEMIT_MINING_REWARD
 #define STEEMIT_MIN_POW_REWARD_PRE_HF_16        STEEMIT_MINING_REWARD_PRE_HF_16
 
-#define STEEMIT_MIN_CURATION_PERCENT            (25*STEEMIT_1_PERCENT) // 25%
+#define STEEMIT_MIN_CURATION_PERCENT            0 // 0%
+#define STEEMIT_MIN_CURATION_PERCENT_PRE_HF21   (25*STEEMIT_1_PERCENT) // 25%
 #define STEEMIT_DEF_CURATION_PERCENT            (25*STEEMIT_1_PERCENT) // 25%
 #define STEEMIT_MAX_CURATION_PERCENT            STEEMIT_100_PERCENT
 
@@ -404,7 +405,8 @@
 #define STEEMIT_MIN_POW_REWARD                  STEEMIT_MINING_REWARD
 #define STEEMIT_MIN_POW_REWARD_PRE_HF_16        STEEMIT_MINING_REWARD_PRE_HF_16
 
-#define STEEMIT_MIN_CURATION_PERCENT            (25*STEEMIT_1_PERCENT) // 25%
+#define STEEMIT_MIN_CURATION_PERCENT            0 // 0%
+#define STEEMIT_MIN_CURATION_PERCENT_PRE_HF21   (25*STEEMIT_1_PERCENT) // 25%
 #define STEEMIT_DEF_CURATION_PERCENT            (25*STEEMIT_1_PERCENT) // 25%
 #define STEEMIT_MAX_CURATION_PERCENT            STEEMIT_100_PERCENT