From 932f5067c9bff89cd894de71d6509d8d0856b34c Mon Sep 17 00:00:00 2001
From: wnqqnw19 <adambrodigan91@gmail.com>
Date: Thu, 4 Dec 2025 12:37:33 -0800
Subject: [PATCH] eth: fix race conditions and add safety checks

---
 eth/handler.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eth/handler.go b/eth/handler.go
index f9786f980a..fca4bf6316 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -319,7 +319,10 @@ func (h *handler) runEthPeer(peer *eth.Peer, handler eth.Handler) error {
 	// Capture peer ID and logger to avoid race conditions in goroutines
 	peerID := peer.ID()
 	peerLogger := peer.Log()
-	peerAddr := peer.RemoteAddr()
+	peerAddr := ""
+	if addr := peer.RemoteAddr(); addr != nil {
+		peerAddr = addr.String()
+	}
 	peerName := peer.Name()
 	for number, hash := range h.requiredBlocks {
 		resCh := make(chan *eth.Response)