Removed Beacon API endpoints which have been deprecated at the Deneb fork (#15166)

* Removed Beacon API endpoints which have been deprecated at the Deneb fork

* fix linter

Author: rkapka

beacon-chain/rpc/endpoints.go

@@ -372,24 +372,6 @@ func (s *Service) validatorEndpoints(
 			handler: server.GetLiveness,
 			methods: []string{http.MethodPost},
 		},
-		{
-			template: "/eth/v2/validator/blocks/{slot}",
-			name:     namespace + ".ProduceBlockV2",
-			middleware: []middleware.Middleware{
-				middleware.AcceptHeaderHandler([]string{api.JsonMediaType, api.OctetStreamMediaType}),
-			},
-			handler: server.ProduceBlockV2,
-			methods: []string{http.MethodGet},
-		},
-		{
-			template: "/eth/v1/validator/blinded_blocks/{slot}",
-			name:     namespace + ".ProduceBlindedBlock",
-			middleware: []middleware.Middleware{
-				middleware.AcceptHeaderHandler([]string{api.JsonMediaType, api.OctetStreamMediaType}),
-			},
-			handler: server.ProduceBlindedBlock,
-			methods: []string{http.MethodGet},
-		},
 		{
 			template: "/eth/v3/validator/blocks/{slot}",
 			name:     namespace + ".ProduceBlockV3",

beacon-chain/rpc/endpoints_test.go

@@ -99,9 +99,7 @@ func Test_endpoints(t *testing.T) {
 		"/eth/v1/validator/duties/attester/{epoch}":        {http.MethodPost},
 		"/eth/v1/validator/duties/proposer/{epoch}":        {http.MethodGet},
 		"/eth/v1/validator/duties/sync/{epoch}":            {http.MethodPost},
-		"/eth/v2/validator/blocks/{slot}":                  {http.MethodGet},
 		"/eth/v3/validator/blocks/{slot}":                  {http.MethodGet},
-		"/eth/v1/validator/blinded_blocks/{slot}":          {http.MethodGet},
 		"/eth/v1/validator/attestation_data":               {http.MethodGet},
 		"/eth/v1/validator/aggregate_attestation":          {http.MethodGet},
 		"/eth/v2/validator/aggregate_attestation":          {http.MethodGet},

beacon-chain/rpc/eth/validator/handlers_block.go

@@ -33,110 +33,6 @@ const (
 	blinded
 )
 
-// DEPRECATED: Please use ProduceBlockV3 instead.
-//
-// ProduceBlockV2 requests the beacon node to produce a valid unsigned beacon block,
-// which can then be signed by a proposer and submitted.
-func (s *Server) ProduceBlockV2(w http.ResponseWriter, r *http.Request) {
-	ctx, span := trace.StartSpan(r.Context(), "validator.ProduceBlockV2")
-	defer span.End()
-
-	if shared.IsSyncing(ctx, w, s.SyncChecker, s.HeadFetcher, s.TimeFetcher, s.OptimisticModeFetcher) {
-		return
-	}
-
-	segments := strings.Split(r.URL.Path, "/")
-	rawSlot := segments[len(segments)-1]
-	rawRandaoReveal := r.URL.Query().Get("randao_reveal")
-	rawGraffiti := r.URL.Query().Get("graffiti")
-	rawSkipRandaoVerification := r.URL.Query().Get("skip_randao_verification")
-
-	slot, valid := shared.ValidateUint(w, "slot", rawSlot)
-	if !valid {
-		return
-	}
-
-	var randaoReveal []byte
-	if rawSkipRandaoVerification == "true" {
-		randaoReveal = common.InfiniteSignature[:]
-	} else {
-		rr, err := bytesutil.DecodeHexWithLength(rawRandaoReveal, fieldparams.BLSSignatureLength)
-		if err != nil {
-			httputil.HandleError(w, errors.Wrap(err, "Unable to decode randao reveal").Error(), http.StatusBadRequest)
-			return
-		}
-		randaoReveal = rr
-	}
-	var graffiti []byte
-	if rawGraffiti != "" {
-		g, err := bytesutil.DecodeHexWithLength(rawGraffiti, 32)
-		if err != nil {
-			httputil.HandleError(w, errors.Wrap(err, "Unable to decode graffiti").Error(), http.StatusBadRequest)
-			return
-		}
-		graffiti = g
-	}
-
-	s.produceBlockV3(ctx, w, r, &eth.BlockRequest{
-		Slot:         primitives.Slot(slot),
-		RandaoReveal: randaoReveal,
-		Graffiti:     graffiti,
-		SkipMevBoost: true,
-	}, full)
-}
-
-// DEPRECATED: Please use ProduceBlockV3 instead.
-//
-// ProduceBlindedBlock requests the beacon node to produce a valid unsigned blinded beacon block,
-// which can then be signed by a proposer and submitted.
-func (s *Server) ProduceBlindedBlock(w http.ResponseWriter, r *http.Request) {
-	ctx, span := trace.StartSpan(r.Context(), "validator.ProduceBlindedBlock")
-	defer span.End()
-
-	if shared.IsSyncing(ctx, w, s.SyncChecker, s.HeadFetcher, s.TimeFetcher, s.OptimisticModeFetcher) {
-		return
-	}
-
-	segments := strings.Split(r.URL.Path, "/")
-	rawSlot := segments[len(segments)-1]
-	rawRandaoReveal := r.URL.Query().Get("randao_reveal")
-	rawGraffiti := r.URL.Query().Get("graffiti")
-	rawSkipRandaoVerification := r.URL.Query().Get("skip_randao_verification")
-
-	slot, valid := shared.ValidateUint(w, "slot", rawSlot)
-	if !valid {
-		return
-	}
-
-	var randaoReveal []byte
-	if rawSkipRandaoVerification == "true" {
-		randaoReveal = common.InfiniteSignature[:]
-	} else {
-		rr, err := bytesutil.DecodeHexWithLength(rawRandaoReveal, fieldparams.BLSSignatureLength)
-		if err != nil {
-			httputil.HandleError(w, errors.Wrap(err, "Unable to decode randao reveal").Error(), http.StatusBadRequest)
-			return
-		}
-		randaoReveal = rr
-	}
-	var graffiti []byte
-	if rawGraffiti != "" {
-		g, err := bytesutil.DecodeHexWithLength(rawGraffiti, 32)
-		if err != nil {
-			httputil.HandleError(w, errors.Wrap(err, "Unable to decode graffiti").Error(), http.StatusBadRequest)
-			return
-		}
-		graffiti = g
-	}
-
-	s.produceBlockV3(ctx, w, r, &eth.BlockRequest{
-		Slot:         primitives.Slot(slot),
-		RandaoReveal: randaoReveal,
-		Graffiti:     graffiti,
-		SkipMevBoost: false,
-	}, blinded)
-}
-
 // ProduceBlockV3 requests a beacon node to produce a valid block, which can then be signed by a validator. The
 // returned block may be blinded or unblinded, depending on the current state of the network as
 // decided by the execution and beacon nodes.