Merge pull request #1837 from tronprotocol/hotfix/v3.2.2_energy_limit

Hotfix/v3.2.2 energy limit

Author: renchenchang

src/main/java/org/tron/core/actuator/ProposalCreateActuator.java

@@ -14,7 +14,6 @@
 import org.tron.core.Wallet;
 import org.tron.core.capsule.ProposalCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
-import org.tron.core.config.Parameter;
 import org.tron.core.config.Parameter.ChainParameters;
 import org.tron.core.config.Parameter.ForkBlockVersionConsts;
 import org.tron.core.config.args.Args;
@@ -216,7 +215,7 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
         }
         break;
       }
-      case (17): {
+      case (17): { // deprecated
         if (!dbManager.getForkController().pass(ForkBlockVersionConsts.ENERGY_LIMIT)) {
           throw new ContractValidateException("Bad chain parameter id");
         }
@@ -240,6 +239,16 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
         }
         break;
       }
+      case (19): {
+        if (!dbManager.getForkController().pass(ForkBlockVersionConsts.VERSION_3_2_2)) {
+          throw new ContractValidateException("Bad chain parameter id");
+        }
+        if (entry.getValue() < 0 || entry.getValue() > 100_000_000_000_000_000L) {
+          throw new ContractValidateException(
+              "Bad chain parameter value,valid range is [0,100_000_000_000_000_000L]");
+        }
+        break;
+      }
       default:
         break;
     }

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

@@ -89,6 +89,7 @@ enum ChainParameters {
     ALLOW_DELEGATE_RESOURCE, // 0, 16
     TOTAL_ENERGY_LIMIT, // 50,000,000,000, 17
     ALLOW_TVM_TRANSFER_TRC10, // 1, 18
+    TOTAL_CURRENT_ENERGY_LIMIT, // 50,000,000,000, 19
 //    ALLOW_ADAPTIVE_ENERGY,
 //    ONE_DAY_NET_LIMIT,
 //    MAX_FROZEN_TIME,

src/main/java/org/tron/core/db/DynamicPropertiesStore.java

@@ -321,6 +321,12 @@ private DynamicPropertiesStore(@Value("properties") String dbName) {
       this.saveTotalEnergyWeight(0L);
     }
 
+    try {
+      this.getAllowAdaptiveEnergy();
+    } catch (IllegalArgumentException e) {
+      this.saveAllowAdaptiveEnergy(Args.getInstance().getAllowAdaptiveEnergy());
+    }
+
     try {
       this.getTotalEnergyLimit();
     } catch (IllegalArgumentException e) {
@@ -435,12 +441,6 @@ private DynamicPropertiesStore(@Value("properties") String dbName) {
       this.saveAllowDelegateResource(Args.getInstance().getAllowDelegateResource());
     }
 
-    try {
-      this.getAllowAdaptiveEnergy();
-    } catch (IllegalArgumentException e) {
-      this.saveAllowAdaptiveEnergy(Args.getInstance().getAllowAdaptiveEnergy());
-    }
-
     try {
       this.getAllowTvmTransferTrc10();
     } catch (IllegalArgumentException e) {
@@ -814,7 +814,16 @@ public void saveTotalEnergyLimit(long totalEnergyLimit) {
         new BytesCapsule(ByteArray.fromLong(totalEnergyLimit)));
 
     saveTotalEnergyTargetLimit(totalEnergyLimit / 14400);
+  }
 
+  public void saveTotalEnergyLimit2(long totalEnergyLimit) {
+    this.put(DynamicResourceProperties.TOTAL_ENERGY_LIMIT,
+        new BytesCapsule(ByteArray.fromLong(totalEnergyLimit)));
+
+    saveTotalEnergyTargetLimit(totalEnergyLimit / 14400);
+    if (getAllowAdaptiveEnergy() == 0) {
+      saveTotalEnergyCurrentLimit(totalEnergyLimit);
+    }
   }
 
   public long getTotalEnergyLimit() {

src/main/java/org/tron/core/services/RpcApiService.java

@@ -68,7 +68,6 @@
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.core.capsule.WitnessCapsule;
 import org.tron.core.config.args.Args;
-import org.tron.core.db.BandwidthProcessor;
 import org.tron.core.db.Manager;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.exception.NonUniqueObjectException;
@@ -272,14 +271,7 @@ public void getAccount(Account request, StreamObserver<Account> responseObserver
       ByteString addressBs = request.getAddress();
       if (addressBs != null) {
         Account reply = wallet.getAccount(request);
-        if (reply == null) {
-          responseObserver.onNext(null);
-        } else {
-          AccountCapsule accountCapsule = new AccountCapsule(reply);
-          BandwidthProcessor processor = new BandwidthProcessor(dbManager);
-          processor.updateUsage(accountCapsule);
-          responseObserver.onNext(accountCapsule.getInstance());
-        }
+        responseObserver.onNext(reply);
       } else {
         responseObserver.onNext(null);
       }
@@ -291,14 +283,7 @@ public void getAccountById(Account request, StreamObserver<Account> responseObse
       ByteString id = request.getAccountId();
       if (id != null) {
         Account reply = wallet.getAccountById(request);
-        if (reply == null) {
-          responseObserver.onNext(null);
-        } else {
-          AccountCapsule accountCapsule = new AccountCapsule(reply);
-          BandwidthProcessor processor = new BandwidthProcessor(dbManager);
-          processor.updateUsage(accountCapsule);
-          responseObserver.onNext(accountCapsule.getInstance());
-        }
+        responseObserver.onNext(reply);
       } else {
         responseObserver.onNext(null);
       }

src/main/java/org/tron/core/witness/ProposalController.java

@@ -178,6 +178,9 @@ public void setDynamicParameters(ProposalCapsule proposalCapsule) {
           manager.getDynamicPropertiesStore().saveAllowTvmTransferTrc10(entry.getValue());
           break;
         }
+        case (19):
+          manager.getDynamicPropertiesStore().saveTotalEnergyLimit2(entry.getValue());
+          break;
         default:
           break;
       }

src/test/java/org/tron/core/WalletTest.java

@@ -415,7 +415,7 @@ public void getPaginatedExchangeList() {
         exchangeList.getExchangesList().get(1).getCreatorAddress().toStringUtf8());
   }
 
-  @Test
+  //@Test
   public void testChainParameters() {
 
     Protocol.ChainParameters.Builder builder = Protocol.ChainParameters.newBuilder();