Merge pull request #4769 from lxcmyf/release_4.6.0

fix(mechanism): fix deflation or expansion problems

Author: zhang0125

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

@@ -565,7 +565,7 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
           throw new ContractValidateException(
               "Bad chain parameter id [ALLOW_NEW_REWARD_ALGO]");
         }
-        if (dynamicPropertiesStore.useNewRewardAlgorithm()) {
+        if (dynamicPropertiesStore.allowNewRewardEnable()) {
           throw new ContractValidateException(
               "New reward algorithm has been valid.");
         }

chainbase/src/main/java/org/tron/core/db/EnergyProcessor.java

@@ -133,9 +133,11 @@ public long calculateGlobalEnergyLimit(AccountCapsule accountCapsule) {
     long energyWeight = frozeBalance / TRX_PRECISION;
     long totalEnergyLimit = dynamicPropertiesStore.getTotalEnergyCurrentLimit();
     long totalEnergyWeight = dynamicPropertiesStore.getTotalEnergyWeight();
-
-    assert totalEnergyWeight > 0;
-
+    if (dynamicPropertiesStore.allowNewRewardEnable() && totalEnergyWeight <= 0) {
+      return 0;
+    } else {
+      assert totalEnergyWeight > 0;
+    }
     return (long) (energyWeight * ((double) totalEnergyLimit / totalEnergyWeight));
   }
 

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

@@ -187,6 +187,7 @@ 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();
 
+  private static final byte[] ALLOW_NEW_REWARD = "ALLOW_NEW_REWARD".getBytes();
   private static final byte[] MEMO_FEE = "MEMO_FEE".getBytes();
   private static final byte[] MEMO_FEE_HISTORY = "MEMO_FEE_HISTORY".getBytes();
 
@@ -861,6 +862,16 @@ private DynamicPropertiesStore(@Value("properties") String dbName) {
       }
     }
 
+    try {
+      this.getAllowNewRewardEnable();
+    } catch (IllegalArgumentException e) {
+      this.saveAllowNewRewardEnable(CommonParameter.getInstance().getAllowNewRewardEnable());
+      if (CommonParameter.getInstance().getAllowNewRewardEnable() == 1) {
+        this.put(NEW_REWARD_ALGORITHM_EFFECTIVE_CYCLE,
+                new BytesCapsule(ByteArray.fromLong(getCurrentCycleNumber())));
+      }
+    }
+
     try {
       this.getMemoFee();
     } catch (IllegalArgumentException e) {
@@ -2145,20 +2156,29 @@ public void updateNextMaintenanceTime(long blockTime) {
   public void addTotalNetWeight(long amount) {
     long totalNetWeight = getTotalNetWeight();
     totalNetWeight += amount;
+    if (allowNewRewardEnable()) {
+      totalNetWeight = Math.max(0, totalNetWeight);
+    }
     saveTotalNetWeight(totalNetWeight);
   }
 
   //The unit is trx
   public void addTotalEnergyWeight(long amount) {
     long totalEnergyWeight = getTotalEnergyWeight();
     totalEnergyWeight += amount;
+    if (allowNewRewardEnable()) {
+      totalEnergyWeight = Math.max(0, totalEnergyWeight);
+    }
     saveTotalEnergyWeight(totalEnergyWeight);
   }
 
   //The unit is trx
   public void addTotalTronPowerWeight(long amount) {
     long totalWeight = getTotalTronPowerWeight();
     totalWeight += amount;
+    if (allowNewRewardEnable()) {
+      totalWeight = Math.max(0, totalWeight);
+    }
     saveTotalTronPowerWeight(totalWeight);
   }
 
@@ -2561,6 +2581,21 @@ public void saveMemoFeeHistory(String value) {
     this.put(MEMO_FEE_HISTORY, new BytesCapsule(ByteArray.fromString(value)));
   }
 
+  public long getAllowNewRewardEnable() {
+    return Optional.ofNullable(getUnchecked(ALLOW_NEW_REWARD))
+            .map(BytesCapsule::getData)
+            .map(ByteArray::toLong)
+            .orElseThrow(() -> new IllegalArgumentException("not found AllowNewRewardEnable"));
+  }
+
+  public void saveAllowNewRewardEnable(long newReward) {
+    this.put(ALLOW_NEW_REWARD, new BytesCapsule(ByteArray.fromLong(newReward)));
+  }
+
+  public boolean allowNewRewardEnable() {
+    return getAllowNewRewardEnable() == 1;
+  }
+
   private static class DynamicResourceProperties {
 
     private static final byte[] ONE_DAY_NET_LIMIT = "ONE_DAY_NET_LIMIT".getBytes();

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

@@ -561,6 +561,10 @@ public class CommonParameter {
   @Setter
   public long allowNewRewardAlgorithm;
 
+  @Getter
+  @Setter
+  public long allowNewRewardEnable = 0L;
+
   @Getter
   @Setter
   public long memoFee = 0L;

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

@@ -307,6 +307,7 @@ public class Constant {
 
   public static final String ALLOW_ACCOUNT_ASSET_OPTIMIZATION = "committee.allowAccountAssetOptimization";
   public static final String ALLOW_ASSET_OPTIMIZATION = "committee.allowAssetOptimization";
+  public static final String ALLOW_NEW_REWARD_ENABLE = "committee.allowNewRewardEnable";
   public static final String MEMO_FEE = "committee.memoFee";
 
   public static final String LOCAL_HOST = "127.0.0.1";

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

@@ -1099,8 +1099,8 @@ public Protocol.ChainParameters getChainParameters() {
         .build());
 
     builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
-        .setKey("getNewRewardAlgorithm")
-        .setValue(dbManager.getDynamicPropertiesStore().useNewRewardAlgorithm() ? 1 : 0)
+        .setKey("getAllowNewRewardEnable")
+        .setValue(dbManager.getDynamicPropertiesStore().getAllowNewRewardEnable())
         .build());
 
     builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()

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

@@ -215,6 +215,8 @@ public static void clearParam() {
     PARAMETER.shutdownBlockCount = -1;
     PARAMETER.blockCacheTimeout = 60;
     PARAMETER.allowNewRewardAlgorithm = 0;
+    PARAMETER.allowNewRewardEnable = 0;
+    PARAMETER.memoFee = 0;
   }
 
   /**
@@ -1034,6 +1036,16 @@ public static void setParam(final String[] args, final String confFileName) {
       PARAMETER.blockCacheTimeout = config.getLong(Constant.BLOCK_CACHE_TIMEOUT);
     }
 
+    if (config.hasPath(Constant.ALLOW_NEW_REWARD_ENABLE)) {
+      PARAMETER.allowNewRewardEnable = config.getLong(Constant.ALLOW_NEW_REWARD_ENABLE);
+      if (PARAMETER.allowNewRewardEnable > 1) {
+        PARAMETER.allowNewRewardEnable = 1;
+      }
+      if (PARAMETER.allowNewRewardEnable < 0) {
+        PARAMETER.allowNewRewardEnable = 0;
+      }
+    }
+
     if (config.hasPath(Constant.MEMO_FEE)) {
       PARAMETER.memoFee = config.getLong(Constant.MEMO_FEE);
       if (PARAMETER.memoFee > 1_000_000_000) {

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

@@ -286,6 +286,7 @@ public static boolean process(Manager manager, ProposalCapsule proposalCapsule)
         }
         case ALLOW_NEW_REWARD_ALGO: {
           manager.getDynamicPropertiesStore().saveNewRewardAlgorithmEffectiveCycle();
+          manager.getDynamicPropertiesStore().saveAllowNewRewardEnable(entry.getValue());
           break;
         }
         case MEMO_FEE: {

framework/src/main/java/org/tron/core/db/BandwidthProcessor.java

@@ -390,6 +390,9 @@ public long calculateGlobalNetLimit(AccountCapsule accountCapsule) {
     long netWeight = frozeBalance / TRX_PRECISION;
     long totalNetLimit = chainBaseManager.getDynamicPropertiesStore().getTotalNetLimit();
     long totalNetWeight = chainBaseManager.getDynamicPropertiesStore().getTotalNetWeight();
+    if (dynamicPropertiesStore.allowNewRewardEnable() && totalNetWeight <= 0) {
+      return 0;
+    }
     if (totalNetWeight == 0) {
       return 0;
     }