feat(eventindexer): Track transition proved / contested event by tier…

…s, generate chart data for each tier, update http API to be able to fetch data by tier (#15458)

packages/eventindexer/chart.go

@@ -18,5 +18,6 @@ type ChartRepository interface {
 		start string,
 		end string,
 		feeTokenAddress string,
+		tier string,
 	) (*ChartResponse, error)
 }

packages/eventindexer/event.go

@@ -44,6 +44,7 @@ type Event struct {
 	ContractAddress string              `json:"contractAddress"`
 	FeeTokenAddress string              `json:"feeTokenAddress"`
 	TransactedAt    time.Time           `json:"transactedAt"`
+	Tier            sql.NullInt16       `json:"tier"`
 }
 
 // SaveEventOpts
@@ -63,6 +64,7 @@ type SaveEventOpts struct {
 	ContractAddress *string
 	FeeTokenAddress *string
 	TransactedAt    time.Time
+	Tier            *uint16
 }
 
 type UniqueProversResponse struct {

packages/eventindexer/generator/generator.go

@@ -193,6 +193,216 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 	var err error
 
 	switch task {
+	case tasks.TotalTransitionProvedByTier:
+		var tiers []uint16 = make([]uint16, 0)
+
+		query := "SELECT DISTINCT(tier) FROM events WHERE name = ?"
+
+		err = g.db.GormDB().
+			Raw(query, eventindexer.EventNameTransitionProved).
+			Scan(&tiers).Error
+		if err != nil {
+			return err
+		}
+
+		slog.Info("tiers", "tiers", tiers)
+
+		for _, tier := range tiers {
+			t := tier
+
+			var dailyCountByTier decimal.NullDecimal
+
+			// nolint: lll
+			query := "SELECT COUNT(*) FROM events WHERE event = ? AND DATE(transacted_at) = ? AND tier = ?"
+			err = g.db.GormDB().
+				Raw(query, eventindexer.EventNameTransitionProved, dateString, t).
+				Scan(&dailyCountByTier).Error
+
+			if err != nil {
+				return err
+			}
+
+			tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, &t)
+			if err != nil {
+				return err
+			}
+
+			result := tsdResult.Decimal.Add(dailyCountByTier.Decimal)
+
+			slog.Info("Query successful",
+				"task", task,
+				"date", dateString,
+				"result", result.String(),
+				"tier", t,
+			)
+
+			insertStmt := `
+		INSERT INTO time_series_data(task, value, date, tier)
+		VALUES (?, ?, ?, ?)`
+
+			err = g.db.GormDB().Exec(insertStmt, task, result, dateString, t).Error
+			if err != nil {
+				slog.Info("Insert failed", "task", task, "date", dateString, "error", err.Error())
+				return err
+			}
+		}
+
+		// return early for array processing data
+		return nil
+	case tasks.TransitionProvedByTierPerDay:
+		var tiers []uint16 = make([]uint16, 0)
+
+		query := "SELECT DISTINCT(tier) FROM events WHERE name = ?"
+
+		err = g.db.GormDB().
+			Raw(query, eventindexer.EventNameTransitionProved).
+			Scan(&tiers).Error
+		if err != nil {
+			return err
+		}
+
+		slog.Info("tiers", "tiers", tiers)
+
+		for _, tier := range tiers {
+			t := tier
+
+			var dailyCountByTier decimal.NullDecimal
+
+			// nolint: lll
+			query := "SELECT COUNT(*) FROM events WHERE event = ? AND DATE(transacted_at) = ? AND tier = ?"
+			err = g.db.GormDB().
+				Raw(query, eventindexer.EventNameTransitionProved, dateString, t).
+				Scan(&dailyCountByTier).Error
+
+			if err != nil {
+				return err
+			}
+
+			slog.Info("Query successful",
+				"task", task,
+				"date", dateString,
+				"result", result.String(),
+				"tier", t,
+			)
+
+			insertStmt := `
+		INSERT INTO time_series_data(task, value, date, tier)
+		VALUES (?, ?, ?, ?)`
+
+			err = g.db.GormDB().Exec(insertStmt, task, result, dateString, t).Error
+			if err != nil {
+				slog.Info("Insert failed", "task", task, "date", dateString, "error", err.Error())
+				return err
+			}
+		}
+
+		// return early for array processing data
+		return nil
+	case tasks.TransitionContestedByTierPerDay:
+		var tiers []uint16 = make([]uint16, 0)
+
+		query := "SELECT DISTINCT(tier) FROM events WHERE name = ?"
+
+		err = g.db.GormDB().
+			Raw(query, eventindexer.EventNameTransitionContested).
+			Scan(&tiers).Error
+		if err != nil {
+			return err
+		}
+
+		slog.Info("tiers", "tiers", tiers)
+
+		for _, tier := range tiers {
+			t := tier
+
+			var dailyCountByTier decimal.NullDecimal
+
+			// nolint: lll
+			query := "SELECT COUNT(*) FROM events WHERE event = ? AND DATE(transacted_at) = ? AND tier = ?"
+			err = g.db.GormDB().
+				Raw(query, eventindexer.EventNameTransitionContested, dateString, t).
+				Scan(&dailyCountByTier).Error
+
+			if err != nil {
+				return err
+			}
+
+			slog.Info("Query successful",
+				"task", task,
+				"date", dateString,
+				"result", result.String(),
+				"tier", t,
+			)
+
+			insertStmt := `
+		INSERT INTO time_series_data(task, value, date, tier)
+		VALUES (?, ?, ?, ?)`
+
+			err = g.db.GormDB().Exec(insertStmt, task, result, dateString, t).Error
+			if err != nil {
+				slog.Info("Insert failed", "task", task, "date", dateString, "error", err.Error())
+				return err
+			}
+		}
+
+		// return early for array processing data
+		return nil
+	case tasks.TotalTransitionContestedByTier:
+		var tiers []uint16 = make([]uint16, 0)
+
+		query := "SELECT DISTINCT(tier) FROM events WHERE name = ?"
+
+		err = g.db.GormDB().
+			Raw(query, eventindexer.EventNameTransitionContested).
+			Scan(&tiers).Error
+		if err != nil {
+			return err
+		}
+
+		slog.Info("tiers", "tiers", tiers)
+
+		for _, tier := range tiers {
+			t := tier
+
+			var dailyCountByTier decimal.NullDecimal
+
+			// nolint: lll
+			query := "SELECT COUNT(*) FROM events WHERE event = ? AND DATE(transacted_at) = ? AND tier = ?"
+			err = g.db.GormDB().
+				Raw(query, eventindexer.EventNameTransitionContested, dateString, t).
+				Scan(&dailyCountByTier).Error
+
+			if err != nil {
+				return err
+			}
+
+			tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, &t)
+			if err != nil {
+				return err
+			}
+
+			result := tsdResult.Decimal.Add(dailyCountByTier.Decimal)
+
+			slog.Info("Query successful",
+				"task", task,
+				"date", dateString,
+				"result", result.String(),
+				"tier", t,
+			)
+
+			insertStmt := `
+		INSERT INTO time_series_data(task, value, date, tier)
+		VALUES (?, ?, ?, ?)`
+
+			err = g.db.GormDB().Exec(insertStmt, task, result, dateString, t).Error
+			if err != nil {
+				slog.Info("Insert failed", "task", task, "date", dateString, "error", err.Error())
+				return err
+			}
+		}
+
+		// return early for array processing data
+		return nil
 	case tasks.TotalProofRewards:
 		var feeTokenAddresses []string = make([]string, 0)
 		// get unique fee token addresses
@@ -222,7 +432,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 				return err
 			}
 
-			tsdResult, err := g.previousDayTsdResultByTask(task, date, &f)
+			tsdResult, err := g.previousDayTsdResultByTask(task, date, &f, nil)
 			if err != nil {
 				return err
 			}
@@ -307,7 +517,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 			return err
 		}
 
-		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil)
+		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, nil)
 		if err != nil {
 			return err
 		}
@@ -323,7 +533,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 			return err
 		}
 
-		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil)
+		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, nil)
 		if err != nil {
 			return err
 		}
@@ -378,7 +588,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 			return err
 		}
 
-		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil)
+		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, nil)
 		if err != nil {
 			return err
 		}
@@ -403,7 +613,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 			return err
 		}
 
-		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil)
+		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, nil)
 		if err != nil {
 			return err
 		}
@@ -422,7 +632,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 			return err
 		}
 
-		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil)
+		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, nil)
 		if err != nil {
 			return err
 		}
@@ -441,7 +651,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 			return err
 		}
 
-		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil)
+		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, nil)
 		if err != nil {
 			return err
 		}
@@ -462,7 +672,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 			return err
 		}
 
-		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil)
+		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, nil)
 		if err != nil {
 			return err
 		}
@@ -482,7 +692,7 @@ func (g *Generator) queryByTask(task string, date time.Time) error {
 			return err
 		}
 
-		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil)
+		tsdResult, err := g.previousDayTsdResultByTask(task, date, nil, nil)
 		if err != nil {
 			return err
 		}
@@ -517,6 +727,7 @@ func (g *Generator) previousDayTsdResultByTask(
 	task string,
 	date time.Time,
 	feeTokenAddress *string,
+	tier *uint16,
 ) (decimal.NullDecimal, error) {
 	var tsdResult decimal.NullDecimal
 
@@ -531,6 +742,12 @@ func (g *Generator) previousDayTsdResultByTask(
 			Raw(tsdQuery, task, date.AddDate(0, 0, -1).Format("2006-01-02"), *feeTokenAddress)
 	}
 
+	if tier != nil {
+		tsdQuery = `SELECT value FROM time_series_data WHERE task = ? AND date = ? AND tier = ?`
+		q = g.db.GormDB().
+			Raw(tsdQuery, task, date.AddDate(0, 0, -1).Format("2006-01-02"), *tier)
+	}
+
 	err := q.
 		Scan(&tsdResult).Error
 	if err != nil {

packages/eventindexer/http/get_chart_by_task.go

@@ -21,7 +21,7 @@ import (
 //			@Success		200	{object} eventindexer.ChartResponse
 //			@Router			/chartByTask [get]
 func (srv *Server) GetChartByTask(c echo.Context) error {
-	cached, found := srv.cache.Get(c.QueryParam("task") + c.QueryParam("fee_token_address"))
+	cached, found := srv.cache.Get(c.QueryParam("task") + c.QueryParam("fee_token_address") + c.QueryParam("tier"))
 
 	var chart *eventindexer.ChartResponse
 
@@ -36,12 +36,17 @@ func (srv *Server) GetChartByTask(c echo.Context) error {
 			c.QueryParam("start"),
 			c.QueryParam("end"),
 			c.QueryParam("fee_token_address"),
+			c.QueryParam("tier"),
 		)
 		if err != nil {
 			return webutils.LogAndRenderErrors(c, http.StatusUnprocessableEntity, err)
 		}
 
-		srv.cache.Set(c.QueryParam("task")+c.QueryParam("fee_token_address"), chart, cache.DefaultExpiration)
+		srv.cache.Set(
+			c.QueryParam("task")+c.QueryParam("fee_token_address")+c.QueryParam("tier"),
+			chart,
+			cache.DefaultExpiration,
+		)
 	}
 
 	return c.JSON(http.StatusOK, chart)

packages/eventindexer/indexer/save_transition_proved_event.go

@@ -77,6 +77,7 @@ func (indxr *Indexer) saveTransitionProvedEvent(
 		Address:      event.Prover.Hex(),
 		BlockID:      &blockID,
 		TransactedAt: time.Unix(int64(block.Time()), 0),
+		Tier:         &event.Tier,
 	})
 	if err != nil {
 		return errors.Wrap(err, "indxr.eventRepo.Save")

packages/eventindexer/migrations/20330906208839_alter_events_table_add_tier.sql

@@ -0,0 +1,10 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE events
+ADD COLUMN tier int DEFAULT NULL;
+
+-- +goose StatementEnd
+-- +goose Down
+-- +goose StatementBegin
+DROP TABLE tier;
+-- +goose StatementEnd

packages/eventindexer/migrations/20330906208840_alter_time_series_data_table_add_tier.sql

@@ -0,0 +1,10 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE time_series_data
+ADD COLUMN tier int DEFAULT NULL;
+
+-- +goose StatementEnd
+-- +goose Down
+-- +goose StatementBegin
+DROP TABLE tier;
+-- +goose StatementEnd