Merge pull request #278 from graft-project/fix/wrong-hf-version-for-h…

…alved-block-reward revert wrong HF version for halved block reward. fixes #267
graft-project · Apr 19, 2019 · dec5c54 · dec5c54
2 parents 38836a1 + 85d4cc4
commit dec5c54
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/cryptonote_basic/cryptonote_basic_impl.cpp b/src/cryptonote_basic/cryptonote_basic_impl.cpp
@@ -114,8 +114,8 @@ namespace cryptonote {
 
     if (current_block_size <= median_size) {
       reward = base_reward;
-      if (version >= 12) { // XXX Be careful when merging back to master, in master "halving" version is 10
-          // halving reward since version 12
+      if (version >= 10) {
+          // halving reward since version 10
           reward /= 2;
       }
       return true;
@@ -144,8 +144,8 @@ namespace cryptonote {
     assert(reward_lo < base_reward);
 
     reward = reward_lo;
-    if (version >= 12) { // XXX Be careful when merging back to master, in master "halving" version is 10
-        // halving reward since version 12
+    if (version >= 10) { 
+        // halving reward since version 10
         reward /= 2;
     }
     return true;