Merge pull request tronprotocol#1081 from tronprotocol/release

Release

Author: zhaohong

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

@@ -4,11 +4,13 @@
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.Arrays;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
+import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
@@ -84,12 +86,20 @@ public boolean validate() throws ContractValidateException {
           "Account[" + readableOwnerAddress + "] not exists");
     }
 
+    String readableOwnerAddress = StringUtil.createReadableString(ownerAddress);
     if (!dbManager.getWitnessStore().has(ownerAddress)) {
-      String readableOwnerAddress = StringUtil.createReadableString(ownerAddress);
       throw new ContractValidateException(
           "Account[" + readableOwnerAddress + "] is not a witnessAccount");
     }
 
+    boolean isGP = Args.getInstance().getGenesisBlock().getWitnesses().stream().anyMatch(witness ->
+        Arrays.equals(ownerAddress, witness.getAddress()));
+    if (isGP) {
+      throw new ContractValidateException(
+          "Account[" + readableOwnerAddress
+              + "] is a guard representative and is not allowed to withdraw Balance");
+    }
+
     long latestWithdrawTime = accountCapsule.getLatestWithdrawTime();
     long now = dbManager.getHeadBlockTimeStamp();
     long witnessAllowanceFrozenTime =

src/main/java/org/tron/core/witness/WitnessController.java

@@ -258,6 +258,7 @@ private Map<ByteString, Long> countVote(VotesStore votesStore) {
       //    .getVoteRewardRate());
       //account.setBalance(account.getBalance() + reward);
       //accountStore.put(account.createDbKey(), account);
+
       votes.getOldVotes().forEach(vote -> {
         //TODO validate witness //active_witness
         ByteString voteAddress = vote.getVoteAddress();
@@ -279,6 +280,7 @@ private Map<ByteString, Long> countVote(VotesStore votesStore) {
         }
       });
 
+
       sizeCount++;
       votesStore.delete(next.getKey());
     }