Feature/new resource model

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

@@ -57,6 +57,11 @@ public boolean execute(Object result) throws ContractExeException {
     AccountCapsule accountCapsule = accountStore
         .get(freezeBalanceContract.getOwnerAddress().toByteArray());
 
+    if (dynamicStore.supportAllowNewResourceModel()
+        && accountCapsule.oldTronPowerIsNotInitialized()) {
+      accountCapsule.initializeOldTronPower();
+    }
+
     long now = dynamicStore.getLatestBlockHeaderTimestamp();
     long duration = freezeBalanceContract.getFrozenDuration() * FROZEN_PERIOD;
 
@@ -98,6 +103,14 @@ public boolean execute(Object result) throws ContractExeException {
         dynamicStore
             .addTotalEnergyWeight(frozenBalance / TRX_PRECISION);
         break;
+      case TRON_POWER:
+        long newFrozenBalanceForTronPower =
+            frozenBalance + accountCapsule.getTronPowerFrozenBalance();
+        accountCapsule.setFrozenForTronPower(newFrozenBalanceForTronPower, expireTime);
+
+        dynamicStore
+            .addTotalTronPowerWeight(frozenBalance / TRX_PRECISION);
+        break;
       default:
         logger.debug("Resource Code Error.");
     }
@@ -182,12 +195,28 @@ public boolean validate() throws ContractValidateException {
 
     switch (freezeBalanceContract.getResource()) {
       case BANDWIDTH:
-        break;
       case ENERGY:
         break;
+      case TRON_POWER:
+        if (dynamicStore.supportAllowNewResourceModel()) {
+          byte[] receiverAddress = freezeBalanceContract.getReceiverAddress().toByteArray();
+          if (!ArrayUtils.isEmpty(receiverAddress)) {
+            throw new ContractValidateException(
+                "TRON_POWER is not allowed to delegate to other accounts.");
+          }
+        } else {
+          throw new ContractValidateException(
+              "ResourceCode error, valid ResourceCode[BANDWIDTH、ENERGY]");
+        }
+        break;
       default:
-        throw new ContractValidateException(
-            "ResourceCode error,valid ResourceCode[BANDWIDTH、ENERGY]");
+        if (dynamicStore.supportAllowNewResourceModel()) {
+          throw new ContractValidateException(
+              "ResourceCode error, valid ResourceCode[BANDWIDTH、ENERGY、TRON_POWER]");
+        } else {
+          throw new ContractValidateException(
+              "ResourceCode error, valid ResourceCode[BANDWIDTH、ENERGY]");
+        }
     }
 
     //todo：need version control and config for delegating resource

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

@@ -75,6 +75,11 @@ public boolean execute(Object result) throws ContractExeException {
 
     long unfreezeBalance = 0L;
 
+    if (dynamicStore.supportAllowNewResourceModel()
+        && accountCapsule.oldTronPowerIsNotInitialized()) {
+      accountCapsule.initializeOldTronPower();
+    }
+
     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.
@@ -195,7 +200,12 @@ public boolean execute(Object result) throws ContractExeException {
           accountCapsule.setInstance(accountCapsule.getInstance().toBuilder()
               .setBalance(oldBalance + unfreezeBalance)
               .setAccountResource(newAccountResource).build());
-
+          break;
+        case TRON_POWER:
+          unfreezeBalance = accountCapsule.getTronPowerFrozenBalance();
+          accountCapsule.setInstance(accountCapsule.getInstance().toBuilder()
+              .setBalance(oldBalance + unfreezeBalance)
+              .clearTronPower().build());
           break;
         default:
           //this should never happen
@@ -213,24 +223,47 @@ public boolean execute(Object result) throws ContractExeException {
         dynamicStore
             .addTotalEnergyWeight(-unfreezeBalance / TRX_PRECISION);
         break;
+      case TRON_POWER:
+        dynamicStore
+            .addTotalTronPowerWeight(-unfreezeBalance / TRX_PRECISION);
+        break;
       default:
         //this should never happen
         break;
     }
 
-    VotesCapsule votesCapsule;
-    if (!votesStore.has(ownerAddress)) {
-      votesCapsule = new VotesCapsule(unfreezeBalanceContract.getOwnerAddress(),
-          accountCapsule.getVotesList());
-    } else {
-      votesCapsule = votesStore.get(ownerAddress);
+    boolean needToClearVote = true;
+    if (dynamicStore.supportAllowNewResourceModel()
+        && accountCapsule.oldTronPowerIsInvalid()) {
+      switch (unfreezeBalanceContract.getResource()) {
+        case BANDWIDTH:
+        case ENERGY:
+          needToClearVote = false;
+          break;
+        default:
+          break;
+      }
     }
-    accountCapsule.clearVotes();
-    votesCapsule.clearNewVotes();
 
-    accountStore.put(ownerAddress, accountCapsule);
+    if (needToClearVote) {
+      VotesCapsule votesCapsule;
+      if (!votesStore.has(ownerAddress)) {
+        votesCapsule = new VotesCapsule(unfreezeBalanceContract.getOwnerAddress(),
+            accountCapsule.getVotesList());
+      } else {
+        votesCapsule = votesStore.get(ownerAddress);
+      }
+      accountCapsule.clearVotes();
+      votesCapsule.clearNewVotes();
+      votesStore.put(ownerAddress, votesCapsule);
+    }
 
-    votesStore.put(ownerAddress, votesCapsule);
+    if (dynamicStore.supportAllowNewResourceModel()
+        && !accountCapsule.oldTronPowerIsInvalid()) {
+      accountCapsule.invalidateOldTronPower();
+    }
+
+    accountStore.put(ownerAddress, accountCapsule);
 
     ret.setUnfreezeAmount(unfreezeBalance);
     ret.setStatus(fee, code.SUCESS);
@@ -396,10 +429,29 @@ public boolean validate() throws ContractValidateException {
             throw new ContractValidateException("It's not time to unfreeze(Energy).");
           }
 
+          break;
+        case TRON_POWER:
+          if (dynamicStore.supportAllowNewResourceModel()) {
+            Frozen frozenBalanceForTronPower = accountCapsule.getInstance().getTronPower();
+            if (frozenBalanceForTronPower.getFrozenBalance() <= 0) {
+              throw new ContractValidateException("no frozenBalance(TronPower)");
+            }
+            if (frozenBalanceForTronPower.getExpireTime() > now) {
+              throw new ContractValidateException("It's not time to unfreeze(TronPower).");
+            }
+          } else {
+            throw new ContractValidateException(
+                "ResourceCode error.valid ResourceCode[BANDWIDTH、Energy]");
+          }
           break;
         default:
-          throw new ContractValidateException(
-              "ResourceCode error.valid ResourceCode[BANDWIDTH、Energy]");
+          if (dynamicStore.supportAllowNewResourceModel()) {
+            throw new ContractValidateException(
+                "ResourceCode error.valid ResourceCode[BANDWIDTH、Energy、TRON_POWER]");
+          } else {
+            throw new ContractValidateException(
+                "ResourceCode error.valid ResourceCode[BANDWIDTH、Energy]");
+          }
       }
 
     }

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

@@ -22,6 +22,7 @@
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.service.MortgageService;
 import org.tron.core.store.AccountStore;
+import org.tron.core.store.DynamicPropertiesStore;
 import org.tron.core.store.VotesStore;
 import org.tron.core.store.WitnessStore;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
@@ -125,7 +126,13 @@ public boolean validate() throws ContractValidateException {
             ACCOUNT_EXCEPTION_STR + readableOwnerAddress + NOT_EXIST_STR);
       }
 
-      long tronPower = accountCapsule.getTronPower();
+      long tronPower;
+      DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();
+      if (dynamicStore.supportAllowNewResourceModel()) {
+        tronPower = accountCapsule.getAllTronPower();
+      } else {
+        tronPower = accountCapsule.getTronPower();
+      }
 
       sum = LongMath
           .checkedMultiply(sum, TRX_PRECISION); //trx -> drop. The vote count is based on TRX
@@ -155,6 +162,12 @@ private void countVoteAccount(VoteWitnessContract voteContract) {
 
     AccountCapsule accountCapsule = accountStore.get(ownerAddress);
 
+    DynamicPropertiesStore dynamicStore = chainBaseManager.getDynamicPropertiesStore();
+    if (dynamicStore.supportAllowNewResourceModel()
+        && accountCapsule.oldTronPowerIsNotInitialized()) {
+      accountCapsule.initializeOldTronPower();
+    }
+
     if (!votesStore.has(ownerAddress)) {
       votesCapsule = new VotesCapsule(voteContract.getOwnerAddress(),
           accountCapsule.getVotesList());

actuator/src/main/java/org/tron/core/utils/ProposalUtil.java

@@ -444,6 +444,20 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
+      case ALLOW_NEW_RESOURCE_MODEL: {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_2)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [ALLOW_NEW_RESOURCE_MODEL]");
+        }
+        if (value != 1 && value != 0) {
+          throw new ContractValidateException(
+              "This value[ALLOW_NEW_RESOURCE_MODEL] is only allowed to be 1 or 0");
+        }
+        break;
+      }
+
+
+
       default:
         break;
     }
@@ -497,7 +511,8 @@ public enum ProposalType {         // current value, value range
     MAX_FEE_LIMIT(47), // [0, 10_000_000_000]
     ALLOW_TRANSACTION_FEE_POOL(48), // 0, 1
     ALLOW_BLACKHOLE_OPTIMIZATION(49),// 0,1
-    ALLOW_RECEIPTS_MERKLE_ROOT(50);// 0,1
+    ALLOW_RECEIPTS_MERKLE_ROOT(50),// 0,1
+    ALLOW_NEW_RESOURCE_MODEL(51);// 0,1
 
     private long code;
 

chainbase/src/main/java/org/tron/core/capsule/AccountCapsule.java

@@ -456,6 +456,14 @@ public List<Vote> getVotesList() {
     }
   }
 
+  public long getVotesUsage() {
+    if (this.account.getVotesList() != null) {
+      return this.account.getVotesList().stream().mapToLong(Vote::getVoteCount).sum();
+    } else {
+      return 0L;
+    }
+  }
+
   //tp:Tron_Power
   public long getTronPower() {
     long tp = 0;
@@ -469,6 +477,16 @@ public long getTronPower() {
     return tp;
   }
 
+  public long getAllTronPower() {
+    if (account.getOldTronPower() == -1) {
+      return getTronPowerFrozenBalance();
+    } else if (account.getOldTronPower() == 0) {
+      return getTronPower() + getTronPowerFrozenBalance();
+    } else {
+      return account.getOldTronPower() + getTronPowerFrozenBalance();
+    }
+  }
+
   /**
    * asset balance enough
    */
@@ -836,6 +854,52 @@ public long getEnergyFrozenBalance() {
     return this.account.getAccountResource().getFrozenBalanceForEnergy().getFrozenBalance();
   }
 
+  public boolean oldTronPowerIsNotInitialized() {
+    return this.account.getOldTronPower() == 0;
+  }
+
+  public boolean oldTronPowerIsInvalid() {
+    return this.account.getOldTronPower() == -1;
+  }
+
+  public void initializeOldTronPower() {
+    long value = getTronPower();
+    if (value == 0) {
+      value = -1;
+    }
+    setInstance(getInstance().toBuilder()
+        .setOldTronPower(value)
+        .build());
+  }
+
+  public void invalidateOldTronPower() {
+    setInstance(getInstance().toBuilder()
+        .setOldTronPower(-1)
+        .build());
+  }
+
+
+  public void setOldTronPower(long value) {
+    setInstance(getInstance().toBuilder()
+        .setOldTronPower(value)
+        .build());
+  }
+
+  public void setFrozenForTronPower(long frozenBalance, long expireTime) {
+    Frozen newFrozen = Frozen.newBuilder()
+        .setFrozenBalance(frozenBalance)
+        .setExpireTime(expireTime)
+        .build();
+
+    setInstance(getInstance().toBuilder()
+        .setTronPower(newFrozen)
+        .build());
+  }
+
+  public long getTronPowerFrozenBalance() {
+    return this.account.getTronPower().getFrozenBalance();
+  }
+
   public long getEnergyUsage() {
     return this.account.getAccountResource().getEnergyUsage();
   }