From 46330e6990ef5108396e2bee60785314fb9d855f Mon Sep 17 00:00:00 2001 From: shana Date: Wed, 25 Oct 2023 03:25:23 +1100 Subject: [PATCH] use v2 publish endpoint by default --- README.md | 2 +- beaconclient/prod_beacon_instance.go | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2b16580b..e05da051 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ redis-cli DEL boost-relay/sepolia:validators-registration boost-relay/sepolia:va * `DISABLE_LOWPRIO_BUILDERS` - reject block submissions by low-prio builders * `FORCE_GET_HEADER_204` - force 204 as getHeader response * `ENABLE_IGNORABLE_VALIDATION_ERRORS` - enable ignorable validation errors -* `USE_V2_PUBLISH_BLOCK_ENDPOINT` - uses the v2 publish block endpoint on the beacon node +* `USE_V1_PUBLISH_BLOCK_ENDPOINT` - uses the v1 publish block endpoint on the beacon node #### Development Environment Variables diff --git a/beaconclient/prod_beacon_instance.go b/beaconclient/prod_beacon_instance.go index 4215f602..c9d20162 100644 --- a/beaconclient/prod_beacon_instance.go +++ b/beaconclient/prod_beacon_instance.go @@ -18,7 +18,7 @@ type ProdBeaconInstance struct { beaconURI string // feature flags - ffUseV2PublishBlockEndpoint bool + ffUseV1PublishBlockEndpoint bool } func NewProdBeaconInstance(log *logrus.Entry, beaconURI string) *ProdBeaconInstance { @@ -30,9 +30,9 @@ func NewProdBeaconInstance(log *logrus.Entry, beaconURI string) *ProdBeaconInsta client := &ProdBeaconInstance{_log, beaconURI, false} // feature flags - if os.Getenv("USE_V2_PUBLISH_BLOCK_ENDPOINT") != "" { - _log.Warn("env: USE_V2_PUBLISH_BLOCK_ENDPOINT: use the v2 publish block endpoint") - client.ffUseV2PublishBlockEndpoint = true + if os.Getenv("USE_V1_PUBLISH_BLOCK_ENDPOINT") != "" { + _log.Warn("env: USE_V1_PUBLISH_BLOCK_ENDPOINT: use the v2 publish block endpoint") + client.ffUseV1PublishBlockEndpoint = true } return client @@ -274,12 +274,16 @@ func (c *ProdBeaconInstance) PublishBlock(block *common.VersionedSignedBlockRequ headers := http.Header{} headers.Add("Eth-Consensus-Version", block.Version.String()) // optional in v1, required in v2 - if c.ffUseV2PublishBlockEndpoint { - uri = fmt.Sprintf("%s/eth/v2/beacon/blocks?broadcast_validation=%s", c.beaconURI, broadcastMode.String()) - return fetchBeacon(http.MethodPost, uri, block, nil, nil, headers, true) - } else { + if c.ffUseV1PublishBlockEndpoint { uri = fmt.Sprintf("%s/eth/v1/beacon/blocks", c.beaconURI) return fetchBeacon(http.MethodPost, uri, block, nil, nil, headers, false) + } else { + blockSSZ, err := block.MarshalSSZ() + if err != nil { + return 0, fmt.Errorf("could not marshal block to SSZ: %w", err) + } + uri = fmt.Sprintf("%s/eth/v2/beacon/blocks?broadcast_validation=%s", c.beaconURI, broadcastMode.String()) + return fetchBeacon(http.MethodPost, uri, blockSSZ, nil, nil, headers, true) } }