refactor(config): auto-bind discovery, PBFT, list fields in NodeConfig

Remove manual reads for fields that ConfigBeanFactory can auto-bind:
- discovery.* via DiscoveryConfig sub-bean (HOCON merges node.discovery)
- PBFT fields via custom setPBFTEnable/setPBFTPort setters
- List fields (active, passive, fastForward, disabledApi)
- isOpenFullTcpDisconnect stays manual (boolean "is" prefix breaks
  JavaBean property pairing)

Only legacy key fallbacks and PascalCase shutdown keys remain manual.

Author: vividctrlalt

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

@@ -6,30 +6,15 @@
 import com.typesafe.config.ConfigBeanFactory;
 import com.typesafe.config.ConfigFactory;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
-/**
- * Node configuration bean for the "node" section of config.conf.
- *
- * <p>This section is complex: it mixes flat scalars, dot-notation nested keys
- * (e.g. "listen.port"), sub-objects (http, rpc, jsonrpc, p2p, dynamicConfig, dns),
- * and list fields (active, passive, fastForward, disabledApi).
- *
- * <p>Strategy:
- * <ul>
- *   <li>ConfigBeanFactory handles simple scalar fields and clean sub-objects</li>
- *   <li>Dot-notation fields (listen.port, connection.timeout, fetchBlock.timeout,
- *       solidity.threads) are read manually — HOCON parses them as nested objects,
- *       not flat keys, so ConfigBeanFactory cannot bind them to flat fields</li>
- *   <li>PBFT-named fields in sub-beans have the same JavaBean naming issue as
- *       CommitteeConfig — handled manually after binding</li>
- *   <li>List fields are read manually since ConfigBeanFactory expects bean lists</li>
- * </ul>
- */
+// Node configuration bean for the "node" section of config.conf.
+// ConfigBeanFactory auto-binds all fields including sub-beans, dot-notation keys,
+// PBFT fields, and list fields. Only legacy key fallbacks and PascalCase shutdown
+// keys are read manually.
 @Slf4j
 @Getter
 @Setter
@@ -50,26 +35,15 @@ public class NodeConfig {
   private boolean openPrintLog = true;
   private boolean openTransactionSort = false;
   private int maxTps = 1000;
-  // "isOpenFullTcpDisconnect" in config.conf: JavaBean convention converts
-  // setOpenFullTcpDisconnect -> key "openFullTcpDisconnect", but config uses
-  // "isOpenFullTcpDisconnect". Excluded from auto-binding, read manually.
+  // Config key "isOpenFullTcpDisconnect" cannot auto-bind — read manually in fromConfig()
   @Getter(lombok.AccessLevel.NONE)
   @Setter(lombok.AccessLevel.NONE)
   private boolean isOpenFullTcpDisconnect = false;
 
   public boolean isOpenFullTcpDisconnect() { return isOpenFullTcpDisconnect; }
 
-  // node.discovery.* is a separate top-level section (not inside node {}).
-  // Excluded from auto-binding, read manually in fromConfig().
-  @Getter(lombok.AccessLevel.NONE)
-  @Setter(lombok.AccessLevel.NONE)
-  private boolean discoveryEnable = false;
-  @Getter(lombok.AccessLevel.NONE)
-  @Setter(lombok.AccessLevel.NONE)
-  private boolean discoveryPersist = false;
-  @Getter(lombok.AccessLevel.NONE)
-  @Setter(lombok.AccessLevel.NONE)
-  private String discoveryExternalIp = "";
+  // node.discovery.* — HOCON merges into node { discovery { ... } }, auto-bound
+  private DiscoveryConfig discovery = new DiscoveryConfig();
 
   // node.shutdown.* uses PascalCase keys (BlockTime, BlockHeight, BlockCount)
   // that don't match JavaBean naming. Excluded, read manually.
@@ -83,9 +57,11 @@ public class NodeConfig {
   @Setter(lombok.AccessLevel.NONE)
   private long shutdownBlockCount = -1;
 
-  public boolean isDiscoveryEnable() { return discoveryEnable; }
-  public boolean isDiscoveryPersist() { return discoveryPersist; }
-  public String getDiscoveryExternalIp() { return discoveryExternalIp; }
+  public boolean isDiscoveryEnable() { return discovery.isEnable(); }
+  public boolean isDiscoveryPersist() { return discovery.isPersist(); }
+  public String getDiscoveryExternalIp() {
+    return discovery.getExternal().getIp();
+  }
   public String getShutdownBlockTime() { return shutdownBlockTime; }
   public long getShutdownBlockHeight() { return shutdownBlockHeight; }
   public long getShutdownBlockCount() { return shutdownBlockCount; }
@@ -151,7 +127,21 @@ public class NodeConfig {
   // ===========================================================================
 
   // ---- Sub-beans for dot-notation config keys ----
-  // These match config.conf's nested structure (e.g., listen.port -> listen { port })
+  // HOCON merges dot-notation into nested objects, ConfigBeanFactory auto-binds
+
+  @Getter
+  @Setter
+  public static class DiscoveryConfig {
+    private boolean enable = true;
+    private boolean persist = true;
+    private ExternalConfig external = new ExternalConfig();
+
+    @Getter
+    @Setter
+    public static class ExternalConfig {
+      private String ip = "";
+    }
+  }
 
   @Getter
   @Setter
@@ -372,18 +362,14 @@ public static class DnsConfig {
   public static NodeConfig fromConfig(Config config) {
     Config section = config.getConfig("node");
 
-    // --- Phase 1: Auto-bind flat scalars and sub-objects ---
-    // ConfigBeanFactory will bind all simple fields and nested sub-beans.
-    // It will skip dot-notation fields (they are nested objects, not scalar keys)
-    // and may mis-bind PBFT fields due to JavaBean naming.
+    // Auto-bind all fields and sub-beans
     NodeConfig nc = ConfigBeanFactory.create(section, NodeConfig.class);
 
-    // --- Phase 2: Dot-notation and naming-mismatch fields (manually read) ---
-    // listen, connection, fetchBlock, solidity, channel, validContractProto
-    // are now sub-beans — auto-bound by ConfigBeanFactory
+    // isOpenFullTcpDisconnect: boolean "is" prefix breaks JavaBean pairing
     nc.isOpenFullTcpDisconnect = getBool(section, "isOpenFullTcpDisconnect", false);
 
-    // Legacy key fallback: node.maxActiveNodes (old) -> maxConnections (new)
+    // --- Legacy key fallbacks (backward compatibility) ---
+    // node.maxActiveNodes (old) -> maxConnections (new)
     if (section.hasPath("maxActiveNodes")) {
       nc.maxConnections = section.getInt("maxActiveNodes");
       if (section.hasPath("connectFactor")) {
@@ -404,50 +390,14 @@ public static NodeConfig fromConfig(Config config) {
     } else if (section.hasPath("fullNodeAllowShieldedTransaction")) {
       nc.allowShieldedTransactionApi = section.getBoolean("fullNodeAllowShieldedTransaction");
     }
-    nc.discoveryExternalIp = config.hasPath("node.discovery.external.ip")
-        ? config.getString("node.discovery.external.ip").trim() : "";
-
-    // node.discovery.* — dot-notation creates nested HOCON objects
-    Config discoverySection = config.hasPath("node.discovery")
-        ? config.getConfig("node.discovery") : ConfigFactory.empty();
-    nc.discoveryEnable = getBool(discoverySection, "enable", false);
-    nc.discoveryPersist = getBool(discoverySection, "persist", false);
-
-    // node.shutdown.* — dot-notation
+    // node.shutdown.* — PascalCase keys (BlockTime, BlockHeight), cannot auto-bind
     nc.shutdownBlockTime = config.hasPath("node.shutdown.BlockTime")
         ? config.getString("node.shutdown.BlockTime") : "";
     nc.shutdownBlockHeight = config.hasPath("node.shutdown.BlockHeight")
         ? config.getLong("node.shutdown.BlockHeight") : -1;
     nc.shutdownBlockCount = config.hasPath("node.shutdown.BlockCount")
         ? config.getLong("node.shutdown.BlockCount") : -1;
 
-    // node.channel.read.timeout — triple-dot-notation
-    // channel.read.timeout is now a sub-bean — auto-bound
-
-    // --- Phase 3: PBFT fields in sub-beans (manually patch) ---
-    // http
-    Config httpSection = section.hasPath("http")
-        ? section.getConfig("http") : ConfigFactory.empty();
-    nc.http.pBFTEnable = getBool(httpSection, "PBFTEnable", true);
-    nc.http.pBFTPort = getInt(httpSection, "PBFTPort", 8092);
-
-    // rpc
-    Config rpcSection = section.hasPath("rpc")
-        ? section.getConfig("rpc") : ConfigFactory.empty();
-    nc.rpc.pBFTEnable = getBool(rpcSection, "PBFTEnable", true);
-    nc.rpc.pBFTPort = getInt(rpcSection, "PBFTPort", 50071);
-
-    // jsonrpc
-    Config jsonrpcSection = section.hasPath("jsonrpc")
-        ? section.getConfig("jsonrpc") : ConfigFactory.empty();
-    nc.jsonrpc.httpPBFTEnable = getBool(jsonrpcSection, "httpPBFTEnable", false);
-    nc.jsonrpc.httpPBFTPort = getInt(jsonrpcSection, "httpPBFTPort", 8565);
-
-    // --- Phase 4: List fields (manually read) ---
-    nc.active = getStringList(section, "active");
-    nc.passive = getStringList(section, "passive");
-    nc.fastForward = getStringList(section, "fastForward");
-    nc.disabledApi = getStringList(section, "disabledApi");
 
     nc.postProcess();
     return nc;
@@ -526,10 +476,4 @@ private static String getString(Config config, String path, String defaultValue)
     return config.hasPath(path) ? config.getString(path) : defaultValue;
   }
 
-  private static List<String> getStringList(Config config, String path) {
-    if (config.hasPath(path)) {
-      return config.getStringList(path);
-    }
-    return Collections.emptyList();
-  }
 }