Merge branch 'feat/shared-solver-config' into feat/mayan-message-handling

Author: mpetrun5

app/app.go

@@ -175,8 +175,8 @@ func Run() error {
 					hubPoolContract = contracts.NewHubPoolContract(client, hubPoolAddress, c.Tokens)
 				}
 
-				if c.LiqudityPool != "" {
-					lpAddress := common.HexToAddress(c.LiqudityPool)
+				if c.LiquidityPool != "" {
+					lpAddress := common.HexToAddress(c.LiquidityPool)
 					liquidityPools[*c.GeneralChainConfig.Id] = lpAddress
 				}
 

chains/evm/config.go

@@ -23,7 +23,7 @@ type EVMConfig struct {
 	AcrossPool         string
 	HubPool            string
 	MayanSwift         string
-	LiqudityPool       string
+	LiquidityPool      string
 	Tokens             map[string]config.TokenConfig
 	// usd bucket -> confirmations
 	ConfirmationsByValue map[uint64]uint64
@@ -34,7 +34,7 @@ type EVMConfig struct {
 type RawEVMConfig struct {
 	chain.GeneralChainConfig `mapstructure:",squash"`
 	Admin                    string                 `mapstructure:"admin"`
-	LiqudityPool             string                 `mapstructure:"liquidityPool"`
+	LiquidityPool            string                 `mapstructure:"liquidityPool"`
 	AcrossPool               string                 `mapstructure:"acrossPool"`
 	MayanSwift               string                 `mapstructure:"mayanSwift"`
 	HubPool                  string                 `mapstructure:"hubPool"`
@@ -109,7 +109,7 @@ func NewEVMConfig(chainConfig map[string]interface{}) (*EVMConfig, error) {
 	config := &EVMConfig{
 		GeneralChainConfig: c.GeneralChainConfig,
 		Admin:              c.Admin,
-		LiqudityPool:       c.LiqudityPool,
+		LiquidityPool:      c.LiquidityPool,
 		AcrossPool:         c.AcrossPool,
 		HubPool:            c.HubPool,
 		MayanSwift:         c.MayanSwift,

chains/evm/message/mayan.go

@@ -43,7 +43,7 @@ type MayanMessageHandler struct {
 	chainID uint64
 
 	mayanPools          map[uint64]common.Address
-	liqudityPools       map[uint64]common.Address
+	liquidityPools      map[uint64]common.Address
 	confirmationWatcher ConfirmationWatcher
 	tokenStore          config.TokenStore
 	mayanDecoder        MayanContract
@@ -60,7 +60,7 @@ type MayanMessageHandler struct {
 func NewMayanMessageHandler(
 	chainID uint64,
 	client EventFilterer,
-	liqudityPools map[uint64]common.Address,
+	liquidityPools map[uint64]common.Address,
 	mayanPools map[uint64]common.Address,
 	coordinator Coordinator,
 	host host.Host,
@@ -76,7 +76,7 @@ func NewMayanMessageHandler(
 		chainID:             chainID,
 		client:              client,
 		mayanPools:          mayanPools,
-		liqudityPools:       liqudityPools,
+		liquidityPools:      liquidityPools,
 		coordinator:         coordinator,
 		host:                host,
 		comm:                comm,
@@ -118,14 +118,16 @@ func (h *MayanMessageHandler) HandleMessage(m *message.Message) (*proposal.Propo
 		return nil, err
 	}
 
-	symbol, token, err := h.tokenStore.ConfigByAddress(h.chainID, common.BytesToAddress(msg.TokenIn[12:]))
+	tokenIn := common.BytesToAddress(msg.TokenIn[12:])
+	symbol, token, err := h.tokenStore.ConfigByAddress(h.chainID, tokenIn)
 	if err != nil {
 		data.ErrChn <- err
 		return nil, err
 	}
 
 	destChainId, err := mayan.WormholeToEVMChainID(msg.DestChainId)
 	if err != nil {
+		data.ErrChn <- err
 		return nil, err
 	}
 	destinationBorrowToken, err := h.tokenStore.ConfigBySymbol(destChainId, symbol)
@@ -150,7 +152,7 @@ func (h *MayanMessageHandler) HandleMessage(m *message.Message) (*proposal.Propo
 		context.Background(),
 		h.chainID,
 		txHash,
-		common.BytesToAddress(msg.TokenIn[12:]),
+		tokenIn,
 		new(big.Int).SetUint64(msg.PromisedAmount))
 	if err != nil {
 		data.ErrChn <- err
@@ -240,8 +242,6 @@ func (h *MayanMessageHandler) verifyOrder(
 		return err
 	}
 
-	fmt.Printf("%+v", msg)
-
 	denormalizedAmountIn := contracts.DenormalizeAmount(new(big.Int).SetUint64(order.AmountIn), tc.Decimals)
 	if data.BorrowAmount.Cmp(denormalizedAmountIn) != -1 {
 		return fmt.Errorf("requested borrow amount more than input amount")
@@ -263,7 +263,7 @@ func (h *MayanMessageHandler) verifyOrder(
 		return fmt.Errorf("invalid order status %d", order.Status)
 	}
 
-	srcLiquidityPool, ok := h.liqudityPools[h.chainID]
+	srcLiquidityPool, ok := h.liquidityPools[h.chainID]
 	if !ok {
 		return fmt.Errorf("no source liqudity recipient configured")
 	}

protocol/mayan/api.go

@@ -39,16 +39,15 @@ func NewMayanExplorer() *MayanExplorer {
 }
 
 func (c *MayanExplorer) GetSwap(hash string) (*MayanSwap, error) {
-	fullURL := fmt.Sprintf("%s/v3/swap/trx/%s", MAYAN_EXPLORER_URL, hash)
-
-	resp, err := c.HTTPClient.Get(fullURL)
+	url := fmt.Sprintf("%s/v3/swap/trx/%s", MAYAN_EXPLORER_URL, hash)
+	resp, err := c.HTTPClient.Get(url)
 	if err != nil {
 		return nil, fmt.Errorf("request failed: %w", err)
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
+		return nil, fmt.Errorf("unexpected status code: %d, %s", resp.StatusCode, url)
 	}
 
 	body, err := io.ReadAll(resp.Body)
@@ -57,7 +56,7 @@ func (c *MayanExplorer) GetSwap(hash string) (*MayanSwap, error) {
 	}
 
 	var s *MayanSwap
-	if err := json.Unmarshal(body, &s); err != nil {
+	if err := json.Unmarshal(body, s); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal JSON: %w", err)
 	}