Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
eda7fdc6
Unverified
Commit
eda7fdc6
authored
Jul 16, 2024
by
Adrian Sutton
Committed by
GitHub
Jul 16, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-challenger: Add a metric to report the number of large preimage proposals (#11154)
parent
66ad3ab5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
2 deletions
+24
-2
scheduler.go
op-challenger/game/keccak/scheduler.go
+8
-0
scheduler_test.go
op-challenger/game/keccak/scheduler_test.go
+2
-1
service.go
op-challenger/game/service.go
+1
-1
metrics.go
op-challenger/metrics/metrics.go
+12
-0
noop.go
op-challenger/metrics/noop.go
+1
-0
No files found.
op-challenger/game/keccak/scheduler.go
View file @
eda7fdc6
...
@@ -21,8 +21,13 @@ type OracleSource interface {
...
@@ -21,8 +21,13 @@ type OracleSource interface {
Oracles
()
[]
keccakTypes
.
LargePreimageOracle
Oracles
()
[]
keccakTypes
.
LargePreimageOracle
}
}
type
Metrics
interface
{
RecordLargePreimageCount
(
count
int
)
}
type
LargePreimageScheduler
struct
{
type
LargePreimageScheduler
struct
{
log
log
.
Logger
log
log
.
Logger
m
Metrics
cl
faultTypes
.
ClockReader
cl
faultTypes
.
ClockReader
ch
chan
common
.
Hash
ch
chan
common
.
Hash
oracles
OracleSource
oracles
OracleSource
...
@@ -33,11 +38,13 @@ type LargePreimageScheduler struct {
...
@@ -33,11 +38,13 @@ type LargePreimageScheduler struct {
func
NewLargePreimageScheduler
(
func
NewLargePreimageScheduler
(
logger
log
.
Logger
,
logger
log
.
Logger
,
m
Metrics
,
cl
faultTypes
.
ClockReader
,
cl
faultTypes
.
ClockReader
,
oracleSource
OracleSource
,
oracleSource
OracleSource
,
challenger
Challenger
)
*
LargePreimageScheduler
{
challenger
Challenger
)
*
LargePreimageScheduler
{
return
&
LargePreimageScheduler
{
return
&
LargePreimageScheduler
{
log
:
logger
,
log
:
logger
,
m
:
m
,
cl
:
cl
,
cl
:
cl
,
ch
:
make
(
chan
common
.
Hash
,
1
),
ch
:
make
(
chan
common
.
Hash
,
1
),
oracles
:
oracleSource
,
oracles
:
oracleSource
,
...
@@ -94,6 +101,7 @@ func (s *LargePreimageScheduler) verifyOraclePreimages(ctx context.Context, orac
...
@@ -94,6 +101,7 @@ func (s *LargePreimageScheduler) verifyOraclePreimages(ctx context.Context, orac
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
s
.
m
.
RecordLargePreimageCount
(
len
(
preimages
))
period
,
err
:=
oracle
.
ChallengePeriod
(
ctx
)
period
,
err
:=
oracle
.
ChallengePeriod
(
ctx
)
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"failed to load challenge period: %w"
,
err
)
return
fmt
.
Errorf
(
"failed to load challenge period: %w"
,
err
)
...
...
op-challenger/game/keccak/scheduler_test.go
View file @
eda7fdc6
...
@@ -9,6 +9,7 @@ import (
...
@@ -9,6 +9,7 @@ import (
"time"
"time"
keccakTypes
"github.com/ethereum-optimism/optimism/op-challenger/game/keccak/types"
keccakTypes
"github.com/ethereum-optimism/optimism/op-challenger/game/keccak/types"
"github.com/ethereum-optimism/optimism/op-challenger/metrics"
"github.com/ethereum-optimism/optimism/op-service/clock"
"github.com/ethereum-optimism/optimism/op-service/clock"
"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum-optimism/optimism/op-service/testlog"
...
@@ -50,7 +51,7 @@ func TestScheduleNextCheck(t *testing.T) {
...
@@ -50,7 +51,7 @@ func TestScheduleNextCheck(t *testing.T) {
}
}
cl
:=
clock
.
NewDeterministicClock
(
time
.
Unix
(
int64
(
currentTimestamp
),
0
))
cl
:=
clock
.
NewDeterministicClock
(
time
.
Unix
(
int64
(
currentTimestamp
),
0
))
challenger
:=
&
stubChallenger
{}
challenger
:=
&
stubChallenger
{}
scheduler
:=
NewLargePreimageScheduler
(
logger
,
cl
,
OracleSourceArray
{
oracle
},
challenger
)
scheduler
:=
NewLargePreimageScheduler
(
logger
,
metrics
.
NoopMetrics
,
cl
,
OracleSourceArray
{
oracle
},
challenger
)
scheduler
.
Start
(
ctx
)
scheduler
.
Start
(
ctx
)
defer
scheduler
.
Close
()
defer
scheduler
.
Close
()
err
:=
scheduler
.
Schedule
(
common
.
Hash
{
0xaa
},
3
)
err
:=
scheduler
.
Schedule
(
common
.
Hash
{
0xaa
},
3
)
...
...
op-challenger/game/service.go
View file @
eda7fdc6
...
@@ -246,7 +246,7 @@ func (s *Service) initLargePreimages() error {
...
@@ -246,7 +246,7 @@ func (s *Service) initLargePreimages() error {
fetcher
:=
fetcher
.
NewPreimageFetcher
(
s
.
logger
,
s
.
l1Client
)
fetcher
:=
fetcher
.
NewPreimageFetcher
(
s
.
logger
,
s
.
l1Client
)
verifier
:=
keccak
.
NewPreimageVerifier
(
s
.
logger
,
fetcher
)
verifier
:=
keccak
.
NewPreimageVerifier
(
s
.
logger
,
fetcher
)
challenger
:=
keccak
.
NewPreimageChallenger
(
s
.
logger
,
s
.
metrics
,
verifier
,
s
.
txSender
)
challenger
:=
keccak
.
NewPreimageChallenger
(
s
.
logger
,
s
.
metrics
,
verifier
,
s
.
txSender
)
s
.
preimages
=
keccak
.
NewLargePreimageScheduler
(
s
.
logger
,
s
.
l1Clock
,
s
.
oracles
,
challenger
)
s
.
preimages
=
keccak
.
NewLargePreimageScheduler
(
s
.
logger
,
s
.
metrics
,
s
.
l1Clock
,
s
.
oracles
,
challenger
)
return
nil
return
nil
}
}
...
...
op-challenger/metrics/metrics.go
View file @
eda7fdc6
...
@@ -53,6 +53,8 @@ type Metricer interface {
...
@@ -53,6 +53,8 @@ type Metricer interface {
RecordGameUpdateScheduled
()
RecordGameUpdateScheduled
()
RecordGameUpdateCompleted
()
RecordGameUpdateCompleted
()
RecordLargePreimageCount
(
count
int
)
IncActiveExecutors
()
IncActiveExecutors
()
DecActiveExecutors
()
DecActiveExecutors
()
IncIdleExecutors
()
IncIdleExecutors
()
...
@@ -81,6 +83,7 @@ type Metrics struct {
...
@@ -81,6 +83,7 @@ type Metrics struct {
preimageChallenged
prometheus
.
Counter
preimageChallenged
prometheus
.
Counter
preimageChallengeFailed
prometheus
.
Counter
preimageChallengeFailed
prometheus
.
Counter
preimageCount
prometheus
.
Gauge
highestActedL1Block
prometheus
.
Gauge
highestActedL1Block
prometheus
.
Gauge
...
@@ -193,6 +196,11 @@ func NewMetrics() *Metrics {
...
@@ -193,6 +196,11 @@ func NewMetrics() *Metrics {
Name
:
"preimage_challenge_failed"
,
Name
:
"preimage_challenge_failed"
,
Help
:
"Number of preimage challenges that failed"
,
Help
:
"Number of preimage challenges that failed"
,
}),
}),
preimageCount
:
factory
.
NewGauge
(
prometheus
.
GaugeOpts
{
Namespace
:
Namespace
,
Name
:
"preimage_count"
,
Help
:
"Number of large preimage proposals being tracked by the challenger"
,
}),
trackedGames
:
*
factory
.
NewGaugeVec
(
prometheus
.
GaugeOpts
{
trackedGames
:
*
factory
.
NewGaugeVec
(
prometheus
.
GaugeOpts
{
Namespace
:
Namespace
,
Namespace
:
Namespace
,
Name
:
"tracked_games"
,
Name
:
"tracked_games"
,
...
@@ -261,6 +269,10 @@ func (m *Metrics) RecordPreimageChallengeFailed() {
...
@@ -261,6 +269,10 @@ func (m *Metrics) RecordPreimageChallengeFailed() {
m
.
preimageChallengeFailed
.
Add
(
1
)
m
.
preimageChallengeFailed
.
Add
(
1
)
}
}
func
(
m
*
Metrics
)
RecordLargePreimageCount
(
count
int
)
{
m
.
preimageCount
.
Set
(
float64
(
count
))
}
func
(
m
*
Metrics
)
RecordBondClaimFailed
()
{
func
(
m
*
Metrics
)
RecordBondClaimFailed
()
{
m
.
bondClaimFailures
.
Add
(
1
)
m
.
bondClaimFailures
.
Add
(
1
)
}
}
...
...
op-challenger/metrics/noop.go
View file @
eda7fdc6
...
@@ -34,6 +34,7 @@ func (*NoopMetricsImpl) RecordActedL1Block(_ uint64) {}
...
@@ -34,6 +34,7 @@ func (*NoopMetricsImpl) RecordActedL1Block(_ uint64) {}
func
(
*
NoopMetricsImpl
)
RecordPreimageChallenged
()
{}
func
(
*
NoopMetricsImpl
)
RecordPreimageChallenged
()
{}
func
(
*
NoopMetricsImpl
)
RecordPreimageChallengeFailed
()
{}
func
(
*
NoopMetricsImpl
)
RecordPreimageChallengeFailed
()
{}
func
(
*
NoopMetricsImpl
)
RecordLargePreimageCount
(
_
int
)
{}
func
(
*
NoopMetricsImpl
)
RecordBondClaimFailed
()
{}
func
(
*
NoopMetricsImpl
)
RecordBondClaimFailed
()
{}
func
(
*
NoopMetricsImpl
)
RecordBondClaimed
(
uint64
)
{}
func
(
*
NoopMetricsImpl
)
RecordBondClaimed
(
uint64
)
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment