Switch client version to a proto type from a string

message/outbound_msg_builder.go

@@ -23,6 +23,10 @@ type OutboundMsgBuilder interface {
 		myTime uint64,
 		ip ips.IPPort,
 		myVersion string,
+		client string,
+		major uint32,
+		minor uint32,
+		patch uint32,
 		myVersionTime uint64,
 		sig []byte,
 		trackedSubnets []ids.ID,
@@ -229,6 +233,10 @@ func (b *outMsgBuilder) Version(
 	myTime uint64,
 	ip ips.IPPort,
 	myVersion string,
+	client string,
+	major uint32,
+	minor uint32,
+	patch uint32,
 	myVersionTime uint64,
 	sig []byte,
 	trackedSubnets []ids.ID,
@@ -247,6 +255,12 @@ func (b *outMsgBuilder) Version(
 					MyVersionTime:  myVersionTime,
 					Sig:            sig,
 					TrackedSubnets: subnetIDBytes,
+					Client: &p2p.Client{
+						Name:  client,
+						Major: major,
+						Minor: minor,
+						Patch: patch,
+					},
 				},
 			},
 		},

network/peer/peer.go

@@ -497,11 +497,22 @@ func (p *peer) writeMessages() {
 		return
 	}
 
+	legacyApplication := &version.Application{
+		Name:  version.LegacyAppName,
+		Major: p.VersionCompatibility.Version().Major,
+		Minor: p.VersionCompatibility.Version().Minor,
+		Patch: p.VersionCompatibility.Version().Patch,
+	}
+
 	msg, err := p.MessageCreator.Version(
 		p.NetworkID,
 		p.Clock.Unix(),
 		mySignedIP.IPPort,
-		p.VersionCompatibility.Version().String(),
+		legacyApplication.String(),
+		p.VersionCompatibility.Version().Name,
+		uint32(p.VersionCompatibility.Version().Major),
+		uint32(p.VersionCompatibility.Version().Minor),
+		uint32(p.VersionCompatibility.Version().Patch),
 		mySignedIP.Timestamp,
 		mySignedIP.Signature,
 		p.MySubnets.List(),
@@ -870,35 +881,46 @@ func (p *peer) handleVersion(msg *p2p.Version) {
 		return
 	}
 
-	peerVersion, err := version.ParseApplication(msg.MyVersion)
-	if err != nil {
-		p.Log.Debug("failed to parse peer version",
-			zap.Stringer("nodeID", p.id),
-			zap.Error(err),
-		)
-		p.StartClose()
-		return
+	if msg.Client != nil {
+		p.version = &version.Application{
+			Name:  msg.Client.Name,
+			Major: int(msg.Client.Major),
+			Minor: int(msg.Client.Minor),
+			Patch: int(msg.Client.Patch),
+		}
+	} else {
+		// Handle legacy version field
+		// TODO deprecate after D upgrade
+		peerVersion, err := version.ParseApplication(msg.MyVersion)
+		if err != nil {
+			p.Log.Debug("failed to parse peer version",
+				zap.Stringer("nodeID", p.id),
+				zap.Error(err),
+			)
+			p.StartClose()
+			return
+		}
+		p.version = peerVersion
 	}
-	p.version = peerVersion
 
-	if p.VersionCompatibility.Version().Before(peerVersion) {
+	if p.VersionCompatibility.Version().Before(p.version) {
 		if _, ok := p.Beacons.GetValidator(constants.PrimaryNetworkID, p.id); ok {
 			p.Log.Info("beacon attempting to connect with newer version. You may want to update your client",
 				zap.Stringer("nodeID", p.id),
-				zap.Stringer("beaconVersion", peerVersion),
+				zap.Stringer("beaconVersion", p.version),
 			)
 		} else {
 			p.Log.Debug("peer attempting to connect with newer version. You may want to update your client",
 				zap.Stringer("nodeID", p.id),
-				zap.Stringer("peerVersion", peerVersion),
+				zap.Stringer("peerVersion", p.version),
 			)
 		}
 	}
 
-	if err := p.VersionCompatibility.Compatible(peerVersion); err != nil {
+	if err := p.VersionCompatibility.Compatible(p.version); err != nil {
 		p.Log.Verbo("peer version not compatible",
 			zap.Stringer("nodeID", p.id),
-			zap.Stringer("peerVersion", peerVersion),
+			zap.Stringer("peerVersion", p.version),
 			zap.Error(err),
 		)
 		p.StartClose()

proto/p2p/p2p.proto

@@ -115,6 +115,17 @@ message Version {
   bytes sig = 7;
   // Subnets the peer is tracking
   repeated bytes tracked_subnets = 8;
+  Client client = 9;
+}
+
+// Metadata about a peer's P2P client used to determine compatibility
+message Client {
+  // Client name (e.g avalanchego)
+  string name = 1;
+  // Client semantic version
+  uint32 major = 2;
+  uint32 minor = 3;
+  uint32 patch = 4;
 }
 
 // ClaimedIpPort contains metadata needed to connect to a peer