From 65fa51e125880fa4a0a1c2697b38d7564c42b43b Mon Sep 17 00:00:00 2001
From: Chen Kai <281165273grape@gmail.com>
Date: Sun, 16 Mar 2025 16:47:29 +0800
Subject: [PATCH] revert challenge fix

Signed-off-by: Chen Kai <281165273grape@gmail.com>
---
 p2p/discover/v5wire/encoding.go | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/p2p/discover/v5wire/encoding.go b/p2p/discover/v5wire/encoding.go
index a6cc278bba..904a3ddec6 100644
--- a/p2p/discover/v5wire/encoding.go
+++ b/p2p/discover/v5wire/encoding.go
@@ -104,19 +104,18 @@ var DefaultProtocolID = [6]byte{'d', 'i', 's', 'c', 'v', '5'}
 
 // Errors.
 var (
-	errTooShort             = errors.New("packet too short")
-	errInvalidHeader        = errors.New("invalid packet header")
-	errInvalidFlag          = errors.New("invalid flag value in header")
-	errMinVersion           = errors.New("version of packet header below minimum")
-	errMsgTooShort          = errors.New("message/handshake packet below minimum size")
-	errAuthSize             = errors.New("declared auth size is beyond packet length")
-	errUnexpectedHandshake  = errors.New("unexpected auth response, not in handshake")
-	errInvalidAuthKey       = errors.New("invalid ephemeral pubkey")
-	errNoRecord             = errors.New("expected ENR in handshake but none sent")
-	errInvalidNonceSig      = errors.New("invalid ID nonce signature")
-	errMessageTooShort      = errors.New("message contains no data")
-	errMessageDecrypt       = errors.New("cannot decrypt message")
-	errChallengeAlreadySent = errors.New("challenge already sent to this node")
+	errTooShort            = errors.New("packet too short")
+	errInvalidHeader       = errors.New("invalid packet header")
+	errInvalidFlag         = errors.New("invalid flag value in header")
+	errMinVersion          = errors.New("version of packet header below minimum")
+	errMsgTooShort         = errors.New("message/handshake packet below minimum size")
+	errAuthSize            = errors.New("declared auth size is beyond packet length")
+	errUnexpectedHandshake = errors.New("unexpected auth response, not in handshake")
+	errInvalidAuthKey      = errors.New("invalid ephemeral pubkey")
+	errNoRecord            = errors.New("expected ENR in handshake but none sent")
+	errInvalidNonceSig     = errors.New("invalid ID nonce signature")
+	errMessageTooShort     = errors.New("message contains no data")
+	errMessageDecrypt      = errors.New("cannot decrypt message")
 )
 
 // Public errors.
@@ -218,10 +217,6 @@ func (c *Codec) Encode(id enode.ID, addr string, packet Packet, challenge *Whoar
 
 	// Store sent WHOAREYOU challenges.
 	if challenge, ok := packet.(*Whoareyou); ok {
-		// check if we already sent a challenge to this node
-		if c.sc.getHandshake(id, addr) != nil {
-			return nil, Nonce{}, errChallengeAlreadySent
-		}
 		challenge.ChallengeData = bytesCopy(&c.buf)
 		c.sc.storeSentHandshake(id, addr, challenge)
 	} else if msgData == nil {