Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a param to return only live nonsigners #494

Merged
merged 3 commits into from
Apr 22, 2024
Merged

Add a param to return only live nonsigners #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a3eae3
Add a param to return only live nonsigners
jianoaix Apr 18, 2024
4256d81
make stake_percentage actually a percentage
jianoaix Apr 20, 2024
3469a20
fix
jianoaix Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions disperser/dataapi/docs/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,10 @@ paths:
in: query
name: end
type: string
- description: 'Whether return only live nonsigners [default: true]'
in: query
name: live_only
type: string
produces:
- application/json
responses:
Expand Down
7 changes: 5 additions & 2 deletions disperser/dataapi/nonsigner_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/Layr-Labs/eigenda/core/eth"
)

func (s *server) getOperatorNonsigningRate(ctx context.Context, startTime, endTime int64) (*OperatorsNonsigningPercentage, error) {
func (s *server) getOperatorNonsigningRate(ctx context.Context, startTime, endTime int64, liveOnly bool) (*OperatorsNonsigningPercentage, error) {
batches, err := s.subgraphClient.QueryBatchNonSigningInfoInInterval(ctx, startTime, endTime)
if err != nil {
return nil, err
Expand Down Expand Up @@ -101,6 +101,9 @@ func (s *server) getOperatorNonsigningRate(ctx context.Context, startTime, endTi
if stake, ok := state.Operators[q][opID]; ok {
p, _ := new(big.Int).Div(new(big.Int).Mul(stake.Stake, big.NewInt(multipler)), state.Totals[q].Stake).Float64()
stakePercentage = p / multipler
} else if liveOnly {
// Operator "opID" isn't live at "endBlock", skip it.
continue
}

nonsignerMetric := OperatorNonsigningPercentageMetrics{
Expand All @@ -110,7 +113,7 @@ func (s *server) getOperatorNonsigningRate(ctx context.Context, startTime, endTi
TotalUnsignedBatches: unsignedCount,
TotalBatches: totalCount,
Percentage: pf,
StakePercentage: stakePercentage,
StakePercentage: 100 * stakePercentage,
}
nonsignerMetrics = append(nonsignerMetrics, &nonsignerMetric)
}
Expand Down
32 changes: 21 additions & 11 deletions disperser/dataapi/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,16 +459,17 @@ func (s *server) FetchNonSigners(c *gin.Context) {

// FetchOperatorsNonsigningPercentageHandler godoc
//
// @Summary Fetch operators non signing percentage
// @Tags Metrics
// @Produce json
// @Param interval query int false "Interval to query for operators nonsigning percentage [default: 3600]"
// @Param end query string false "End time (2006-01-02T15:04:05Z) to query for operators nonsigning percentage [default: now]"
// @Success 200 {object} OperatorsNonsigningPercentage
// @Failure 400 {object} ErrorResponse "error: Bad request"
// @Failure 404 {object} ErrorResponse "error: Not found"
// @Failure 500 {object} ErrorResponse "error: Server error"
// @Router /metrics/operator-nonsigning-percentage [get]
// @Summary Fetch operators non signing percentage
// @Tags Metrics
// @Produce json
// @Param interval query int false "Interval to query for operators nonsigning percentage [default: 3600]"
// @Param end query string false "End time (2006-01-02T15:04:05Z) to query for operators nonsigning percentage [default: now]"
// @Param live_only query string false "Whether return only live nonsigners [default: true]"
// @Success 200 {object} OperatorsNonsigningPercentage
// @Failure 400 {object} ErrorResponse "error: Bad request"
// @Failure 404 {object} ErrorResponse "error: Not found"
// @Failure 500 {object} ErrorResponse "error: Server error"
// @Router /metrics/operator-nonsigning-percentage [get]
func (s *server) FetchOperatorsNonsigningPercentageHandler(c *gin.Context) {
timer := prometheus.NewTimer(prometheus.ObserverFunc(func(f float64) {
s.metrics.ObserveLatency("FetchOperatorsNonsigningPercentageHandler", f*1000) // make milliseconds
Expand All @@ -491,9 +492,18 @@ func (s *server) FetchOperatorsNonsigningPercentageHandler(c *gin.Context) {
interval = 3600
}

liveOnly := "true"
if c.Query("live_only") != "" {
liveOnly = c.Query("live_only")
if liveOnly != "true" && liveOnly != "false" {
errorResponse(c, errors.New("the live_only param must be \"true\" or \"false\""))
return
}
}

startTime := endTime.Add(-time.Duration(interval) * time.Second)

metric, err := s.getOperatorNonsigningRate(c.Request.Context(), startTime.Unix(), endTime.Unix())
metric, err := s.getOperatorNonsigningRate(c.Request.Context(), startTime.Unix(), endTime.Unix(), liveOnly == "true")
if err != nil {
s.metrics.IncrementFailedRequestNum("FetchOperatorsNonsigningPercentageHandler")
errorResponse(c, err)
Expand Down
4 changes: 2 additions & 2 deletions disperser/dataapi/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ func TestFetchUnsignedBatchesHandler(t *testing.T) {
assert.Equal(t, uint8(0), responseData.QuorumId)
assert.Equal(t, float64(100), responseData.Percentage)
assert.Equal(t, "0xe22dae12a0074f20b8fc96a0489376db34075e545ef60c4845d264a732568311", operatorId)
assert.Equal(t, float64(0.5), responseData.StakePercentage)
assert.Equal(t, float64(50), responseData.StakePercentage)

responseData = response.Data[1]
operatorId = responseData.OperatorId
Expand All @@ -379,7 +379,7 @@ func TestFetchUnsignedBatchesHandler(t *testing.T) {
assert.Equal(t, uint8(1), responseData.QuorumId)
assert.Equal(t, float64(100), responseData.Percentage)
assert.Equal(t, "0xe22dae12a0074f20b8fc96a0489376db34075e545ef60c4845d264a732568311", operatorId)
assert.Equal(t, float64(0.25), responseData.StakePercentage)
assert.Equal(t, float64(25), responseData.StakePercentage)
}

func TestCheckBatcherHealthExpectServing(t *testing.T) {
Expand Down
Loading