From df91643976b7bb75a95cce9f4e4304fde3342510 Mon Sep 17 00:00:00 2001
From: stasatdaglabs <39559713+stasatdaglabs@users.noreply.github.com>
Date: Sun, 5 Jan 2020 16:47:58 +0200
Subject: [PATCH] [NOD-608] Make the user agent read the version from the
 version package. (#566)

---
 peer/peer_test.go    | 8 ++++----
 wire/message_test.go | 2 +-
 wire/msgversion.go   | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/peer/peer_test.go b/peer/peer_test.go
index dae1ad57f..d742f72eb 100644
--- a/peer/peer_test.go
+++ b/peer/peer_test.go
@@ -241,8 +241,8 @@ func TestPeerConnection(t *testing.T) {
 		wantLastPingNonce:   uint64(0),
 		wantLastPingMicros:  int64(0),
 		wantTimeOffset:      int64(0),
-		wantBytesSent:       198, // 174 version + 24 verack
-		wantBytesReceived:   198,
+		wantBytesSent:       201, // 177 version + 24 verack
+		wantBytesReceived:   201,
 	}
 	wantStats2 := peerStats{
 		wantUserAgent:       wire.DefaultUserAgent + "peer:1.0(comment)/",
@@ -255,8 +255,8 @@ func TestPeerConnection(t *testing.T) {
 		wantLastPingNonce:   uint64(0),
 		wantLastPingMicros:  int64(0),
 		wantTimeOffset:      int64(0),
-		wantBytesSent:       198, // 174 version + 24 verack
-		wantBytesReceived:   198,
+		wantBytesSent:       201, // 177 version + 24 verack
+		wantBytesReceived:   201,
 	}
 
 	tests := []struct {
diff --git a/wire/message_test.go b/wire/message_test.go
index 35d0762a8..6cb5114d2 100644
--- a/wire/message_test.go
+++ b/wire/message_test.go
@@ -79,7 +79,7 @@ func TestMessage(t *testing.T) {
 		kaspaNet KaspaNet // Network to use for wire encoding
 		bytes    int      // Expected num bytes read/written
 	}{
-		{msgVersion, msgVersion, pver, MainNet, 156},
+		{msgVersion, msgVersion, pver, MainNet, 159},
 		{msgVerack, msgVerack, pver, MainNet, 24},
 		{msgGetAddr, msgGetAddr, pver, MainNet, 26},
 		{msgAddr, msgAddr, pver, MainNet, 27},
diff --git a/wire/msgversion.go b/wire/msgversion.go
index 1c63ba46d..86b0891fd 100644
--- a/wire/msgversion.go
+++ b/wire/msgversion.go
@@ -7,6 +7,7 @@ package wire
 import (
 	"bytes"
 	"fmt"
+	"github.com/kaspanet/kaspad/version"
 	"github.com/pkg/errors"
 	"io"
 	"strings"
@@ -21,7 +22,7 @@ import (
 const MaxUserAgentLen = 256
 
 // DefaultUserAgent for wire in the stack
-const DefaultUserAgent = "/kaspawire:0.1.0/"
+var DefaultUserAgent = fmt.Sprintf("/kaspad:%s/", version.Version())
 
 // MsgVersion implements the Message interface and represents a kaspa version
 // message. It is used for a peer to advertise itself as soon as an outbound