go: update to urfave v2, merge endpoint-monitor and op-heartbeat into main go module

endpoint-monitor/Dockerfile

@@ -1,18 +1,28 @@
-FROM golang:1.18.0-alpine3.15 as builder
+FROM golang:1.19.9-alpine3.16 as builder
 
-COPY ./endpoint-monitor /app
-
-WORKDIR /app
 RUN apk --no-cache add make jq bash git alpine-sdk
+
+COPY ./endpoint-monitor /app/endpoint-monitor
+COPY ./op-service /app/op-service
+COPY ./op-node /app/op-node
+COPY ./go.mod /app/go.mod
+COPY ./go.sum /app/go.sum
+
+COPY ./.git /app/.git
+
+WORKDIR /app/endpoint-monitor
+
+RUN go mod download
+
 RUN make build
 
-FROM alpine:3.15
+FROM alpine:3.16
 RUN apk --no-cache add ca-certificates
 
 RUN addgroup -S app && adduser -S app -G app
 USER app
 WORKDIR /app
 
-COPY --from=builder /app/bin/endpoint-monitor /app
+COPY --from=builder /app/endpoint-monitor/bin/endpoint-monitor /app
 
 ENTRYPOINT ["/app/endpoint-monitor"]

endpoint-monitor/README.md

@@ -4,7 +4,7 @@ The endpoint-monitor runs websocket checks on edge-proxyd endpoints and downstre
 
 ## Setup
 
-Install go1.18
+Install go1.19
 
 ```bash
 make build

endpoint-monitor/cmd/main.go

@@ -6,7 +6,7 @@ import (
 
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 
 	endpointMonitor "github.com/ethereum-optimism/optimism/endpoint-monitor"
 )

endpoint-monitor/config.go

@@ -9,7 +9,7 @@ import (
 	opservice "github.com/ethereum-optimism/optimism/op-service"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
 type ProviderConfig struct {
@@ -24,24 +24,27 @@ const (
 )
 
 func CLIFlags(envPrefix string) []cli.Flag {
+	prefixEnvVars := func(name string) []string {
+		return opservice.PrefixEnvVar(envPrefix, name)
+	}
 	flags := []cli.Flag{
-		cli.StringSliceFlag{
+		&cli.StringSliceFlag{
 			Name:     ProvidersFlagName,
 			Usage:    "List of providers",
 			Required: true,
-			EnvVar:   opservice.PrefixEnvVar(envPrefix, "PROVIDERS"),
+			EnvVars:  prefixEnvVars("PROVIDERS"),
 		},
-		cli.DurationFlag{
-			Name:   CheckIntervalFlagName,
-			Usage:  "Check interval duration",
-			Value:  5 * time.Minute,
-			EnvVar: opservice.PrefixEnvVar(envPrefix, "CHECK_INTERVAL"),
+		&cli.DurationFlag{
+			Name:    CheckIntervalFlagName,
+			Usage:   "Check interval duration",
+			Value:   5 * time.Minute,
+			EnvVars: prefixEnvVars("CHECK_INTERVAL"),
 		},
-		cli.DurationFlag{
-			Name:   CheckDurationFlagName,
-			Usage:  "Check duration",
-			Value:  4 * time.Minute,
-			EnvVar: opservice.PrefixEnvVar(envPrefix, "CHECK_DURATION"),
+		&cli.DurationFlag{
+			Name:    CheckDurationFlagName,
+			Usage:   "Check duration",
+			Value:   4 * time.Minute,
+			EnvVars: prefixEnvVars("CHECK_DURATION"),
 		},
 	}
 	flags = append(flags, opmetrics.CLIFlags(envPrefix)...)
@@ -73,9 +76,9 @@ func (c Config) Check() error {
 
 func NewConfig(ctx *cli.Context) Config {
 	return Config{
-		Providers:     ctx.GlobalStringSlice(ProvidersFlagName),
-		CheckInterval: ctx.GlobalDuration(CheckIntervalFlagName),
-		CheckDuration: ctx.GlobalDuration(CheckDurationFlagName),
+		Providers:     ctx.StringSlice(ProvidersFlagName),
+		CheckInterval: ctx.Duration(CheckIntervalFlagName),
+		CheckDuration: ctx.Duration(CheckDurationFlagName),
 		LogConfig:     oplog.ReadCLIConfig(ctx),
 		MetricsConfig: opmetrics.ReadCLIConfig(ctx),
 	}

endpoint-monitor/endpoint_monitor.go

@@ -11,10 +11,10 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 
-	"github.com/ethereum-optimism/optimism/l2geth/core/types"
-	"github.com/ethereum-optimism/optimism/l2geth/ethclient"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient"
 )
 
 var (