From a97d622588c2b71557c6222b95d487f51b46bd78 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Mon, 4 Mar 2024 14:07:41 +0100
Subject: [PATCH] cmd/devp2p: fix commandHasFlag (#29091)

It got broken in some update of the cli library, and thus bootnodes weren't
being configured automatically for some of the discovery commands.
---
 cmd/devp2p/main.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmd/devp2p/main.go b/cmd/devp2p/main.go
index 8461a8b9b5..66974bba58 100644
--- a/cmd/devp2p/main.go
+++ b/cmd/devp2p/main.go
@@ -66,9 +66,15 @@ func commandHasFlag(ctx *cli.Context, flag cli.Flag) bool {
 	for _, name := range names {
 		set[name] = struct{}{}
 	}
-	for _, fn := range ctx.FlagNames() {
-		if _, ok := set[fn]; ok {
-			return true
+	for _, ctx := range ctx.Lineage() {
+		if ctx.Command != nil {
+			for _, f := range ctx.Command.Flags {
+				for _, name := range f.Names() {
+					if _, ok := set[name]; ok {
+						return true
+					}
+				}
+			}
 		}
 	}
 	return false