Skip to content

Commit e5e8401

Browse files
committed
fix(config): trustNode default empty when not configured
Previously config.hasPath returned false when trustNode was commented out, resulting in trustNodeAddr=null. Bean binding always provided a default value '127.0.0.1:50051', changing behavior. Restore null semantics by defaulting to empty string and converting to null.
1 parent 965051d commit e5e8401

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
public class NodeConfig {
3636

3737
// ---- Flat scalar fields (auto-bound by ConfigBeanFactory) ----
38-
private String trustNode = "127.0.0.1:50051";
38+
private String trustNode = "";
3939
private boolean walletExtensionApi = true;
4040
private int syncFetchBatchNum = 2000;
4141
private int validateSignThreadNum = Runtime.getRuntime().availableProcessors();
@@ -321,7 +321,7 @@ public static class DnsConfig {
321321
int cpus = Runtime.getRuntime().availableProcessors();
322322
StringBuilder sb = new StringBuilder();
323323
// flat scalars
324-
sb.append("trustNode = \"127.0.0.1:50051\"\n");
324+
sb.append("trustNode = \"\"\n");
325325
sb.append("walletExtensionApi = true\n");
326326
sb.append("syncFetchBatchNum = 2000\n");
327327
sb.append("validateSignThreadNum = ").append(cpus).append("\n");

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,8 @@ private static void applyNodeConfig(NodeConfig nc) {
656656
PARAMETER.udpNettyWorkThreadNum = nc.getUdpNettyWorkThreadNum();
657657

658658
if (StringUtils.isEmpty(PARAMETER.trustNodeAddr)) {
659-
PARAMETER.trustNodeAddr = nc.getTrustNode();
659+
String trustNode = nc.getTrustNode();
660+
PARAMETER.trustNodeAddr = StringUtils.isEmpty(trustNode) ? null : trustNode;
660661
}
661662

662663
PARAMETER.validateSignThreadNum = nc.getValidateSignThreadNum();

0 commit comments

Comments
 (0)