add checkStandbyWitness method

Author: alberto-zhang

framework/src/main/java/org/tron/core/Wallet.java

@@ -23,6 +23,7 @@
 import static org.tron.common.utils.WalletUtil.isConstant;
 import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
 import static org.tron.core.config.Parameter.ChainConstant.FROZEN_PERIOD;
+import static org.tron.core.config.Parameter.ChainConstant.WITNESS_STANDBY_LENGTH;
 import static org.tron.core.config.Parameter.DatabaseConstants.EXCHANGE_COUNT_LIMIT_MAX;
 import static org.tron.core.config.Parameter.DatabaseConstants.PROPOSAL_COUNT_LIMIT_MAX;
 
@@ -35,6 +36,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.security.SignatureException;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -2436,7 +2438,7 @@ public double percentageOfBlockReward(long beginCycle, long endCycle, byte[] add
         if (brokerage == 100) {
           continue;
         }
-        
+
         double brokerageRate = (double) brokerage / 100;
         reward += dbManager.getDelegationStore().getReward(cycle, address) / (1 - brokerageRate);
         blockPayReward += dbManager.getDelegationStore().getBlockReward(cycle, address);
@@ -2840,5 +2842,22 @@ public boolean existAddress(byte[] address) {
     }
     return false;
   }
+
+  public boolean checkStandbyWitness(byte[] address) {
+    List<ByteString> witnessAddressList = new ArrayList<>();
+    for (WitnessCapsule witnessCapsule : consensusDelegate.getAllWitnesses()) {
+      witnessAddressList.add(witnessCapsule.getAddress());
+    }
+    witnessAddressList.sort(Comparator.comparingLong((ByteString b) ->
+        consensusDelegate.getWitness(b.toByteArray()).getVoteCount())
+        .reversed()
+        .thenComparing(Comparator.comparingInt(ByteString::hashCode).reversed()));
+
+    if (witnessAddressList.size() > WITNESS_STANDBY_LENGTH) {
+      witnessAddressList = witnessAddressList.subList(0, WITNESS_STANDBY_LENGTH);
+    }
+    boolean contains = witnessAddressList.contains(ByteString.copyFrom(address));
+    return contains;
+  }
 }
 

framework/src/main/java/org/tron/core/services/http/GetNowSRAnnualizedRateOfReturnServlet.java

@@ -3,13 +3,11 @@
 
 import static org.tron.core.config.Parameter.ChainConstant.MAX_ACTIVE_WITNESS_NUM;
 
-import com.alibaba.fastjson.JSONObject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.tron.common.utils.Commons;
 import org.tron.common.utils.DecodeUtil;
 import org.tron.core.Wallet;
 import org.tron.core.exception.AddressNotFound;
@@ -31,7 +29,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       if (!DecodeUtil.addressValid(address)) {
         throw new InvalidAddress("Invalid address!");
       }
-      long rewardOfVoteEachBlock = wallet.getRewardOfVoteEachBlock() / 1000000;
+      long rewardOfVoteEachBlock = wallet.checkStandbyWitness(address)
+          ? wallet.getRewardOfVoteEachBlock() / 1000000 : 0;
       long rewardOfBlockEachBlock = wallet.checkAddress(address)
           ? wallet.getRewardOfBlockEachBlock() / 1000000 : 0;
       double srNumber = MAX_ACTIVE_WITNESS_NUM;
@@ -46,7 +45,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       totalVote = wallet.queryNowTotalVoteNumber();
       ratio = wallet.queryNowSrRatio(address);
       annualizedRateOfReturn = wallet.getAnnualizedRateOfReturn(rewardOfBlockEachBlock,
-          blockNumberEachDay, srNumber,srVote,totalVote,rewardOfVoteEachBlock,ratio);
+          blockNumberEachDay, srNumber, srVote, totalVote, rewardOfVoteEachBlock, ratio);
       response.getWriter().println("{\"annualizedRateOfReturn\": " + annualizedRateOfReturn + "}");
     } catch (Exception e) {
       Util.processError(e, response);
@@ -56,16 +55,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
   @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     try {
-      PostParams params = PostParams.getPostParams(request);
-      String addressStr = JSONObject.parseObject(params.getParams()).getString("address");
-      if (!DecodeUtil.addressValid(Commons.decodeFromBase58Check(addressStr))) {
+      byte[] address = Util.getAddress(request);
+      if (!DecodeUtil.addressValid(address)) {
         throw new InvalidAddress("Invalid address!");
       }
-      Account.Builder build = Account.newBuilder();
-      JsonFormat.merge(params.getParams(), build, params.isVisible());
       double annualizedRateOfReturn = 0;
-      byte[] address = build.getAddress().toByteArray();
-      long rewardOfVoteEachBlock = wallet.getRewardOfVoteEachBlock() / 1000000;
+      long rewardOfVoteEachBlock = wallet.checkStandbyWitness(address)
+          ? wallet.getRewardOfVoteEachBlock() / 1000000 : 0;
       long rewardOfBlockEachBlock = wallet.checkAddress(address)
           ? wallet.getRewardOfBlockEachBlock() / 1000000 : 0;
       double srNumber = MAX_ACTIVE_WITNESS_NUM;
@@ -80,7 +76,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       totalVote = wallet.queryNowTotalVoteNumber();
       ratio = wallet.queryNowSrRatio(address);
       annualizedRateOfReturn = wallet.getAnnualizedRateOfReturn(rewardOfBlockEachBlock,
-          blockNumberEachDay, srNumber,srVote,totalVote,rewardOfVoteEachBlock,ratio);
+          blockNumberEachDay, srNumber, srVote, totalVote, rewardOfVoteEachBlock, ratio);
       response.getWriter().println("{\"annualizedRateOfReturn\": " + annualizedRateOfReturn + "}");
     } catch (Exception e) {
       Util.processError(e, response);

framework/src/test/java/stest/tron/wallet/onlinestress/TestApproveProposal.java

@@ -14,12 +14,12 @@
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 import org.tron.api.GrpcAPI;
-import org.tron.protos.Protocol.ChainParameters;
 import org.tron.api.GrpcAPI.EmptyMessage;
 import org.tron.api.GrpcAPI.ProposalList;
 import org.tron.api.WalletGrpc;
 import org.tron.api.WalletSolidityGrpc;
 import org.tron.core.Wallet;
+import org.tron.protos.Protocol.ChainParameters;
 import org.tron.protos.contract.BalanceContract.TransferContract;
 import stest.tron.wallet.common.client.Configuration;
 import stest.tron.wallet.common.client.Parameter.CommonConstant;