Set NegotiatedVersion on Peer Object (#1334)

* Set NegotiatedVersion on Peer Object

* Fix naming

lib/peer.go

@@ -38,6 +38,9 @@ type DeSoMessageMeta struct {
 // Any communication with other nodes happens via this object, which maintains a
 // queue of messages to send to the other node.
 type Peer struct {
+	// TODO: Remove this and merge it with the RemoteNode.HandshakeMetaData type
+	NegotiatedProtocolVersion ProtocolVersionType
+
 	// These stats should be accessed atomically.
 	bytesReceived uint64
 	bytesSent     uint64
@@ -401,7 +404,7 @@ func (pp *Peer) HandleGetBlocks(msg *MsgDeSoGetBlocks) {
 	// Before Version2 we would send each block in a single message, which was quite
 	// slow. Now when we receive a GetBlocks message we will send the blocks in large
 	// batches, which is much faster.
-	if pp.Params.ProtocolVersion == ProtocolVersion2 {
+	if pp.NegotiatedProtocolVersion == ProtocolVersion2 {
 		allBlocks := MsgDeSoBlockBundle{}
 		for _, hashToSend := range msg.HashList {
 			blockToSend := pp.srv.blockchain.GetBlock(hashToSend)
@@ -931,6 +934,13 @@ func (pp *Peer) SetServiceFlag(sf ServiceFlag) {
 	pp.serviceFlags = sf
 }
 
+func (pp *Peer) SetNegotiatedProtocolVersion(negotiatedProtocolVersion ProtocolVersionType) {
+	pp.PeerInfoMtx.Lock()
+	defer pp.PeerInfoMtx.Unlock()
+
+	pp.NegotiatedProtocolVersion = negotiatedProtocolVersion
+}
+
 func (pp *Peer) outHandler() {
 	pp.startGroup.Done()
 	glog.V(1).Infof("Peer.outHandler: Starting outHandler for Peer %v", pp)

lib/remote_node.go

@@ -546,7 +546,12 @@ func (rn *RemoteNode) HandleVersionMessage(verMsg *MsgDeSoVersion, responseNonce
 		negotiatedVersion = NewProtocolVersionType(verMsg.Version)
 	}
 
+	// TODO: everywhere we update the negotiated protocol version on the handshake metadata, we also update
+	// the value in the peer object. The two should be merged to reduce duplication of data in the future.
 	vMeta.negotiatedProtocolVersion = negotiatedVersion
+	if rn.peer != nil {
+		rn.peer.SetNegotiatedProtocolVersion(negotiatedVersion)
+	}
 
 	// Record the services the peer is advertising.
 	vMeta.serviceFlag = verMsg.Services