Merge pull request #4694 from bladehan1/feat/config_for_proposal

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

Author: lvs007

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

@@ -845,6 +845,18 @@ private DynamicPropertiesStore(@Value("properties") String dbName) {
       this.saveAllowHigherLimitForMaxCpuTimeOfOneTx(
           CommonParameter.getInstance().getAllowHigherLimitForMaxCpuTimeOfOneTx());
     }
+
+    try {
+      this.getNewRewardAlgorithmEffectiveCycle();
+    } catch (IllegalArgumentException e) {
+      if (CommonParameter.getInstance().getAllowNewRewardAlgorithm() == 1) {
+        this.put(NEW_REWARD_ALGORITHM_EFFECTIVE_CYCLE,
+            new BytesCapsule(ByteArray.fromLong(getCurrentCycleNumber())));
+      } else {
+        this.put(NEW_REWARD_ALGORITHM_EFFECTIVE_CYCLE,
+            new BytesCapsule(ByteArray.fromLong(Long.MAX_VALUE)));
+      }
+    }
   }
 
   public String intArrayToString(int[] a) {
@@ -2397,7 +2409,8 @@ public long getNewRewardAlgorithmEffectiveCycle() {
     return Optional.ofNullable(getUnchecked(NEW_REWARD_ALGORITHM_EFFECTIVE_CYCLE))
         .map(BytesCapsule::getData)
         .map(ByteArray::toLong)
-        .orElse(Long.MAX_VALUE);
+        .orElseThrow(
+            () -> new IllegalArgumentException("not found NEW_REWARD_ALGORITHM_EFFECTIVE_CYCLE"));
   }
 
   public long getAllowAccountAssetOptimizationFromRoot() {

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -557,6 +557,10 @@ public class CommonParameter {
   @Setter
   public long blockCacheTimeout = 60;
 
+  @Getter
+  @Setter
+  public long allowNewRewardAlgorithm;
+
   private static double calcMaxTimeRatio() {
     //return max(2.0, min(5.0, 5 * 4.0 / max(Runtime.getRuntime().availableProcessors(), 1)));
     return 5.0;

common/src/main/java/org/tron/core/Constant.java

@@ -290,6 +290,8 @@ public class Constant {
   public static final String COMMITTEE_ALLOW_TVM_COMPATIBLE_EVM = "committee.allowTvmCompatibleEvm";
   public static final String COMMITTEE_ALLOW_HIGHER_LIMIT_FOR_MAX_CPU_TIME_OF_ONE_TX =
       "committee.allowHigherLimitForMaxCpuTimeOfOneTx";
+  public static final String COMMITTEE_ALLOW_NEW_REWARD_ALGORITHM = "committee.allowNewRewardAlgorithm";
+
 
   public static final String METRICS_STORAGE_ENABLE = "node.metrics.storageEnable";
   public static final String METRICS_INFLUXDB_IP = "node.metrics.influxdb.ip";

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -214,6 +214,7 @@ public static void clearParam() {
     PARAMETER.shutdownBlockHeight = -1;
     PARAMETER.shutdownBlockCount = -1;
     PARAMETER.blockCacheTimeout = 60;
+    PARAMETER.allowNewRewardAlgorithm = 0;
   }
 
   /**
@@ -946,6 +947,10 @@ public static void setParam(final String[] args, final String confFileName) {
         config.hasPath(Constant.COMMITTEE_ALLOW_HIGHER_LIMIT_FOR_MAX_CPU_TIME_OF_ONE_TX) ? config
             .getInt(Constant.COMMITTEE_ALLOW_HIGHER_LIMIT_FOR_MAX_CPU_TIME_OF_ONE_TX) : 0;
 
+    PARAMETER.allowNewRewardAlgorithm =
+        config.hasPath(Constant.COMMITTEE_ALLOW_NEW_REWARD_ALGORITHM) ? config
+            .getInt(Constant.COMMITTEE_ALLOW_NEW_REWARD_ALGORITHM) : 0;
+
     initBackupProperty(config);
     if (Constant.ROCKSDB.equalsIgnoreCase(CommonParameter
         .getInstance().getStorage().getDbEngine())) {