Add hub pool address to config

Author: mpetrun5

app/app.go

@@ -22,6 +22,7 @@ import (
 	"github.com/sprintertech/sprinter-signing/api/handlers"
 	"github.com/sprintertech/sprinter-signing/cache"
 	"github.com/sprintertech/sprinter-signing/chains/evm"
+	"github.com/sprintertech/sprinter-signing/chains/evm/calls/contracts"
 	"github.com/sprintertech/sprinter-signing/chains/evm/calls/events"
 	evmListener "github.com/sprintertech/sprinter-signing/chains/evm/listener"
 	evmMessage "github.com/sprintertech/sprinter-signing/chains/evm/message"
@@ -139,6 +140,7 @@ func Run() error {
 	confirmationsPerChain := make(map[uint64]map[uint64]uint64)
 	domains := make(map[uint64]relayer.RelayedChain)
 
+	var hubPoolContract evmMessage.TokenMatcher
 	acrossPools := make(map[uint64]common.Address)
 	for _, chainConfig := range configuration.ChainConfigs {
 		switch chainConfig["type"] {
@@ -151,6 +153,14 @@ func Run() error {
 					poolAddress := common.HexToAddress(config.AcrossPool)
 					acrossPools[*config.GeneralChainConfig.Id] = poolAddress
 				}
+
+				if config.HubPool != "" {
+					client, err := evmClient.NewEVMClient(config.GeneralChainConfig.Endpoint, nil)
+					panicOnError(err)
+
+					hubPoolAddress := common.HexToAddress(config.HubPool)
+					hubPoolContract = contracts.NewHubPoolContract(client, hubPoolAddress, config.Tokens)
+				}
 			}
 		default:
 			panic(fmt.Errorf("type '%s' not recognized", chainConfig["type"]))
@@ -182,6 +192,7 @@ func Run() error {
 						communication,
 						keyshareStore,
 						priceAPI,
+						hubPoolContract,
 						sigChn,
 						config.Tokens,
 						config.ConfirmationsByValue,

chains/evm/calls/contracts/hubPool.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/sprintertech/sprinter-signing/chains/evm"
 	"github.com/sprintertech/sprinter-signing/chains/evm/calls/consts"
 	"github.com/sygmaprotocol/sygma-core/chains/evm/client"
 	"github.com/sygmaprotocol/sygma-core/chains/evm/contracts"
@@ -17,13 +18,13 @@ import (
 type HubPoolContract struct {
 	contracts.Contract
 	client client.Client
-	tokens map[string]common.Address
+	tokens map[string]evm.TokenConfig
 }
 
 func NewHubPoolContract(
 	client client.Client,
 	address common.Address,
-	l1Tokens map[string]common.Address,
+	l1Tokens map[string]evm.TokenConfig,
 ) *HubPoolContract {
 	return &HubPoolContract{
 		Contract: contracts.NewContract(address, consts.HubPoolABI, nil, client, nil),
@@ -33,12 +34,12 @@ func NewHubPoolContract(
 }
 
 func (c *HubPoolContract) DestinationToken(destinationChainId *big.Int, symbol string) (common.Address, error) {
-	tokenAddress, ok := c.tokens[symbol]
+	tokenConfig, ok := c.tokens[symbol]
 	if !ok {
 		return common.Address{}, fmt.Errorf("no hub pool token configured for symbol %s", symbol)
 	}
 
-	res, err := c.CallContract("poolRebalanceRoute", destinationChainId, tokenAddress)
+	res, err := c.CallContract("poolRebalanceRoute", destinationChainId, tokenConfig.Address)
 	if err != nil {
 		return common.Address{}, err
 	}

chains/evm/config.go

@@ -25,6 +25,7 @@ type EVMConfig struct {
 	GeneralChainConfig chain.GeneralChainConfig
 	Admin              string
 	AcrossPool         string
+	HubPool            string
 	LiqudityPool       string
 	Tokens             map[string]TokenConfig
 	// usd bucket -> confirmations
@@ -38,6 +39,7 @@ type RawEVMConfig struct {
 	Admin                    string                 `mapstructure:"admin"`
 	LiqudityPool             string                 `mapstructure:"liquidityPool"`
 	AcrossPool               string                 `mapstructure:"acrossPool"`
+	HubPool                  string                 `mapstructure:"hubPool"`
 	Tokens                   map[string]interface{} `mapstructure:"tokens"`
 	ConfirmationsByValue     map[string]interface{} `mapstructure:"confirmationsByValue"`
 	BlockInterval            int64                  `mapstructure:"blockInterval" default:"5"`
@@ -111,6 +113,7 @@ func NewEVMConfig(chainConfig map[string]interface{}) (*EVMConfig, error) {
 		Admin:              c.Admin,
 		LiqudityPool:       c.LiqudityPool,
 		AcrossPool:         c.AcrossPool,
+		HubPool:            c.HubPool,
 		// nolint:gosec
 		BlockRetryInterval: time.Duration(c.BlockRetryInterval) * time.Second,
 		BlockInterval:      big.NewInt(c.BlockInterval),

chains/evm/config_test.go

@@ -109,6 +109,7 @@ func (s *NewEVMConfigTestSuite) Test_ValidConfigWithCustomTxParams() {
 		"admin":                 "adminAddress",
 		"liquidityPool":         "pool",
 		"acrossPool":            "acrossPool",
+		"hubPool":               "hubPool",
 		"maxGasPrice":           1000,
 		"gasMultiplier":         1000,
 		"gasIncreasePercentage": 20,
@@ -158,6 +159,7 @@ func (s *NewEVMConfigTestSuite) Test_ValidConfigWithCustomTxParams() {
 		Admin:                "adminAddress",
 		LiqudityPool:         "pool",
 		AcrossPool:           "acrossPool",
+		HubPool:              "hubPool",
 		ConfirmationsByValue: expectedBlockConfirmations,
 		Tokens:               expectedTokens,
 	})

example/cfg/config_evm-evm_1.json

@@ -22,6 +22,7 @@
       "type": "evm",
       "endpoint": "wss://ethereum-sepolia-rpc.publicnode.com",
       "acrossPool": "0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662",
+      "hubPool": "0x14224e63716afAcE30C9a417E0542281869f7d9e",
       "tokens": {
         "USDC": 
         { 

example/cfg/config_evm-evm_2.json

@@ -22,6 +22,7 @@
       "type": "evm",
       "endpoint": "wss://ethereum-sepolia-rpc.publicnode.com",
       "acrossPool": "0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662",
+      "hubPool": "0x14224e63716afAcE30C9a417E0542281869f7d9e",
       "tokens": {
         "USDC": 
         { 

example/cfg/config_evm-evm_3.json

@@ -22,6 +22,7 @@
       "type": "evm",
       "endpoint": "wss://ethereum-sepolia-rpc.publicnode.com",
       "acrossPool": "0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662",
+      "hubPool": "0x14224e63716afAcE30C9a417E0542281869f7d9e",
       "tokens": {
         "USDC": 
         {