Fix call to flashbots_validateBuilderSubmissionV4 (#671)

* fix(electra): send electra payload for flashbots_validateBuilderSubmissionV4 * Add electra case to VersionedSubmitBlockRequest.UnmarshalSSZ --------- Co-authored-by: Justin Traglia <[email protected]>
flashbots · Jan 20, 2025 · e5d991e · e5d991e
1 parent a6d2ce5
commit e5d991e
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/common/types_spec.go b/common/types_spec.go
@@ -336,6 +336,16 @@ type denebBuilderBlockValidationRequestJSON struct {
 	ParentBeaconBlockRoot string                       `json:"parent_beacon_block_root"`
 }
 
+type electraBuilderBlockValidationRequestJSON struct {
+	Message               *builderApiV1.BidTrace       `json:"message"`
+	ExecutionPayload      *deneb.ExecutionPayload      `json:"execution_payload"`
+	BlobsBundle           *builderApiDeneb.BlobsBundle `json:"blobs_bundle"`
+	ExecutionRequests     *electra.ExecutionRequests   `json:"execution_requests"`
+	Signature             string                       `json:"signature"`
+	RegisteredGasLimit    uint64                       `json:"registered_gas_limit,string"`
+	ParentBeaconBlockRoot string                       `json:"parent_beacon_block_root"`
+}
+
 func (r *BuilderBlockValidationRequest) MarshalJSON() ([]byte, error) {
 	switch r.Version { //nolint:exhaustive
 	case spec.DataVersionCapella:
@@ -355,11 +365,11 @@ func (r *BuilderBlockValidationRequest) MarshalJSON() ([]byte, error) {
 			ParentBeaconBlockRoot: r.ParentBeaconBlockRoot.String(),
 		})
 	case spec.DataVersionElectra:
-		// Electra uses the same ExecutionPayload as Deneb
-		return json.Marshal(&denebBuilderBlockValidationRequestJSON{
+		return json.Marshal(&electraBuilderBlockValidationRequestJSON{
 			Message:               r.Electra.Message,
 			ExecutionPayload:      r.Electra.ExecutionPayload,
 			BlobsBundle:           r.Electra.BlobsBundle,
+			ExecutionRequests:     r.Electra.ExecutionRequests,
 			Signature:             r.Electra.Signature.String(),
 			RegisteredGasLimit:    r.RegisteredGasLimit,
 			ParentBeaconBlockRoot: r.ParentBeaconBlockRoot.String(),
@@ -392,6 +402,12 @@ func (r *VersionedSubmitBlockRequest) MarshalSSZ() ([]byte, error) {
 
 func (r *VersionedSubmitBlockRequest) UnmarshalSSZ(input []byte) error {
 	var err error
+	electraRequest := new(builderApiElectra.SubmitBlockRequest)
+	if err = electraRequest.UnmarshalSSZ(input); err == nil {
+		r.Version = spec.DataVersionElectra
+		r.Electra = electraRequest
+		return nil
+	}
 	denebRequest := new(builderApiDeneb.SubmitBlockRequest)
 	if err = denebRequest.UnmarshalSSZ(input); err == nil {
 		r.Version = spec.DataVersionDeneb