feat: bolt-relay changes

mev-boost-relay/README.md

@@ -153,6 +153,7 @@ redis-cli DEL boost-relay/sepolia:validators-registration boost-relay/sepolia:va
 * `FORCE_GET_HEADER_204` - force 204 as getHeader response
 * `ENABLE_IGNORABLE_VALIDATION_ERRORS` - enable ignorable validation errors
 * `USE_V1_PUBLISH_BLOCK_ENDPOINT` - uses the v1 publish block endpoint on the beacon node
+* `USE_SSZ_ENCODING_PUBLISH_BLOCK` - uses the SSZ encoding for the publish block endpoint
 
 #### Development Environment Variables
 

mev-boost-relay/beaconclient/prod_beacon_instance.go

@@ -19,7 +19,8 @@ type ProdBeaconInstance struct {
 	beaconURI string
 
 	// feature flags
-	ffUseV1PublishBlockEndpoint bool
+	ffUseV1PublishBlockEndpoint  bool
+	ffUseSSZEncodingPublishBlock bool
 }
 
 func NewProdBeaconInstance(log *logrus.Entry, beaconURI string) *ProdBeaconInstance {
@@ -28,14 +29,19 @@ func NewProdBeaconInstance(log *logrus.Entry, beaconURI string) *ProdBeaconInsta
 		"beaconURI": beaconURI,
 	})
 
-	client := &ProdBeaconInstance{_log, beaconURI, false}
+	client := &ProdBeaconInstance{_log, beaconURI, false, false}
 
 	// feature flags
 	if os.Getenv("USE_V1_PUBLISH_BLOCK_ENDPOINT") != "" {
 		_log.Warn("env: USE_V1_PUBLISH_BLOCK_ENDPOINT: use the v1 publish block endpoint")
 		client.ffUseV1PublishBlockEndpoint = true
 	}
 
+	if os.Getenv("USE_SSZ_ENCODING_PUBLISH_BLOCK") != "" {
+		_log.Warn("env: USE_SSZ_ENCODING_PUBLISH_BLOCK: using SSZ encoding to publish blocks")
+		client.ffUseSSZEncodingPublishBlock = true
+	}
+
 	return client
 }
 
@@ -251,7 +257,37 @@ func (c *ProdBeaconInstance) PublishBlock(block *common.VersionedSignedProposal,
 	}
 	headers := http.Header{}
 	headers.Add("Eth-Consensus-Version", strings.ToLower(block.Version.String())) // optional in v1, required in v2
-	return fetchBeacon(http.MethodPost, uri, block, nil, nil, headers, false)
+
+	slot, err := block.Slot()
+	if err != nil {
+		slot = 0
+	}
+
+	var payloadBytes []byte
+	useSSZ := c.ffUseSSZEncodingPublishBlock
+	log := c.log
+	encodeStartTime := time.Now().UTC()
+	if useSSZ {
+		log = log.WithField("publishContentType", "ssz")
+		payloadBytes, err = block.MarshalSSZ()
+	} else {
+		log = log.WithField("publishContentType", "json")
+		payloadBytes, err = json.Marshal(block)
+	}
+	if err != nil {
+		return 0, fmt.Errorf("could not marshal request: %w", err)
+	}
+	publishingStartTime := time.Now().UTC()
+	encodeDurationMs := publishingStartTime.Sub(encodeStartTime).Milliseconds()
+	code, err = fetchBeacon(http.MethodPost, uri, payloadBytes, nil, nil, headers, useSSZ)
+	publishDurationMs := time.Now().UTC().Sub(publishingStartTime).Milliseconds()
+	log.WithFields(logrus.Fields{
+		"slot":              slot,
+		"encodeDurationMs":  encodeDurationMs,
+		"publishDurationMs": publishDurationMs,
+		"payloadBytes":      len(payloadBytes),
+	}).Info("finished publish block request")
+	return code, err
 }
 
 type GetGenesisResponse struct {

mev-boost-relay/common/preconf.go

@@ -15,15 +15,16 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 )
 
-// VersionedSubmitBlockRequestWithPreconfsProofs is a wrapper struct
+// VersionedSubmitBlockRequestWithProofs is a wrapper struct
 // over `builderSpec.VersionedSubmitBlockRequest`
 // to include preconfirmation proofs
-type VersionedSubmitBlockRequestWithPreconfsProofs struct {
-	Inner  *VersionedSubmitBlockRequest `json:"inner"`
-	Proofs []*PreconfirmationWithProof  `json:"proofs"`
+type VersionedSubmitBlockRequestWithProofs struct {
+	Inner *VersionedSubmitBlockRequest `json:"inner"`
+	// FIXME: this is not spec-aligned yet https://github.com/chainbound/bolt/issues/55
+	Proofs []*PreconfirmationWithProof `json:"proofs"`
 }
 
-func (v *VersionedSubmitBlockRequestWithPreconfsProofs) String() string {
+func (v *VersionedSubmitBlockRequestWithProofs) String() string {
 	out, err := json.Marshal(v)
 	if err != nil {
 		return err.Error()
@@ -58,7 +59,7 @@ type HexBytes []byte
 
 // MarshalJSON implements json.Marshaler.
 func (h HexBytes) MarshalJSON() ([]byte, error) {
-	return []byte(fmt.Sprintf(`"%#x"`, h)), nil
+	return []byte(fmt.Sprintf(`"%#x"`, []byte(h))), nil
 }
 
 // UnmarshalJSON implements json.Unmarshaler.
@@ -85,6 +86,10 @@ func (h *HexBytes) UnmarshalJSON(input []byte) error {
 	return nil
 }
 
+func (h HexBytes) String() string {
+	return JSONStringify(h)
+}
+
 // SerializedMerkleProof contains a serialized Merkle proof of transaction inclusion.
 //   - `Index“ is the generalized index of the included transaction from the SSZ tree
 //     created from the list of transactions.

mev-boost-relay/common/utils.go

@@ -276,3 +276,11 @@ func GetBlockSubmissionExecutionPayload(submission *VersionedSubmitBlockRequest)
 	}
 	return nil, ErrEmptyPayload
 }
+
+func JSONStringify(v interface{}) string {
+	out, err := json.Marshal(v)
+	if err != nil {
+		return err.Error()
+	}
+	return string(out)
+}