fix: match signature with on-chain one (#26)

* feat: use nonce from api request

* Update codeowners

* Improve logs

* Fix missing bracket

* Lint

* fix: match signature with on-chain one

* Rename variable

Author: mpetrun5

app/app.go

@@ -138,6 +138,25 @@ func Run() error {
 	supportedChains := make(map[uint64]struct{})
 	confirmationsPerChain := make(map[uint64]map[uint64]uint64)
 	domains := make(map[uint64]relayer.RelayedChain)
+
+	acrossPools := make(map[uint64]common.Address)
+	for _, chainConfig := range configuration.ChainConfigs {
+		switch chainConfig["type"] {
+		case "evm":
+			{
+				config, err := evm.NewEVMConfig(chainConfig)
+				panicOnError(err)
+
+				if config.AcrossPool != "" {
+					poolAddress := common.HexToAddress(config.AcrossPool)
+					acrossPools[*config.GeneralChainConfig.Id] = poolAddress
+				}
+			}
+		default:
+			panic(fmt.Errorf("type '%s' not recognized", chainConfig["type"]))
+		}
+	}
+
 	for _, chainConfig := range configuration.ChainConfigs {
 		switch chainConfig["type"] {
 		case "evm":
@@ -154,11 +173,10 @@ func Run() error {
 
 				mh := message.NewMessageHandler()
 				if config.AcrossPool != "" {
-					poolAddress := common.HexToAddress(config.AcrossPool)
 					acrossMh := evmMessage.NewAcrossMessageHandler(
 						*config.GeneralChainConfig.Id,
 						client,
-						poolAddress,
+						acrossPools,
 						coordinator,
 						host,
 						communication,

chains/evm/calls/events/events.go

@@ -83,5 +83,6 @@ func (a *AcrossV3RelayData) Calldata(repaymentChainID *big.Int, repaymentAddress
 	if err != nil {
 		return []byte{}, err
 	}
+
 	return input, nil
 }

chains/evm/message/across.go

@@ -3,12 +3,13 @@ package message
 import (
 	"context"
 	"fmt"
+	"maps"
 	"math/big"
+	"slices"
 	"time"
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -79,7 +80,7 @@ type AcrossMessageHandler struct {
 	confirmations map[uint64]uint64
 	blocktime     time.Duration
 	tokenPricer   TokenPricer
-	pool          common.Address
+	pools         map[uint64]common.Address
 
 	coordinator Coordinator
 	host        host.Host
@@ -92,7 +93,7 @@ type AcrossMessageHandler struct {
 func NewAcrossMessageHandler(
 	chainID uint64,
 	client EventFilterer,
-	pool common.Address,
+	pools map[uint64]common.Address,
 	coordinator Coordinator,
 	host host.Host,
 	comm comm.Communication,
@@ -106,7 +107,7 @@ func NewAcrossMessageHandler(
 	return &AcrossMessageHandler{
 		chainID:       chainID,
 		client:        client,
-		pool:          pool,
+		pools:         pools,
 		coordinator:   coordinator,
 		host:          host,
 		comm:          comm,
@@ -241,18 +242,21 @@ func (h *AcrossMessageHandler) minimalConfirmations(d *events.AcrossDeposit) (ui
 		return 0, err
 	}
 
-	orderValue, _ := new(big.Float).Quo(
+	orderValueInt := new(big.Int)
+	orderValueInt, _ = new(big.Float).Quo(
 		new(big.Float).Mul(big.NewFloat(price), new(big.Float).SetInt(d.InputAmount)),
 		new(big.Float).SetInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(c.Decimals)), nil)),
-	).Float64()
+	).Int(orderValueInt)
 
-	for bucket, confirmation := range h.confirmations {
-		if uint64(orderValue) < bucket {
-			return confirmation, nil
+	buckets := slices.Collect(maps.Keys(h.confirmations))
+	slices.Sort(buckets)
+	for _, bucket := range buckets {
+		if orderValueInt.Cmp(new(big.Int).SetUint64(bucket)) < 0 {
+			return h.confirmations[bucket], nil
 		}
 	}
 
-	return 0, fmt.Errorf("order value %f exceeds confirmation buckets", orderValue)
+	return 0, fmt.Errorf("order value %f exceeds confirmation buckets", orderValueInt)
 }
 
 func (h *AcrossMessageHandler) waitForConfirmations(
@@ -319,7 +323,7 @@ func (h *AcrossMessageHandler) deposit(depositId *big.Int) (common.Hash, *events
 		ToBlock:   latestBlock,
 		FromBlock: new(big.Int).Sub(latestBlock, big.NewInt(BLOCK_RANGE)),
 		Addresses: []common.Address{
-			h.pool,
+			h.pools[h.chainID],
 		},
 		Topics: [][]common.Hash{
 			{
@@ -374,7 +378,7 @@ func (h *AcrossMessageHandler) unlockHash(
 ) ([]byte, error) {
 	calldata, err := deposit.ToV3RelayData(
 		new(big.Int).SetUint64(sourceChainId),
-	).Calldata(deposit.DestinationChainId, data.LiquidityPool)
+	).Calldata(deposit.DestinationChainId, data.Caller)
 	if err != nil {
 		return []byte{}, err
 	}
@@ -383,8 +387,8 @@ func (h *AcrossMessageHandler) unlockHash(
 		"caller":         data.Caller.Hex(),
 		"borrowToken":    common.BytesToAddress(deposit.OutputToken[12:]).Hex(),
 		"amount":         deposit.OutputAmount,
-		"target":         common.BytesToAddress(deposit.Recipient[12:]).Hex(),
-		"targetCallData": hexutil.Encode(calldata),
+		"target":         h.pools[deposit.DestinationChainId.Uint64()].Hex(),
+		"targetCallData": calldata,
 		"nonce":          data.Nonce,
 		"deadline":       new(big.Int).SetUint64(uint64(deposit.FillDeadline)),
 	}

chains/evm/message/across_test.go

@@ -61,7 +61,8 @@ func (s *AcrossMessageHandlerTestSuite) SetupTest() {
 
 	s.mockPricer = mock_message.NewMockTokenPricer(ctrl)
 
-	pool := common.HexToAddress("0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5")
+	pools := make(map[uint64]common.Address)
+	pools[2] = common.HexToAddress("0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5")
 
 	s.sigChn = make(chan interface{}, 1)
 
@@ -79,7 +80,7 @@ func (s *AcrossMessageHandlerTestSuite) SetupTest() {
 	s.handler = message.NewAcrossMessageHandler(
 		1,
 		s.mockEventFilterer,
-		pool,
+		pools,
 		s.mockCoordinator,
 		s.mockHost,
 		s.mockCommunication,

tss/ecdsa/signing/signing.go

@@ -207,6 +207,7 @@ func (s *Signing) processEndMessage(ctx context.Context, endChn chan tssCommon.S
 				es = append(es[:], ethCommon.LeftPadBytes(sig.R, 32)...)
 				es = append(es[:], ethCommon.LeftPadBytes(sig.S, 32)...)
 				es = append(es[:], sig.SignatureRecovery...)
+				es[len(es)-1] += 27 // Transform V from 0/1 to 27/28
 
 				s.resultChn <- EcdsaSignature{
 					Signature: es,