fix(lib/grandpa): update grandpa protocol ID

lib/grandpa/grandpa.go

@@ -200,7 +200,7 @@ func (s *Service) Start() error {
 		}
 	}()
 
-	go s.sendNeighbourMessage()
+	go s.sendNeighbourMessage(neighbourMessageInterval)
 
 	return nil
 }

lib/grandpa/network.go

@@ -5,6 +5,7 @@ package grandpa
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/ChainSafe/gossamer/dot/network"
@@ -15,10 +16,9 @@ import (
 	"github.com/libp2p/go-libp2p-core/protocol"
 )
 
-var (
-	grandpaID                protocol.ID = "/paritytech/grandpa/1"
-	messageID                            = network.ConsensusMsgType
-	neighbourMessageInterval             = time.Minute * 5
+const (
+	grandpaID1               = "grandpa/1"
+	neighbourMessageInterval = time.Minute * 5
 )
 
 // Handshake is an alias for network.Handshake
@@ -39,8 +39,9 @@ type GrandpaHandshake struct { //nolint:revive
 }
 
 // SubProtocol returns the grandpa sub-protocol
+// TODO: should we remove the SubProtocol method from the `Message` interface?
 func (*GrandpaHandshake) SubProtocol() string {
-	return string(grandpaID)
+	return ""
 }
 
 // String formats a BlockAnnounceHandshake as a string
@@ -74,9 +75,13 @@ func (*GrandpaHandshake) IsHandshake() bool {
 }
 
 func (s *Service) registerProtocol() error {
+	genesisHash := s.blockState.GenesisHash().String()
+	genesisHash = strings.TrimPrefix(genesisHash, "0x")
+	grandpaProtocolID := fmt.Sprintf("/%s/%s", genesisHash, grandpaID1)
+
 	return s.network.RegisterNotificationsProtocol(
-		grandpaID,
-		messageID,
+		protocol.ID(grandpaProtocolID),
+		network.ConsensusMsgType,
 		s.getHandshake,
 		s.decodeHandshake,
 		s.validateHandshake,
@@ -175,8 +180,8 @@ func (s *Service) sendMessage(msg GrandpaMessage) error {
 	return nil
 }
 
-func (s *Service) sendNeighbourMessage() {
-	t := time.NewTicker(neighbourMessageInterval)
+func (s *Service) sendNeighbourMessage(interval time.Duration) {
+	t := time.NewTicker(interval)
 	defer t.Stop()
 	for {
 		select {

lib/grandpa/network_test.go

@@ -80,11 +80,7 @@ func TestHandleNetworkMessage(t *testing.T) {
 
 func TestSendNeighbourMessage(t *testing.T) {
 	gs, st := newTestService(t)
-	neighbourMessageInterval = time.Second
-	defer func() {
-		neighbourMessageInterval = time.Minute * 5
-	}()
-	go gs.sendNeighbourMessage()
+	go gs.sendNeighbourMessage(time.Second)
 
 	digest := types.NewDigest()
 	prd, err := types.NewBabeSecondaryPlainPreDigest(0, 1).ToPreRuntimeDigest()