Merge pull request #4645 from tronprotocol/feature/new_reward_algo

feat(reward): add a proposal for new reward algorithm

Author: xxo1shine

actuator/src/main/java/org/tron/core/utils/ProposalUtil.java

@@ -560,6 +560,21 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
+      case ALLOW_NEW_REWARD_ALGO: {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_6)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [ALLOW_NEW_REWARD_ALGO]");
+        }
+        if (dynamicPropertiesStore.useNewRewardAlgorithm()) {
+          throw new ContractValidateException(
+              "New reward algorithm has been valid.");
+        }
+        if (value != 1) {
+          throw new ContractValidateException(
+              "This value[ALLOW_NEW_REWARD_ALGO] is only allowed to be 1");
+        }
+        break;
+      }
       default:
         break;
     }
@@ -623,7 +638,8 @@ public enum ProposalType {         // current value, value range
     TOTAL_NET_LIMIT(62), // 43_200_000_000L, [0, 1000_000_000_000L]
     ALLOW_TVM_LONDON(63), // 0, 1
     ALLOW_HIGHER_LIMIT_FOR_MAX_CPU_TIME_OF_ONE_TX(65), // 0, 1
-    ALLOW_ASSET_OPTIMIZATION(66); // 0, 1
+    ALLOW_ASSET_OPTIMIZATION(66), // 0, 1
+    ALLOW_NEW_REWARD_ALGO(67); // 0, 1
 
     private long code;
 

chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java

@@ -187,7 +187,6 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
   private static final byte[] ALLOW_HIGHER_LIMIT_FOR_MAX_CPU_TIME_OF_ONE_TX =
       "ALLOW_HIGHER_LIMIT_FOR_MAX_CPU_TIME_OF_ONE_TX".getBytes();
 
-
   @Autowired
   private DynamicPropertiesStore(@Value("properties") String dbName) {
     super(dbName);
@@ -2383,7 +2382,7 @@ public long getAllowTvmCompatibleEvm() {
   }
 
   public boolean useNewRewardAlgorithm() {
-    return getAllowTvmVote() == 1;
+    return getNewRewardAlgorithmEffectiveCycle() != Long.MAX_VALUE;
   }
 
   public void saveNewRewardAlgorithmEffectiveCycle() {

common/src/main/java/org/tron/core/config/Parameter.java

@@ -18,7 +18,8 @@ public enum ForkBlockVersionEnum {
     VERSION_4_2(21, 1596780000000L, 80),
     VERSION_4_3(22, 1596780000000L, 80),
     VERSION_4_4(23, 1596780000000L, 80),
-    VERSION_4_5(24, 1596780000000L, 80);
+    VERSION_4_5(24, 1596780000000L, 80),
+    VERSION_4_6(25, 1596780000000L, 80);
 
     @Getter
     private int value;
@@ -66,7 +67,7 @@ public class ChainConstant {
     public static final int SINGLE_REPEAT = 1;
     public static final int BLOCK_FILLED_SLOTS_NUMBER = 128;
     public static final int MAX_FROZEN_NUMBER = 1;
-    public static final int BLOCK_VERSION = 24;
+    public static final int BLOCK_VERSION = 25;
     public static final long FROZEN_PERIOD = 86_400_000L;
     public static final long TRX_PRECISION = 1000_000L;
   }

framework/src/main/java/org/tron/core/Wallet.java

@@ -1098,6 +1098,11 @@ public Protocol.ChainParameters getChainParameters() {
         .setValue(dbManager.getDynamicPropertiesStore().getAllowAssetOptimization())
         .build());
 
+    builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
+        .setKey("getNewRewardAlgorithm")
+        .setValue(dbManager.getDynamicPropertiesStore().useNewRewardAlgorithm() ? 1 : 0)
+        .build());
+
     return builder.build();
   }
 

framework/src/main/java/org/tron/core/consensus/ProposalService.java

@@ -251,8 +251,8 @@ public static boolean process(Manager manager, ProposalCapsule proposalCapsule)
           break;
         }
         case ALLOW_TVM_VOTE: {
-          manager.getDynamicPropertiesStore().saveAllowTvmVote(entry.getValue());
           manager.getDynamicPropertiesStore().saveNewRewardAlgorithmEffectiveCycle();
+          manager.getDynamicPropertiesStore().saveAllowTvmVote(entry.getValue());
           break;
         }
         case ALLOW_TVM_LONDON: {
@@ -284,6 +284,10 @@ public static boolean process(Manager manager, ProposalCapsule proposalCapsule)
           manager.getDynamicPropertiesStore().setAllowAssetOptimization(entry.getValue());
           break;
         }
+        case ALLOW_NEW_REWARD_ALGO: {
+          manager.getDynamicPropertiesStore().saveNewRewardAlgorithmEffectiveCycle();
+          break;
+        }
         default:
           find = false;
           break;

framework/src/test/java/org/tron/common/runtime/vm/VoteTest.java

@@ -301,6 +301,7 @@ public void init() throws Exception {
     VMConfig.initAllowTvmVote(1);
     manager.getDynamicPropertiesStore().saveChangeDelegation(1);
     manager.getDynamicPropertiesStore().saveAllowTvmVote(1);
+    manager.getDynamicPropertiesStore().saveNewRewardAlgorithmEffectiveCycle();
   }
 
   @After