From 48199f7f2044dcca59efb41c8166ef6bc6e138a8 Mon Sep 17 00:00:00 2001
From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com>
Date: Fri, 10 Nov 2023 12:27:53 -0600
Subject: [PATCH] Revert "cmd/utils: fix bootnodes config priority (#28095)"

This reverts commit 877c5be6fefe0e77473bce49d82d813aa3301aa1.
---
 cmd/utils/flags.go | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index c172d269c5..653ae4d9eb 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1032,45 +1032,35 @@ func setNodeUserIdent(ctx *cli.Context, cfg *node.Config) {
 
 // setBootstrapNodes creates a list of bootstrap nodes from the command line
 // flags, reverting to pre-configured ones if none have been specified.
-// Priority order for bootnodes configuration:
-//
-// 1. --bootnodes flag
-// 2. Config file
-// 3. Network preset flags (e.g. --goerli)
-// 4. default to mainnet nodes
 func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
 	urls := params.MainnetBootnodes
-	if ctx.IsSet(BootnodesFlag.Name) {
+	switch {
+	case ctx.IsSet(BootnodesFlag.Name):
 		urls = SplitAndTrim(ctx.String(BootnodesFlag.Name))
-	} else {
-		if cfg.BootstrapNodes != nil {
-			return // Already set by config file, don't apply defaults.
-		}
-		switch {
-		case ctx.Bool(HoleskyFlag.Name):
-			urls = params.HoleskyBootnodes
-		case ctx.Bool(SepoliaFlag.Name):
-			urls = params.SepoliaBootnodes
-		case ctx.Bool(GoerliFlag.Name):
-			urls = params.GoerliBootnodes
-		}
+	case ctx.Bool(HoleskyFlag.Name):
+		urls = params.HoleskyBootnodes
+	case ctx.Bool(SepoliaFlag.Name):
+		urls = params.SepoliaBootnodes
+	case ctx.Bool(GoerliFlag.Name):
+		urls = params.GoerliBootnodes
 	}
-	cfg.BootstrapNodes = mustParseBootnodes(urls)
-}
 
-func mustParseBootnodes(urls []string) []*enode.Node {
-	nodes := make([]*enode.Node, 0, len(urls))
+	// don't apply defaults if BootstrapNodes is already set
+	if cfg.BootstrapNodes != nil {
+		return
+	}
+
+	cfg.BootstrapNodes = make([]*enode.Node, 0, len(urls))
 	for _, url := range urls {
 		if url != "" {
 			node, err := enode.Parse(enode.ValidSchemes, url)
 			if err != nil {
 				log.Crit("Bootstrap URL invalid", "enode", url, "err", err)
-				return nil
+				continue
 			}
-			nodes = append(nodes, node)
+			cfg.BootstrapNodes = append(cfg.BootstrapNodes, node)
 		}
 	}
-	return nodes
 }
 
 // setBootstrapNodesV5 creates a list of bootstrap nodes from the command line