Addressed PR comments - user custom type for resource ID [32]bytes

ChainSafe · Oct 11, 2021 · abd13c8 · abd13c8
1 parent fd01c75
commit abd13c8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/chains/evm/calls/bridge.go b/chains/evm/calls/bridge.go
@@ -53,7 +53,7 @@ func PrepareErc20DepositInput(destDomainID uint8, resourceID types.ResourceID, d
 	return input, nil
 }
 
-func PrepareExecuteProposalInput(sourceDomainID uint8, depositNonce uint64, resourceID [32]byte, calldata []byte, revertOnFail bool) ([]byte, error) {
+func PrepareExecuteProposalInput(sourceDomainID uint8, depositNonce uint64, resourceID types.ResourceID, calldata []byte, revertOnFail bool) ([]byte, error) {
 	a, err := abi.JSON(strings.NewReader(consts.BridgeABI))
 	if err != nil {
 		return []byte{}, err
@@ -65,7 +65,7 @@ func PrepareExecuteProposalInput(sourceDomainID uint8, depositNonce uint64, reso
 	return input, nil
 }
 
-func PrepareVoteProposalInput(sourceDomainID uint8, resourceID [32]byte, calldata []byte) ([]byte, error) {
+func PrepareVoteProposalInput(sourceDomainID uint8, resourceID types.ResourceID, calldata []byte) ([]byte, error) {
 	a, err := abi.JSON(strings.NewReader(consts.BridgeABI))
 	if err != nil {
 		return []byte{}, err
@@ -119,7 +119,7 @@ func ParseIsRelayerOutput(output []byte) (bool, error) {
 	return *b, nil
 }
 
-func Deposit(client ChainClient, fabric TxFabric, bridgeAddress, recipient common.Address, amount *big.Int, resourceID [32]byte, destDomainID uint8) error {
+func Deposit(client ChainClient, fabric TxFabric, bridgeAddress, recipient common.Address, amount *big.Int, resourceID types.ResourceID, destDomainID uint8) error {
 	data := ConstructErc20DepositData(recipient.Bytes(), amount)
 	input, err := PrepareErc20DepositInput(destDomainID, resourceID, data)
 	if err != nil {

diff --git a/chains/evm/listener/listener.go b/chains/evm/listener/listener.go
@@ -31,7 +31,7 @@ type ChainClient interface {
 }
 
 type EventHandler interface {
-	HandleEvent(sourceID, destID uint8, nonce uint64, rID [32]byte) (*relayer.Message, error)
+	HandleEvent(sourceID, destID uint8, nonce uint64, resourceID types.ResourceID) (*relayer.Message, error)
 }
 
 type EVMListener struct {

diff --git a/chains/evm/voter/proposal/proposal.go b/chains/evm/voter/proposal/proposal.go
@@ -1,11 +1,12 @@
 package proposal
 
 import (
+	"github.com/ChainSafe/chainbridge-core/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
-func NewProposal(source uint8, depositNonce uint64, resourceId [32]byte, data []byte, handlerAddress, bridgeAddress common.Address) *Proposal {
+func NewProposal(source uint8, depositNonce uint64, resourceId types.ResourceID, data []byte, handlerAddress, bridgeAddress common.Address) *Proposal {
 	return &Proposal{
 		Source:         source,
 		DepositNonce:   depositNonce,
@@ -19,7 +20,7 @@ func NewProposal(source uint8, depositNonce uint64, resourceId [32]byte, data []
 type Proposal struct {
 	Source         uint8  // Source domainID where message was initiated
 	DepositNonce   uint64 // Nonce for the deposit
-	ResourceId     [32]byte
+	ResourceId     types.ResourceID
 	Payload        []interface{} // data associated with event sequence
 	Data           []byte
 	HandlerAddress common.Address
@@ -29,4 +30,4 @@ type Proposal struct {
 // GetDataHash constructs and returns proposal data hash
 func (p *Proposal) GetDataHash() common.Hash {
 	return crypto.Keccak256Hash(append(p.HandlerAddress.Bytes(), p.Data...))
-}
+}
diff --git a/chains/substrate/listener/handlers.go b/chains/substrate/listener/handlers.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/ChainSafe/chainbridge-core/chains/substrate"
 	"github.com/ChainSafe/chainbridge-core/relayer"
+	"github.com/ChainSafe/chainbridge-core/types"
 )
 
 func FungibleTransferHandler(sourceID uint8, evtI interface{}) (*relayer.Message, error) {
@@ -17,7 +18,7 @@ func FungibleTransferHandler(sourceID uint8, evtI interface{}) (*relayer.Message
 		Source:       sourceID,
 		Destination:  uint8(evt.Destination),
 		DepositNonce: uint64(evt.DepositNonce),
-		ResourceId:   evt.ResourceId,
+		ResourceId:   types.ResourceID(evt.ResourceId),
 		Payload: []interface{}{
 			evt.Amount.Bytes(),
 			[]byte(evt.Recipient),
@@ -35,7 +36,7 @@ func NonFungibleTransferHandler(sourceID uint8, evtI interface{}) (*relayer.Mess
 		Source:       sourceID,
 		Destination:  uint8(evt.Destination),
 		DepositNonce: uint64(evt.DepositNonce),
-		ResourceId:   evt.ResourceId,
+		ResourceId:   types.ResourceID(evt.ResourceId),
 		Payload: []interface{}{
 			[]byte(evt.TokenId),
 			[]byte(evt.Recipient),
@@ -53,7 +54,7 @@ func GenericTransferHandler(sourceID uint8, evtI interface{}) (*relayer.Message,
 		Source:       sourceID,
 		Destination:  uint8(evt.Destination),
 		DepositNonce: uint64(evt.DepositNonce),
-		ResourceId:   evt.ResourceId,
+		ResourceId:   types.ResourceID(evt.ResourceId),
 		Payload: []interface{}{
 			[]byte(evt.Metadata),
 		},

diff --git a/chains/substrate/writer/writer.go b/chains/substrate/writer/writer.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ChainSafe/chainbridge-core/chains/substrate"
 	"github.com/ChainSafe/chainbridge-core/relayer"
+	internalTypes "github.com/ChainSafe/chainbridge-core/types"
 	"github.com/centrifuge/go-substrate-rpc-client/types"
 	"github.com/rs/zerolog/log"
 )
@@ -109,7 +110,7 @@ func (w *SubstrateWriter) proposalValid(prop *SubstrateProposal) (bool, string,
 	}
 }
 
-func (w *SubstrateWriter) createProposal(sourceChain uint8, depositNonce uint64, resourceId [32]byte, args ...interface{}) (*SubstrateProposal, error) {
+func (w *SubstrateWriter) createProposal(sourceChain uint8, depositNonce uint64, resourceId internalTypes.ResourceID, args ...interface{}) (*SubstrateProposal, error) {
 	meta := w.client.GetMetadata()
 	method, err := w.client.ResolveResourceId(resourceId)
 	if err != nil {

diff --git a/relayer/message.go b/relayer/message.go
@@ -6,6 +6,8 @@ package relayer
 import (
 	"errors"
 	"math/big"
+
+	"github.com/ChainSafe/chainbridge-core/types"
 )
 
 type TransferType string
@@ -34,7 +36,7 @@ type Message struct {
 	Source       uint8  // Source where message was initiated
 	Destination  uint8  // Destination chain of message
 	DepositNonce uint64 // Nonce for the deposit
-	ResourceId   [32]byte
+	ResourceId   types.ResourceID
 	Payload      []interface{} // data associated with event sequence
 	Type         TransferType
 }