Merge pull request #151 from attestantio/beaconblockroot-strategies

Add beacon block root strategies.

CHANGELOG.md

@@ -4,6 +4,7 @@ dev:
   - fix crash if beacon node returns nil block during cache update
   - add score to blinded block proposal trace
   - increase speed of validator registration generation, reduce memory usage
+  - add strategies to obtain the beacon block root
 
 1.7.5:
   - add score of block proposals to tracing

docs/configuration.md

@@ -97,6 +97,16 @@ strategies:
     # This allows Vouch to remain responsive in the situation where some beacon nodes are significantly slower than others, for
     # example if one is remote.
     timeout: '2s'
+  # The beaconblockroot strategy obtains the beacon block root from multiple beacon nodes.
+  beaconblockroot:
+    # style can be 'first', which uses the first returned, 'latest', which uses the latest returned, or 'majority', which uses
+    # the one returned by most nodes (taking the latest in case of a tie).
+    style: 'latest'
+    # beacon-node-addresses are the addresses from which to receive beacon block roots.
+    beacon-node-addresses: ['localhost:4000', 'localhost:5051', 'localhost:5052']
+    # timeout defines the maximum amount of time the strategy will wait for a response.  Different strategies may return earlier
+    # if they have obtained enoguh information from their beacon node(s).
+    timeout: '2s'
   # The blindedbeaconblockproposal strategy obtains blinded beacon block proposals from multiple beacon nodes when using the block
   # relay module to obtain execution payloads from MEV relays.
   blindedbeaconblockproposal:

go.mod

@@ -5,51 +5,52 @@ go 1.20
 require (
 	github.com/attestantio/go-block-relay v0.1.9
 	github.com/attestantio/go-builder-client v0.3.1
-	github.com/attestantio/go-eth2-client v0.16.6
-	github.com/aws/aws-sdk-go v1.44.274
-	github.com/holiman/uint256 v1.2.2
+	github.com/attestantio/go-eth2-client v0.18.1
+	github.com/aws/aws-sdk-go v1.44.319
+	github.com/holiman/uint256 v1.2.3
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
 	github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7
-	github.com/rs/zerolog v1.29.1
+	github.com/rs/zerolog v1.30.0
 	github.com/sasha-s/go-deadlock v0.3.1
 	github.com/shopspring/decimal v1.3.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.16.0
 	github.com/stretchr/testify v1.8.4
 	github.com/wealdtech/go-bytesutil v1.2.1
-	github.com/wealdtech/go-eth2-types/v2 v2.8.1
-	github.com/wealdtech/go-eth2-wallet v1.15.1
+	github.com/wealdtech/go-eth2-types/v2 v2.8.2
+	github.com/wealdtech/go-eth2-wallet v1.16.0
 	github.com/wealdtech/go-eth2-wallet-dirk v1.4.4
-	github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.3.1
-	github.com/wealdtech/go-eth2-wallet-hd/v2 v2.6.1
-	github.com/wealdtech/go-eth2-wallet-nd/v2 v2.4.1
-	github.com/wealdtech/go-eth2-wallet-store-filesystem v1.17.1
-	github.com/wealdtech/go-eth2-wallet-store-scratch v1.7.1
-	github.com/wealdtech/go-eth2-wallet-types/v2 v2.10.1
+	github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.4.1
+	github.com/wealdtech/go-eth2-wallet-hd/v2 v2.7.0
+	github.com/wealdtech/go-eth2-wallet-nd/v2 v2.5.0
+	github.com/wealdtech/go-eth2-wallet-store-filesystem v1.18.1
+	github.com/wealdtech/go-eth2-wallet-store-scratch v1.7.2
+	github.com/wealdtech/go-eth2-wallet-types/v2 v2.11.0
 	github.com/wealdtech/go-majordomo v1.1.1
 	go.opentelemetry.io/otel v1.16.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
 	go.opentelemetry.io/otel/sdk v1.16.0
 	go.opentelemetry.io/otel/trace v1.16.0
 	go.uber.org/atomic v1.11.0
-	golang.org/x/sync v0.2.0
-	google.golang.org/grpc v1.55.0
+	golang.org/x/sync v0.3.0
+	google.golang.org/grpc v1.57.0
 	gotest.tools v2.2.0+incompatible
 )
 
 require (
-	cloud.google.com/go/compute v1.20.0 // indirect
+	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.1.0 // indirect
-	cloud.google.com/go/secretmanager v1.11.0 // indirect
+	cloud.google.com/go/iam v1.1.2 // indirect
+	cloud.google.com/go/secretmanager v1.11.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.10.0-rc3 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/ferranbt/fastssz v0.1.3 // indirect
@@ -61,18 +62,18 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.15.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/goccy/go-yaml v1.11.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/s2a-go v0.1.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.10.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/herumi/bls-eth-go-binary v1.31.0 // indirect
 	github.com/jackc/puddle v1.3.0 // indirect
@@ -88,12 +89,12 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
-	github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
+	github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/r3labs/sse/v2 v2.10.0 // indirect
 	github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
@@ -103,29 +104,29 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/wealdtech/eth2-signer-api v1.7.1 // indirect
-	github.com/wealdtech/go-ecodec v1.1.3 // indirect
-	github.com/wealdtech/go-eth2-util v1.8.1 // indirect
-	github.com/wealdtech/go-eth2-wallet-distributed v1.1.5 // indirect
-	github.com/wealdtech/go-eth2-wallet-store-s3 v1.11.3 // indirect
-	github.com/wealdtech/go-indexer v1.0.1 // indirect
+	github.com/wealdtech/go-ecodec v1.1.4 // indirect
+	github.com/wealdtech/go-eth2-util v1.8.2 // indirect
+	github.com/wealdtech/go-eth2-wallet-distributed v1.2.1 // indirect
+	github.com/wealdtech/go-eth2-wallet-store-s3 v1.12.0 // indirect
+	github.com/wealdtech/go-indexer v1.1.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
 	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.10.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	golang.org/x/arch v0.4.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/oauth2 v0.11.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/api v0.125.0 // indirect
+	google.golang.org/api v0.136.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/genproto v0.0.0-20230807174057-1744710a1577 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230807174057-1744710a1577 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect