remove getSRAnnualizedRateOfReturnServlet and fix bug

Author: alberto-zhang

common/src/main/java/org/tron/core/exception/AddressNotFound.java

@@ -0,0 +1,12 @@
+package org.tron.core.exception;
+
+public class AddressNotFound extends StoreException {
+
+  public AddressNotFound() {
+    super();
+  }
+
+  public AddressNotFound(String message) {
+    super(message);
+  }
+}

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

@@ -33,7 +33,6 @@
 import com.google.common.collect.Range;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import java.math.BigDecimal;
 import java.security.SignatureException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -104,6 +103,7 @@
 import org.tron.common.zksnark.LibrustzcashParam.CrhIvkParams;
 import org.tron.common.zksnark.LibrustzcashParam.IvkToPkdParams;
 import org.tron.common.zksnark.LibrustzcashParam.SpendSigParams;
+import org.tron.consensus.ConsensusDelegate;
 import org.tron.core.actuator.Actuator;
 import org.tron.core.actuator.ActuatorFactory;
 import org.tron.core.actuator.VMActuator;
@@ -206,6 +206,8 @@ public class Wallet {
   private TronNetDelegate tronNetDelegate;
   @Autowired
   private Manager dbManager;
+  @Autowired
+  private ConsensusDelegate consensusDelegate;
 
   @Autowired
   private ChainBaseManager chainBaseManager;
@@ -2823,10 +2825,16 @@ public double getAnnualizedRateOfReturn(long rewardOfBlockEachBlock, double bloc
     return annualizedRateOfReturn;
   }
 
-  public long queryCurrentCycle() {
-    long current = dbManager.getDynamicPropertiesStore()
-        .getCurrentCycleNumber();
-    return current;
+  public boolean checkAddress(byte[] address) {
+    return consensusDelegate.getActiveWitnesses().contains(ByteString.copyFrom(address));
+  }
+
+  public boolean existAddress(byte[] address) {
+    WitnessCapsule witnessCapsule = dbManager.getWitnessStore().get(address);
+    if (witnessCapsule != null) {
+      return true;
+    }
+    return false;
   }
 }
 

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

@@ -246,8 +246,6 @@ public class FullNodeHttpApiService implements Service {
   @Autowired
   private GetCurrentCycleService getCurrentCycleServlet;
   @Autowired
-  private GetSRAnnualizedRateOfReturnServlet getSRAnnualizedRateOfReturnServlet;
-  @Autowired
   private GetNowSRAnnualizedRateOfReturnServlet getNowSRAnnualizedRateOfReturnServlet;
 
   private static String getParamsFile(String fileName) {
@@ -458,8 +456,6 @@ public void start() {
             "/wallet/getSRProfitByCycleServlet");
         context.addServlet(new ServletHolder(getSRDividendsByCycleServlet),
             "/wallet/getSRDividendsByCycleServlet");
-        context.addServlet(new ServletHolder(getSRAnnualizedRateOfReturnServlet),
-            "/wallet/getSRAnnualizedRateOfReturnServlet");
         context.addServlet(new ServletHolder(getNowSRAnnualizedRateOfReturnServlet),
             "/wallet/getNowSRAnnualizedRateOfReturnServlet");
         context.addServlet(new ServletHolder(getAccountLastUnwithdrawRewardServlet),

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

@@ -1,14 +1,15 @@
 
 package org.tron.core.services.http;
 
-import com.alibaba.fastjson.JSONObject;
-import java.util.stream.Collectors;
+import static org.tron.core.config.Parameter.ChainConstant.MAX_ACTIVE_WITNESS_NUM;
+
 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.core.Wallet;
+import org.tron.core.exception.AddressNotFound;
 import org.tron.protos.Protocol.Account;
 
 @Component
@@ -25,15 +26,17 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       byte[] address = Util.getAddress(request);
       long rewardOfVoteEachBlock = wallet.getRewardOfVoteEachBlock() / 1000000;
       long rewardOfBlockEachBlock = wallet.getRewardOfBlockEachBlock() / 1000000;
-      double srNumber = 27;
-      double blockNumberEachDay = wallet.getBlockNumberEachDay();
+      double srNumber = MAX_ACTIVE_WITNESS_NUM;
+      double blockNumberEachDay = wallet.checkAddress(address) ? wallet.getBlockNumberEachDay() : 0;
       double totalVote;
       double srVote;
       double ratio;
+      if (wallet.existAddress(address)) {
+        throw new AddressNotFound("address not found!");
+      }
       srVote = wallet.queryNowVoteNumber(address);
       totalVote = wallet.queryNowTotalVoteNumber();
       ratio = wallet.queryNowSrRatio(address);
-
       annualizedRateOfReturn = wallet.getAnnualizedRateOfReturn(rewardOfBlockEachBlock,
           blockNumberEachDay, srNumber,srVote,totalVote,rewardOfVoteEachBlock,ratio);
       response.getWriter().println("{\"annualizedRateOfReturn\": " + annualizedRateOfReturn + "}");
@@ -52,11 +55,14 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       byte[] address = build.getAddress().toByteArray();
       long rewardOfVoteEachBlock = wallet.getRewardOfVoteEachBlock() / 1000000;
       long rewardOfBlockEachBlock = wallet.getRewardOfBlockEachBlock() / 1000000;
-      double srNumber = 27;
-      double blockNumberEachDay = wallet.getBlockNumberEachDay();
+      double srNumber = MAX_ACTIVE_WITNESS_NUM;
+      double blockNumberEachDay = wallet.checkAddress(address) ? wallet.getBlockNumberEachDay() : 0;
       double totalVote;
       double srVote;
       double ratio;
+      if (!wallet.existAddress(address)) {
+        throw new AddressNotFound("address not found!");
+      }
       srVote = wallet.queryNowVoteNumber(address);
       totalVote = wallet.queryNowTotalVoteNumber();
       ratio = wallet.queryNowSrRatio(address);