Merge pull request #4750 from yanghang8612/feature/new_tvm_unfreeze_vote

feat(freezeV2): optimize votes and latest consume time
tronprotocol · Oct 31, 2022 · 9b3820e · 9b3820e
2 parents da4d0dc + 431c547
commit 9b3820e
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 26 deletions.
diff --git a/actuator/src/main/java/org/tron/core/actuator/VMActuator.java b/actuator/src/main/java/org/tron/core/actuator/VMActuator.java
@@ -557,6 +557,7 @@ public long getAccountEnergyLimitWithFixRatio(AccountCapsule account, long feeLi
               rootRepository.getDynamicPropertiesStore(),
               ChainBaseManager.getInstance().getAccountStore());
       energyProcessor.updateUsage(account);
+      account.setLatestConsumeTimeForEnergy(now);
       receipt.setCallerEnergyUsage(account.getEnergyUsage());
       receipt.setCallerEnergyWindowSize(account.getWindowSize(Common.ResourceCode.ENERGY));
       account.setEnergyUsage(
@@ -717,6 +718,7 @@ public long getTotalEnergyLimitWithFixRatio(AccountCapsule creator, AccountCapsu
               rootRepository.getDynamicPropertiesStore(),
               ChainBaseManager.getInstance().getAccountStore());
       energyProcessor.updateUsage(creator);
+      creator.setLatestConsumeTimeForEnergy(now);
       receipt.setOriginEnergyUsage(creator.getEnergyUsage());
       receipt.setOriginEnergyWindowSize(creator.getWindowSize(Common.ResourceCode.ENERGY));
       creator.setEnergyUsage(

diff --git a/actuator/src/main/java/org/tron/core/vm/nativecontract/UnDelegateResourceProcessor.java b/actuator/src/main/java/org/tron/core/vm/nativecontract/UnDelegateResourceProcessor.java
@@ -119,6 +119,7 @@ public void execute(UnDelegateResourceParam param, Repository repo) {
 
           long newNetUsage = receiverCapsule.getNetUsage() - transferUsage;
           receiverCapsule.setNetUsage(newNetUsage);
+          receiverCapsule.setLatestConsumeTime(now);
           break;
         case ENERGY:
           EnergyProcessor energyProcessor =
@@ -142,6 +143,7 @@ public void execute(UnDelegateResourceParam param, Repository repo) {
 
           long newEnergyUsage = receiverCapsule.getEnergyUsage() - transferUsage;
           receiverCapsule.setEnergyUsage(newEnergyUsage);
+          receiverCapsule.setLatestConsumeTimeForEnergy(now);
           break;
         default:
           //this should never happen

diff --git a/actuator/src/main/java/org/tron/core/vm/nativecontract/UnfreezeBalanceV2Processor.java b/actuator/src/main/java/org/tron/core/vm/nativecontract/UnfreezeBalanceV2Processor.java
@@ -7,6 +7,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -140,7 +141,7 @@ public long execute(UnfreezeBalanceV2Param param, Repository repo) {
     accountCapsule.addUnfrozenV2List(param.getResourceType(), unfreezeBalance, expireTime);
 
     this.updateTotalResourceWeight(param.getResourceType(), unfreezeBalance, repo);
-    this.clearVotes(accountCapsule, param.getResourceType(), ownerAddress, repo);
+    this.updateVote(accountCapsule, param.getResourceType(), ownerAddress, repo);
 
     if (repo.getDynamicPropertiesStore().supportAllowNewResourceModel()
         && !accountCapsule.oldTronPowerIsInvalid()) {
@@ -215,34 +216,28 @@ public void updateTotalResourceWeight(Common.ResourceCode freezeType,
     }
   }
 
-  private void clearVotes(
-      AccountCapsule accountCapsule, Common.ResourceCode freezeType, byte[] ownerAddress, Repository repo) {
+  private void updateVote(
+      AccountCapsule accountCapsule,
+      Common.ResourceCode freezeType,
+      byte[] ownerAddress,
+      Repository repo) {
+    DynamicPropertiesStore dynamicStore = repo.getDynamicPropertiesStore();
 
-    boolean needToClearVote = true;
-    if (repo.getDynamicPropertiesStore().supportAllowNewResourceModel()
-        && accountCapsule.oldTronPowerIsInvalid()) {
-      switch (freezeType) {
-        case BANDWIDTH:
-        case ENERGY:
-          needToClearVote = false;
-          break;
-        default:
-          break;
-      }
+    if (!VMConfig.allowTvmVote() || accountCapsule.getVotesList().isEmpty()) {
+      return;
     }
-
-    if (needToClearVote && VMConfig.allowTvmVote() && !accountCapsule.getVotesList().isEmpty()) {
-      long usedTronPower = 0;
-      for (Protocol.Vote vote : accountCapsule.getVotesList()) {
-        usedTronPower += vote.getVoteCount();
-      }
-      long ownedTronPower;
-      if (repo.getDynamicPropertiesStore().supportAllowNewResourceModel()) {
-        ownedTronPower = accountCapsule.getAllTronPower();
+    if (dynamicStore.supportAllowNewResourceModel()) {
+      if (accountCapsule.oldTronPowerIsInvalid()) {
+        switch (freezeType) {
+          case BANDWIDTH:
+          case ENERGY:
+            // there is no need to change votes
+            return;
+          default:
+            break;
+        }
       } else {
-        ownedTronPower = accountCapsule.getTronPower();
-      }
-      if (ownedTronPower < usedTronPower * TRX_PRECISION) {
+        // clear all votes at once when new resource model start
         VotesCapsule votesCapsule = repo.getVotes(ownerAddress);
         if (votesCapsule == null) {
           votesCapsule =
@@ -251,7 +246,53 @@ private void clearVotes(
         accountCapsule.clearVotes();
         votesCapsule.clearNewVotes();
         repo.updateVotes(ownerAddress, votesCapsule);
+        return;
       }
     }
+
+    long totalVote = 0;
+    for (Protocol.Vote vote : accountCapsule.getVotesList()) {
+      totalVote += vote.getVoteCount();
+    }
+    if (totalVote == 0) {
+      return;
+    }
+
+    long ownedTronPower;
+    if (dynamicStore.supportAllowNewResourceModel()) {
+      ownedTronPower = accountCapsule.getAllTronPower();
+    } else {
+      ownedTronPower = accountCapsule.getTronPower();
+    }
+    // tron power is enough to total votes
+    if (ownedTronPower >= totalVote * TRX_PRECISION) {
+      return;
+    }
+
+    VotesCapsule votesCapsule = repo.getVotes(ownerAddress);
+    if (votesCapsule == null) {
+      votesCapsule =
+          new VotesCapsule(ByteString.copyFrom(ownerAddress), accountCapsule.getVotesList());
+    }
+
+    // Update Owner Voting
+    List<Protocol.Vote> votesToAdd = new ArrayList<>();
+    for (Protocol.Vote vote : accountCapsule.getVotesList()) {
+      long newVoteCount =
+          (long) ((double) vote.getVoteCount() / totalVote * ownedTronPower / TRX_PRECISION);
+      if (newVoteCount > 0) {
+        votesToAdd.add(
+            Protocol.Vote.newBuilder()
+                .setVoteAddress(vote.getVoteAddress())
+                .setVoteCount(newVoteCount)
+                .build());
+      }
+    }
+    votesCapsule.clearNewVotes();
+    votesCapsule.addAllNewVotes(votesToAdd);
+    repo.updateVotes(ownerAddress, votesCapsule);
+
+    accountCapsule.clearVotes();
+    accountCapsule.addAllVotes(votesToAdd);
   }
 }
diff --git a/actuator/src/main/java/org/tron/core/vm/program/Program.java b/actuator/src/main/java/org/tron/core/vm/program/Program.java
@@ -544,6 +544,7 @@ private long transferFrozenV2BalanceToInheritor(byte[] ownerAddr, byte[] inherit
     // merge usage
     BandwidthProcessor bandwidthProcessor = new BandwidthProcessor(ChainBaseManager.getInstance());
     bandwidthProcessor.updateUsage(ownerCapsule);
+    ownerCapsule.setLatestConsumeTime(now);
     if (ownerCapsule.getNetUsage() > 0) {
       long newNetUsage =
           bandwidthProcessor.unDelegateIncrease(
@@ -560,6 +561,7 @@ private long transferFrozenV2BalanceToInheritor(byte[] ownerAddr, byte[] inherit
         new EnergyProcessor(
             repo.getDynamicPropertiesStore(), ChainBaseManager.getInstance().getAccountStore());
     energyProcessor.updateUsage(ownerCapsule);
+    ownerCapsule.setLatestConsumeTimeForEnergy(now);
     if (ownerCapsule.getEnergyUsage() > 0) {
       long newEnergyUsage =
           energyProcessor.unDelegateIncrease(

diff --git a/chainbase/src/main/java/org/tron/core/capsule/AccountCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/AccountCapsule.java
@@ -494,6 +494,10 @@ public void addVotes(ByteString voteAddress, long voteAdd) {
         .build();
   }
 
+  public void addAllVotes(List<Vote> votesToAdd) {
+    this.account = this.account.toBuilder().addAllVotes(votesToAdd).build();
+  }
+
   public void clearLatestAssetOperationTimeV2() {
     this.account = this.account.toBuilder()
         .clearLatestAssetOperationTimeV2()

diff --git a/chainbase/src/main/java/org/tron/core/capsule/VotesCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/VotesCapsule.java
@@ -84,6 +84,10 @@ public void addNewVotes(ByteString voteAddress, long voteCount) {
         .build();
   }
 
+  public void addAllNewVotes(List<Vote> votesToAdd) {
+    this.votes = this.votes.toBuilder().addAllNewVotes(votesToAdd).build();
+  }
+
   public void addOldVotes(ByteString voteAddress, long voteCount) {
     this.votes = this.votes.toBuilder()
             .addOldVotes(Vote.newBuilder().setVoteAddress(voteAddress).setVoteCount(voteCount).build())