Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(freezeV2): fix freezeV2 #4748

Merged
merged 1 commit into from
Oct 31, 2022
Merged

fix(freezeV2): fix freezeV2 #4748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions actuator/src/main/java/org/tron/core/actuator/UnDelegateResourceActuator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions chainbase/src/main/java/org/tron/core/db/BandwidthProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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);
});
}

Expand Down
1 change: 0 additions & 1 deletion chainbase/src/main/java/org/tron/core/db/EnergyProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down