Update warp message format

contracts/contracts/IWarpMessenger.sol

@@ -7,17 +7,17 @@ pragma solidity ^0.8.0;
 
 struct WarpMessage {
     bytes32 originChainID;
-    bytes32 originSenderAddress;
+    address originSenderAddress;
     bytes32 destinationChainID;
-    bytes32 destinationAddress;
+    address destinationAddress;
     bytes payload;
 }
 
 interface WarpMessenger {
     event SendWarpMessage(
         bytes32 indexed destinationChainID,
-        bytes32 indexed destinationAddress,
-        bytes32 indexed sender,
+        address indexed destinationAddress,
+        address indexed sender,
         bytes message
     );
 
@@ -30,7 +30,7 @@ interface WarpMessenger {
     // it is willing to sign for an off-chain relayer to aggregate Warp signatures.
     function sendWarpMessage(
         bytes32 destinationChainID,
-        bytes32 destinationAddress,
+        address destinationAddress,
         bytes calldata payload
     ) external;
 

plugin/evm/vm_warp_test.go

@@ -57,7 +57,7 @@ func TestSendWarpMessage(t *testing.T) {
 
 	warpSendMessageInput, err := warp.PackSendWarpMessage(warp.SendWarpMessageInput{
 		DestinationChainID: common.Hash(vm.ctx.CChainID),
-		DestinationAddress: testEthAddrs[1].Hash(),
+		DestinationAddress: testEthAddrs[1],
 		Payload:            payload,
 	})
 	require.NoError(err)
@@ -143,9 +143,9 @@ func TestReceiveWarpMessage(t *testing.T) {
 	payload := utils.RandomBytes(100)
 
 	addressedPayload, err := warpPayload.NewAddressedPayload(
-		ids.ID(testEthAddrs[0].Hash()),
-		vm.ctx.CChainID,
-		ids.ID(testEthAddrs[1].Hash()),
+		testEthAddrs[0],
+		common.Hash(vm.ctx.CChainID),
+		testEthAddrs[1],
 		payload,
 	)
 	require.NoError(err)
@@ -236,9 +236,9 @@ func TestReceiveWarpMessage(t *testing.T) {
 	expectedOutput, err := warp.PackGetVerifiedWarpMessageOutput(warp.GetVerifiedWarpMessageOutput{
 		Message: warp.WarpMessage{
 			OriginChainID:       common.Hash(vm.ctx.ChainID),
-			OriginSenderAddress: testEthAddrs[0].Hash(),
+			OriginSenderAddress: testEthAddrs[0],
 			DestinationChainID:  common.Hash(vm.ctx.CChainID),
-			DestinationAddress:  testEthAddrs[1].Hash(),
+			DestinationAddress:  testEthAddrs[1],
 			Payload:             payload,
 		},
 		Exists: true,

tests/warp/warp_test.go

@@ -179,7 +179,7 @@ var _ = ginkgo.Describe("[Warp]", ginkgo.Ordered, func() {
 
 		packedInput, err := warp.PackSendWarpMessage(warp.SendWarpMessageInput{
 			DestinationChainID: common.Hash(blockchainIDB),
-			DestinationAddress: fundedAddress.Hash(),
+			DestinationAddress: fundedAddress,
 			Payload:            payload,
 		})
 		gomega.Expect(err).Should(gomega.BeNil())

warp/payload/payload.go

@@ -6,22 +6,22 @@ package payload
 import (
 	"fmt"
 
-	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 // AddressedPayload defines the format for delivering a point to point message across VMs
 // ie. (ChainA, AddressA) -> (ChainB, AddressB)
 type AddressedPayload struct {
-	SourceAddress      ids.ID `serialize:"true"`
-	DestinationChainID ids.ID `serialize:"true"`
-	DestinationAddress ids.ID `serialize:"true"`
-	Payload            []byte `serialize:"true"`
+	SourceAddress      common.Address `serialize:"true"`
+	DestinationChainID common.Hash    `serialize:"true"`
+	DestinationAddress common.Address `serialize:"true"`
+	Payload            []byte         `serialize:"true"`
 
 	bytes []byte
 }
 
 // NewAddressedPayload creates a new *AddressedPayload and initializes it.
-func NewAddressedPayload(sourceAddress ids.ID, destinationChainID ids.ID, destinationAddress ids.ID, payload []byte) (*AddressedPayload, error) {
+func NewAddressedPayload(sourceAddress common.Address, destinationChainID common.Hash, destinationAddress common.Address, payload []byte) (*AddressedPayload, error) {
 	ap := &AddressedPayload{
 		SourceAddress:      sourceAddress,
 		DestinationChainID: destinationChainID,

warp/payload/payload_test.go

@@ -9,16 +9,17 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 )
 
 func TestAddressedPayload(t *testing.T) {
 	require := require.New(t)
 
 	addressedPayload, err := NewAddressedPayload(
-		ids.GenerateTestID(),
-		ids.GenerateTestID(),
-		ids.GenerateTestID(),
+		common.Address(ids.GenerateTestShortID()),
+		common.Hash(ids.GenerateTestID()),
+		common.Address(ids.GenerateTestShortID()),
 		[]byte("payload"),
 	)
 	require.NoError(err)
@@ -35,11 +36,11 @@ func TestParseAddressedPayloadJunk(t *testing.T) {
 }
 
 func TestParseAddressedPayload(t *testing.T) {
-	base64Payload := "AAAAAAAAAQIDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBQYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcICQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwoLDA=="
+	base64Payload := "AAAAAAAAAQIDAAAAAAAAAAAAAAAAAAAAAAAEBQYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcICQAAAAAAAAAAAAAAAAAAAAAAAAAAAwoLDA=="
 	payload := &AddressedPayload{
-		SourceAddress:      ids.ID{1, 2, 3},
-		DestinationChainID: ids.ID{4, 5, 6},
-		DestinationAddress: ids.ID{7, 8, 9},
+		SourceAddress:      common.Address{1, 2, 3},
+		DestinationChainID: common.Hash{4, 5, 6},
+		DestinationAddress: common.Address{7, 8, 9},
 		Payload:            []byte{10, 11, 12},
 	}
 

x/warp/contract.abi

@@ -10,15 +10,15 @@
       },
       {
         "indexed": true,
-        "internalType": "bytes32",
+        "internalType": "address",
         "name": "destinationAddress",
-        "type": "bytes32"
+        "type": "address"
       },
       {
         "indexed": true,
-        "internalType": "bytes32",
+        "internalType": "address",
         "name": "sender",
-        "type": "bytes32"
+        "type": "address"
       },
       {
         "indexed": false,
@@ -55,19 +55,19 @@
             "type": "bytes32"
           },
           {
-            "internalType": "bytes32",
+            "internalType": "address",
             "name": "originSenderAddress",
-            "type": "bytes32"
+            "type": "address"
           },
           {
             "internalType": "bytes32",
             "name": "destinationChainID",
             "type": "bytes32"
           },
           {
-            "internalType": "bytes32",
+            "internalType": "address",
             "name": "destinationAddress",
-            "type": "bytes32"
+            "type": "address"
           },
           {
             "internalType": "bytes",
@@ -96,9 +96,9 @@
         "type": "bytes32"
       },
       {
-        "internalType": "bytes32",
+        "internalType": "address",
         "name": "destinationAddress",
-        "type": "bytes32"
+        "type": "address"
       },
       {
         "internalType": "bytes",

x/warp/contract.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/vms/platformvm/warp"
 	"github.com/ava-labs/subnet-evm/params"
 	"github.com/ava-labs/subnet-evm/precompile/contract"
@@ -57,9 +56,9 @@ var (
 // WarpMessage is an auto generated low-level Go binding around an user-defined struct.
 type WarpMessage struct {
 	OriginChainID       common.Hash
-	OriginSenderAddress common.Hash
+	OriginSenderAddress common.Address
 	DestinationChainID  common.Hash
-	DestinationAddress  common.Hash
+	DestinationAddress  common.Address
 	Payload             []byte
 }
 
@@ -70,7 +69,7 @@ type GetVerifiedWarpMessageOutput struct {
 
 type SendWarpMessageInput struct {
 	DestinationChainID common.Hash
-	DestinationAddress common.Hash
+	DestinationAddress common.Address
 	Payload            []byte
 }
 
@@ -162,9 +161,9 @@ func getVerifiedWarpMessage(accessibleState contract.AccessibleState, caller com
 	packedOutput, err := PackGetVerifiedWarpMessageOutput(GetVerifiedWarpMessageOutput{
 		Message: WarpMessage{
 			OriginChainID:       common.Hash(warpMessage.SourceChainID),
-			OriginSenderAddress: common.Hash(addressedPayload.SourceAddress),
-			DestinationChainID:  common.Hash(addressedPayload.DestinationChainID),
-			DestinationAddress:  common.Hash(addressedPayload.DestinationAddress),
+			OriginSenderAddress: addressedPayload.SourceAddress,
+			DestinationChainID:  addressedPayload.DestinationChainID,
+			DestinationAddress:  addressedPayload.DestinationAddress,
 			Payload:             addressedPayload.Payload,
 		},
 		Exists: true,
@@ -218,15 +217,15 @@ func sendWarpMessage(accessibleState contract.AccessibleState, caller common.Add
 	var (
 		sourceChainID      = accessibleState.GetSnowContext().ChainID
 		destinationChainID = inputStruct.DestinationChainID
-		sourceAddress      = caller.Hash()
+		sourceAddress      = caller
 		destinationAddress = inputStruct.DestinationAddress
 		payload            = inputStruct.Payload
 	)
 
 	addressedPayload, err := warpPayload.NewAddressedPayload(
-		ids.ID(sourceAddress),
-		ids.ID(destinationChainID),
-		ids.ID(destinationAddress),
+		sourceAddress,
+		destinationChainID,
+		destinationAddress,
 		payload,
 	)
 	if err != nil {
@@ -247,8 +246,8 @@ func sendWarpMessage(accessibleState contract.AccessibleState, caller common.Add
 		[]common.Hash{
 			WarpABI.Events["SendWarpMessage"].ID,
 			destinationChainID,
-			destinationAddress,
-			sourceAddress,
+			destinationAddress.Hash(),
+			sourceAddress.Hash(),
 		},
 		unsignedWarpMessage.Bytes(),
 		accessibleState.GetBlockContext().Number().Uint64(),

x/warp/contract_test.go

@@ -89,7 +89,7 @@ func TestSendWarpMessage(t *testing.T) {
 
 	sendWarpMessageInput, err := PackSendWarpMessage(SendWarpMessageInput{
 		DestinationChainID: common.Hash(destinationChainID),
-		DestinationAddress: receiverAddr.Hash(),
+		DestinationAddress: receiverAddr,
 		Payload:            sendWarpMessagePayload,
 	})
 	require.NoError(t, err)
@@ -143,8 +143,8 @@ func TestSendWarpMessage(t *testing.T) {
 
 				// require.Equal(t, unsignedWarpMsg.DestinationChainID, destinationChainID)
 				require.Equal(t, unsignedWarpMsg.SourceChainID, blockchainID)
-				require.Equal(t, addressedPayload.DestinationAddress, ids.ID(receiverAddr.Hash()))
-				require.Equal(t, addressedPayload.SourceAddress, ids.ID(callerAddr.Hash()))
+				require.Equal(t, addressedPayload.DestinationAddress, receiverAddr)
+				require.Equal(t, addressedPayload.SourceAddress, callerAddr)
 				require.Equal(t, addressedPayload.Payload, sendWarpMessagePayload)
 			},
 		},
@@ -161,9 +161,9 @@ func TestGetVerifiedWarpMessage(t *testing.T) {
 	sourceChainID := ids.GenerateTestID()
 	packagedPayloadBytes := []byte("mcsorley")
 	addressedPayload, err := warpPayload.NewAddressedPayload(
-		ids.ID(sourceAddress.Hash()),
-		destinationChainID,
-		ids.ID(destinationAddress.Hash()),
+		sourceAddress,
+		common.Hash(destinationChainID),
+		destinationAddress,
 		packagedPayloadBytes,
 	)
 	require.NoError(t, err)
@@ -188,9 +188,9 @@ func TestGetVerifiedWarpMessage(t *testing.T) {
 				res, err := PackGetVerifiedWarpMessageOutput(GetVerifiedWarpMessageOutput{
 					Message: WarpMessage{
 						OriginChainID:       common.Hash(sourceChainID),
-						OriginSenderAddress: sourceAddress.Hash(),
+						OriginSenderAddress: sourceAddress,
 						DestinationChainID:  common.Hash(destinationChainID),
-						DestinationAddress:  destinationAddress.Hash(),
+						DestinationAddress:  destinationAddress,
 						Payload:             packagedPayloadBytes,
 					},
 					Exists: true,
@@ -226,9 +226,9 @@ func TestGetVerifiedWarpMessage(t *testing.T) {
 				res, err := PackGetVerifiedWarpMessageOutput(GetVerifiedWarpMessageOutput{
 					Message: WarpMessage{
 						OriginChainID:       common.Hash(sourceChainID),
-						OriginSenderAddress: sourceAddress.Hash(),
+						OriginSenderAddress: sourceAddress,
 						DestinationChainID:  common.Hash(destinationChainID),
-						DestinationAddress:  destinationAddress.Hash(),
+						DestinationAddress:  destinationAddress,
 						Payload:             packagedPayloadBytes,
 					},
 					Exists: true,

x/warp/predicate_test.go

@@ -23,6 +23,7 @@ import (
 	subnetEVMUtils "github.com/ava-labs/subnet-evm/utils"
 	predicateutils "github.com/ava-labs/subnet-evm/utils/predicate"
 	warpPayload "github.com/ava-labs/subnet-evm/warp/payload"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )
@@ -80,7 +81,12 @@ func init() {
 	}
 
 	var err error
-	addressedPayload, err = warpPayload.NewAddressedPayload(ids.GenerateTestID(), destinationChainID, ids.GenerateTestID(), []byte{1, 2, 3})
+	addressedPayload, err = warpPayload.NewAddressedPayload(
+		common.Address(ids.GenerateTestShortID()),
+		common.Hash(destinationChainID),
+		common.Address(ids.GenerateTestShortID()),
+		[]byte{1, 2, 3},
+	)
 	if err != nil {
 		panic(err)
 	}