feat: use repayer addresses on across (#67)

Author: mpetrun5

app/app.go

@@ -230,6 +230,7 @@ func Run() error {
 					acrossMh := evmMessage.NewAcrossMessageHandler(
 						*c.GeneralChainConfig.Id,
 						acrossPools,
+						repayerAddresses,
 						coordinator,
 						host,
 						communication,

chains/evm/message/across.go

@@ -52,6 +52,7 @@ type AcrossMessageHandler struct {
 	chainID uint64
 
 	pools               map[uint64]common.Address
+	repayers            map[uint64]common.Address
 	confirmationWatcher ConfirmationWatcher
 	depositFetcher      DepositFetcher
 
@@ -66,6 +67,7 @@ type AcrossMessageHandler struct {
 func NewAcrossMessageHandler(
 	chainID uint64,
 	pools map[uint64]common.Address,
+	repayers map[uint64]common.Address,
 	coordinator Coordinator,
 	host host.Host,
 	comm comm.Communication,
@@ -77,6 +79,7 @@ func NewAcrossMessageHandler(
 	return &AcrossMessageHandler{
 		chainID:             chainID,
 		pools:               pools,
+		repayers:            repayers,
 		coordinator:         coordinator,
 		host:                host,
 		comm:                comm,
@@ -96,6 +99,13 @@ func (h *AcrossMessageHandler) HandleMessage(m *message.Message) (*proposal.Prop
 	log.Info().Str("depositId", data.DepositId.String()).Msgf("Handling across message %+v", data)
 
 	sourceChainID := h.chainID
+	repaymentAddress, ok := h.repayers[data.RepaymentChainID]
+	if !ok {
+		err := fmt.Errorf("invalid repayment chain %d", data.RepaymentChainID)
+		data.ErrChn <- err
+		return nil, err
+	}
+
 	err := h.notify(data)
 	if err != nil {
 		log.Warn().Msgf("Failed to notify relayers because of %s", err)
@@ -121,7 +131,7 @@ func (h *AcrossMessageHandler) HandleMessage(m *message.Message) (*proposal.Prop
 
 	calldata, err := d.ToV3RelayData(
 		new(big.Int).SetUint64(sourceChainID),
-	).Calldata(d.DestinationChainId, data.LiquidityPool)
+	).Calldata(new(big.Int).SetUint64(data.RepaymentChainID), repaymentAddress)
 	if err != nil {
 		return nil, err
 	}

chains/evm/message/across_test.go

@@ -71,6 +71,9 @@ func (s *AcrossMessageHandlerTestSuite) SetupTest() {
 	pools := make(map[uint64]common.Address)
 	pools[2] = common.HexToAddress("0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5")
 
+	repayers := make(map[uint64]common.Address)
+	repayers[10] = common.HexToAddress("0x5c7BCd6E7De5423a257D81B442095A1a6ced35C6")
+
 	s.sigChn = make(chan interface{}, 1)
 
 	// Ethereum: 0x93a9d5e32f5c81cbd17ceb842edc65002e3a79da4efbdc9f1e1f7e97fbcd669b
@@ -83,6 +86,7 @@ func (s *AcrossMessageHandlerTestSuite) SetupTest() {
 	s.handler = message.NewAcrossMessageHandler(
 		1,
 		pools,
+		repayers,
 		s.mockCoordinator,
 		s.mockHost,
 		s.mockCommunication,
@@ -93,6 +97,31 @@ func (s *AcrossMessageHandlerTestSuite) SetupTest() {
 	)
 }
 
+func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_InvalidRepaymentAddress() {
+	errChn := make(chan error, 1)
+	ad := &message.AcrossData{
+		ErrChn:           errChn,
+		DepositId:        big.NewInt(100),
+		Nonce:            big.NewInt(101),
+		LiquidityPool:    common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
+		Caller:           common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
+		RepaymentChainID: 11,
+	}
+	m := &coreMessage.Message{
+		Data:        ad,
+		Source:      1,
+		Destination: 2,
+	}
+
+	prop, err := s.handler.HandleMessage(m)
+
+	s.Nil(prop)
+	s.NotNil(err)
+
+	err = <-errChn
+	s.NotNil(err)
+}
+
 func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_FailedDepositQuery() {
 	s.mockCommunication.EXPECT().Broadcast(
 		gomock.Any(),
@@ -106,11 +135,12 @@ func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_FailedDepositQuery()
 
 	errChn := make(chan error, 1)
 	ad := &message.AcrossData{
-		ErrChn:        errChn,
-		DepositId:     big.NewInt(100),
-		Nonce:         big.NewInt(101),
-		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
-		Caller:        common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
+		ErrChn:           errChn,
+		DepositId:        big.NewInt(100),
+		Nonce:            big.NewInt(101),
+		LiquidityPool:    common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
+		Caller:           common.HexToAddress("0xde526bA5d1ad94cC59D7A79d99A59F607d31A657"),
+		RepaymentChainID: 10,
 	}
 	m := &coreMessage.Message{
 		Data:        ad,
@@ -162,11 +192,12 @@ func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_ValidDeposit() {
 
 	errChn := make(chan error, 1)
 	ad := &message.AcrossData{
-		ErrChn:        errChn,
-		DepositId:     big.NewInt(2595221),
-		Nonce:         big.NewInt(101),
-		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
-		Caller:        common.HexToAddress("0x5ECF7351930e4A251193aA022Ef06249C6cBfa27"),
+		ErrChn:           errChn,
+		DepositId:        big.NewInt(2595221),
+		Nonce:            big.NewInt(101),
+		LiquidityPool:    common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
+		Caller:           common.HexToAddress("0x5ECF7351930e4A251193aA022Ef06249C6cBfa27"),
+		RepaymentChainID: 10,
 	}
 	m := &coreMessage.Message{
 		Data:        ad,

chains/evm/message/message.go

@@ -26,14 +26,15 @@ const (
 type AcrossData struct {
 	ErrChn chan error `json:"-"`
 
-	DepositTxHash common.Hash
-	DepositId     *big.Int
-	Nonce         *big.Int
-	LiquidityPool common.Address
-	Caller        common.Address
-	Coordinator   peer.ID
-	Source        uint64
-	Destination   uint64
+	DepositTxHash    common.Hash
+	DepositId        *big.Int
+	Nonce            *big.Int
+	LiquidityPool    common.Address
+	RepaymentChainID uint64
+	Caller           common.Address
+	Coordinator      peer.ID
+	Source           uint64
+	Destination      uint64
 }
 
 func NewAcrossMessage(source, destination uint64, acrossData *AcrossData) *message.Message {