Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions op-monitorism/cmd/monitorism/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/ethereum-optimism/monitorism/op-monitorism/secrets"
"github.com/ethereum-optimism/monitorism/op-monitorism/transaction_monitor"
"github.com/ethereum-optimism/monitorism/op-monitorism/withdrawals"
withdrawalsv2 "github.com/ethereum-optimism/monitorism/op-monitorism/withdrawals-v2"
"github.com/ethereum-optimism/optimism/op-service/cliapp"
oplog "github.com/ethereum-optimism/optimism/op-service/log"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
Expand Down Expand Up @@ -57,6 +58,13 @@ func newCli(GitCommit string, GitDate string) *cli.App {
Flags: append(withdrawals.CLIFlags("WITHDRAWAL_MON"), defaultFlags...),
Action: cliapp.LifecycleCmd(WithdrawalsMain),
},
{
Name: "withdrawals-v2",
Usage: "Monitors proven withdrawals (OptimismPortal2) on L1 against L2",
Description: "Monitors proven withdrawals (OptimismPortal2) on L1 against L2",
Flags: append(withdrawalsv2.CLIFlags("WITHDRAWALS_V2_MON"), defaultFlags...),
Action: cliapp.LifecycleCmd(WithdrawalsV2Main),
},
{
Name: "balances",
Usage: "Monitors account balances",
Expand Down Expand Up @@ -204,6 +212,22 @@ func WithdrawalsMain(ctx *cli.Context, closeApp context.CancelCauseFunc) (cliapp
return monitorism.NewCliApp(ctx, log, metricsRegistry, monitor)
}

func WithdrawalsV2Main(ctx *cli.Context, closeApp context.CancelCauseFunc) (cliapp.Lifecycle, error) {
log := oplog.NewLogger(oplog.AppOut(ctx), oplog.ReadCLIConfig(ctx))
cfg, err := withdrawalsv2.ReadCLIFlags(ctx)
if err != nil {
return nil, fmt.Errorf("failed to parse withdrawals-v2 config from flags: %w", err)
}

metricsRegistry := opmetrics.NewRegistry()
monitor, err := withdrawalsv2.NewMonitor(ctx.Context, log, opmetrics.With(metricsRegistry), cfg)
if err != nil {
return nil, fmt.Errorf("failed to create withdrawals-v2 monitor: %w", err)
}

return monitorism.NewCliApp(ctx, log, metricsRegistry, monitor)
}

func FaultproofWithdrawalsMain(ctx *cli.Context, closeApp context.CancelCauseFunc) (cliapp.Lifecycle, error) {
log := oplog.NewLogger(oplog.AppOut(ctx), oplog.ReadCLIConfig(ctx))
cfg, err := faultproof_withdrawals.ReadCLIFlags(ctx)
Expand Down
1 change: 1 addition & 0 deletions op-monitorism/conservation_monitor/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ func NewMonitor(ctx context.Context, log log.Logger, m metrics.Factory, cfg CLIC
cfg.NodeUrl,
nil,
mon.processBlock,
nil,
&processor.Config{
StartBlock: big.NewInt(int64(cfg.StartBlock)),
Interval: cfg.PollingInterval,
Expand Down
3 changes: 2 additions & 1 deletion op-monitorism/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ require (
github.com/prometheus/client_model v0.6.1
github.com/stretchr/testify v1.10.0
github.com/urfave/cli/v2 v2.27.5
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
gopkg.in/yaml.v3 v3.0.1
)

Expand Down Expand Up @@ -66,6 +67,7 @@ require (
github.com/rivo/uniseg v0.4.7 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/supranational/blst v0.3.14 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
Expand All @@ -74,7 +76,6 @@ require (
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
Expand Down
Loading