Update warp msg format (#1686)

Author: aaronbuchwald

chains/manager.go

@@ -475,7 +475,7 @@ func (m *manager) buildChain(chainParams ChainParameters, sb subnets.Subnet) (*c
 			BCLookup:     m,
 			Metrics:      vmMetrics,
 
-			WarpSigner: warp.NewSigner(m.StakingBLSKey, chainParams.ID),
+			WarpSigner: warp.NewSigner(m.StakingBLSKey, m.NetworkID, chainParams.ID),
 
 			ValidatorState: m.validatorState,
 			ChainDataDir:   chainDataDir,

proto/pb/warp/message.pb.go

@@ -9,8 +9,8 @@ service Signer {
 }
 
 message SignRequest {
-  bytes source_chain_id = 1;
-  bytes destination_chain_id = 2;
+  uint32 network_id = 1;
+  bytes source_chain_id = 2;
   bytes payload = 3;
 }
 

proto/warp/message.proto

@@ -23,9 +23,9 @@ func NewClient(client pb.SignerClient) *Client {
 
 func (c *Client) Sign(unsignedMsg *warp.UnsignedMessage) ([]byte, error) {
 	resp, err := c.client.Sign(context.Background(), &pb.SignRequest{
-		SourceChainId:      unsignedMsg.SourceChainID[:],
-		DestinationChainId: unsignedMsg.DestinationChainID[:],
-		Payload:            unsignedMsg.Payload,
+		NetworkId:     unsignedMsg.NetworkID,
+		SourceChainId: unsignedMsg.SourceChainID[:],
+		Payload:       unsignedMsg.Payload,
 	})
 	if err != nil {
 		return nil, err

vms/platformvm/warp/gwarp/client.go

@@ -29,14 +29,9 @@ func (s *Server) Sign(_ context.Context, unsignedMsg *pb.SignRequest) (*pb.SignR
 		return nil, err
 	}
 
-	destinationChainID, err := ids.ToID(unsignedMsg.DestinationChainId)
-	if err != nil {
-		return nil, err
-	}
-
 	msg, err := warp.NewUnsignedMessage(
+		unsignedMsg.NetworkId,
 		sourceChainID,
-		destinationChainID,
 		unsignedMsg.Payload,
 	)
 	if err != nil {

vms/platformvm/warp/gwarp/server.go

@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/avalanchego/vms/platformvm/warp"
 	"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"
@@ -17,11 +18,12 @@ import (
 )
 
 type testSigner struct {
-	client  *Client
-	server  warp.Signer
-	sk      *bls.SecretKey
-	chainID ids.ID
-	closeFn func()
+	client    *Client
+	server    warp.Signer
+	sk        *bls.SecretKey
+	networkID uint32
+	chainID   ids.ID
+	closeFn   func()
 }
 
 func setupSigner(t testing.TB) *testSigner {
@@ -33,9 +35,10 @@ func setupSigner(t testing.TB) *testSigner {
 	chainID := ids.GenerateTestID()
 
 	s := &testSigner{
-		server:  warp.NewSigner(sk, chainID),
-		sk:      sk,
-		chainID: chainID,
+		server:    warp.NewSigner(sk, constants.UnitTestID, chainID),
+		sk:        sk,
+		networkID: constants.UnitTestID,
+		chainID:   chainID,
 	}
 
 	listener, err := grpcutils.NewListener()
@@ -63,7 +66,7 @@ func setupSigner(t testing.TB) *testSigner {
 func TestInterface(t *testing.T) {
 	for _, test := range warp.SignerTests {
 		s := setupSigner(t)
-		test(t, s.client, s.sk, s.chainID)
+		test(t, s.client, s.sk, s.networkID, s.chainID)
 		s.closeFn()
 	}
 }

vms/platformvm/warp/gwarp/signer_test.go

@@ -10,14 +10,15 @@ import (
 
 	"github.com/ava-labs/avalanchego/codec"
 	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 )
 
 func TestMessage(t *testing.T) {
 	require := require.New(t)
 
 	unsignedMsg, err := NewUnsignedMessage(
-		ids.GenerateTestID(),
+		constants.UnitTestID,
 		ids.GenerateTestID(),
 		[]byte("payload"),
 	)

vms/platformvm/warp/message_test.go

@@ -37,6 +37,7 @@ type Signature interface {
 	Verify(
 		ctx context.Context,
 		msg *UnsignedMessage,
+		networkID uint32,
 		pChainState validators.State,
 		pChainHeight uint64,
 		quorumNum uint64,
@@ -67,11 +68,16 @@ func (s *BitSetSignature) NumSigners() (int, error) {
 func (s *BitSetSignature) Verify(
 	ctx context.Context,
 	msg *UnsignedMessage,
+	networkID uint32,
 	pChainState validators.State,
 	pChainHeight uint64,
 	quorumNum uint64,
 	quorumDen uint64,
 ) error {
+	if msg.NetworkID != networkID {
+		return errWrongNetworkID
+	}
+
 	subnetID, err := pChainState.GetSubnetID(ctx, msg.SourceChainID)
 	if err != nil {
 		return err