fix: panic when discv5 is enabled while running service node

waku-org · Nov 14, 2023 · 72db096 · 72db096
1 parent a5ce5df
commit 72db096
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/cmd/waku/node.go b/cmd/waku/node.go
@@ -293,6 +293,21 @@ func Execute(options NodeOptions) error {
 		return nonRecoverError(err)
 	}
 
+	var discoveredNodes []dnsdisc.DiscoveredNode
+	if options.DNSDiscovery.Enable {
+		if len(options.DNSDiscovery.URLs.Value()) == 0 {
+			return nonRecoverErrorMsg("DNS discovery URL is required")
+		}
+		discoveredNodes = node.GetNodesFromDNSDiscovery(logger, ctx, options.DNSDiscovery.Nameserver, options.DNSDiscovery.URLs.Value())
+	}
+	if options.DiscV5.Enable {
+		discv5Opts, err := node.GetDiscv5Option(discoveredNodes, options.DiscV5.Nodes.Value(), options.DiscV5.Port, options.DiscV5.AutoUpdate)
+		if err != nil {
+			logger.Fatal("parsing ENR", zap.Error(err))
+		}
+		nodeOpts = append(nodeOpts, discv5Opts)
+	}
+
 	wakuNode, err := node.New(nodeOpts...)
 	if err != nil {
 		return fmt.Errorf("could not instantiate waku: %w", err)
@@ -315,21 +330,6 @@ func Execute(options NodeOptions) error {
 		}
 	}
 
-	var discoveredNodes []dnsdisc.DiscoveredNode
-	if options.DNSDiscovery.Enable {
-		if len(options.DNSDiscovery.URLs.Value()) == 0 {
-			return nonRecoverErrorMsg("DNS discovery URL is required")
-		}
-		discoveredNodes = node.GetNodesFromDNSDiscovery(logger, ctx, options.DNSDiscovery.Nameserver, options.DNSDiscovery.URLs.Value())
-	}
-	if options.DiscV5.Enable {
-		discv5Opts, err := node.GetDiscv5Option(discoveredNodes, options.DiscV5.Nodes.Value(), options.DiscV5.Port, options.DiscV5.AutoUpdate)
-		if err != nil {
-			logger.Fatal("parsing ENR", zap.Error(err))
-		}
-		nodeOpts = append(nodeOpts, discv5Opts)
-	}
-
 	if err = wakuNode.Start(ctx); err != nil {
 		return nonRecoverError(err)
 	}