add_BEP20_HOGL

.gitignore

@@ -3,6 +3,7 @@
 /watchmarket.exe
 /bin/*
 *-bin
+__debug_bin
 
 ### APP ###
 *.csv

api/api.go

@@ -56,4 +56,5 @@ func SetupTickersAPI(engine *gin.Engine, tickers controllers.TickersController,
 
 func SetupRatesAPI(engine *gin.Engine, rates controllers.RatesController) {
 	engine.GET("/v1/market/rate", endpoint.GetRate(rates))
+	engine.GET("/v1/fiat_rates", endpoint.GetFiatRates(rates))
 }

api/api_test.go

@@ -49,15 +49,15 @@ func TestSetupTickersAPI(t *testing.T) {
 				Price: watchmarket.Price{
 					Change24h: 2,
 					Currency:  "",
-					Provider:  "coinmarketcap",
+					Provider:  watchmarket.CoinMarketCap,
 					Value:     1,
 				},
 			},
 		},
 	}
 	wantedTickersV2 := controllers.TickerResponseV2{
 		Currency: "USD",
-		Tickers:  []controllers.TickerPrice{{Change24h: 2, Provider: "coinmarketcap", Price: 1, ID: "c60_ta"}},
+		Tickers:  []controllers.TickerPrice{{Change24h: 2, Provider: watchmarket.CoinMarketCap, Price: 1, ID: "c60_ta"}},
 	}
 
 	SetupTickersAPI(e, getTickersMock(wantedTickers, wantedTickersV2, nil), time.Minute)
@@ -72,7 +72,7 @@ func TestSetupTickersAPI(t *testing.T) {
 
 	cr1 := controllers.TickerRequest{
 		Currency: "USD",
-		Assets:   []controllers.Coin{{Coin: 60, TokenId: "a"}},
+		Assets:   []controllers.Asset{{CoinId: 60, TokenId: "a"}},
 	}
 
 	rawcr1, err := json.Marshal(&cr1)
@@ -87,7 +87,7 @@ func TestSetupTickersAPI(t *testing.T) {
 	assert.Equal(t, "a", givenV1Resp.Tickers[0].TokenId)
 	assert.Equal(t, float64(1), givenV1Resp.Tickers[0].Price.Value)
 	assert.Equal(t, float64(2), givenV1Resp.Tickers[0].Price.Change24h)
-	assert.Equal(t, "coinmarketcap", givenV1Resp.Tickers[0].Price.Provider)
+	assert.Equal(t, watchmarket.CoinMarketCap, givenV1Resp.Tickers[0].Price.Provider)
 
 	givenV2Resp := controllers.TickerResponseV2{}
 
@@ -107,7 +107,7 @@ func TestSetupTickersAPI(t *testing.T) {
 	assert.Equal(t, "c60_ta", givenV2Resp.Tickers[0].ID)
 	assert.Equal(t, float64(1), givenV2Resp.Tickers[0].Price)
 	assert.Equal(t, float64(2), givenV2Resp.Tickers[0].Change24h)
-	assert.Equal(t, "coinmarketcap", givenV2Resp.Tickers[0].Provider)
+	assert.Equal(t, watchmarket.CoinMarketCap, givenV2Resp.Tickers[0].Provider)
 
 	resp3, err := http.Get(server.URL + "/v2/market/ticker/c60_ta")
 	assert.Nil(t, err)
@@ -123,7 +123,7 @@ func TestSetupTickersAPI(t *testing.T) {
 	assert.Equal(t, "c60_ta", givenV2Resp2.Tickers[0].ID)
 	assert.Equal(t, float64(1), givenV2Resp2.Tickers[0].Price)
 	assert.Equal(t, float64(2), givenV2Resp2.Tickers[0].Change24h)
-	assert.Equal(t, "coinmarketcap", givenV2Resp2.Tickers[0].Provider)
+	assert.Equal(t, watchmarket.CoinMarketCap, givenV2Resp2.Tickers[0].Provider)
 
 	resp4, err := http.Get(server.URL + "/v2/market/tickers/c60_ta")
 	assert.Nil(t, err)
@@ -139,15 +139,15 @@ func TestSetupTickersAPI(t *testing.T) {
 	assert.Equal(t, "c60_ta", givenV2Resp3.Tickers[0].ID)
 	assert.Equal(t, float64(1), givenV2Resp3.Tickers[0].Price)
 	assert.Equal(t, float64(2), givenV2Resp3.Tickers[0].Change24h)
-	assert.Equal(t, "coinmarketcap", givenV2Resp3.Tickers[0].Provider)
+	assert.Equal(t, watchmarket.CoinMarketCap, givenV2Resp3.Tickers[0].Provider)
 }
 
 func TestSetupChartsAPI(t *testing.T) {
 	e := setupEngine()
 	server := httptest.NewServer(e)
 	defer server.Close()
 	wantedCharts := watchmarket.Chart{
-		Provider: "coinmarketcap",
+		Provider: watchmarket.CoinMarketCap,
 		Prices:   []watchmarket.ChartPrice{{Price: 10, Date: 10}},
 	}
 	SetupChartsAPI(e, getChartsMock(wantedCharts, nil), time.Minute)
@@ -191,7 +191,7 @@ func TestSetupInfoAPI(t *testing.T) {
 	server := httptest.NewServer(e)
 	defer server.Close()
 	wantedInfo := controllers.InfoResponse{
-		Provider: "coinmarketcap",
+		Provider: watchmarket.CoinMarketCap,
 		Info: &watchmarket.Info{
 			Name:             "a",
 			Website:          "b",
@@ -309,12 +309,8 @@ func (c infoControllerMock) HandleInfoRequest(dr controllers.DetailsRequest) (co
 	return c.wantedInfo, c.wantedError
 }
 
-func (c tickersControllerMock) HandleTickersRequestV2(tr controllers.TickerRequestV2) (controllers.TickerResponseV2, error) {
-	return c.wantedTickersV2, c.wantedError
-}
-
-func (c tickersControllerMock) HandleTickersRequest(tr controllers.TickerRequest) (controllers.TickerResponse, error) {
-	return c.wantedTickersV1, c.wantedError
+func (c tickersControllerMock) HandleTickersRequest(tr controllers.TickerRequest) (watchmarket.Tickers, error) {
+	return c.wantedTickersV1.Tickers, c.wantedError
 }
 
 func setupEngine() *gin.Engine {

api/endpoint/charts.go

@@ -1,13 +1,11 @@
 package endpoint
 
 import (
-	"net/http"
-	"strconv"
-
 	"github.com/gin-gonic/gin"
 	"github.com/trustwallet/golibs/asset"
-	"github.com/trustwallet/watchmarket/pkg/watchmarket"
+	"github.com/trustwallet/golibs/coin"
 	"github.com/trustwallet/watchmarket/services/controllers"
+	"net/http"
 )
 
 // @Summary Get charts data for a specific coin
@@ -25,12 +23,20 @@ import (
 // @Router /v1/market/charts [get]
 func GetChartsHandler(controller controllers.ChartsController) func(c *gin.Context) {
 	return func(c *gin.Context) {
+		coinId, err := controllers.GetCoinId(c.Query("coin"))
+		if err != nil {
+			code, response := createErrorResponseAndStatusCode(err)
+			c.AbortWithStatusJSON(code, response)
+			return
+		}
 		request := controllers.ChartRequest{
-			CoinQuery:    c.Query("coin"),
-			Token:        c.Query("token"),
-			Currency:     c.DefaultQuery("currency", watchmarket.DefaultCurrency),
-			TimeStartRaw: c.Query("time_start"),
-			MaxItems:     c.Query("max_items"),
+			Asset: controllers.Asset{
+				CoinId:  coinId,
+				TokenId: c.Query("token"),
+			},
+			Currency:  controllers.GetCurrency(c.Query("currency")),
+			TimeStart: controllers.GetTimeStart(c.Query("time_start")),
+			MaxItems:  controllers.GetMaxItems(c.Query("max_items")),
 		}
 
 		response, err := controller.HandleChartsRequest(request)
@@ -58,19 +64,25 @@ func GetChartsHandler(controller controllers.ChartsController) func(c *gin.Conte
 // @Router /v2/market/charts/{id} [get]
 func GetChartsHandlerV2(controller controllers.ChartsController) func(c *gin.Context) {
 	return func(c *gin.Context) {
-		coin, token, err := asset.ParseID(c.Param("id"))
+		coinId, tokenId, err := asset.ParseID(c.Param("id"))
 		if err != nil {
 			code, response := createErrorResponseAndStatusCode(err)
 			c.AbortWithStatusJSON(code, response)
 			return
 		}
-
+		if _, ok := coin.Coins[coinId]; !ok {
+			code, response := createErrorResponseAndStatusCode(err)
+			c.AbortWithStatusJSON(code, response)
+			return
+		}
 		request := controllers.ChartRequest{
-			CoinQuery:    strconv.Itoa(int(coin)),
-			Token:        token,
-			Currency:     c.DefaultQuery("currency", watchmarket.DefaultCurrency),
-			TimeStartRaw: c.Query("time_start"),
-			MaxItems:     c.Query("max_items"),
+			Asset: controllers.Asset{
+				CoinId:  coinId,
+				TokenId: tokenId,
+			},
+			Currency:  controllers.GetCurrency(c.Query("currency")),
+			TimeStart: controllers.GetTimeStart(c.Query("time_start")),
+			MaxItems:  controllers.GetMaxItems(c.Query("max_items")),
 		}
 
 		response, err := controller.HandleChartsRequest(request)

api/endpoint/info.go

@@ -1,13 +1,12 @@
 package endpoint
 
 import (
-	"net/http"
-	"strconv"
-
 	"github.com/gin-gonic/gin"
 	"github.com/trustwallet/golibs/asset"
+	"github.com/trustwallet/golibs/coin"
 	"github.com/trustwallet/watchmarket/pkg/watchmarket"
 	"github.com/trustwallet/watchmarket/services/controllers"
+	"net/http"
 )
 
 // @Summary Get charts coin assets data for a specific coin
@@ -23,10 +22,18 @@ import (
 // @Router /v1/market/info [get]
 func GetCoinInfoHandler(controller controllers.InfoController) func(c *gin.Context) {
 	return func(c *gin.Context) {
+		coinId, err := controllers.GetCoinId(c.Query("coin"))
+		if err != nil {
+			code, response := createErrorResponseAndStatusCode(err)
+			c.AbortWithStatusJSON(code, response)
+			return
+		}
 		request := controllers.DetailsRequest{
-			CoinQuery: c.Query("coin"),
-			Token:     c.Query("token"),
-			Currency:  c.DefaultQuery("currency", watchmarket.DefaultCurrency),
+			Asset: controllers.Asset{
+				CoinId:  coinId,
+				TokenId: c.Query("token"),
+			},
+			Currency: controllers.GetCurrency(c.Query("currency")),
 		}
 		response, err := controller.HandleInfoRequest(request)
 		if err != nil {
@@ -51,17 +58,23 @@ func GetCoinInfoHandler(controller controllers.InfoController) func(c *gin.Conte
 // @Router /v2/market/info/{id} [get]
 func GetCoinInfoHandlerV2(controller controllers.InfoController) func(c *gin.Context) {
 	return func(c *gin.Context) {
-		coin, token, err := asset.ParseID(c.Param("id"))
+		coinId, token, err := asset.ParseID(c.Param("id"))
 		if err != nil {
 			code, response := createErrorResponseAndStatusCode(err)
 			c.AbortWithStatusJSON(code, response)
 			return
 		}
-
+		if _, ok := coin.Coins[coinId]; !ok {
+			code, response := createErrorResponseAndStatusCode(err)
+			c.AbortWithStatusJSON(code, response)
+			return
+		}
 		request := controllers.DetailsRequest{
-			CoinQuery: strconv.Itoa(int(coin)),
-			Token:     token,
-			Currency:  c.DefaultQuery("currency", watchmarket.DefaultCurrency),
+			Asset: controllers.Asset{
+				CoinId:  coinId,
+				TokenId: token,
+			},
+			Currency: c.DefaultQuery("currency", watchmarket.DefaultCurrency),
 		}
 		response, err := controller.HandleInfoRequest(request)
 		if err != nil {

api/endpoint/rates.go

@@ -20,7 +20,7 @@ import (
 // @Param amount query string false "Amount" default(100)
 // @Success 200 {object} controllers.RateResponse
 // @Router /v1/market/rate [get]
-func GetRate(controller controllers.RatesController) func(c *gin.Context) {
+func GetRate(controller controllers.RatesController) func(context *gin.Context) {
 	return func(c *gin.Context) {
 		from := c.DefaultQuery("from", watchmarket.DefaultCurrency)
 		to := c.Query("to")
@@ -42,3 +42,22 @@ func GetRate(controller controllers.RatesController) func(c *gin.Context) {
 		c.JSON(http.StatusOK, response)
 	}
 }
+
+// @Summary Get Fiat Rates
+// @Description Get Fiat Rates
+// @Accept json
+// @Produce json
+// @Tags Rates
+// @Success 200 {object} controllers.FiatRates
+// @Router /v1/fiat_rates [get]
+func GetFiatRates(controller controllers.RatesController) func(context *gin.Context) {
+	return func(context *gin.Context) {
+		rates, err := controller.GetFiatRates()
+		if err != nil {
+			code, response := createErrorResponseAndStatusCode(err)
+			context.AbortWithStatusJSON(code, response)
+			return
+		}
+		context.JSON(http.StatusOK, rates)
+	}
+}