merged

network/peer/peer.go

@@ -716,14 +716,6 @@ func (p *peer) shouldDisconnect() bool {
 		return false
 	}
 
-	if p.ip.BLSSignature == nil {
-		p.Log.Debug(disconnectingLog,
-			zap.String("reason", "missing BLS signature"),
-			zap.Stringer("nodeID", p.id),
-		)
-		return true
-	}
-
 	validSignature := bls.VerifyProofOfPossession(
 		vdr.PublicKey,
 		p.ip.BLSSignature,
@@ -1082,24 +1074,21 @@ func (p *peer) handleHandshake(msg *p2p.Handshake) {
 		return
 	}
 
-	// TODO: After v1.11.x is activated, require the key to be provided.
-	if len(msg.IpBlsSig) > 0 {
-		signature, err := bls.SignatureFromBytes(msg.IpBlsSig)
-		if err != nil {
-			p.Log.Debug(malformedMessageLog,
-				zap.Stringer("nodeID", p.id),
-				zap.Stringer("messageOp", message.HandshakeOp),
-				zap.String("field", "blsSignature"),
-				zap.Error(err),
-			)
-			p.StartClose()
-			return
-		}
-
-		p.ip.BLSSignature = signature
-		p.ip.BLSSignatureBytes = msg.IpBlsSig
+	signature, err := bls.SignatureFromBytes(msg.IpBlsSig)
+	if err != nil {
+		p.Log.Debug(malformedMessageLog,
+			zap.Stringer("nodeID", p.id),
+			zap.Stringer("messageOp", message.HandshakeOp),
+			zap.String("field", "blsSignature"),
+			zap.Error(err),
+		)
+		p.StartClose()
+		return
 	}
 
+	p.ip.BLSSignature = signature
+	p.ip.BLSSignatureBytes = msg.IpBlsSig
+
 	// If the peer is running an incompatible version or has an invalid BLS
 	// signature, disconnect from them prior to marking the handshake as
 	// completed.
@@ -1238,8 +1227,8 @@ func (p *peer) handlePeerList(msg *p2p.PeerList) {
 				zap.String("field", "port"),
 				zap.Uint32("port", claimedIPPort.IpPort),
 			)
-			// TODO: After v1.11.x is activated, close the peer here.
-			continue
+			p.StartClose()
+			return
 		}
 
 		discoveredIPs[i] = ips.NewClaimedIPPort(

proto/sdk/sdk.proto

@@ -5,8 +5,6 @@ package sdk;
 option go_package = "github.com/ava-labs/avalanchego/proto/pb/sdk";
 
 message PullGossipRequest {
-  // TODO: Remove reservation after v1.11.x activates.
-  reserved 1;
   bytes salt = 2;
   bytes filter = 3;
 }