Merge pull request #6171 from lxcmyf/feature/sensitive_information_optimization

feat(*): optimize sensitive information

Author: CodeNinjaEvan

framework/src/test/java/org/tron/common/crypto/BouncyCastleTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.tron.common.utils.client.utils.AbiUtil.generateOccupationConstantPrivateKey;
 
 import java.math.BigInteger;
 import java.security.SignatureException;
@@ -20,12 +21,13 @@
  */
 public class BouncyCastleTest {
 
-  private String privString = "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4";
-  private BigInteger privateKey = new BigInteger(privString, 16);
+  // For safety reasons, test with a placeholder private key
+  private final String privString = generateOccupationConstantPrivateKey();
+  private final BigInteger privateKey = new BigInteger(privString, 16);
 
   @Test
   public void testHex() {
-    String spongyAddress = "cd2a3d9f938e13cd947ec05abc7fe734df8dd826";
+    String spongyAddress = "2e988a386a799f506693793c6a5af6b54dfaabfb";
     ECKey key = ECKey.fromPrivate(privateKey);
     byte[] address = key.getAddress();
     assertEquals(spongyAddress,
@@ -55,10 +57,9 @@ public void testSha3Hash() {
 
   @Test
   public void testECKeyAddress() {
-    String spongyPubkey =
-        "040947751e3022ecf3016be03ec77ab0ce3c2662b4843898cb068d74f698ccc8ad75"
-            + "aa17564ae80a20bb044ee7a6d903e8e8df624b089c95d66a0570f051e5a05b";
-    String spongyAddress = "cd2a3d9f938e13cd947ec05abc7fe734df8dd826";
+    String spongyPubkey = "04e90c7d3640a1568839c31b70a893ab6714ef8415b9de90cedfc1c8f353a6983e625529"
+        + "392df7fa514bdd65a2003f6619567d79bee89830e63e932dbd42362d34";
+    String spongyAddress = "2e988a386a799f506693793c6a5af6b54dfaabfb";
     ECKey key = ECKey.fromPrivate(privateKey);
     byte[] pubkey = key.getPubKey();
     assertEquals(spongyPubkey, Hex.toHexString(pubkey));
@@ -71,7 +72,7 @@ public void testECKeyAddress() {
   public void testECKeySignature() throws SignatureException {
     SignInterface sign = SignUtils.fromPrivate(Hex.decode(privString), true);
     String msg = "transaction raw data";
-    String spongyAddress = "cd2a3d9f938e13cd947ec05abc7fe734df8dd826";
+    String spongyAddress = "2e988a386a799f506693793c6a5af6b54dfaabfb";
     byte[] hash = Sha256Hash.hash(true, msg.getBytes());
     String sig = sign.signHash(hash);
     byte[] address = SignUtils.signatureToAddress(hash, sig, true);
@@ -102,9 +103,9 @@ public void testSM3Hash() {
 
   @Test
   public void testSM2Address() {
-    String spongyPublickey = "04f9539070c135be6183cbff4539f8298755df5981022769cd16cfdcb917fa7e32"
-        + "4e83b50f0bdbb34acd6ccbb78d45a8a383403f26bbd03805a178c43407dfdeae";
-    String spongyAddress = "7dc44d739a5226c0d3037bb7919f653eb2f938b9";
+    String spongyPublickey = "04dc3547dbbc4c90a9cde599848e26cb145e805b3d11daaf9daae0680d9c6824058ac"
+        + "35ddecb12f3a8bbc3104a2b91a2b7d04851d773d9b4ab8d5e0359243c8628";
+    String spongyAddress = "6cb22f88564bdd61eb4cdb36215add53bc702ff1";
     SM2 key = SM2.fromPrivate(privateKey);
     assertEquals(spongyPublickey, Hex.toHexString(key.getPubKey()));
     byte[] address = key.getAddress();
@@ -115,7 +116,7 @@ public void testSM2Address() {
   public void testSM2Signature() throws SignatureException {
     SignInterface sign = SignUtils.fromPrivate(Hex.decode(privString), false);
     String msg = "transaction raw data";
-    String spongyAddress = "7dc44d739a5226c0d3037bb7919f653eb2f938b9";
+    String spongyAddress = "6cb22f88564bdd61eb4cdb36215add53bc702ff1";
     byte[] hash = Sha256Hash.hash(false, msg.getBytes());
     String sig = sign.signHash(hash);
     byte[] address = SignUtils.signatureToAddress(hash, sig, false);

framework/src/test/java/org/tron/common/crypto/ECKeyTest.java

@@ -7,6 +7,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.tron.common.utils.client.utils.AbiUtil.generateOccupationConstantPrivateKey;
 
 import java.math.BigInteger;
 import java.security.KeyPairGenerator;
@@ -27,16 +28,17 @@
 @Slf4j
 public class ECKeyTest {
 
-  private String privString = "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4";
+  // For safety reasons, test with a placeholder private key
+  private String privString = generateOccupationConstantPrivateKey();
   private BigInteger privateKey = new BigInteger(privString, 16);
 
-  private String pubString = "040947751e3022ecf3016be03ec77ab0ce3c2662b4843898cb068d74f698ccc"
-      + "8ad75aa17564ae80a20bb044ee7a6d903e8e8df624b089c95d66a0570f051e5a05b";
+  private String pubString = "04e90c7d3640a1568839c31b70a893ab6714ef8415b9de90cedfc1c8f353a6983e62"
+      + "5529392df7fa514bdd65a2003f6619567d79bee89830e63e932dbd42362d34";
   private String compressedPubString =
-      "030947751e3022ecf3016be03ec77ab0ce3c2662b4843898cb068d74f6" + "98ccc8ad";
+      "02e90c7d3640a1568839c31b70a893ab6714ef8415b9de90cedfc1c8f353a6983e";
   private byte[] pubKey = Hex.decode(pubString);
   private byte[] compressedPubKey = Hex.decode(compressedPubString);
-  private String address = "cd2a3d9f938e13cd947ec05abc7fe734df8dd826";
+  private String address = "2e988a386a799f506693793c6a5af6b54dfaabfb";
   String eventSign = "eventBytesL(address,bytes,bytes32,uint256,string)";
 
   @Test
@@ -46,7 +48,7 @@ public void testSha3() {
 
   @Test
   public void testHashCode() {
-    assertEquals(-351262686, ECKey.fromPrivate(privateKey).hashCode());
+    assertEquals(-827927068, ECKey.fromPrivate(privateKey).hashCode());
   }
 
   @Test

framework/src/test/java/org/tron/common/crypto/SM2KeyTest.java

@@ -6,6 +6,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.tron.common.utils.client.utils.AbiUtil.generateOccupationConstantPrivateKey;
 
 import java.math.BigInteger;
 import java.security.KeyPairGenerator;
@@ -30,19 +31,20 @@ public class SM2KeyTest {
   //private String IDa = "[email protected]";
   private static BigInteger SM2_N = new BigInteger("FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFF7203DF6"
       + "B21C6052B53BBF40939D54123", 16);
-  private String privString = "128B2FA8BD433C6C068C8D803DFF79792A519A55171B1B650C23661D15897263";
+  // For safety reasons, test with a placeholder private key
+  private String privString = generateOccupationConstantPrivateKey();
   private BigInteger privateKey = new BigInteger(privString, 16);
-  private String pubString = "04d5548c7825cbb56150a3506cd57464af8a1ae0519dfaf3c58221dc810caf28d"
-      + "d921073768fe3d59ce54e79a49445cf73fed23086537027264d168946d479533e";
+  private String pubString = "04dc3547dbbc4c90a9cde599848e26cb145e805b3d11daaf9daae0680d9c6824058ac"
+      + "35ddecb12f3a8bbc3104a2b91a2b7d04851d773d9b4ab8d5e0359243c8628";
   private String compressedPubString =
-      "02d5548c7825cbb56150a3506cd57464af8a1ae0519dfaf3c58221dc810caf28dd";
+      "02dc3547dbbc4c90a9cde599848e26cb145e805b3d11daaf9daae0680d9c682405";
   private byte[] pubKey = Hex.decode(pubString);
   private byte[] compressedPubKey = Hex.decode(compressedPubString);
-  private String address = "62e49e4c2f4e3c0653a02f8859c1e6991b759e87";
+  private String address = "6cb22f88564bdd61eb4cdb36215add53bc702ff1";
 
   @Test
   public void testHashCode() {
-    assertEquals(1126288006, SM2.fromPrivate(privateKey).hashCode());
+    assertEquals(578690511, SM2.fromPrivate(privateKey).hashCode());
   }
 
   @Test
@@ -114,7 +116,7 @@ public void testSM3Hash() {
     SM2Signer signer = key.getSM2SignerForHash();
     String message = "message digest";
     byte[] hash = signer.generateSM3Hash(message.getBytes());
-    assertEquals("299C7DDB0D8DD2A85381BACBB92F738F390210A493A144C78E18C67B430DA882",
+    assertEquals("2A723761EAE35429DF643648FD69FB7787E7FC32F321BFAF7E294390F529BAF4",
         Hex.toHexString(hash).toUpperCase());
   }
 

framework/src/test/java/org/tron/common/utils/client/utils/AbiUtil.java

@@ -240,6 +240,16 @@ public static byte[] encodeInput(String methodSign, String input) {
     return pack(coders, items);
   }
 
+  public static String generateOccupationConstantPrivateKey() {
+    StringBuilder privateKey = new StringBuilder();
+    String baseKey = "1234567890";
+    for (int i = 0; i < 6; i++) {
+      privateKey.append(baseKey);
+    }
+    privateKey.append("1234");
+    return privateKey.toString();
+  }
+
   public static void main(String[] args) {
     String method = "test(string,int2,string)";
     String params = "asdf,3123,adf";