Merge pull request #4776 from lxcmyf/release_4.6.0

fix(mechanism): optimize freezing precision query

Author: zhang0125

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

@@ -292,16 +292,13 @@ private long delegateResource(byte[] ownerAddress, byte[] receiverAddress, boole
     //modify DelegatedResourceStore
     DelegatedResourceCapsule delegatedResourceCapsule = delegatedResourceStore
         .get(key);
-    long oldWeight;
     if (delegatedResourceCapsule != null) {
-      oldWeight = delegatedResourceCapsule.getFrozenBalance(isBandwidth) / TRX_PRECISION;
       if (isBandwidth) {
         delegatedResourceCapsule.addFrozenBalanceForBandwidth(balance, expireTime);
       } else {
         delegatedResourceCapsule.addFrozenBalanceForEnergy(balance, expireTime);
       }
     } else {
-      oldWeight = 0;
       delegatedResourceCapsule = new DelegatedResourceCapsule(
           ByteString.copyFrom(ownerAddress),
           ByteString.copyFrom(receiverAddress));
@@ -312,7 +309,6 @@ private long delegateResource(byte[] ownerAddress, byte[] receiverAddress, boole
       }
 
     }
-    long newWeight = delegatedResourceCapsule.getFrozenBalance(isBandwidth) / TRX_PRECISION;
     delegatedResourceStore.put(key, delegatedResourceCapsule);
 
     //modify DelegatedResourceAccountIndexStore
@@ -349,12 +345,17 @@ private long delegateResource(byte[] ownerAddress, byte[] receiverAddress, boole
 
     //modify AccountStore
     AccountCapsule receiverCapsule = accountStore.get(receiverAddress);
+    long oldWeight;
+    long newWeight;
     if (isBandwidth) {
+      oldWeight = receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth() / TRX_PRECISION;
       receiverCapsule.addAcquiredDelegatedFrozenBalanceForBandwidth(balance);
+      newWeight = receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth() / TRX_PRECISION;
     } else {
+      oldWeight = receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy() / TRX_PRECISION;
       receiverCapsule.addAcquiredDelegatedFrozenBalanceForEnergy(balance);
+      newWeight = receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy() / TRX_PRECISION;
     }
-
     accountStore.put(receiverCapsule.createDbKey(), receiverCapsule);
     return newWeight - oldWeight;
   }

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

@@ -83,6 +83,7 @@ public boolean execute(Object result) throws ContractExeException {
     byte[] receiverAddress = unfreezeBalanceContract.getReceiverAddress().toByteArray();
     //If the receiver is not included in the contract, unfreeze frozen balance for this account.
     //otherwise,unfreeze delegated frozen balance provided this account.
+    long decrease = 0;
     if (!ArrayUtils.isEmpty(receiverAddress) && dynamicStore.supportDR()) {
       byte[] key = DelegatedResourceCapsule
           .createDbKey(unfreezeBalanceContract.getOwnerAddress().toByteArray(),
@@ -107,25 +108,38 @@ public boolean execute(Object result) throws ContractExeException {
       }
 
       AccountCapsule receiverCapsule = accountStore.get(receiverAddress);
+      
       if (dynamicStore.getAllowTvmConstantinople() == 0 ||
           (receiverCapsule != null && receiverCapsule.getType() != AccountType.Contract)) {
         switch (unfreezeBalanceContract.getResource()) {
           case BANDWIDTH:
+            long oldNetWeight = receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth() / 
+                    TRX_PRECISION;
             if (dynamicStore.getAllowTvmSolidity059() == 1
                 && receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth()
                 < unfreezeBalance) {
+              oldNetWeight = unfreezeBalance / TRX_PRECISION;
               receiverCapsule.setAcquiredDelegatedFrozenBalanceForBandwidth(0);
             } else {
               receiverCapsule.addAcquiredDelegatedFrozenBalanceForBandwidth(-unfreezeBalance);
             }
+            long newNetWeight = receiverCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth() / 
+                    TRX_PRECISION;
+            decrease = newNetWeight - oldNetWeight;
             break;
           case ENERGY:
+            long oldEnergyWeight = receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy() / 
+                    TRX_PRECISION;
             if (dynamicStore.getAllowTvmSolidity059() == 1
                 && receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy() < unfreezeBalance) {
+              oldEnergyWeight = unfreezeBalance / TRX_PRECISION;
               receiverCapsule.setAcquiredDelegatedFrozenBalanceForEnergy(0);
             } else {
               receiverCapsule.addAcquiredDelegatedFrozenBalanceForEnergy(-unfreezeBalance);
             }
+            long newEnergyWeight = receiverCapsule.getAcquiredDelegatedFrozenBalanceForEnergy() / 
+                    TRX_PRECISION;
+            decrease = newEnergyWeight - oldEnergyWeight;
             break;
           default:
             //this should never happen
@@ -213,19 +227,20 @@ public boolean execute(Object result) throws ContractExeException {
       }
 
     }
-
+    
+    long weight = dynamicStore.allowNewRewardEnable() ? decrease : -unfreezeBalance / TRX_PRECISION;
     switch (unfreezeBalanceContract.getResource()) {
       case BANDWIDTH:
         dynamicStore
-            .addTotalNetWeight(-unfreezeBalance / TRX_PRECISION);
+            .addTotalNetWeight(weight);
         break;
       case ENERGY:
         dynamicStore
-            .addTotalEnergyWeight(-unfreezeBalance / TRX_PRECISION);
+            .addTotalEnergyWeight(weight);
         break;
       case TRON_POWER:
         dynamicStore
-            .addTotalTronPowerWeight(-unfreezeBalance / TRX_PRECISION);
+            .addTotalTronPowerWeight(weight);
         break;
       default:
         //this should never happen