fix(mechanism): optimize total weight when unfreeze owner

Author: lxcmyf

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

@@ -108,7 +108,7 @@ 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()) {
@@ -146,6 +146,8 @@ public boolean execute(Object result) throws ContractExeException {
             break;
         }
         accountStore.put(receiverCapsule.createDbKey(), receiverCapsule);
+      } else {
+        decrease = -unfreezeBalance / TRX_PRECISION;
       }
 
       accountCapsule.setBalance(oldBalance + unfreezeBalance);
@@ -187,7 +189,7 @@ public boolean execute(Object result) throws ContractExeException {
     } else {
       switch (unfreezeBalanceContract.getResource()) {
         case BANDWIDTH:
-
+          long oldNetWeight = accountCapsule.getFrozenBalance() / TRX_PRECISION;
           List<Frozen> frozenList = Lists.newArrayList();
           frozenList.addAll(accountCapsule.getFrozenList());
           Iterator<Frozen> iterator = frozenList.iterator();
@@ -203,9 +205,11 @@ public boolean execute(Object result) throws ContractExeException {
           accountCapsule.setInstance(accountCapsule.getInstance().toBuilder()
               .setBalance(oldBalance + unfreezeBalance)
               .clearFrozen().addAllFrozen(frozenList).build());
-
+          long newNetWeight = accountCapsule.getFrozenBalance() / TRX_PRECISION;
+          decrease = newNetWeight - oldNetWeight;
           break;
         case ENERGY:
+          long oldEnergyWeight = accountCapsule.getEnergyFrozenBalance() / TRX_PRECISION;
           unfreezeBalance = accountCapsule.getAccountResource().getFrozenBalanceForEnergy()
               .getFrozenBalance();
 
@@ -214,12 +218,17 @@ public boolean execute(Object result) throws ContractExeException {
           accountCapsule.setInstance(accountCapsule.getInstance().toBuilder()
               .setBalance(oldBalance + unfreezeBalance)
               .setAccountResource(newAccountResource).build());
+          long newEnergyWeight = accountCapsule.getEnergyFrozenBalance() / TRX_PRECISION;
+          decrease = newEnergyWeight - oldEnergyWeight;
           break;
         case TRON_POWER:
+          long oldTPWeight = accountCapsule.getTronPowerFrozenBalance() / TRX_PRECISION;
           unfreezeBalance = accountCapsule.getTronPowerFrozenBalance();
           accountCapsule.setInstance(accountCapsule.getInstance().toBuilder()
               .setBalance(oldBalance + unfreezeBalance)
               .clearTronPower().build());
+          long newTPWeight = accountCapsule.getTronPowerFrozenBalance() / TRX_PRECISION;
+          decrease = newTPWeight - oldTPWeight;
           break;
         default:
           //this should never happen

framework/src/test/java/org/tron/core/actuator/UnfreezeBalanceActuatorTest.java

@@ -140,6 +140,7 @@ private Any getContract(String ownerAddress, ResourceCode resourceCode) {
   @Test
   public void testUnfreezeBalanceForBandwidth() {
     long now = System.currentTimeMillis();
+    dbManager.getDynamicPropertiesStore().saveAllowNewRewardEnable(0);
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(now);
 
     AccountCapsule accountCapsule = dbManager.getAccountStore()
@@ -178,10 +179,98 @@ public void testUnfreezeBalanceForBandwidth() {
     }
   }
 
+  @Test
+  public void testUnfreezeSelfAndOthersForBandwidth() {
+    dbManager.getDynamicPropertiesStore().saveAllowDelegateResource(1);
+    dbManager.getDynamicPropertiesStore().saveAllowNewRewardEnable(1);
+    long now = System.currentTimeMillis();
+    dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(now);
+
+    AccountCapsule owner = dbManager.getAccountStore().get(ByteArray.fromHexString(OWNER_ADDRESS));
+    owner.setDelegatedFrozenBalanceForBandwidth(150_0000L);
+    owner.setFrozen(150_0000L, now);
+    dbManager.getDynamicPropertiesStore().saveTotalNetWeight(2L);
+    long beforeWeight = dbManager.getDynamicPropertiesStore().getTotalNetWeight();
+    Assert.assertEquals(2, beforeWeight);
+
+    AccountCapsule receiver = dbManager.getAccountStore()
+            .get(ByteArray.fromHexString(RECEIVER_ADDRESS));
+    receiver.setAcquiredDelegatedFrozenBalanceForBandwidth(150_0000L);
+
+    dbManager.getAccountStore().put(owner.createDbKey(), owner);
+    dbManager.getAccountStore().put(receiver.createDbKey(), receiver);
+
+    //init DelegatedResourceCapsule
+    DelegatedResourceCapsule delegatedResourceCapsule = new DelegatedResourceCapsule(
+            owner.getAddress(), receiver.getAddress());
+    delegatedResourceCapsule.setFrozenBalanceForBandwidth(150_0000L, now - 100L);
+    dbManager.getDelegatedResourceStore().put(DelegatedResourceCapsule
+            .createDbKey(ByteArray.fromHexString(OWNER_ADDRESS),
+                    ByteArray.fromHexString(RECEIVER_ADDRESS)), delegatedResourceCapsule);
+
+    //init DelegatedResourceAccountIndex
+    {
+      DelegatedResourceAccountIndexCapsule delegatedResourceAccountIndex =
+              new DelegatedResourceAccountIndexCapsule(
+                      owner.getAddress());
+      delegatedResourceAccountIndex
+              .addToAccount(ByteString.copyFrom(ByteArray.fromHexString(RECEIVER_ADDRESS)));
+      dbManager.getDelegatedResourceAccountIndexStore()
+              .put(ByteArray.fromHexString(OWNER_ADDRESS), delegatedResourceAccountIndex);
+    }
+
+    {
+      DelegatedResourceAccountIndexCapsule delegatedResourceAccountIndex =
+              new DelegatedResourceAccountIndexCapsule(
+                      receiver.getAddress());
+      delegatedResourceAccountIndex
+              .addFromAccount(ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)));
+      dbManager.getDelegatedResourceAccountIndexStore()
+              .put(ByteArray.fromHexString(RECEIVER_ADDRESS), delegatedResourceAccountIndex);
+    }
+
+
+
+    UnfreezeBalanceActuator actuator1 = new UnfreezeBalanceActuator();
+    actuator1.setChainBaseManager(dbManager.getChainBaseManager())
+            .setAny(getContractForBandwidth(OWNER_ADDRESS));
+    TransactionResultCapsule ret1 = new TransactionResultCapsule();
+    try {
+      actuator1.validate();
+      actuator1.execute(ret1);
+      long afterWeight1 = dbManager.getDynamicPropertiesStore().getTotalNetWeight();
+      Assert.assertEquals(1, afterWeight1);
+      Assert.assertEquals(ret1.getInstance().getRet(), code.SUCESS);
+    } catch (ContractValidateException e) {
+      logger.error("ContractValidateException", e);
+      Assert.assertFalse(e instanceof ContractValidateException);
+    } catch (ContractExeException e) {
+      Assert.assertFalse(e instanceof ContractExeException);
+    }
+
+    UnfreezeBalanceActuator actuator = new UnfreezeBalanceActuator();
+    actuator.setChainBaseManager(dbManager.getChainBaseManager())
+            .setAny(getDelegatedContractForBandwidth(OWNER_ADDRESS, RECEIVER_ADDRESS));
+    TransactionResultCapsule ret = new TransactionResultCapsule();
+
+    try {
+      actuator.validate();
+      actuator.execute(ret);
+      long afterWeight = dbManager.getDynamicPropertiesStore().getTotalNetWeight();
+      Assert.assertEquals(0, afterWeight);
+      Assert.assertEquals(ret.getInstance().getRet(), code.SUCESS);
+    } catch (ContractValidateException e) {
+      Assert.assertFalse(e instanceof ContractValidateException);
+    } catch (ContractExeException e) {
+      Assert.assertFalse(e instanceof ContractExeException);
+    }
+    dbManager.getDynamicPropertiesStore().saveAllowNewRewardEnable(0);
+  }
 
   @Test
   public void testUnfreezeBalanceForEnergy() {
     long now = System.currentTimeMillis();
+    dbManager.getDynamicPropertiesStore().saveAllowNewRewardEnable(0);
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(now);
 
     AccountCapsule accountCapsule = dbManager.getAccountStore()
@@ -304,6 +393,7 @@ public void testUnfreezeDelegatedBalanceForBandwidth() {
     } catch (ContractExeException e) {
       Assert.assertFalse(e instanceof ContractExeException);
     }
+
   }
 
   @Test