optimize external.ip

Author: 317787106

common/src/main/java/org/tron/core/config/args/CommitteeConfig.java

@@ -82,11 +82,11 @@ public static CommitteeConfig fromConfig(Config config) {
   private static Config normalizeNonStandardKeys(Config section) {
     if (section.hasPath("allowPBFT")) {
       ConfigValue v = section.getValue("allowPBFT");
-      section = section.withValue("allowPbft", v);
+      section = section.withValue("allowPbft", v); // rename allowPBFT -> allowPbft
     }
     if (section.hasPath("pBFTExpireNum")) {
       ConfigValue v = section.getValue("pBFTExpireNum");
-      section = section.withValue("pbftExpireNum", v);
+      section = section.withValue("pbftExpireNum", v); // rename pBFTExpireNum -> pbftExpireNum
     }
     return section;
   }
@@ -101,35 +101,61 @@ private void postProcess() {
     }
 
     // clamp allowDelegateOptimization to 0-1
-    if (allowDelegateOptimization < 0) { allowDelegateOptimization = 0; }
-    if (allowDelegateOptimization > 1) { allowDelegateOptimization = 1; }
+    if (allowDelegateOptimization < 0) {
+      allowDelegateOptimization = 0;
+    }
+    if (allowDelegateOptimization > 1) {
+      allowDelegateOptimization = 1;
+    }
 
     // clamp allowDynamicEnergy to 0-1
-    if (allowDynamicEnergy < 0) { allowDynamicEnergy = 0; }
-    if (allowDynamicEnergy > 1) { allowDynamicEnergy = 1; }
+    if (allowDynamicEnergy < 0) {
+      allowDynamicEnergy = 0;
+    }
+    if (allowDynamicEnergy > 1) {
+      allowDynamicEnergy = 1;
+    }
 
     // clamp dynamicEnergyThreshold to 0-100_000_000_000_000_000
-    if (dynamicEnergyThreshold < 0) { dynamicEnergyThreshold = 0; }
+    if (dynamicEnergyThreshold < 0) {
+      dynamicEnergyThreshold = 0;
+    }
     if (dynamicEnergyThreshold > 100_000_000_000_000_000L) {
       dynamicEnergyThreshold = 100_000_000_000_000_000L;
     }
 
     // clamp dynamicEnergyIncreaseFactor to 0-10_000
-    if (dynamicEnergyIncreaseFactor < 0) { dynamicEnergyIncreaseFactor = 0; }
-    if (dynamicEnergyIncreaseFactor > 10_000L) { dynamicEnergyIncreaseFactor = 10_000L; }
+    if (dynamicEnergyIncreaseFactor < 0) {
+      dynamicEnergyIncreaseFactor = 0;
+    }
+    if (dynamicEnergyIncreaseFactor > 10_000L) {
+      dynamicEnergyIncreaseFactor = 10_000L;
+    }
 
     // clamp dynamicEnergyMaxFactor to 0-100_000
-    if (dynamicEnergyMaxFactor < 0) { dynamicEnergyMaxFactor = 0; }
-    if (dynamicEnergyMaxFactor > 100_000L) { dynamicEnergyMaxFactor = 100_000L; }
+    if (dynamicEnergyMaxFactor < 0) {
+      dynamicEnergyMaxFactor = 0;
+    }
+    if (dynamicEnergyMaxFactor > 100_000L) {
+      dynamicEnergyMaxFactor = 100_000L;
+    }
 
     // clamp allowNewReward to 0-1 (must run BEFORE the cross-field check below,
     // which depends on allowNewReward != 1)
-    if (allowNewReward < 0) { allowNewReward = 0; }
-    if (allowNewReward > 1) { allowNewReward = 1; }
+    if (allowNewReward < 0) {
+      allowNewReward = 0;
+    }
+    if (allowNewReward > 1) {
+      allowNewReward = 1;
+    }
 
     // clamp memoFee to 0-1_000_000_000
-    if (memoFee < 0) { memoFee = 0; }
-    if (memoFee > 1_000_000_000L) { memoFee = 1_000_000_000L; }
+    if (memoFee < 0) {
+      memoFee = 0;
+    }
+    if (memoFee > 1_000_000_000L) {
+      memoFee = 1_000_000_000L;
+    }
 
     // cross-field: allowOldRewardOpt requires at least one reward/vote flag
     if (allowOldRewardOpt == 1 && allowNewRewardAlgorithm != 1

common/src/main/java/org/tron/core/config/args/NodeConfig.java

@@ -43,9 +43,6 @@ public class NodeConfig {
 
   // node.discovery.* — HOCON merges into node { discovery { ... } }, auto-bound
   private DiscoveryConfig discovery = new DiscoveryConfig();
-  @Getter(lombok.AccessLevel.NONE)
-  @Setter(lombok.AccessLevel.NONE)
-  private String externalIP = "";
 
   // node.shutdown.* uses PascalCase nested keys (shutdown.BlockTime, etc.).
   // These are optional (not in reference.conf), so @Setter(NONE) prevents ConfigBeanFactory
@@ -66,7 +63,7 @@ public boolean isDiscoveryPersist() {
   }
 
   public String getDiscoveryExternalIp() {
-    return externalIP;
+    return discovery.getExternal().getIp();
   }
 
   private int inactiveThreshold = 600;
@@ -148,6 +145,14 @@ public static class DiscoveryConfig {
 
     private boolean enable = false;
     private boolean persist = false;
+    private ExternalConfig external = new ExternalConfig();
+
+    @Getter
+    @Setter
+    public static class ExternalConfig {
+
+      private String ip = "";
+    }
   }
 
   @Getter
@@ -314,11 +319,6 @@ public static NodeConfig fromConfig(Config config) {
       nc.maxConnectionsWithSameIp = section.getInt("maxActiveNodesWithSameIp");
     }
 
-    nc.externalIP = getString(section, "discovery.external.ip", "");
-    if ("null".equalsIgnoreCase(nc.externalIP)) {
-      nc.externalIP = "";
-    }
-
     // Legacy key fallback: node.fullNodeAllowShieldedTransaction -> allowShieldedTransactionApi.
     if (section.hasPath("allowShieldedTransactionApi")) {
       nc.allowShieldedTransactionApi =
@@ -449,13 +449,19 @@ private static String getString(Config config, String path, String defaultValue)
 
   /**
    * "isOpenFullTcpDisconnect" config key has an "is" prefix that the JavaBean Introspector
-   * strips from boolean getter names, so the derived property is "openFullTcpDisconnect"
+   * strips from boolean getter names, so the derived property is "openFullTcpDisconnect".
+   * "discovery.external.ip" may be HOCON null or the string "null"; both normalize to "".
    */
   private static Config normalizeNonStandardKeys(Config section) {
     if (section.hasPath("isOpenFullTcpDisconnect")) {
       section = section.withValue("openFullTcpDisconnect",
           section.getValue("isOpenFullTcpDisconnect"));
     }
+    String externalIpPath = "discovery.external.ip";
+    if (section.getIsNull(externalIpPath)
+        || "null".equalsIgnoreCase(section.getString(externalIpPath))) {
+      section = section.withValue(externalIpPath, ConfigValueFactory.fromAnyRef(""));
+    }
     return section;
   }