fix bug for exception

Author: alberto-zhang

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

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

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

@@ -3,13 +3,17 @@
 
 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;
+import org.tron.core.exception.InvalidAddress;
 import org.tron.protos.Protocol.Account;
 
 @Component
@@ -24,10 +28,14 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     try {
       double annualizedRateOfReturn = 0;
       byte[] address = Util.getAddress(request);
+      if (!DecodeUtil.addressValid(address)) {
+        throw new InvalidAddress("Invalid address!");
+      }
       long rewardOfVoteEachBlock = wallet.getRewardOfVoteEachBlock() / 1000000;
-      long rewardOfBlockEachBlock = wallet.getRewardOfBlockEachBlock() / 1000000;
+      long rewardOfBlockEachBlock = wallet.checkAddress(address)
+          ? wallet.getRewardOfBlockEachBlock() / 1000000 : 0;
       double srNumber = MAX_ACTIVE_WITNESS_NUM;
-      double blockNumberEachDay = wallet.checkAddress(address) ? wallet.getBlockNumberEachDay() : 0;
+      double blockNumberEachDay = wallet.getBlockNumberEachDay();
       double totalVote;
       double srVote;
       double ratio;
@@ -49,14 +57,19 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
   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))) {
+        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 rewardOfBlockEachBlock = wallet.getRewardOfBlockEachBlock() / 1000000;
+      long rewardOfBlockEachBlock = wallet.checkAddress(address)
+          ? wallet.getRewardOfBlockEachBlock() / 1000000 : 0;
       double srNumber = MAX_ACTIVE_WITNESS_NUM;
-      double blockNumberEachDay = wallet.checkAddress(address) ? wallet.getBlockNumberEachDay() : 0;
+      double blockNumberEachDay = wallet.getBlockNumberEachDay();
       double totalVote;
       double srVote;
       double ratio;