Merge pull request #6417 from halibobo1205/fix/code-scanning

kuny0707 · web-flow · commit 2c06f4f66677 · 2025-08-11T18:19:38.000+08:00
refactor(crypto,api): improve code quality
diff --git a/actuator/src/main/java/org/tron/core/vm/PrecompiledContracts.java b/actuator/src/main/java/org/tron/core/vm/PrecompiledContracts.java
@@ -41,6 +41,7 @@
 import org.apache.commons.lang3.tuple.Triple;
 import org.tron.common.crypto.Blake2bfMessageDigest;
 import org.tron.common.crypto.Hash;
+import org.tron.common.crypto.Rsv;
 import org.tron.common.crypto.SignUtils;
 import org.tron.common.crypto.SignatureInterface;
 import org.tron.common.crypto.zksnark.BN128;
@@ -352,22 +353,13 @@ private static byte[] encodeMultiRes(byte[]... words) {
   }
 
   private static byte[] recoverAddrBySign(byte[] sign, byte[] hash) {
-    byte v;
-    byte[] r;
-    byte[] s;
     byte[] out = null;
     if (ArrayUtils.isEmpty(sign) || sign.length < 65) {
       return new byte[0];
     }
     try {
-      r = Arrays.copyOfRange(sign, 0, 32);
-      s = Arrays.copyOfRange(sign, 32, 64);
-      v = sign[64];
-      if (v < 27) {
-        v += 27;
-      }
-
-      SignatureInterface signature = SignUtils.fromComponents(r, s, v,
+      Rsv rsv = Rsv.fromSignature(sign);
+      SignatureInterface signature = SignUtils.fromComponents(rsv.getR(), rsv.getS(), rsv.getV(),
           CommonParameter.getInstance().isECKeyCryptoEngine());
       if (signature.validateComponents()) {
         out = SignUtils.signatureToAddress(hash, signature,
diff --git a/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java
@@ -41,6 +41,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.tron.common.crypto.ECKey.ECDSASignature;
+import org.tron.common.crypto.Rsv;
 import org.tron.common.crypto.SignInterface;
 import org.tron.common.crypto.SignUtils;
 import org.tron.common.es.ExecutorServiceManager;
@@ -456,14 +457,8 @@ public static long getCallValue(Transaction.Contract contract) {
   }
 
   public static String getBase64FromByteString(ByteString sign) {
-    byte[] r = sign.substring(0, 32).toByteArray();
-    byte[] s = sign.substring(32, 64).toByteArray();
-    byte v = sign.byteAt(64);
-    if (v < 27) {
-      v += 27; //revId -> v
-    }
-    ECDSASignature signature = ECDSASignature.fromComponents(r, s, v);
-    return signature.toBase64();
+    Rsv rsv = Rsv.fromSignature(sign.toByteArray());
+    return ECDSASignature.fromComponents(rsv.getR(), rsv.getS(), rsv.getV()).toBase64();
   }
 
   public static boolean validateSignature(Transaction transaction,
diff --git a/chainbase/src/main/java/org/tron/core/service/MortgageService.java b/chainbase/src/main/java/org/tron/core/service/MortgageService.java
@@ -182,7 +182,7 @@ private long computeReward(long cycle, List<Pair<byte[], Long>> votes) {
       }
       long userVote = vote.getValue();
       double voteRate = (double) userVote / totalVote;
-      reward += voteRate * totalReward;
+      reward += (long) (voteRate * totalReward);
     }
     return reward;
   }
diff --git a/crypto/src/main/java/org/tron/common/crypto/Rsv.java b/crypto/src/main/java/org/tron/common/crypto/Rsv.java
@@ -0,0 +1,26 @@
+package org.tron.common.crypto;
+
+
+import java.util.Arrays;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class Rsv {
+
+  private final byte[] r;
+  private final byte[] s;
+  private final byte v;
+
+
+  public static Rsv fromSignature(byte[] sign) {
+    byte[] r = Arrays.copyOfRange(sign, 0, 32);
+    byte[] s = Arrays.copyOfRange(sign, 32, 64);
+    byte v = sign[64];
+    if (v < 27) {
+      v += (byte) 27; //revId -> v
+    }
+    return new Rsv(r, s, v);
+  }
+}
diff --git a/framework/src/main/java/org/tron/core/capsule/utils/RLP.java b/framework/src/main/java/org/tron/core/capsule/utils/RLP.java
@@ -165,7 +165,7 @@ static short decodeShort(byte[] data, int index) {
       byte pow = (byte) (length - 1);
       for (int i = 1; i <= length; ++i) {
         // << (8 * pow) == bit shift to 0 (*1), 8 (*256) , 16 (*65..)
-        value += (data[index + i] & 0xFF) << (8 * pow);
+        value += (short) ((data[index + i] & 0xFF) << (8 * pow));
         pow--;
       }
     } else {
diff --git a/framework/src/main/java/org/tron/core/services/http/GetBrokerageServlet.java b/framework/src/main/java/org/tron/core/services/http/GetBrokerageServlet.java
@@ -28,8 +28,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       response.getWriter().println("{\"brokerage\": " + value + "}");
     } catch (DecoderException | IllegalArgumentException e) {
       try {
-        response.getWriter()
-            .println("{\"Error\": " + "\"INVALID address, " + e.getMessage() + "\"}");
+        response.getWriter().println("{\"Error\": " + "\"INVALID address\"}");
       } catch (IOException ioe) {
         logger.debug("IOException: {}", ioe.getMessage());
       }
diff --git a/framework/src/main/java/org/tron/core/services/http/GetRewardServlet.java b/framework/src/main/java/org/tron/core/services/http/GetRewardServlet.java
@@ -27,8 +27,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       response.getWriter().println("{\"reward\": " + value + "}");
     } catch (DecoderException | IllegalArgumentException e) {
       try {
-        response.getWriter()
-            .println("{\"Error\": " + "\"INVALID address, " + e.getMessage() + "\"}");
+        response.getWriter().println("{\"Error\": " + "\"INVALID address\"}");
       } catch (IOException ioe) {
         logger.debug("IOException: {}", ioe.getMessage());
       }
diff --git a/framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionByIdSolidityServlet.java b/framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionByIdSolidityServlet.java
@@ -30,12 +30,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
       String input = request.getParameter("value");
       fillResponse(ByteString.copyFrom(ByteArray.fromHexString(input)), visible, response);
     } catch (Exception e) {
-      logger.debug("Exception: {}", e.getMessage());
-      try {
-        response.getWriter().println(e.getMessage());
-      } catch (IOException ioe) {
-        logger.debug("IOException: {}", ioe.getMessage());
-      }
+      Util.processError(e, response);
     }
   }
 
@@ -46,12 +41,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       JsonFormat.merge(params.getParams(), build, params.isVisible());
       fillResponse(build.build().getValue(), params.isVisible(), response);
     } catch (Exception e) {
-      logger.debug("Exception: {}", e.getMessage());
-      try {
-        response.getWriter().println(e.getMessage());
-      } catch (IOException ioe) {
-        logger.debug("IOException: {}", ioe.getMessage());
-      }
+      Util.processError(e, response);
     }
   }
 
diff --git a/framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionInfoByIdSolidityServlet.java b/framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionInfoByIdSolidityServlet.java
@@ -1,7 +1,6 @@
 package org.tron.core.services.http.solidity;
 
 import com.google.protobuf.ByteString;
-import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -37,12 +36,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
         response.getWriter().println(JsonFormat.printToString(transInfo, visible));
       }
     } catch (Exception e) {
-      logger.debug("Exception: {}", e.getMessage());
-      try {
-        response.getWriter().println(e.getMessage());
-      } catch (IOException ioe) {
-        logger.debug("IOException: {}", ioe.getMessage());
-      }
+      Util.processError(e, response);
     }
   }
 
@@ -60,12 +54,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         response.getWriter().println(JsonFormat.printToString(transInfo, params.isVisible()));
       }
     } catch (Exception e) {
-      logger.debug("Exception: {}", e.getMessage());
-      try {
-        response.getWriter().println(e.getMessage());
-      } catch (IOException ioe) {
-        logger.debug("IOException: {}", ioe.getMessage());
-      }
+      Util.processError(e, response);
     }
   }
 
diff --git a/framework/src/main/java/org/tron/core/services/jsonrpc/types/TransactionResult.java b/framework/src/main/java/org/tron/core/services/jsonrpc/types/TransactionResult.java
@@ -5,9 +5,9 @@
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.google.protobuf.ByteString;
-import java.util.Arrays;
 import lombok.Getter;
 import lombok.ToString;
+import org.tron.common.crypto.Rsv;
 import org.tron.common.utils.ByteArray;
 import org.tron.core.Wallet;
 import org.tron.core.capsule.BlockCapsule;
@@ -65,16 +65,10 @@ private void parseSignature(Transaction tx) {
     }
 
     ByteString signature = tx.getSignature(0); // r[32] + s[32] + v[1]
-    byte[] signData = signature.toByteArray();
-    byte[] rByte = Arrays.copyOfRange(signData, 0, 32);
-    byte[] sByte = Arrays.copyOfRange(signData, 32, 64);
-    byte vByte = signData[64];
-    if (vByte < 27) {
-      vByte += 27;
-    }
-    v = ByteArray.toJsonHex(vByte);
-    r = ByteArray.toJsonHex(rByte);
-    s = ByteArray.toJsonHex(sByte);
+    Rsv rsv = Rsv.fromSignature(signature.toByteArray());
+    r = ByteArray.toJsonHex(rsv.getR());
+    s = ByteArray.toJsonHex(rsv.getS());
+    v = ByteArray.toJsonHex(rsv.getV());
   }
 
   private String parseInput(Transaction tx) {
diff --git a/framework/src/main/java/org/tron/core/zen/address/SpendingKey.java b/framework/src/main/java/org/tron/core/zen/address/SpendingKey.java
@@ -89,7 +89,7 @@ public DiversifierT defaultDiversifier() throws BadItemException, ZksnarkExcepti
           throw new BadItemException(
               "librustzcash_check_diversifier does not return valid diversifier");
         }
-        blob[33] += 1;
+        blob[33] += (byte) 1;
       } finally {
         JLibsodium.freeState(state);
       }
diff --git a/framework/src/test/java/org/tron/common/utils/client/utils/TransactionUtils.java b/framework/src/test/java/org/tron/common/utils/client/utils/TransactionUtils.java
@@ -14,6 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import static org.tron.core.capsule.TransactionCapsule.getBase64FromByteString;
 
 import com.google.protobuf.ByteString;
 import java.security.SignatureException;
@@ -116,20 +117,6 @@ public static byte[] getOwner(Transaction.Contract contract) {
     }
   }
 
-  /**
-   * constructor.
-   */
-
-  public static String getBase64FromByteString(ByteString sign) {
-    byte[] r = sign.substring(0, 32).toByteArray();
-    byte[] s = sign.substring(32, 64).toByteArray();
-    byte v = sign.byteAt(64);
-    if (v < 27) {
-      v += 27; //revId -> v
-    }
-    ECDSASignature signature = ECDSASignature.fromComponents(r, s, v);
-    return signature.toBase64();
-  }
 
   /*
    * 1. check hash

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private long computeReward(long cycle, List<Pair<byte[], Long>> votes) {`
`182`	`182`	`}`
`183`	`183`	`long userVote = vote.getValue();`
`184`	`184`	`double voteRate = (double) userVote / totalVote;`
`185`		`- reward += voteRate * totalReward;`
	`185`	`+ reward += (long) (voteRate * totalReward);`
`186`	`186`	`}`
`187`	`187`	`return reward;`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ static short decodeShort(byte[] data, int index) {`
`165`	`165`	`byte pow = (byte) (length - 1);`
`166`	`166`	`for (int i = 1; i <= length; ++i) {`
`167`	`167`	`// << (8 * pow) == bit shift to 0 (1), 8 (256) , 16 (*65..)`
`168`		`- value += (data[index + i] & 0xFF) << (8 * pow);`
	`168`	`+ value += (short) ((data[index + i] & 0xFF) << (8 * pow));`
`169`	`169`	`pow--;`
`170`	`170`	`}`
`171`	`171`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package org.tron.core.services.http.solidity;`
`2`	`2`
`3`	`3`	`import com.google.protobuf.ByteString;`
`4`		`-import java.io.IOException;`
`5`	`4`	`import javax.servlet.http.HttpServletRequest;`
`6`	`5`	`import javax.servlet.http.HttpServletResponse;`
`7`	`6`	`import lombok.extern.slf4j.Slf4j;`
`@@ -37,12 +36,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {`
`37`	`36`	`response.getWriter().println(JsonFormat.printToString(transInfo, visible));`
`38`	`37`	`}`
`39`	`38`	`} catch (Exception e) {`
`40`		`- logger.debug("Exception: {}", e.getMessage());`
`41`		`- try {`
`42`		`- response.getWriter().println(e.getMessage());`
`43`		`- } catch (IOException ioe) {`
`44`		`- logger.debug("IOException: {}", ioe.getMessage());`
`45`		`- }`
	`39`	`+ Util.processError(e, response);`
`46`	`40`	`}`
`47`	`41`	`}`
`48`	`42`
`@@ -60,12 +54,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)`
`60`	`54`	`response.getWriter().println(JsonFormat.printToString(transInfo, params.isVisible()));`
`61`	`55`	`}`
`62`	`56`	`} catch (Exception e) {`
`63`		`- logger.debug("Exception: {}", e.getMessage());`
`64`		`- try {`
`65`		`- response.getWriter().println(e.getMessage());`
`66`		`- } catch (IOException ioe) {`
`67`		`- logger.debug("IOException: {}", ioe.getMessage());`
`68`		`- }`
	`57`	`+ Util.processError(e, response);`
`69`	`58`	`}`
`70`	`59`	`}`
`71`	`60`