From 3f3b7931b0375533bf5352835cba94a65025d662 Mon Sep 17 00:00:00 2001 From: Sam Calder-Mason Date: Thu, 15 Dec 2022 14:42:02 +1000 Subject: [PATCH] feat(consensus): Bump ethpandaops/beacon to v0.14.0 --- go.mod | 2 +- go.sum | 4 ++-- pkg/exporter/exporter.go | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index d4d46d4..5ad2338 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.17 require ( github.com/ethereum/go-ethereum v1.10.17 + github.com/ethpandaops/beacon v0.14.0 github.com/onrik/ethrpc v1.0.0 github.com/prometheus/client_golang v1.13.0 - github.com/samcm/beacon v0.12.0 github.com/sirupsen/logrus v1.9.0 github.com/spf13/cobra v1.4.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index e5affa8..9de46fe 100644 --- a/go.sum +++ b/go.sum @@ -130,6 +130,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.10.17 h1:XEcumY+qSr1cZQaWsQs5Kck3FHB0V2RiMHPdTBJ+oT8= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= +github.com/ethpandaops/beacon v0.14.0 h1:JSh3r0Z55UDP3sl95g72YOxwjAr4nnCTf9jElJ10MBw= +github.com/ethpandaops/beacon v0.14.0/go.mod h1:fkS2U962xdB6+VwBn+J+DMK8cTgTtzVtjZWtvTKjbuE= github.com/ethpandaops/ethwallclock v0.2.0 h1:EeFKtZ7v6TAdn/oAh0xaPujD7N4amjBxrWIByraUfLM= github.com/ethpandaops/ethwallclock v0.2.0/go.mod h1:y0Cu+mhGLlem19vnAV2x0hpFS5KZ7oOi2SWYayv9l24= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -466,8 +468,6 @@ github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/samcm/beacon v0.12.0 h1:N3vJjOatIxDYo642Jx+1CGP/ayhbRqDHd6bMxz4qEac= -github.com/samcm/beacon v0.12.0/go.mod h1:Fd0Vq88gZGQ7KCAoRY0+SLwSghx9Pj/AOONvdonPePg= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= diff --git a/pkg/exporter/exporter.go b/pkg/exporter/exporter.go index a53ab0b..8a0c950 100644 --- a/pkg/exporter/exporter.go +++ b/pkg/exporter/exporter.go @@ -7,10 +7,10 @@ import ( "strings" "time" + "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/disk" "github.com/ethpandaops/ethereum-metrics-exporter/pkg/exporter/execution" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/samcm/beacon" "github.com/sirupsen/logrus" ) @@ -133,8 +133,7 @@ func (e *exporter) Serve(ctx context.Context, port int) error { func (e *exporter) bootstrapConsensusClients(ctx context.Context) error { opts := *beacon.DefaultOptions(). EnableDefaultBeaconSubscription(). - EnablePrometheusMetrics(). - DisableFetchingProposerDuties() + EnablePrometheusMetrics() e.beacon = beacon.NewNode(e.log, &beacon.Config{ Addr: e.config.Consensus.URL,