fix(crypto): optimize the null localwitness

Author: Federico2014

chainbase/src/main/java/org/tron/common/utils/LocalWitnesses.java

@@ -46,7 +46,7 @@ public LocalWitnesses(List<String> privateKeys) {
   }
 
   public byte[] getWitnessAccountAddress(boolean isECKeyCryptoEngine) {
-    if (witnessAccountAddress == null) {
+    if (witnessAccountAddress == null && !this.privateKeys.isEmpty()) {
       byte[] privateKey = ByteArray.fromHexString(getPrivateKey());
       final SignInterface cryptoEngine = SignUtils.fromPrivate(privateKey, isECKeyCryptoEngine);
       this.witnessAccountAddress = cryptoEngine.getAddress();
@@ -59,7 +59,7 @@ public void setWitnessAccountAddress(final byte[] localWitnessAccountAddress) {
   }
 
   public void initWitnessAccountAddress(boolean isECKeyCryptoEngine) {
-    if (witnessAccountAddress == null) {
+    if (witnessAccountAddress == null && !this.privateKeys.isEmpty()) {
       byte[] privateKey = ByteArray.fromHexString(getPrivateKey());
       final SignInterface ecKey = SignUtils.fromPrivate(privateKey,
           isECKeyCryptoEngine);
@@ -85,8 +85,8 @@ private void validate(String privateKey) {
       privateKey = privateKey.substring(2);
     }
 
-    if (StringUtils.isNotBlank(privateKey)
-        && privateKey.length() != ChainConstant.PRIVATE_KEY_LENGTH) {
+    if (StringUtils.isBlank(privateKey) || (StringUtils.isNotBlank(privateKey)
+        && privateKey.length() != ChainConstant.PRIVATE_KEY_LENGTH)) {
       throw new IllegalArgumentException(
           String.format("private key must be %d-bits hex string, actual: %d",
               ChainConstant.PRIVATE_KEY_LENGTH, privateKey.length()));

crypto/src/main/java/org/tron/common/crypto/ECKey.java

@@ -285,7 +285,7 @@ public static ECKey fromPrivate(BigInteger privKey) {
    * @return -
    */
   public static ECKey fromPrivate(byte[] privKeyBytes) {
-    if (Objects.isNull(privKeyBytes)) {
+    if (Objects.isNull(privKeyBytes) || privKeyBytes.length == 0) {
       return null;
     }
     return fromPrivate(new BigInteger(1, privKeyBytes));

crypto/src/main/java/org/tron/common/crypto/sm2/SM2.java

@@ -247,7 +247,7 @@ public static SM2 fromPrivate(BigInteger privKey) {
    * @return -
    */
   public static SM2 fromPrivate(byte[] privKeyBytes) {
-    if (Objects.isNull(privKeyBytes)) {
+    if (Objects.isNull(privKeyBytes) || privKeyBytes.length == 0) {
       return null;
     }
     return fromPrivate(new BigInteger(1, privKeyBytes));

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -420,10 +420,12 @@ public static void setParam(final Config config) {
     } else if (config.hasPath(Constant.LOCAL_WITNESS)) {
       localWitnesses = new LocalWitnesses();
       List<String> localwitness = config.getStringList(Constant.LOCAL_WITNESS);
-      localWitnesses.setPrivateKeys(localwitness);
-      witnessAddressCheck(config);
-      localWitnesses.initWitnessAccountAddress(PARAMETER.isECKeyCryptoEngine());
-      logger.debug("Got privateKey from config.conf");
+      if (localwitness.size() > 0) {
+        localWitnesses.setPrivateKeys(localwitness);
+        witnessAddressCheck(config);
+        localWitnesses.initWitnessAccountAddress(PARAMETER.isECKeyCryptoEngine());
+        logger.debug("Got privateKey from config.conf");
+      }
     } else if (config.hasPath(Constant.LOCAL_WITNESS_KEYSTORE)) {
       localWitnesses = new LocalWitnesses();
       List<String> privateKeys = new ArrayList<String>();

framework/src/main/java/org/tron/core/consensus/ConsensusService.java

@@ -61,7 +61,7 @@ public void start() {
         logger.info("Add witness: {}, size: {}",
             Hex.toHexString(privateKeyAddress), miners.size());
       }
-    } else {
+    } else if (privateKeys.size() == 1) {
       byte[] privateKey =
           fromHexString(Args.getLocalWitnesses().getPrivateKey());
       byte[] privateKeyAddress = SignUtils.fromPrivate(privateKey,

framework/src/main/java/org/tron/core/net/service/relay/RelayService.java

@@ -66,12 +66,12 @@ public class RelayService {
 
   private List<InetSocketAddress> fastForwardNodes = parameter.getFastForwardNodes();
 
-  private ByteString witnessAddress = ByteString
-      .copyFrom(Args.getLocalWitnesses().getWitnessAccountAddress(CommonParameter.getInstance()
-          .isECKeyCryptoEngine()));
-
   private int keySize = Args.getLocalWitnesses().getPrivateKeys().size();
 
+  private ByteString witnessAddress = keySize > 0 ? ByteString
+      .copyFrom(Args.getLocalWitnesses().getWitnessAccountAddress(CommonParameter.getInstance()
+          .isECKeyCryptoEngine())) : null;
+
   private int maxFastForwardNum = Args.getInstance().getMaxFastForwardNum();
 
   public void init() {

framework/src/test/java/org/tron/core/config/args/LocalWitnessTest.java

@@ -15,6 +15,8 @@
 
 package org.tron.core.config.args;
 
+import static org.junit.Assert.fail;
+
 import com.google.common.collect.Lists;
 import org.junit.Assert;
 import org.junit.Before;
@@ -42,16 +44,16 @@ public void whenSetNullPrivateKey() {
     Assert.assertNotNull(localWitness.getPublicKey());
   }
 
-  @Test
+  @Test(expected = IllegalArgumentException.class)
   public void whenSetEmptyPrivateKey() {
     localWitness.setPrivateKeys(Lists.newArrayList(""));
-    Assert.assertNotNull(localWitness.getPrivateKey());
-    Assert.assertNotNull(localWitness.getPublicKey());
+    fail("private key must be 64-bits hex string");
   }
 
   @Test(expected = IllegalArgumentException.class)
   public void whenSetBadFormatPrivateKey() {
     localWitness.setPrivateKeys(Lists.newArrayList("a111"));
+    fail("private key must be 64-bits hex string");
   }
 
   @Test
@@ -85,6 +87,6 @@ public void testConstructor() {
     Assert.assertNull(localWitnesses2.getPublicKey());
     localWitnesses2.initWitnessAccountAddress(true);
     LocalWitnesses localWitnesses3 = new LocalWitnesses();
-    Assert.assertNotNull(localWitnesses3.getWitnessAccountAddress(true));
+    Assert.assertNull(localWitnesses3.getWitnessAccountAddress(true));
   }
 }