From 7e9334861b3be3a21bb3f2687a8adc94cb3d7895 Mon Sep 17 00:00:00 2001
From: Lucas Vasconcelos <lucas@gelato.digital>
Date: Wed, 27 Nov 2024 20:16:05 -0300
Subject: [PATCH] p2p: simplify NewV4WithDNS function

---
 p2p/enode/urlv4.go | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go
index 9cb50ac856..76b7a7cdf8 100644
--- a/p2p/enode/urlv4.go
+++ b/p2p/enode/urlv4.go
@@ -102,28 +102,16 @@ func NewV4(pubkey *ecdsa.PublicKey, ip net.IP, tcp, udp int) *Node {
 }
 
 func NewV4WithDNS(pubkey *ecdsa.PublicKey, ip net.IP, dnsName string, tcp, udp int) *Node {
-	var r enr.Record
-	if len(ip) > 0 {
-		r.Set(enr.IP(ip))
-	}
+	n := NewV4(pubkey, ip, tcp, udp)
 	// Always set TCP/UDP ports regardless of IP
 	// This is to ensure that the node is always
 	// considered valid even if the IP is not
 	// set.
-	if tcp != 0 {
-		r.Set(enr.TCP(tcp))
-	}
-	if udp != 0 {
-		r.Set(enr.UDP(udp))
-	}
-	signV4Compat(&r, pubkey)
-	n, err := New(v4CompatID{}, &r)
-	if err != nil {
-		panic(err)
+	if len(ip) == 0 {
+		n.tcp = uint16(tcp)
+		n.udp = uint16(udp)
 	}
 	n.dnsName = dnsName
-	n.tcp = uint16(tcp)
-	n.udp = uint16(udp)
 	return n
 }