feat: do not connect to v1 peers

api/node/node_test.go

@@ -49,7 +49,7 @@ func initCommServer(t *testing.T) {
 		Limit:           10000,
 		LimitPerAccount: 16,
 		MaxLifetime:     10 * time.Minute,
-	}))
+	}), "2.0.0")
 	router := mux.NewRouter()
 	node.New(comm).Mount(router, "/node")
 	ts = httptest.NewServer(router)

cmd/thor/utils.go

@@ -461,7 +461,7 @@ func newP2PCommunicator(ctx *cli.Context, repo *chain.Repository, txPool *txpool
 	}
 
 	return p2p.New(
-		comm.New(repo, txPool),
+		comm.New(repo, txPool, version),
 		key,
 		instanceDir,
 		userNAT,

comm/communicator.go

@@ -9,7 +9,9 @@ import (
 	"context"
 	"fmt"
 	"math"
+	"regexp"
 	"sort"
+	"strings"
 	"sync"
 	"time"
 
@@ -41,10 +43,11 @@ type Communicator struct {
 	feedScope      event.SubscriptionScope
 	goes           co.Goes
 	onceSynced     sync.Once
+	version        string
 }
 
 // New create a new Communicator instance.
-func New(repo *chain.Repository, txPool *txpool.TxPool) *Communicator {
+func New(repo *chain.Repository, txPool *txpool.TxPool, version string) *Communicator {
 	ctx, cancel := context.WithCancel(context.Background())
 	return &Communicator{
 		repo:           repo,
@@ -54,6 +57,7 @@ func New(repo *chain.Repository, txPool *txpool.TxPool) *Communicator {
 		peerSet:        newPeerSet(),
 		syncedCh:       make(chan struct{}),
 		announcementCh: make(chan *announcement),
+		version:        version,
 	}
 }
 
@@ -161,6 +165,11 @@ type txsToSync struct {
 }
 
 func (c *Communicator) servePeer(p *p2p.Peer, rw p2p.MsgReadWriter) error {
+	if !sameMajor(c.version, p.Name()) {
+		log.Warn("peer version mismatch", "name", p.Name(), "address", p.RemoteAddr().String(), "id", p.ID().String())
+		return nil
+	}
+
 	peer := newPeer(p, rw)
 	c.goes.Go(func() {
 		c.runPeer(peer)
@@ -283,3 +292,24 @@ func (c *Communicator) PeersStats() []*PeerStats {
 	})
 	return stats
 }
+
+// sameMajor returns true if the peer has the same major version
+func sameMajor(appVersion, peerName string) bool {
+	versionRegex := regexp.MustCompile(`\d+\.\d+\.\d+`)
+	if appVersion == "" || !versionRegex.MatchString(appVersion) {
+		// Got a bad app version, so accept any peer
+		return true
+	}
+
+	// Extract the semantic version from the name
+	peerVersion := versionRegex.FindString(peerName)
+	if peerVersion == "" {
+		return false
+	}
+
+	peerMajorVersion := strings.Split(peerVersion, ".")[0]
+	givenMajorVersion := strings.Split(appVersion, ".")[0]
+
+	// Compare the major versions
+	return peerMajorVersion == givenMajorVersion
+}

comm/communicator_test.go

@@ -0,0 +1,59 @@
+// Copyright (c) 2024 The VeChainThor developers
+
+// Distributed under the GNU Lesser General Public License v3.0 software license, see the accompanying
+// file LICENSE or <https://www.gnu.org/licenses/lgpl-3.0.html>
+package comm
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSameMajor(t *testing.T) {
+	testCases := []struct {
+		id         string
+		appVersion string
+		peerName   string
+		expected   bool
+	}{
+		{
+			id:         "only-major-same",
+			appVersion: "2.0.0",
+			peerName:   "thor/v2.1.1-88c7c86-release/linux/go1.21.9",
+			expected:   true,
+		},
+		{
+			id:         "only-major-different",
+			appVersion: "2.1.1",
+			peerName:   "thor/v1.1.1-88c7c86-release/linux/go1.21.9",
+			expected:   false,
+		},
+		{
+			id:         "app-version-empty",
+			appVersion: "",
+			peerName:   "thor/v1.1.1-88c7c86-release/linux/go1.21.9",
+			expected:   true,
+		},
+		{
+			id:         "exact-match",
+			appVersion: "1.1.1",
+			peerName:   "thor/v1.1.1-88c7c86-release/linux/go1.21.9",
+			expected:   true,
+		},
+		{
+			id: "bad-app-version",
+			// bad app version, so accept any peer
+			appVersion: "bad.bad.bad",
+			peerName:   "thor/v1.1.1-88c7c86-release/linux/go1.21.9",
+			expected:   true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.id, func(t *testing.T) {
+			result := sameMajor(tc.appVersion, tc.peerName)
+			assert.Equal(t, tc.expected, result)
+		})
+	}
+}