feat!: Return prices array along with SuggestedRoutes

services/wallet/responses/router_suggested_routes.go

@@ -9,7 +9,6 @@ type RouterSuggestedRoutes struct {
 	Uuid          string                `json:"Uuid"`
 	Best          routes.Route          `json:"Best,omitempty"`
 	Candidates    routes.Route          `json:"Candidates,omitempty"`
-	TokenPrice            *float64              `json:"TokenPrice,omitempty"`
-	NativeChainTokenPrice *float64              `json:"NativeChainTokenPrice,omitempty"`
+	UpdatedPrices map[string]float64    `json:"UpdatedPrices,omitempty"`
 	ErrorResponse *errors.ErrorResponse `json:"ErrorResponse,omitempty"`
 }

services/wallet/router/router.go

@@ -58,8 +58,7 @@ type SuggestedRoutes struct {
 	Uuid          string
 	Best          routes.Route
 	Candidates    routes.Route
-	TokenPrice            float64
-	NativeChainTokenPrice float64
+	UpdatedPrices map[string]float64
 }
 
 type Router struct {
@@ -128,18 +127,14 @@ func (r *Router) SetTestBalanceMap(balanceMap map[string]*big.Int) {
 }
 
 func newSuggestedRoutes(
-	uuid string,
-	amountIn *big.Int,
+	input *requests.RouteInputParams,
 	candidates routes.Route,
-	fromLockedAmount map[uint64]*hexutil.Big,
-	tokenPrice float64,
-	nativeChainTokenPrice float64,
+	updatedPrices map[string]float64,
 ) (*SuggestedRoutes, []routes.Route) {
 	suggestedRoutes := &SuggestedRoutes{
-		Uuid:                  uuid,
+		Uuid:          input.Uuid,
 		Candidates:    candidates,
-		TokenPrice:            tokenPrice,
-		NativeChainTokenPrice: nativeChainTokenPrice,
+		UpdatedPrices: updatedPrices,
 	}
 	if len(candidates) == 0 {
 		return suggestedRoutes, nil
@@ -147,10 +142,10 @@ func newSuggestedRoutes(
 
 	node := &routes.Node{
 		Path:     nil,
-		Children: routes.BuildGraph(amountIn, candidates, 0, []uint64{}),
+		Children: routes.BuildGraph(input.AmountIn.ToInt(), candidates, 0, []uint64{}),
 	}
 	allRoutes := node.BuildAllRoutes()
-	allRoutes = filterRoutes(allRoutes, amountIn, fromLockedAmount)
+	allRoutes = filterRoutes(allRoutes, input.AmountIn.ToInt(), input.FromLockedAmount)
 
 	if len(allRoutes) > 0 {
 		sort.Slice(allRoutes, func(i, j int) bool {
@@ -176,8 +171,7 @@ func sendRouterResult(uuid string, result interface{}, err error) {
 	if suggestedRoutes, ok := result.(*SuggestedRoutes); ok && suggestedRoutes != nil {
 		routesResponse.Best = suggestedRoutes.Best
 		routesResponse.Candidates = suggestedRoutes.Candidates
-		routesResponse.TokenPrice = &suggestedRoutes.TokenPrice
-		routesResponse.NativeChainTokenPrice = &suggestedRoutes.NativeChainTokenPrice
+		routesResponse.UpdatedPrices = suggestedRoutes.UpdatedPrices
 	}
 
 	signal.SendWalletEvent(signal.SuggestedRoutes, routesResponse)
@@ -851,7 +845,7 @@ func (r *Router) resolveRoutes(ctx context.Context, input *requests.RouteInputPa
 	if input.TestsMode {
 		prices = input.TestParams.TokenPrices
 	} else {
-		prices, err = input.SendType.FetchPrices(r.marketManager, input.TokenID)
+		prices, err = input.SendType.FetchPrices(r.marketManager, []string{input.TokenID, input.ToTokenID})
 		if err != nil {
 			return nil, errors.CreateErrorResponseFromError(err)
 		}
@@ -861,7 +855,7 @@ func (r *Router) resolveRoutes(ctx context.Context, input *requests.RouteInputPa
 	nativeTokenPrice := prices[pathprocessor.EthSymbol]
 
 	var allRoutes []routes.Route
-	suggestedRoutes, allRoutes = newSuggestedRoutes(input.Uuid, input.AmountIn.ToInt(), candidates, input.FromLockedAmount, tokenPrice, nativeTokenPrice)
+	suggestedRoutes, allRoutes = newSuggestedRoutes(input, candidates, prices)
 
 	defer func() {
 		if suggestedRoutes.Best != nil && len(suggestedRoutes.Best) > 0 {

services/wallet/router/sendtype/send_type.go

@@ -2,6 +2,7 @@ package sendtype
 
 import (
 	"math/big"
+	"slices"
 	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -39,8 +40,11 @@ func (s SendType) IsStickersTransfer() bool {
 	return s == StickersBuy
 }
 
-func (s SendType) FetchPrices(marketManager *market.Manager, tokenID string) (map[string]float64, error) {
-	symbols := []string{tokenID, "ETH"}
+func (s SendType) FetchPrices(marketManager *market.Manager, tokenIDs []string) (map[string]float64, error) {
+	nonUniqueSymbols := append(tokenIDs, "ETH")
+	// remove duplicate enteries
+	slices.Sort(nonUniqueSymbols)
+	symbols := slices.Compact(nonUniqueSymbols)
 	if s.IsCollectiblesTransfer() {
 		symbols = []string{"ETH"}
 	}
@@ -54,8 +58,10 @@ func (s SendType) FetchPrices(marketManager *market.Manager, tokenID string) (ma
 		prices[symbol] = pricePerCurrency["USD"]
 	}
 	if s.IsCollectiblesTransfer() {
+		for _, tokenID := range tokenIDs {
 			prices[tokenID] = 0
 		}
+	}
 	return prices, nil
 }