deepsource

prysmaticlabs · Nov 18, 2024 · 1edfa82 · 1edfa82
1 parent 5c6a7ed
commit 1edfa82
Showing 1 changed file with 43 additions and 43 deletions.
diff --git a/beacon-chain/rpc/eth/events/events.go b/beacon-chain/rpc/eth/events/events.go
@@ -605,48 +605,6 @@ func (s *Server) computePayloadAttributes(ctx context.Context, ev payloadattribu
 	})
 }
 
-func (s *Server) marshalAttributes(ctx context.Context, attr payloadattribute.Attributer) ([]byte, error) {
-	v := attr.Version()
-	if v < version.Bellatrix {
-		return nil, errors.Wrapf(errUnsupportedPayloadAttribute, "Payload version %s is not supported", version.String(v))
-	}
-
-	timestamp := strconv.FormatUint(attr.Timestamp(), 10)
-	prevRandao := hexutil.Encode(attr.PrevRandao())
-	feeRecpt := hexutil.Encode(attr.SuggestedFeeRecipient())
-	if v == version.Bellatrix {
-		return json.Marshal(&structs.PayloadAttributesV1{
-			Timestamp:             timestamp,
-			PrevRandao:            prevRandao,
-			SuggestedFeeRecipient: feeRecpt,
-		})
-	}
-	w, err := attr.Withdrawals()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not get withdrawals from payload attributes event")
-	}
-	withdrawals := structs.WithdrawalsFromConsensus(w)
-	if v == version.Capella {
-		return json.Marshal(&structs.PayloadAttributesV2{
-			Timestamp:             timestamp,
-			PrevRandao:            prevRandao,
-			SuggestedFeeRecipient: feeRecpt,
-			Withdrawals:           withdrawals,
-		})
-	}
-	parentRoot, err := attr.ParentBeaconBlockRoot()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not get parent beacon block root from payload attributes event")
-	}
-	return json.Marshal(&structs.PayloadAttributesV3{
-		Timestamp:             timestamp,
-		PrevRandao:            prevRandao,
-		SuggestedFeeRecipient: feeRecpt,
-		Withdrawals:           withdrawals,
-		ParentBeaconBlockRoot: hexutil.Encode(parentRoot),
-	})
-}
-
 type asyncPayloadAttrData struct {
 	data    json.RawMessage
 	version string
@@ -673,7 +631,7 @@ func (s *Server) payloadAttributesReader(ctx context.Context, ev payloadattribut
 				return
 			}
 		}
-		attributesBytes, err := s.marshalAttributes(ctx, attr)
+		attributesBytes, err := marshalAttributes(attr)
 		if err != nil {
 			d.err = errors.Wrap(err, "errors marshaling payload attributes to json")
 			return
@@ -709,6 +667,48 @@ func (s *Server) payloadAttributesReader(ctx context.Context, ev payloadattribut
 	}, nil
 }
 
+func marshalAttributes(attr payloadattribute.Attributer) ([]byte, error) {
+	v := attr.Version()
+	if v < version.Bellatrix {
+		return nil, errors.Wrapf(errUnsupportedPayloadAttribute, "Payload version %s is not supported", version.String(v))
+	}
+
+	timestamp := strconv.FormatUint(attr.Timestamp(), 10)
+	prevRandao := hexutil.Encode(attr.PrevRandao())
+	feeRecpt := hexutil.Encode(attr.SuggestedFeeRecipient())
+	if v == version.Bellatrix {
+		return json.Marshal(&structs.PayloadAttributesV1{
+			Timestamp:             timestamp,
+			PrevRandao:            prevRandao,
+			SuggestedFeeRecipient: feeRecpt,
+		})
+	}
+	w, err := attr.Withdrawals()
+	if err != nil {
+		return nil, errors.Wrap(err, "could not get withdrawals from payload attributes event")
+	}
+	withdrawals := structs.WithdrawalsFromConsensus(w)
+	if v == version.Capella {
+		return json.Marshal(&structs.PayloadAttributesV2{
+			Timestamp:             timestamp,
+			PrevRandao:            prevRandao,
+			SuggestedFeeRecipient: feeRecpt,
+			Withdrawals:           withdrawals,
+		})
+	}
+	parentRoot, err := attr.ParentBeaconBlockRoot()
+	if err != nil {
+		return nil, errors.Wrap(err, "could not get parent beacon block root from payload attributes event")
+	}
+	return json.Marshal(&structs.PayloadAttributesV3{
+		Timestamp:             timestamp,
+		PrevRandao:            prevRandao,
+		SuggestedFeeRecipient: feeRecpt,
+		Withdrawals:           withdrawals,
+		ParentBeaconBlockRoot: hexutil.Encode(parentRoot),
+	})
+}
+
 func newStreamingResponseController(rw http.ResponseWriter, timeout time.Duration) *streamingResponseWriterController {
 	rc := http.NewResponseController(rw)
 	return &streamingResponseWriterController{