Merge pull request #4748 from lxcmyf/release_v4.6.0

fix(freezeV2): fix freezeV2
tronprotocol · Oct 31, 2022 · da4d0dc · da4d0dc
2 parents 79a190a + 8ff83b0
commit da4d0dc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/actuator/src/main/java/org/tron/core/actuator/UnDelegateResourceActuator.java b/actuator/src/main/java/org/tron/core/actuator/UnDelegateResourceActuator.java
@@ -92,6 +92,7 @@ public boolean execute(Object result) throws ContractExeException {
 
           long newNetUsage = receiverCapsule.getNetUsage() - transferUsage;
           receiverCapsule.setNetUsage(newNetUsage);
+          receiverCapsule.setLatestConsumeTime(chainBaseManager.getHeadSlot());
           break;
         case ENERGY:
           EnergyProcessor energyProcessor = new EnergyProcessor(dynamicStore, accountStore);
@@ -114,6 +115,7 @@ public boolean execute(Object result) throws ContractExeException {
 
           long newEnergyUsage = receiverCapsule.getEnergyUsage() - transferUsage;
           receiverCapsule.setEnergyUsage(newEnergyUsage);
+          receiverCapsule.setLatestConsumeTimeForEnergy(chainBaseManager.getHeadSlot());
           break;
         default:
           //this should never happen

diff --git a/chainbase/src/main/java/org/tron/core/db/BandwidthProcessor.java b/chainbase/src/main/java/org/tron/core/db/BandwidthProcessor.java
@@ -47,11 +47,9 @@ private void updateUsage(AccountCapsule accountCapsule, long now) {
     long latestConsumeTime = accountCapsule.getLatestConsumeTime();
     accountCapsule.setNetUsage(increase(accountCapsule, BANDWIDTH,
             oldNetUsage, 0, latestConsumeTime, now));
-    accountCapsule.setLatestConsumeTime(now);
     long oldFreeNetUsage = accountCapsule.getFreeNetUsage();
     long latestConsumeFreeTime = accountCapsule.getLatestConsumeFreeTime();
     accountCapsule.setFreeNetUsage(increase(oldFreeNetUsage, 0, latestConsumeFreeTime, now));
-    accountCapsule.setLatestConsumeFreeTime(now);
 
     if (chainBaseManager.getDynamicPropertiesStore().getAllowSameTokenName() == 0) {
       Map<String, Long> assetMap = accountCapsule.getAssetMap();
@@ -60,7 +58,6 @@ private void updateUsage(AccountCapsule accountCapsule, long now) {
         long latestAssetOperationTime = accountCapsule.getLatestAssetOperationTime(assetName);
         accountCapsule.putFreeAssetNetUsage(assetName,
             increase(oldFreeAssetNetUsage, 0, latestAssetOperationTime, now));
-        accountCapsule.putLatestAssetOperationTimeMap(assetName, now);
       });
     }
     Map<String, Long> assetMapV2 = accountCapsule.getAssetMapV2();
@@ -76,7 +73,6 @@ private void updateUsage(AccountCapsule accountCapsule, long now) {
       long latestAssetOperationTime = accountCapsule.getLatestAssetOperationTimeV2(assetName);
       accountCapsule.putFreeAssetNetUsageV2(assetName,
           increase(oldFreeAssetNetUsage, 0, latestAssetOperationTime, now));
-      accountCapsule.putLatestAssetOperationTimeMapV2(assetName, now);
     });
   }
 

diff --git a/chainbase/src/main/java/org/tron/core/db/EnergyProcessor.java b/chainbase/src/main/java/org/tron/core/db/EnergyProcessor.java
@@ -45,7 +45,6 @@ private void updateUsage(AccountCapsule accountCapsule, long now) {
 
     accountCapsule.setEnergyUsage(increase(accountCapsule, ENERGY,
             oldEnergyUsage, 0, latestConsumeTime, now));
-    accountCapsule.setLatestConsumeTimeForEnergy(now);
   }
 
   public void updateTotalEnergyAverageUsage() {