Merge branch 'develop' into peerDAS

nalepae · nalepae · commit da9d4cf5b998 · 2025-02-21T16:03:20.000+01:00
diff --git a/beacon-chain/rpc/endpoints.go b/beacon-chain/rpc/endpoints.go
@@ -161,6 +161,7 @@ func (s *Service) builderEndpoints(stater lookup.Stater) []endpoint {
 	const namespace = "builder"
 	return []endpoint{
 		{
+			// Deprecated: use SSE from /eth/v1/events for `Payload Attributes` instead
 			template: "/eth/v1/builder/states/{state_id}/expected_withdrawals",
 			name:     namespace + ".ExpectedWithdrawals",
 			middleware: []middleware.Middleware{
@@ -225,6 +226,7 @@ func (s *Service) validatorEndpoints(
 	const namespace = "validator"
 	return []endpoint{
 		{
+			// Deprecated: use /eth/v2/validator/aggregate_attestation instead
 			template: "/eth/v1/validator/aggregate_attestation",
 			name:     namespace + ".GetAggregateAttestation",
 			middleware: []middleware.Middleware{
@@ -253,6 +255,7 @@ func (s *Service) validatorEndpoints(
 			methods: []string{http.MethodPost},
 		},
 		{
+			// Deprecated: use /eth/v2/validator/aggregate_and_proofs instead
 			template: "/eth/v1/validator/aggregate_and_proofs",
 			name:     namespace + ".SubmitAggregateAndProofs",
 			middleware: []middleware.Middleware{
@@ -583,6 +586,7 @@ func (s *Service) beaconEndpoints(
 			methods: []string{http.MethodGet},
 		},
 		{
+			// Deprecated: use /eth/v2/beacon/blocks instead
 			template: "/eth/v1/beacon/blocks",
 			name:     namespace + ".PublishBlock",
 			middleware: []middleware.Middleware{
@@ -593,6 +597,7 @@ func (s *Service) beaconEndpoints(
 			methods: []string{http.MethodPost},
 		},
 		{
+			// Deprecated: use /eth/v2/beacon/blinded_blocks instead
 			template: "/eth/v1/beacon/blinded_blocks",
 			name:     namespace + ".PublishBlindedBlock",
 			middleware: []middleware.Middleware{
@@ -632,6 +637,7 @@ func (s *Service) beaconEndpoints(
 			methods: []string{http.MethodGet},
 		},
 		{
+			// Deprecated: use /eth/v2/beacon/blocks/{block_id}/attestations instead
 			template: "/eth/v1/beacon/blocks/{block_id}/attestations",
 			name:     namespace + ".GetBlockAttestations",
 			middleware: []middleware.Middleware{
@@ -668,6 +674,7 @@ func (s *Service) beaconEndpoints(
 			methods: []string{http.MethodGet},
 		},
 		{
+			// Deprecated: use /eth/v2/beacon/pool/attestations instead
 			template: "/eth/v1/beacon/pool/attestations",
 			name:     namespace + ".ListAttestations",
 			middleware: []middleware.Middleware{
@@ -754,6 +761,7 @@ func (s *Service) beaconEndpoints(
 			methods: []string{http.MethodPost},
 		},
 		{
+			// Deprecated: use /eth/v2/beacon/pool/attester_slashings instead
 			template: "/eth/v1/beacon/pool/attester_slashings",
 			name:     namespace + ".GetAttesterSlashings",
 			middleware: []middleware.Middleware{
@@ -876,6 +884,7 @@ func (s *Service) beaconEndpoints(
 			methods: []string{http.MethodGet, http.MethodPost},
 		},
 		{
+			// Deprecated: no longer needed post Electra
 			template: "/eth/v1/beacon/deposit_snapshot",
 			name:     namespace + ".GetDepositSnapshot",
 			middleware: []middleware.Middleware{
diff --git a/beacon-chain/rpc/eth/beacon/handlers.go b/beacon-chain/rpc/eth/beacon/handlers.go
@@ -292,6 +292,7 @@ func (s *Server) getBlockResponseBodyJson(ctx context.Context, blk interfaces.Re
 	}, nil
 }
 
+// Deprecated: use GetBlockAttestationsV2 instead
 // GetBlockAttestations retrieves attestation included in requested block.
 func (s *Server) GetBlockAttestations(w http.ResponseWriter, r *http.Request) {
 	ctx, span := trace.StartSpan(r.Context(), "beacon.GetBlockAttestations")
@@ -394,6 +395,7 @@ func (s *Server) blockData(ctx context.Context, w http.ResponseWriter, r *http.R
 	return blk, isOptimistic, root
 }
 
+// Deprecated: use PublishBlindedBlockV2 instead
 // PublishBlindedBlock instructs the beacon node to use the components of the `SignedBlindedBeaconBlock` to construct
 // and publish a SignedBeaconBlock by swapping out the transactions_root for the corresponding full list of `transactions`.
 // The beacon node should broadcast a newly constructed SignedBeaconBlock to the beacon network, to be included in the
@@ -624,6 +626,7 @@ func decodeBlindedBellatrixJSON(body []byte) (*eth.GenericSignedBeaconBlock, err
 	)
 }
 
+// Deprecated: use PublishBlockV2 instead
 // PublishBlock instructs the beacon node to broadcast a newly signed beacon block to the beacon network,
 // to be included in the beacon chain. A success response (20x) indicates that the block
 // passed gossip validation and was successfully broadcast onto the network.
@@ -1534,6 +1537,7 @@ func (s *Server) GetGenesis(w http.ResponseWriter, r *http.Request) {
 	httputil.WriteJson(w, resp)
 }
 
+// Deprecated: no longer needed post Electra
 // GetDepositSnapshot retrieves the EIP-4881 Deposit Tree Snapshot. Either a JSON or,
 // if the Accept header was added, bytes serialized by SSZ will be returned.
 func (s *Server) GetDepositSnapshot(w http.ResponseWriter, r *http.Request) {
diff --git a/beacon-chain/rpc/eth/beacon/handlers_pool.go b/beacon-chain/rpc/eth/beacon/handlers_pool.go
@@ -34,6 +34,7 @@ import (
 
 const broadcastBLSChangesRateLimit = 128
 
+// Deprecated: use ListAttestationsV2 instead
 // ListAttestations retrieves attestations known by the node but
 // not necessarily incorporated into any block. Allows filtering by committee index or slot.
 func (s *Server) ListAttestations(w http.ResponseWriter, r *http.Request) {
@@ -707,6 +708,7 @@ func (s *Server) ListBLSToExecutionChanges(w http.ResponseWriter, r *http.Reques
 	})
 }
 
+// Deprecated: use GetAttesterSlashingsV2 instead
 // GetAttesterSlashings retrieves attester slashings known by the node but
 // not necessarily incorporated into any block.
 func (s *Server) GetAttesterSlashings(w http.ResponseWriter, r *http.Request) {
diff --git a/beacon-chain/rpc/eth/builder/handlers.go b/beacon-chain/rpc/eth/builder/handlers.go
@@ -17,6 +17,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/time/slots"
 )
 
+// Deprecated: use SSE from events for `payload attributes` instead
 // ExpectedWithdrawals get the withdrawals computed from the specified state, that will be included in the block that gets built on the specified state.
 func (s *Server) ExpectedWithdrawals(w http.ResponseWriter, r *http.Request) {
 	// Retrieve beacon state
diff --git a/beacon-chain/rpc/eth/validator/handlers.go b/beacon-chain/rpc/eth/validator/handlers.go
@@ -43,6 +43,7 @@ import (
 	"google.golang.org/grpc/status"
 )
 
+// Deprecated: use GetAggregateAttestationV2 instead
 // GetAggregateAttestation aggregates all attestations matching the given attestation data root and slot, returning the aggregated result.
 func (s *Server) GetAggregateAttestation(w http.ResponseWriter, r *http.Request) {
 	_, span := trace.StartSpan(r.Context(), "validator.GetAggregateAttestation")
@@ -256,6 +257,7 @@ func (s *Server) SubmitContributionAndProofs(w http.ResponseWriter, r *http.Requ
 	}
 }
 
+// Deprecated: use SubmitAggregateAndProofsV2 instead
 // SubmitAggregateAndProofs verifies given aggregate and proofs and publishes them on appropriate gossipsub topic.
 func (s *Server) SubmitAggregateAndProofs(w http.ResponseWriter, r *http.Request) {
 	ctx, span := trace.StartSpan(r.Context(), "validator.SubmitAggregateAndProofs")
diff --git a/beacon-chain/sync/rpc_status.go b/beacon-chain/sync/rpc_status.go
@@ -295,7 +295,7 @@ func (s *Service) validateStatusMessage(ctx context.Context, msg *pb.Status) err
 		return err
 	}
 	if !bytes.Equal(forkDigest[:], msg.ForkDigest) {
-		return p2ptypes.ErrWrongForkDigestVersion
+		return fmt.Errorf("mismatch fork digest: expected %#x, got %#x: %w", forkDigest[:], msg.ForkDigest, p2ptypes.ErrWrongForkDigestVersion)
 	}
 	genesis := s.cfg.clock.GenesisTime()
 	cp := s.cfg.chain.FinalizedCheckpt()
diff --git a/changelog/james-prysm_deprecate-apis-for-electra.md b/changelog/james-prysm_deprecate-apis-for-electra.md
@@ -0,0 +1,3 @@
+### Changed
+
+- deprecate beacon api endpoints based on [3.0.0 release](https://github.com/ethereum/beacon-APIs/pull/506) for electra
diff --git a/changelog/james-prysm_improve-execution-request-errors.md b/changelog/james-prysm_improve-execution-request-errors.md
@@ -0,0 +1,3 @@
+### Changed
+
+- execution requests errors on ssz length have been improved
diff --git a/changelog/nisdas_add_deposit_request_testing.md b/changelog/nisdas_add_deposit_request_testing.md
@@ -0,0 +1,3 @@
+### Added
+
+- Added deposit request testing for electra.
diff --git a/changelog/tt_fork_digest.md b/changelog/tt_fork_digest.md
@@ -0,0 +1,3 @@
+### Ignored
+
+- Add more debugging information to mismatch fork digest error message
diff --git a/proto/engine/v1/electra.go b/proto/engine/v1/electra.go
@@ -63,30 +63,33 @@ func (ebe *ExecutionBundleElectra) GetDecodedExecutionRequests() (*ExecutionRequ
 
 func unmarshalDeposits(requestListInSSZBytes []byte) ([]*DepositRequest, error) {
 	if len(requestListInSSZBytes) < drSize {
-		return nil, fmt.Errorf("invalid deposit requests length, requests should be at least the size of %d", drSize)
+		return nil, fmt.Errorf("invalid deposit requests SSZ size, got %d expected at least %d", len(requestListInSSZBytes), drSize)
 	}
-	if uint64(len(requestListInSSZBytes)) > uint64(drSize)*params.BeaconConfig().MaxDepositRequestsPerPayload {
-		return nil, fmt.Errorf("invalid deposit requests length, requests should not be more than the max per payload, got %d max %d", len(requestListInSSZBytes), drSize)
+	maxSSZsize := uint64(drSize) * params.BeaconConfig().MaxDepositRequestsPerPayload
+	if uint64(len(requestListInSSZBytes)) > maxSSZsize {
+		return nil, fmt.Errorf("invalid deposit requests SSZ size, requests should not be more than the max per payload, got %d max %d", len(requestListInSSZBytes), maxSSZsize)
 	}
 	return unmarshalItems(requestListInSSZBytes, drSize, func() *DepositRequest { return &DepositRequest{} })
 }
 
 func unmarshalWithdrawals(requestListInSSZBytes []byte) ([]*WithdrawalRequest, error) {
 	if len(requestListInSSZBytes) < wrSize {
-		return nil, fmt.Errorf("invalid withdrawal requests length, requests should be at least the size of %d", wrSize)
+		return nil, fmt.Errorf("invalid withdrawal requests SSZ size, got %d expected at least %d", len(requestListInSSZBytes), wrSize)
 	}
-	if uint64(len(requestListInSSZBytes)) > uint64(wrSize)*params.BeaconConfig().MaxWithdrawalRequestsPerPayload {
-		return nil, fmt.Errorf("invalid withdrawal requests length, requests should not be more than the max per payload, got %d max %d", len(requestListInSSZBytes), wrSize)
+	maxSSZsize := uint64(wrSize) * params.BeaconConfig().MaxWithdrawalRequestsPerPayload
+	if uint64(len(requestListInSSZBytes)) > maxSSZsize {
+		return nil, fmt.Errorf("invalid withdrawal requests SSZ size, requests should not be more than the max per payload, got %d max %d", len(requestListInSSZBytes), maxSSZsize)
 	}
 	return unmarshalItems(requestListInSSZBytes, wrSize, func() *WithdrawalRequest { return &WithdrawalRequest{} })
 }
 
 func unmarshalConsolidations(requestListInSSZBytes []byte) ([]*ConsolidationRequest, error) {
 	if len(requestListInSSZBytes) < crSize {
-		return nil, fmt.Errorf("invalid consolidation requests length, requests should be at least the size of %d", crSize)
+		return nil, fmt.Errorf("invalid consolidation requests SSZ size, got %d expected at least %d", len(requestListInSSZBytes), crSize)
 	}
-	if uint64(len(requestListInSSZBytes)) > uint64(crSize)*params.BeaconConfig().MaxConsolidationsRequestsPerPayload {
-		return nil, fmt.Errorf("invalid consolidation requests length, requests should not be more than the max per payload, got %d max %d", len(requestListInSSZBytes), crSize)
+	maxSSZsize := uint64(crSize) * params.BeaconConfig().MaxConsolidationsRequestsPerPayload
+	if uint64(len(requestListInSSZBytes)) > maxSSZsize {
+		return nil, fmt.Errorf("invalid consolidation requests SSZ size, requests should not be more than the max per payload, got %d max %d", len(requestListInSSZBytes), maxSSZsize)
 	}
 	return unmarshalItems(requestListInSSZBytes, crSize, func() *ConsolidationRequest { return &ConsolidationRequest{} })
 }
diff --git a/proto/engine/v1/electra_test.go b/proto/engine/v1/electra_test.go
@@ -122,7 +122,7 @@ func TestGetDecodedExecutionRequests(t *testing.T) {
 			ExecutionRequests: [][]byte{append([]byte{uint8(enginev1.DepositRequestType)}, []byte{}...), append([]byte{uint8(enginev1.ConsolidationRequestType)}, consolidationRequestBytes...)},
 		}
 		_, err = ebe.GetDecodedExecutionRequests()
-		require.ErrorContains(t, "invalid deposit requests length", err)
+		require.ErrorContains(t, "invalid deposit requests SSZ size", err)
 	})
 	t.Run("If deposit requests are over the max allowed per payload then we should error", func(t *testing.T) {
 		requests := make([]*enginev1.DepositRequest, params.BeaconConfig().MaxDepositRequestsPerPayload+1)
@@ -143,7 +143,7 @@ func TestGetDecodedExecutionRequests(t *testing.T) {
 			},
 		}
 		_, err = ebe.GetDecodedExecutionRequests()
-		require.ErrorContains(t, "invalid deposit requests length, requests should not be more than the max per payload", err)
+		require.ErrorContains(t, "invalid deposit requests SSZ size, requests should not be more than the max per payload", err)
 	})
 	t.Run("If withdrawal requests are over the max allowed per payload then we should error", func(t *testing.T) {
 		requests := make([]*enginev1.WithdrawalRequest, params.BeaconConfig().MaxWithdrawalRequestsPerPayload+1)
@@ -162,7 +162,7 @@ func TestGetDecodedExecutionRequests(t *testing.T) {
 			},
 		}
 		_, err = ebe.GetDecodedExecutionRequests()
-		require.ErrorContains(t, "invalid withdrawal requests length, requests should not be more than the max per payload", err)
+		require.ErrorContains(t, "invalid withdrawal requests SSZ size, requests should not be more than the max per payload", err)
 	})
 	t.Run("If consolidation requests are over the max allowed per payload then we should error", func(t *testing.T) {
 		requests := make([]*enginev1.ConsolidationRequest, params.BeaconConfig().MaxConsolidationsRequestsPerPayload+1)
@@ -181,7 +181,7 @@ func TestGetDecodedExecutionRequests(t *testing.T) {
 			},
 		}
 		_, err = ebe.GetDecodedExecutionRequests()
-		require.ErrorContains(t, "invalid consolidation requests length, requests should not be more than the max per payload", err)
+		require.ErrorContains(t, "invalid consolidation requests SSZ size, requests should not be more than the max per payload", err)
 	})
 }
 
diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go
@@ -159,6 +159,7 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co
 		ShanghaiTime:            shanghaiTime,
 		CancunTime:              cancunTime,
 		PragueTime:              pragueTime,
+		DepositContractAddress:  common.HexToAddress(cfg.DepositContractAddress),
 		BlobScheduleConfig: &params.BlobScheduleConfig{
 			Cancun: &params.BlobConfig{
 				Target:         3,
diff --git a/testing/endtoend/component_handler_test.go b/testing/endtoend/component_handler_test.go
@@ -28,6 +28,7 @@ type componentHandler struct {
 	web3Signer               e2etypes.ComponentRunner
 	bootnode                 e2etypes.ComponentRunner
 	eth1Miner                e2etypes.ComponentRunner
+	txGen                    e2etypes.ComponentRunner
 	builders                 e2etypes.MultipleComponentRunners
 	eth1Proxy                e2etypes.MultipleComponentRunners
 	eth1Nodes                e2etypes.MultipleComponentRunners
diff --git a/testing/endtoend/components/eth1/depositor.go b/testing/endtoend/components/eth1/depositor.go
@@ -176,6 +176,62 @@ func (d *Depositor) SendAndMine(ctx context.Context, offset, nvals int, batch ty
 	return nil
 }
 
+// SendAndMineByBatch uses the deterministic validator generator to generate deposits for `nvals` (number of validators).
+// To control which validators should receive deposits, so that we can generate deposits at different stages of e2e,
+// the `offset` parameter skips the first N validators in the deterministic list.
+// In order to test the requirement that our deposit follower is able to handle multiple partial deposits,
+// the `partial` flag specifies that half of the deposits should be broken up into 2 transactions.
+// Once the set of deposits has been generated, it submits a transaction for each deposit
+// (using 2 transactions for partial deposits) and then uses WaitForBlocks to send these transactions by one batch per block.
+// The batch size is determined by the provided batch size provided as an argument.
+func (d *Depositor) SendAndMineByBatch(ctx context.Context, offset, nvals, batchSize int, batch types.DepositBatch, partial bool) error {
+	balance, err := d.Client.BalanceAt(ctx, d.Key.Address, nil)
+	if err != nil {
+		return err
+	}
+	// This is the "Send" part of the function. Compute deposits for `nvals` validators,
+	// with half of those deposits being split over 2 transactions if the `partial` flag is true,
+	// and throwing away any validators before `offset`.
+	deposits, err := computeDeposits(offset, nvals, partial)
+	if err != nil {
+		return err
+	}
+	numBatch := len(deposits) / batchSize
+	log.WithField("numDeposits", len(deposits)).WithField("batchSize", batchSize).WithField("numBatches", numBatch).WithField("balance", balance.String()).WithField("account", d.Key.Address.Hex()).Info("SendAndMineByBatch check")
+	for i := 0; i < numBatch; i++ {
+		txo, err := d.txops(ctx)
+		if err != nil {
+			return err
+		}
+		for _, dd := range deposits[i*batchSize : (i+1)*batchSize] {
+			if err := d.SendDeposit(dd, txo, batch); err != nil {
+				return err
+			}
+		}
+		// This is the "AndMine" part of the function. WaitForBlocks will spam transactions to/from the given key
+		// to advance the EL chain and until the chain has advanced the requested amount.
+		if err = WaitForBlocks(d.Client, d.Key, 1); err != nil {
+			return fmt.Errorf("failed to mine blocks %w", err)
+		}
+	}
+	txo, err := d.txops(ctx)
+	if err != nil {
+		return err
+	}
+	// Send out the last partial batch
+	for _, dd := range deposits[numBatch*batchSize:] {
+		if err := d.SendDeposit(dd, txo, batch); err != nil {
+			return err
+		}
+	}
+	// This is the "AndMine" part of the function. WaitForBlocks will spam transactions to/from the given key
+	// to advance the EL chain and until the chain has advanced the requested amount.
+	if err = WaitForBlocks(d.Client, d.Key, 1); err != nil {
+		return fmt.Errorf("failed to mine blocks %w", err)
+	}
+	return nil
+}
+
 // SendDeposit sends a single deposit. A record of this deposit will be tracked for the life of the Depositor,
 // allowing evaluators to use the deposit history to make assertions about those deposits.
 func (d *Depositor) SendDeposit(dep *eth.Deposit, txo *bind.TransactOpts, batch types.DepositBatch) error {
diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go
@@ -39,6 +39,13 @@ type TransactionGenerator struct {
 	seed     int64
 	started  chan struct{}
 	cancel   context.CancelFunc
+	paused   bool
+}
+
+func (t *TransactionGenerator) UnderlyingProcess() *os.Process {
+	// Transaction Generator runs under the same underlying process so
+	// we return an empty process object.
+	return &os.Process{}
 }
 
 func NewTransactionGenerator(keystore string, seed int64) *TransactionGenerator {
@@ -94,6 +101,9 @@ func (t *TransactionGenerator) Start(ctx context.Context) error {
 		case <-ctx.Done():
 			return nil
 		case <-ticker.C:
+			if t.paused {
+				continue
+			}
 			backend := ethclient.NewClient(client)
 			err = SendTransaction(client, mineKey.PrivateKey, f, gasPrice, mineKey.Address.String(), txCount, backend, false)
 			if err != nil {
@@ -211,11 +221,13 @@ func SendTransaction(client *rpc.Client, key *ecdsa.PrivateKey, f *filler.Filler
 
 // Pause pauses the component and its underlying process.
 func (t *TransactionGenerator) Pause() error {
+	t.paused = true
 	return nil
 }
 
 // Resume resumes the component and its underlying process.
 func (t *TransactionGenerator) Resume() error {
+	t.paused = false
 	return nil
 }
 
diff --git a/testing/endtoend/endtoend_test.go b/testing/endtoend/endtoend_test.go
@@ -225,6 +225,7 @@ func (r *testRunner) testDepositsAndTx(ctx context.Context, g *errgroup.Group,
 
 func (r *testRunner) testTxGeneration(ctx context.Context, g *errgroup.Group, keystorePath string, requiredNodes []e2etypes.ComponentRunner) {
 	txGenerator := eth1.NewTransactionGenerator(keystorePath, r.config.Seed)
+	r.comHandler.txGen = txGenerator
 	g.Go(func() error {
 		if err := helpers.ComponentsStarted(ctx, requiredNodes); err != nil {
 			return fmt.Errorf("transaction generator requires eth1 nodes to be run: %w", err)
@@ -501,6 +502,19 @@ func (r *testRunner) defaultEndToEndRun() error {
 	if err := r.runEvaluators(ec, conns, tickingStartTime); err != nil {
 		return errors.Wrap(err, "one or more evaluators failed")
 	}
+	// Test execution request processing in electra.
+	if r.config.TestDeposits && params.ElectraEnabled() {
+		if err := r.comHandler.txGen.Pause(); err != nil {
+			r.t.Error(err)
+		}
+		err = r.depositor.SendAndMineByBatch(ctx, int(params.BeaconConfig().MinGenesisActiveValidatorCount)+int(e2e.DepositCount), int(e2e.PostElectraDepositCount), int(params.BeaconConfig().MaxDepositRequestsPerPayload), e2etypes.PostElectraDepositBatch, false)
+		if err != nil {
+			r.t.Error(err)
+		}
+		if err := r.comHandler.txGen.Resume(); err != nil {
+			r.t.Error(err)
+		}
+	}
 
 	index := e2e.TestParams.BeaconNodeCount + e2e.TestParams.LighthouseBeaconNodeCount
 	if config.TestSync {
diff --git a/testing/endtoend/params/params.go b/testing/endtoend/params/params.go
diff --git a/testing/endtoend/types/types.go b/testing/endtoend/types/types.go

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ func (s *Server) getBlockResponseBodyJson(ctx context.Context, blk interfaces.Re`
`292`	`292`	`}, nil`
`293`	`293`	`}`
`294`	`294`
	`295`	`+// Deprecated: use GetBlockAttestationsV2 instead`
`295`	`296`	`// GetBlockAttestations retrieves attestation included in requested block.`
`296`	`297`	`func (s Server) GetBlockAttestations(w http.ResponseWriter, r http.Request) {`
`297`	`298`	`ctx, span := trace.StartSpan(r.Context(), "beacon.GetBlockAttestations")`
`@@ -394,6 +395,7 @@ func (s Server) blockData(ctx context.Context, w http.ResponseWriter, r http.R`
`394`	`395`	`return blk, isOptimistic, root`
`395`	`396`	`}`
`396`	`397`
	`398`	`+// Deprecated: use PublishBlindedBlockV2 instead`
`397`	`399`	// PublishBlindedBlock instructs the beacon node to use the components of the `SignedBlindedBeaconBlock` to construct
`398`	`400`	// and publish a SignedBeaconBlock by swapping out the transactions_root for the corresponding full list of `transactions`.
`399`	`401`	`// The beacon node should broadcast a newly constructed SignedBeaconBlock to the beacon network, to be included in the`
`@@ -624,6 +626,7 @@ func decodeBlindedBellatrixJSON(body []byte) (*eth.GenericSignedBeaconBlock, err`
`624`	`626`	`)`
`625`	`627`	`}`
`626`	`628`
	`629`	`+// Deprecated: use PublishBlockV2 instead`
`627`	`630`	`// PublishBlock instructs the beacon node to broadcast a newly signed beacon block to the beacon network,`
`628`	`631`	`// to be included in the beacon chain. A success response (20x) indicates that the block`
`629`	`632`	`// passed gossip validation and was successfully broadcast onto the network.`
`@@ -1534,6 +1537,7 @@ func (s Server) GetGenesis(w http.ResponseWriter, r http.Request) {`
`1534`	`1537`	`httputil.WriteJson(w, resp)`
`1535`	`1538`	`}`
`1536`	`1539`
	`1540`	`+// Deprecated: no longer needed post Electra`
`1537`	`1541`	`// GetDepositSnapshot retrieves the EIP-4881 Deposit Tree Snapshot. Either a JSON or,`
`1538`	`1542`	`// if the Accept header was added, bytes serialized by SSZ will be returned.`
`1539`	`1543`	`func (s Server) GetDepositSnapshot(w http.ResponseWriter, r http.Request) {`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import (`
`17`	`17`	`"github.com/prysmaticlabs/prysm/v5/time/slots"`
`18`	`18`	`)`
`19`	`19`
	`20`	+// Deprecated: use SSE from events for `payload attributes` instead
`20`	`21`	`// ExpectedWithdrawals get the withdrawals computed from the specified state, that will be included in the block that gets built on the specified state.`
`21`	`22`	`func (s Server) ExpectedWithdrawals(w http.ResponseWriter, r http.Request) {`
`22`	`23`	`// Retrieve beacon state`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ import (`
`43`	`43`	`"google.golang.org/grpc/status"`
`44`	`44`	`)`
`45`	`45`
	`46`	`+// Deprecated: use GetAggregateAttestationV2 instead`
`46`	`47`	`// GetAggregateAttestation aggregates all attestations matching the given attestation data root and slot, returning the aggregated result.`
`47`	`48`	`func (s Server) GetAggregateAttestation(w http.ResponseWriter, r http.Request) {`
`48`	`49`	`_, span := trace.StartSpan(r.Context(), "validator.GetAggregateAttestation")`
`@@ -256,6 +257,7 @@ func (s Server) SubmitContributionAndProofs(w http.ResponseWriter, r http.Requ`
`256`	`257`	`}`
`257`	`258`	`}`
`258`	`259`
	`260`	`+// Deprecated: use SubmitAggregateAndProofsV2 instead`
`259`	`261`	`// SubmitAggregateAndProofs verifies given aggregate and proofs and publishes them on appropriate gossipsub topic.`
`260`	`262`	`func (s Server) SubmitAggregateAndProofs(w http.ResponseWriter, r http.Request) {`
`261`	`263`	`ctx, span := trace.StartSpan(r.Context(), "validator.SubmitAggregateAndProofs")`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ func (s Service) validateStatusMessage(ctx context.Context, msg pb.Status) err`
`295`	`295`	`return err`
`296`	`296`	`}`
`297`	`297`	`if !bytes.Equal(forkDigest[:], msg.ForkDigest) {`
`298`		`- return p2ptypes.ErrWrongForkDigestVersion`
	`298`	`+ return fmt.Errorf("mismatch fork digest: expected %#x, got %#x: %w", forkDigest[:], msg.ForkDigest, p2ptypes.ErrWrongForkDigestVersion)`
`299`	`299`	`}`
`300`	`300`	`genesis := s.cfg.clock.GenesisTime()`
`301`	`301`	`cp := s.cfg.chain.FinalizedCheckpt()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+### Changed`
	`2`	`+`
	`3`	`+- deprecate beacon api endpoints based on [3.0.0 release](https://github.com/ethereum/beacon-APIs/pull/506) for electra`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+### Changed`
	`2`	`+`
	`3`	`+- execution requests errors on ssz length have been improved`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+### Added`
	`2`	`+`
	`3`	`+- Added deposit request testing for electra.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+### Ignored`
	`2`	`+`
	`3`	`+- Add more debugging information to mismatch fork digest error message`