Add p2p_minimum_peers_per_subnet metric.

- Use `Warning` with fields instead of `Warnf`.
- Avoid to both modify in place the input value and return it.

CHANGELOG.md

@@ -4,44 +4,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.
 
-## [v6.1.3](https://github.com/prysmaticlabs/prysm/compare/v6.1.2...v6.1.3) - 2025-10-20
-
-This release has several important beacon API and p2p fixes.
-
-### Added
-
-- Add Grandine to P2P known agents. (Useful for metrics). [[PR]](https://github.com/prysmaticlabs/prysm/pull/15829)
-- Delegate sszInfo HashTreeRoot to FastSSZ-generated implementations via SSZObject, enabling roots calculation for generated types while avoiding duplicate logic. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15805)
-- SSZ-QL: Use `fastssz`'s `SizeSSZ` method for calculating the size of `Container` type. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15864)
-- SSZ-QL: Access n-th element in `List`/`Vector`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15767)
-
-### Changed
-
-- Do not verify block data when calculating rewards. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15819)
-- Process pending attestations after pending blocks are cleared. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15824)
-- updated web3signer to 25.9.1. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15832)
-- Gracefully handle submit blind block returning 502 errors. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15848)
-- Improve returning individual message errors from Beacon API. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15835)
-- SSZ-QL: Clarify `Size` method with more sophisticated `SSZType`s. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15864)
-
-### Fixed
-
-- Use service context and continue on slasher attestation errors (#15803). [[PR]](https://github.com/prysmaticlabs/prysm/pull/15803)
-- block event probably shouldn't be sent on certain block processing failures, now sends only on successing processing Block is NON-CANONICAL, Block IS CANONICAL but getFCUArgs FAILS, and Full success. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15814)
-- Fixed web3signer e2e, issues caused due to a regression on old fork support. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15832)
-- Do not mark blocks as invalid from ErrNotDescendantOfFinalized. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15846)
-- Fixed [#15812](https://github.com/OffchainLabs/prysm/issues/15812): Gossip attestation validation incorrectly rejecting attestations that arrive before their referenced blocks. Previously, attestations were saved to the pending queue but immediately rejected by forkchoice validation, causing "not descendant of finalized checkpoint" errors. Now attestations for missing blocks return `ValidationIgnore` without error, allowing them to be properly processed when their blocks arrive. This eliminates false positive rejections and prevents potential incorrect peer downscoring during network congestion. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15840)
-- Mark the block as invalid if it has an invalid signature. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15847)
-- Display error messages from the server verbatim when they are not encoded as `application/json`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15860)
-- `HasAtLeastOneIndex`: Check the index is not too high. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15865)
-- Fix `/eth/v1/beacon/blob_sidecars/` beacon API is the fulu fork epoch is set to the far future epoch. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15867)
-- `dataColumnSidecarsByRangeRPCHandler`: Gracefully close the stream if no data to return. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15866)
-- `VerifyDataColumnSidecar`: Check if there is no too many commitments. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15859)
-- `WithDataColumnRetentionEpochs`: Use `dataColumnRetentionEpoch` instead of `blobColumnRetentionEpoch`. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15872)
-- Mark epoch transition correctly on new head events. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15871)
-- reject committee index >= committees_per_slot in unaggregated attestation validation. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15855)
-- Decreased attestation gossip validation batch deadline to 5ms. [[PR]](https://github.com/prysmaticlabs/prysm/pull/15882)
-
 ## [v6.1.2](https://github.com/prysmaticlabs/prysm/compare/v6.1.1...v6.1.2) - 2025-10-10
 
 This release has several important fixes to improve Prysm's peering, stability, and attestation inclusion on mainnet and all testnets. All node operators are encouraged to update to this release as soon as practical for the best mainnet performance.
@@ -3797,4 +3759,4 @@ There are no security updates in this release.
 
 # Older than v2.0.0
 
-For changelog history for releases older than v2.0.0, please refer to https://github.com/prysmaticlabs/prysm/releases
+For changelog history for releases older than v2.0.0, please refer to https://github.com/prysmaticlabs/prysm/releases

WORKSPACE

@@ -253,16 +253,16 @@ filegroup(
     url = "https://github.com/ethereum/EIPs/archive/5480440fe51742ed23342b68cf106cefd427e39d.tar.gz",
 )
 
-consensus_spec_version = "v1.6.0-beta.1"
+consensus_spec_version = "v1.6.0-beta.0"
 
 load("@prysm//tools:download_spectests.bzl", "consensus_spec_tests")
 
 consensus_spec_tests(
     name = "consensus_spec_tests",
     flavors = {
-        "general": "sha256-oEj0MTViJHjZo32nABK36gfvSXpbwkBk/jt6Mj7pWFI=",
-        "minimal": "sha256-cS4NPv6IRBoCSmWomQ8OEo8IsVNW9YawUFqoRZQBUj4=",
-        "mainnet": "sha256-BYuLndMPAh4p13IRJgNfVakrCVL69KRrNw2tdc3ETbE=",
+        "general": "sha256-rT3jQp2+ZaDiO66gIQggetzqr+kGeexaLqEhbx4HDMY=",
+        "minimal": "sha256-wowwwyvd0KJLsE+oDOtPkrhZyJndJpJ0lbXYsLH6XBw=",
+        "mainnet": "sha256-4ZLrLNeO7NihZ4TuWH5V5fUhvW9Y3mAPBQDCqrfShps=",
     },
     version = consensus_spec_version,
 )
@@ -278,7 +278,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-yrq3tdwPS8Ri+ueeLAHssIT3ssMrX7zvHiJ8Xf9GVYs=",
+    integrity = "sha256-sBe3Rx8zGq9IrvfgIhZQpYidGjy3mE1SiCb6/+pjLdY=",
     strip_prefix = "consensus-specs-" + consensus_spec_version[1:],
     url = "https://github.com/ethereum/consensus-specs/archive/refs/tags/%s.tar.gz" % consensus_spec_version,
 )

api/client/BUILD.bazel

@@ -6,7 +6,6 @@ go_library(
         "client.go",
         "errors.go",
         "options.go",
-        "transport.go",
     ],
     importpath = "github.com/OffchainLabs/prysm/v6/api/client",
     visibility = ["//visibility:public"],
@@ -15,13 +14,7 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = [
-        "client_test.go",
-        "transport_test.go",
-    ],
+    srcs = ["client_test.go"],
     embed = [":go_default_library"],
-    deps = [
-        "//testing/assert:go_default_library",
-        "//testing/require:go_default_library",
-    ],
+    deps = ["//testing/require:go_default_library"],
 )

api/client/beacon/client.go

@@ -284,7 +284,7 @@ func (c *Client) SubmitChangeBLStoExecution(ctx context.Context, request []*stru
 	if resp.StatusCode != http.StatusOK {
 		decoder := json.NewDecoder(resp.Body)
 		decoder.DisallowUnknownFields()
-		errorJson := &server.IndexedErrorContainer{}
+		errorJson := &server.IndexedVerificationFailureError{}
 		if err := decoder.Decode(errorJson); err != nil {
 			return errors.Wrapf(err, "failed to decode error JSON for %s", resp.Request.URL)
 		}

api/client/transport.go

@@ -1,25 +0,0 @@
-package client
-
-import "net/http"
-
-// CustomHeadersTransport adds custom headers to each request
-type CustomHeadersTransport struct {
-	base    http.RoundTripper
-	headers map[string][]string
-}
-
-func NewCustomHeadersTransport(base http.RoundTripper, headers map[string][]string) *CustomHeadersTransport {
-	return &CustomHeadersTransport{
-		base:    base,
-		headers: headers,
-	}
-}
-
-func (t *CustomHeadersTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	for header, values := range t.headers {
-		for _, value := range values {
-			req.Header.Add(header, value)
-		}
-	}
-	return t.base.RoundTrip(req)
-}

api/client/transport_test.go

@@ -1,25 +0,0 @@
-package client
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-)
-
-type noopTransport struct{}
-
-func (*noopTransport) RoundTrip(*http.Request) (*http.Response, error) {
-	return nil, nil
-}
-
-func TestRoundTrip(t *testing.T) {
-	tr := &CustomHeadersTransport{base: &noopTransport{}, headers: map[string][]string{"key1": []string{"value1", "value2"}, "key2": []string{"value3"}}}
-	req := httptest.NewRequest("GET", "http://foo", nil)
-	_, err := tr.RoundTrip(req)
-	require.NoError(t, err)
-	assert.DeepEqual(t, []string{"value1", "value2"}, req.Header.Values("key1"))
-	assert.DeepEqual(t, []string{"value3"}, req.Header.Values("key2"))
-}

api/server/error.go

@@ -6,11 +6,6 @@ import (
 	"strings"
 )
 
-var (
-	ErrIndexedValidationFail = "One or more messages failed validation"
-	ErrIndexedBroadcastFail  = "One or more messages failed broadcast"
-)
-
 // DecodeError represents an error resulting from trying to decode an HTTP request.
 // It tracks the full field name for which decoding failed.
 type DecodeError struct {
@@ -34,38 +29,19 @@ func (e *DecodeError) Error() string {
 	return fmt.Sprintf("could not decode %s: %s", strings.Join(e.path, "."), e.err.Error())
 }
 
-// IndexedErrorContainer wraps a collection of indexed errors.
-type IndexedErrorContainer struct {
-	Message  string          `json:"message"`
-	Code     int             `json:"code"`
-	Failures []*IndexedError `json:"failures"`
+// IndexedVerificationFailureError wraps a collection of verification failures.
+type IndexedVerificationFailureError struct {
+	Message  string                        `json:"message"`
+	Code     int                           `json:"code"`
+	Failures []*IndexedVerificationFailure `json:"failures"`
 }
 
-func (e *IndexedErrorContainer) StatusCode() int {
+func (e *IndexedVerificationFailureError) StatusCode() int {
 	return e.Code
 }
 
-// IndexedError represents an issue when processing a single indexed object e.g. an item in an array.
-type IndexedError struct {
+// IndexedVerificationFailure represents an issue when verifying a single indexed object e.g. an item in an array.
+type IndexedVerificationFailure struct {
 	Index   int    `json:"index"`
 	Message string `json:"message"`
 }
-
-// BroadcastFailedError represents an error scenario where broadcasting a published message failed.
-type BroadcastFailedError struct {
-	msg string
-	err error
-}
-
-// NewBroadcastFailedError creates a new instance of BroadcastFailedError.
-func NewBroadcastFailedError(msg string, err error) *BroadcastFailedError {
-	return &BroadcastFailedError{
-		msg: msg,
-		err: err,
-	}
-}
-
-// Error returns the underlying error message.
-func (e *BroadcastFailedError) Error() string {
-	return fmt.Sprintf("could not broadcast %s: %s", e.msg, e.err.Error())
-}

api/server/structs/endpoints_beacon.go

@@ -296,8 +296,3 @@ type GetBlobsResponse struct {
 	Finalized           bool     `json:"finalized"`
 	Data                []string `json:"data"` //blobs
 }
-
-type SSZQueryRequest struct {
-	Query        string `json:"query"`
-	IncludeProof bool   `json:"include_proof,omitempty"`
-}

beacon-chain/blockchain/BUILD.bazel

@@ -173,7 +173,6 @@ go_test(
         "//beacon-chain/state/state-native:go_default_library",
         "//beacon-chain/state/stategen:go_default_library",
         "//beacon-chain/verification:go_default_library",
-        "//cmd/beacon-chain/flags:go_default_library",
         "//config/features:go_default_library",
         "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",

beacon-chain/blockchain/head.go

@@ -346,24 +346,13 @@ func (s *Service) notifyNewHeadEvent(
 	if err != nil {
 		return errors.Wrap(err, "could not check if node is optimistically synced")
 	}
-
-	parentRoot, err := s.ParentRoot([32]byte(newHeadRoot))
-	if err != nil {
-		return errors.Wrap(err, "could not obtain parent root in forkchoice")
-	}
-	parentSlot, err := s.RecentBlockSlot(parentRoot)
-	if err != nil {
-		return errors.Wrap(err, "could not obtain parent slot in forkchoice")
-	}
-	epochTransition := slots.ToEpoch(newHeadSlot) > slots.ToEpoch(parentSlot)
-
 	s.cfg.StateNotifier.StateFeed().Send(&feed.Event{
 		Type: statefeed.NewHead,
 		Data: &ethpbv1.EventHead{
 			Slot:                      newHeadSlot,
 			Block:                     newHeadRoot,
 			State:                     newHeadStateRoot,
-			EpochTransition:           epochTransition,
+			EpochTransition:           slots.IsEpochStart(newHeadSlot),
 			PreviousDutyDependentRoot: previousDutyDependentRoot[:],
 			CurrentDutyDependentRoot:  currentDutyDependentRoot[:],
 			ExecutionOptimistic:       isOptimistic,

beacon-chain/blockchain/head_test.go

@@ -162,9 +162,6 @@ func Test_notifyNewHeadEvent(t *testing.T) {
 		require.NoError(t, srv.cfg.ForkChoiceStore.InsertNode(t.Context(), st, blk))
 		newHeadStateRoot := [32]byte{2}
 		newHeadRoot := [32]byte{3}
-		st, blk, err = prepareForkchoiceState(t.Context(), 1, newHeadRoot, [32]byte{}, [32]byte{}, &ethpb.Checkpoint{}, &ethpb.Checkpoint{})
-		require.NoError(t, err)
-		require.NoError(t, srv.cfg.ForkChoiceStore.InsertNode(t.Context(), st, blk))
 		require.NoError(t, srv.notifyNewHeadEvent(t.Context(), 1, bState, newHeadStateRoot[:], newHeadRoot[:]))
 		events := notifier.ReceivedEvents()
 		require.Equal(t, 1, len(events))
@@ -199,9 +196,6 @@ func Test_notifyNewHeadEvent(t *testing.T) {
 
 		newHeadStateRoot := [32]byte{2}
 		newHeadRoot := [32]byte{3}
-		st, blk, err = prepareForkchoiceState(t.Context(), 0, newHeadRoot, [32]byte{}, [32]byte{}, &ethpb.Checkpoint{}, &ethpb.Checkpoint{})
-		require.NoError(t, err)
-		require.NoError(t, srv.cfg.ForkChoiceStore.InsertNode(t.Context(), st, blk))
 		err = srv.notifyNewHeadEvent(t.Context(), epoch2Start, bState, newHeadStateRoot[:], newHeadRoot[:])
 		require.NoError(t, err)
 		events := notifier.ReceivedEvents()
@@ -219,37 +213,6 @@ func Test_notifyNewHeadEvent(t *testing.T) {
 		}
 		require.DeepSSZEqual(t, wanted, eventHead)
 	})
-	t.Run("epoch transition", func(t *testing.T) {
-		bState, _ := util.DeterministicGenesisState(t, 10)
-		srv := testServiceWithDB(t)
-		srv.SetGenesisTime(time.Now())
-		notifier := srv.cfg.StateNotifier.(*mock.MockStateNotifier)
-		srv.originBlockRoot = [32]byte{1}
-		st, blk, err := prepareForkchoiceState(t.Context(), 0, [32]byte{}, [32]byte{}, [32]byte{}, &ethpb.Checkpoint{}, &ethpb.Checkpoint{})
-		require.NoError(t, err)
-		require.NoError(t, srv.cfg.ForkChoiceStore.InsertNode(t.Context(), st, blk))
-		newHeadStateRoot := [32]byte{2}
-		newHeadRoot := [32]byte{3}
-		st, blk, err = prepareForkchoiceState(t.Context(), 32, newHeadRoot, [32]byte{}, [32]byte{}, &ethpb.Checkpoint{}, &ethpb.Checkpoint{})
-		require.NoError(t, err)
-		require.NoError(t, srv.cfg.ForkChoiceStore.InsertNode(t.Context(), st, blk))
-		newHeadSlot := params.BeaconConfig().SlotsPerEpoch
-		require.NoError(t, srv.notifyNewHeadEvent(t.Context(), newHeadSlot, bState, newHeadStateRoot[:], newHeadRoot[:]))
-		events := notifier.ReceivedEvents()
-		require.Equal(t, 1, len(events))
-
-		eventHead, ok := events[0].Data.(*ethpbv1.EventHead)
-		require.Equal(t, true, ok)
-		wanted := &ethpbv1.EventHead{
-			Slot:                      newHeadSlot,
-			Block:                     newHeadRoot[:],
-			State:                     newHeadStateRoot[:],
-			EpochTransition:           true,
-			PreviousDutyDependentRoot: params.BeaconConfig().ZeroHash[:],
-			CurrentDutyDependentRoot:  srv.originBlockRoot[:],
-		}
-		require.DeepSSZEqual(t, wanted, eventHead)
-	})
 }
 
 func TestRetrieveHead_ReadOnly(t *testing.T) {

beacon-chain/blockchain/service.go

@@ -472,8 +472,8 @@ func (s *Service) removeStartupState() {
 func (s *Service) updateCustodyInfoInDB(slot primitives.Slot) (primitives.Slot, uint64, error) {
 	isSubscribedToAllDataSubnets := flags.Get().SubscribeAllDataSubnets
 
-	cfg := params.BeaconConfig()
-	custodyRequirement := cfg.CustodyRequirement
+	beaconConfig := params.BeaconConfig()
+	custodyRequirement := beaconConfig.CustodyRequirement
 
 	// Check if the node was previously subscribed to all data subnets, and if so,
 	// store the new status accordingly.
@@ -493,7 +493,7 @@ func (s *Service) updateCustodyInfoInDB(slot primitives.Slot) (primitives.Slot,
 	// Compute the custody group count.
 	custodyGroupCount := custodyRequirement
 	if isSubscribedToAllDataSubnets {
-		custodyGroupCount = cfg.NumberOfCustodyGroups
+		custodyGroupCount = beaconConfig.NumberOfColumns
 	}
 
 	// Safely compute the fulu fork slot.
@@ -536,11 +536,11 @@ func spawnCountdownIfPreGenesis(ctx context.Context, genesisTime time.Time, db d
 }
 
 func fuluForkSlot() (primitives.Slot, error) {
-	cfg := params.BeaconConfig()
+	beaconConfig := params.BeaconConfig()
 
-	fuluForkEpoch := cfg.FuluForkEpoch
-	if fuluForkEpoch == cfg.FarFutureEpoch {
-		return cfg.FarFutureSlot, nil
+	fuluForkEpoch := beaconConfig.FuluForkEpoch
+	if fuluForkEpoch == beaconConfig.FarFutureEpoch {
+		return beaconConfig.FarFutureSlot, nil
 	}
 
 	forkFuluSlot, err := slots.EpochStart(fuluForkEpoch)

beacon-chain/blockchain/service_test.go

@@ -23,11 +23,9 @@ import (
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/startup"
 	state_native "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/state/stategen"
-	"github.com/OffchainLabs/prysm/v6/cmd/beacon-chain/flags"
 	"github.com/OffchainLabs/prysm/v6/config/features"
 	fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams"
 	"github.com/OffchainLabs/prysm/v6/config/params"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/blocks"
 	consensusblocks "github.com/OffchainLabs/prysm/v6/consensus-types/blocks"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/interfaces"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
@@ -598,103 +596,3 @@ func TestNotifyIndex(t *testing.T) {
 		t.Errorf("Notifier channel did not receive the index")
 	}
 }
-
-func TestUpdateCustodyInfoInDB(t *testing.T) {
-	const (
-		fuluForkEpoch         = 10
-		custodyRequirement    = uint64(4)
-		earliestStoredSlot    = primitives.Slot(12)
-		numberOfCustodyGroups = uint64(64)
-		numberOfColumns       = uint64(128)
-	)
-
-	params.SetupTestConfigCleanup(t)
-	cfg := params.BeaconConfig()
-	cfg.FuluForkEpoch = fuluForkEpoch
-	cfg.CustodyRequirement = custodyRequirement
-	cfg.NumberOfCustodyGroups = numberOfCustodyGroups
-	cfg.NumberOfColumns = numberOfColumns
-	params.OverrideBeaconConfig(cfg)
-
-	ctx := t.Context()
-	pbBlock := util.NewBeaconBlock()
-	pbBlock.Block.Slot = 12
-	signedBeaconBlock, err := blocks.NewSignedBeaconBlock(pbBlock)
-	require.NoError(t, err)
-
-	roBlock, err := blocks.NewROBlock(signedBeaconBlock)
-	require.NoError(t, err)
-
-	t.Run("CGC increases before fulu", func(t *testing.T) {
-		service, requirements := minimalTestService(t)
-		err = requirements.db.SaveBlock(ctx, roBlock)
-		require.NoError(t, err)
-
-		// Before Fulu
-		// -----------
-		actualEas, actualCgc, err := service.updateCustodyInfoInDB(15)
-		require.NoError(t, err)
-		require.Equal(t, earliestStoredSlot, actualEas)
-		require.Equal(t, custodyRequirement, actualCgc)
-
-		actualEas, actualCgc, err = service.updateCustodyInfoInDB(17)
-		require.NoError(t, err)
-		require.Equal(t, earliestStoredSlot, actualEas)
-		require.Equal(t, custodyRequirement, actualCgc)
-
-		resetFlags := flags.Get()
-		gFlags := new(flags.GlobalFlags)
-		gFlags.SubscribeAllDataSubnets = true
-		flags.Init(gFlags)
-		defer flags.Init(resetFlags)
-
-		actualEas, actualCgc, err = service.updateCustodyInfoInDB(19)
-		require.NoError(t, err)
-		require.Equal(t, earliestStoredSlot, actualEas)
-		require.Equal(t, numberOfCustodyGroups, actualCgc)
-
-		// After Fulu
-		// ----------
-		actualEas, actualCgc, err = service.updateCustodyInfoInDB(fuluForkEpoch*primitives.Slot(cfg.SlotsPerEpoch) + 1)
-		require.NoError(t, err)
-		require.Equal(t, earliestStoredSlot, actualEas)
-		require.Equal(t, numberOfCustodyGroups, actualCgc)
-	})
-
-	t.Run("CGC increases after fulu", func(t *testing.T) {
-		service, requirements := minimalTestService(t)
-		err = requirements.db.SaveBlock(ctx, roBlock)
-		require.NoError(t, err)
-
-		// Before Fulu
-		// -----------
-		actualEas, actualCgc, err := service.updateCustodyInfoInDB(15)
-		require.NoError(t, err)
-		require.Equal(t, earliestStoredSlot, actualEas)
-		require.Equal(t, custodyRequirement, actualCgc)
-
-		actualEas, actualCgc, err = service.updateCustodyInfoInDB(17)
-		require.NoError(t, err)
-		require.Equal(t, earliestStoredSlot, actualEas)
-		require.Equal(t, custodyRequirement, actualCgc)
-
-		// After Fulu
-		// ----------
-		resetFlags := flags.Get()
-		gFlags := new(flags.GlobalFlags)
-		gFlags.SubscribeAllDataSubnets = true
-		flags.Init(gFlags)
-		defer flags.Init(resetFlags)
-
-		slot := fuluForkEpoch*primitives.Slot(cfg.SlotsPerEpoch) + 1
-		actualEas, actualCgc, err = service.updateCustodyInfoInDB(slot)
-		require.NoError(t, err)
-		require.Equal(t, slot, actualEas)
-		require.Equal(t, numberOfCustodyGroups, actualCgc)
-
-		actualEas, actualCgc, err = service.updateCustodyInfoInDB(slot + 2)
-		require.NoError(t, err)
-		require.Equal(t, slot, actualEas)
-		require.Equal(t, numberOfCustodyGroups, actualCgc)
-	})
-}

beacon-chain/blockchain/setup_test.go

@@ -130,14 +130,6 @@ func (dch *mockCustodyManager) UpdateCustodyInfo(earliestAvailableSlot primitive
 	return earliestAvailableSlot, custodyGroupCount, nil
 }
 
-func (dch *mockCustodyManager) UpdateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error {
-	dch.mut.Lock()
-	defer dch.mut.Unlock()
-
-	dch.earliestAvailableSlot = earliestAvailableSlot
-	return nil
-}
-
 func (dch *mockCustodyManager) CustodyGroupCountFromPeer(peer.ID) uint64 {
 	return 0
 }

beacon-chain/core/altair/upgrade.go

@@ -12,46 +12,6 @@ import (
 	"github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1/attestation"
 )
 
-// ConvertToAltair converts a Phase 0 beacon state to an Altair beacon state.
-func ConvertToAltair(state state.BeaconState) (state.BeaconState, error) {
-	epoch := time.CurrentEpoch(state)
-
-	numValidators := state.NumValidators()
-	s := &ethpb.BeaconStateAltair{
-		GenesisTime:           uint64(state.GenesisTime().Unix()),
-		GenesisValidatorsRoot: state.GenesisValidatorsRoot(),
-		Slot:                  state.Slot(),
-		Fork: &ethpb.Fork{
-			PreviousVersion: state.Fork().CurrentVersion,
-			CurrentVersion:  params.BeaconConfig().AltairForkVersion,
-			Epoch:           epoch,
-		},
-		LatestBlockHeader:           state.LatestBlockHeader(),
-		BlockRoots:                  state.BlockRoots(),
-		StateRoots:                  state.StateRoots(),
-		HistoricalRoots:             state.HistoricalRoots(),
-		Eth1Data:                    state.Eth1Data(),
-		Eth1DataVotes:               state.Eth1DataVotes(),
-		Eth1DepositIndex:            state.Eth1DepositIndex(),
-		Validators:                  state.Validators(),
-		Balances:                    state.Balances(),
-		RandaoMixes:                 state.RandaoMixes(),
-		Slashings:                   state.Slashings(),
-		PreviousEpochParticipation:  make([]byte, numValidators),
-		CurrentEpochParticipation:   make([]byte, numValidators),
-		JustificationBits:           state.JustificationBits(),
-		PreviousJustifiedCheckpoint: state.PreviousJustifiedCheckpoint(),
-		CurrentJustifiedCheckpoint:  state.CurrentJustifiedCheckpoint(),
-		FinalizedCheckpoint:         state.FinalizedCheckpoint(),
-		InactivityScores:            make([]uint64, numValidators),
-	}
-	newState, err := state_native.InitializeFromProtoUnsafeAltair(s)
-	if err != nil {
-		return nil, err
-	}
-	return newState, nil
-}
-
 // UpgradeToAltair updates input state to return the version Altair state.
 //
 // Spec code:
@@ -104,7 +64,39 @@ func ConvertToAltair(state state.BeaconState) (state.BeaconState, error) {
 //	post.next_sync_committee = get_next_sync_committee(post)
 //	return post
 func UpgradeToAltair(ctx context.Context, state state.BeaconState) (state.BeaconState, error) {
-	newState, err := ConvertToAltair(state)
+	epoch := time.CurrentEpoch(state)
+
+	numValidators := state.NumValidators()
+	s := &ethpb.BeaconStateAltair{
+		GenesisTime:           uint64(state.GenesisTime().Unix()),
+		GenesisValidatorsRoot: state.GenesisValidatorsRoot(),
+		Slot:                  state.Slot(),
+		Fork: &ethpb.Fork{
+			PreviousVersion: state.Fork().CurrentVersion,
+			CurrentVersion:  params.BeaconConfig().AltairForkVersion,
+			Epoch:           epoch,
+		},
+		LatestBlockHeader:           state.LatestBlockHeader(),
+		BlockRoots:                  state.BlockRoots(),
+		StateRoots:                  state.StateRoots(),
+		HistoricalRoots:             state.HistoricalRoots(),
+		Eth1Data:                    state.Eth1Data(),
+		Eth1DataVotes:               state.Eth1DataVotes(),
+		Eth1DepositIndex:            state.Eth1DepositIndex(),
+		Validators:                  state.Validators(),
+		Balances:                    state.Balances(),
+		RandaoMixes:                 state.RandaoMixes(),
+		Slashings:                   state.Slashings(),
+		PreviousEpochParticipation:  make([]byte, numValidators),
+		CurrentEpochParticipation:   make([]byte, numValidators),
+		JustificationBits:           state.JustificationBits(),
+		PreviousJustifiedCheckpoint: state.PreviousJustifiedCheckpoint(),
+		CurrentJustifiedCheckpoint:  state.CurrentJustifiedCheckpoint(),
+		FinalizedCheckpoint:         state.FinalizedCheckpoint(),
+		InactivityScores:            make([]uint64, numValidators),
+	}
+
+	newState, err := state_native.InitializeFromProtoUnsafeAltair(s)
 	if err != nil {
 		return nil, err
 	}

beacon-chain/core/electra/upgrade.go

@@ -15,129 +15,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-// ConvertToElectra converts a Deneb beacon state to an Electra beacon state. It does not perform any fork logic.
-func ConvertToElectra(beaconState state.BeaconState) (state.BeaconState, error) {
-	currentSyncCommittee, err := beaconState.CurrentSyncCommittee()
-	if err != nil {
-		return nil, err
-	}
-	nextSyncCommittee, err := beaconState.NextSyncCommittee()
-	if err != nil {
-		return nil, err
-	}
-	prevEpochParticipation, err := beaconState.PreviousEpochParticipation()
-	if err != nil {
-		return nil, err
-	}
-	currentEpochParticipation, err := beaconState.CurrentEpochParticipation()
-	if err != nil {
-		return nil, err
-	}
-	inactivityScores, err := beaconState.InactivityScores()
-	if err != nil {
-		return nil, err
-	}
-	payloadHeader, err := beaconState.LatestExecutionPayloadHeader()
-	if err != nil {
-		return nil, err
-	}
-	txRoot, err := payloadHeader.TransactionsRoot()
-	if err != nil {
-		return nil, err
-	}
-	wdRoot, err := payloadHeader.WithdrawalsRoot()
-	if err != nil {
-		return nil, err
-	}
-	wi, err := beaconState.NextWithdrawalIndex()
-	if err != nil {
-		return nil, err
-	}
-	vi, err := beaconState.NextWithdrawalValidatorIndex()
-	if err != nil {
-		return nil, err
-	}
-	summaries, err := beaconState.HistoricalSummaries()
-	if err != nil {
-		return nil, err
-	}
-	excessBlobGas, err := payloadHeader.ExcessBlobGas()
-	if err != nil {
-		return nil, err
-	}
-	blobGasUsed, err := payloadHeader.BlobGasUsed()
-	if err != nil {
-		return nil, err
-	}
-
-	s := &ethpb.BeaconStateElectra{
-		GenesisTime:           uint64(beaconState.GenesisTime().Unix()),
-		GenesisValidatorsRoot: beaconState.GenesisValidatorsRoot(),
-		Slot:                  beaconState.Slot(),
-		Fork: &ethpb.Fork{
-			PreviousVersion: beaconState.Fork().CurrentVersion,
-			CurrentVersion:  params.BeaconConfig().ElectraForkVersion,
-			Epoch:           time.CurrentEpoch(beaconState),
-		},
-		LatestBlockHeader:           beaconState.LatestBlockHeader(),
-		BlockRoots:                  beaconState.BlockRoots(),
-		StateRoots:                  beaconState.StateRoots(),
-		HistoricalRoots:             beaconState.HistoricalRoots(),
-		Eth1Data:                    beaconState.Eth1Data(),
-		Eth1DataVotes:               beaconState.Eth1DataVotes(),
-		Eth1DepositIndex:            beaconState.Eth1DepositIndex(),
-		Validators:                  beaconState.Validators(),
-		Balances:                    beaconState.Balances(),
-		RandaoMixes:                 beaconState.RandaoMixes(),
-		Slashings:                   beaconState.Slashings(),
-		PreviousEpochParticipation:  prevEpochParticipation,
-		CurrentEpochParticipation:   currentEpochParticipation,
-		JustificationBits:           beaconState.JustificationBits(),
-		PreviousJustifiedCheckpoint: beaconState.PreviousJustifiedCheckpoint(),
-		CurrentJustifiedCheckpoint:  beaconState.CurrentJustifiedCheckpoint(),
-		FinalizedCheckpoint:         beaconState.FinalizedCheckpoint(),
-		InactivityScores:            inactivityScores,
-		CurrentSyncCommittee:        currentSyncCommittee,
-		NextSyncCommittee:           nextSyncCommittee,
-		LatestExecutionPayloadHeader: &enginev1.ExecutionPayloadHeaderDeneb{
-			ParentHash:       payloadHeader.ParentHash(),
-			FeeRecipient:     payloadHeader.FeeRecipient(),
-			StateRoot:        payloadHeader.StateRoot(),
-			ReceiptsRoot:     payloadHeader.ReceiptsRoot(),
-			LogsBloom:        payloadHeader.LogsBloom(),
-			PrevRandao:       payloadHeader.PrevRandao(),
-			BlockNumber:      payloadHeader.BlockNumber(),
-			GasLimit:         payloadHeader.GasLimit(),
-			GasUsed:          payloadHeader.GasUsed(),
-			Timestamp:        payloadHeader.Timestamp(),
-			ExtraData:        payloadHeader.ExtraData(),
-			BaseFeePerGas:    payloadHeader.BaseFeePerGas(),
-			BlockHash:        payloadHeader.BlockHash(),
-			TransactionsRoot: txRoot,
-			WithdrawalsRoot:  wdRoot,
-			ExcessBlobGas:    excessBlobGas,
-			BlobGasUsed:      blobGasUsed,
-		},
-		NextWithdrawalIndex:          wi,
-		NextWithdrawalValidatorIndex: vi,
-		HistoricalSummaries:          summaries,
-
-		DepositRequestsStartIndex:  params.BeaconConfig().UnsetDepositRequestsStartIndex,
-		DepositBalanceToConsume:    0,
-		EarliestConsolidationEpoch: helpers.ActivationExitEpoch(slots.ToEpoch(beaconState.Slot())),
-		PendingDeposits:            make([]*ethpb.PendingDeposit, 0),
-		PendingPartialWithdrawals:  make([]*ethpb.PendingPartialWithdrawal, 0),
-		PendingConsolidations:      make([]*ethpb.PendingConsolidation, 0),
-	}
-
-	// need to cast the beaconState to use in helper functions
-	post, err := state_native.InitializeFromProtoUnsafeElectra(s)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to initialize post electra beaconState")
-	}
-	return post, nil
-}
-
 // UpgradeToElectra updates inputs a generic state to return the version Electra state.
 //
 // nolint:dupword
@@ -249,7 +126,55 @@ func ConvertToElectra(beaconState state.BeaconState) (state.BeaconState, error)
 //
 //	return post
 func UpgradeToElectra(beaconState state.BeaconState) (state.BeaconState, error) {
-	s, err := ConvertToElectra(beaconState)
+	currentSyncCommittee, err := beaconState.CurrentSyncCommittee()
+	if err != nil {
+		return nil, err
+	}
+	nextSyncCommittee, err := beaconState.NextSyncCommittee()
+	if err != nil {
+		return nil, err
+	}
+	prevEpochParticipation, err := beaconState.PreviousEpochParticipation()
+	if err != nil {
+		return nil, err
+	}
+	currentEpochParticipation, err := beaconState.CurrentEpochParticipation()
+	if err != nil {
+		return nil, err
+	}
+	inactivityScores, err := beaconState.InactivityScores()
+	if err != nil {
+		return nil, err
+	}
+	payloadHeader, err := beaconState.LatestExecutionPayloadHeader()
+	if err != nil {
+		return nil, err
+	}
+	txRoot, err := payloadHeader.TransactionsRoot()
+	if err != nil {
+		return nil, err
+	}
+	wdRoot, err := payloadHeader.WithdrawalsRoot()
+	if err != nil {
+		return nil, err
+	}
+	wi, err := beaconState.NextWithdrawalIndex()
+	if err != nil {
+		return nil, err
+	}
+	vi, err := beaconState.NextWithdrawalValidatorIndex()
+	if err != nil {
+		return nil, err
+	}
+	summaries, err := beaconState.HistoricalSummaries()
+	if err != nil {
+		return nil, err
+	}
+	excessBlobGas, err := payloadHeader.ExcessBlobGas()
+	if err != nil {
+		return nil, err
+	}
+	blobGasUsed, err := payloadHeader.BlobGasUsed()
 	if err != nil {
 		return nil, err
 	}
@@ -281,38 +206,97 @@ func UpgradeToElectra(beaconState state.BeaconState) (state.BeaconState, error)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get total active balance")
 	}
-	if err := s.SetExitBalanceToConsume(helpers.ActivationExitChurnLimit(primitives.Gwei(tab))); err != nil {
-		return nil, errors.Wrap(err, "failed to set exit balance to consume")
-	}
-	if err := s.SetEarliestExitEpoch(earliestExitEpoch); err != nil {
-		return nil, errors.Wrap(err, "failed to set earliest exit epoch")
-	}
-	if err := s.SetConsolidationBalanceToConsume(helpers.ConsolidationChurnLimit(primitives.Gwei(tab))); err != nil {
-		return nil, errors.Wrap(err, "failed to set consolidation balance to consume")
+
+	s := &ethpb.BeaconStateElectra{
+		GenesisTime:           uint64(beaconState.GenesisTime().Unix()),
+		GenesisValidatorsRoot: beaconState.GenesisValidatorsRoot(),
+		Slot:                  beaconState.Slot(),
+		Fork: &ethpb.Fork{
+			PreviousVersion: beaconState.Fork().CurrentVersion,
+			CurrentVersion:  params.BeaconConfig().ElectraForkVersion,
+			Epoch:           time.CurrentEpoch(beaconState),
+		},
+		LatestBlockHeader:           beaconState.LatestBlockHeader(),
+		BlockRoots:                  beaconState.BlockRoots(),
+		StateRoots:                  beaconState.StateRoots(),
+		HistoricalRoots:             beaconState.HistoricalRoots(),
+		Eth1Data:                    beaconState.Eth1Data(),
+		Eth1DataVotes:               beaconState.Eth1DataVotes(),
+		Eth1DepositIndex:            beaconState.Eth1DepositIndex(),
+		Validators:                  beaconState.Validators(),
+		Balances:                    beaconState.Balances(),
+		RandaoMixes:                 beaconState.RandaoMixes(),
+		Slashings:                   beaconState.Slashings(),
+		PreviousEpochParticipation:  prevEpochParticipation,
+		CurrentEpochParticipation:   currentEpochParticipation,
+		JustificationBits:           beaconState.JustificationBits(),
+		PreviousJustifiedCheckpoint: beaconState.PreviousJustifiedCheckpoint(),
+		CurrentJustifiedCheckpoint:  beaconState.CurrentJustifiedCheckpoint(),
+		FinalizedCheckpoint:         beaconState.FinalizedCheckpoint(),
+		InactivityScores:            inactivityScores,
+		CurrentSyncCommittee:        currentSyncCommittee,
+		NextSyncCommittee:           nextSyncCommittee,
+		LatestExecutionPayloadHeader: &enginev1.ExecutionPayloadHeaderDeneb{
+			ParentHash:       payloadHeader.ParentHash(),
+			FeeRecipient:     payloadHeader.FeeRecipient(),
+			StateRoot:        payloadHeader.StateRoot(),
+			ReceiptsRoot:     payloadHeader.ReceiptsRoot(),
+			LogsBloom:        payloadHeader.LogsBloom(),
+			PrevRandao:       payloadHeader.PrevRandao(),
+			BlockNumber:      payloadHeader.BlockNumber(),
+			GasLimit:         payloadHeader.GasLimit(),
+			GasUsed:          payloadHeader.GasUsed(),
+			Timestamp:        payloadHeader.Timestamp(),
+			ExtraData:        payloadHeader.ExtraData(),
+			BaseFeePerGas:    payloadHeader.BaseFeePerGas(),
+			BlockHash:        payloadHeader.BlockHash(),
+			TransactionsRoot: txRoot,
+			WithdrawalsRoot:  wdRoot,
+			ExcessBlobGas:    excessBlobGas,
+			BlobGasUsed:      blobGasUsed,
+		},
+		NextWithdrawalIndex:          wi,
+		NextWithdrawalValidatorIndex: vi,
+		HistoricalSummaries:          summaries,
+
+		DepositRequestsStartIndex:     params.BeaconConfig().UnsetDepositRequestsStartIndex,
+		DepositBalanceToConsume:       0,
+		ExitBalanceToConsume:          helpers.ActivationExitChurnLimit(primitives.Gwei(tab)),
+		EarliestExitEpoch:             earliestExitEpoch,
+		ConsolidationBalanceToConsume: helpers.ConsolidationChurnLimit(primitives.Gwei(tab)),
+		EarliestConsolidationEpoch:    helpers.ActivationExitEpoch(slots.ToEpoch(beaconState.Slot())),
+		PendingDeposits:               make([]*ethpb.PendingDeposit, 0),
+		PendingPartialWithdrawals:     make([]*ethpb.PendingPartialWithdrawal, 0),
+		PendingConsolidations:         make([]*ethpb.PendingConsolidation, 0),
 	}
 
 	// Sorting preActivationIndices based on a custom criteria
-	vals := s.Validators()
 	sort.Slice(preActivationIndices, func(i, j int) bool {
 		// Comparing based on ActivationEligibilityEpoch and then by index if the epochs are the same
-		if vals[preActivationIndices[i]].ActivationEligibilityEpoch == vals[preActivationIndices[j]].ActivationEligibilityEpoch {
+		if s.Validators[preActivationIndices[i]].ActivationEligibilityEpoch == s.Validators[preActivationIndices[j]].ActivationEligibilityEpoch {
 			return preActivationIndices[i] < preActivationIndices[j]
 		}
-		return vals[preActivationIndices[i]].ActivationEligibilityEpoch < vals[preActivationIndices[j]].ActivationEligibilityEpoch
+		return s.Validators[preActivationIndices[i]].ActivationEligibilityEpoch < s.Validators[preActivationIndices[j]].ActivationEligibilityEpoch
 	})
 
+	// need to cast the beaconState to use in helper functions
+	post, err := state_native.InitializeFromProtoUnsafeElectra(s)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to initialize post electra beaconState")
+	}
+
 	for _, index := range preActivationIndices {
-		if err := QueueEntireBalanceAndResetValidator(s, index); err != nil {
+		if err := QueueEntireBalanceAndResetValidator(post, index); err != nil {
 			return nil, errors.Wrap(err, "failed to queue entire balance and reset validator")
 		}
 	}
 
 	// Ensure early adopters of compounding credentials go through the activation churn
 	for _, index := range compoundWithdrawalIndices {
-		if err := QueueExcessActiveBalance(s, index); err != nil {
+		if err := QueueExcessActiveBalance(post, index); err != nil {
 			return nil, errors.Wrap(err, "failed to queue excess active balance")
 		}
 	}
 
-	return s, nil
+	return post, nil
 }

beacon-chain/core/execution/BUILD.bazel

@@ -7,7 +7,6 @@ go_library(
     visibility = [
         "//beacon-chain:__subpackages__",
         "//cmd/prysmctl/testnet:__pkg__",
-        "//consensus-types/hdiff:__subpackages__",
         "//testing/spectest:__subpackages__",
         "//validator/client:__pkg__",
     ],

beacon-chain/core/fulu/BUILD.bazel

@@ -15,7 +15,6 @@ go_library(
         "//beacon-chain/state:go_default_library",
         "//beacon-chain/state/state-native:go_default_library",
         "//config/params:go_default_library",
-        "//consensus-types/primitives:go_default_library",
         "//monitoring/tracing/trace:go_default_library",
         "//proto/engine/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",

beacon-chain/core/fulu/upgrade.go

@@ -8,7 +8,6 @@ import (
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/state"
 	state_native "github.com/OffchainLabs/prysm/v6/beacon-chain/state/state-native"
 	"github.com/OffchainLabs/prysm/v6/config/params"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	enginev1 "github.com/OffchainLabs/prysm/v6/proto/engine/v1"
 	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/OffchainLabs/prysm/v6/time/slots"
@@ -18,25 +17,6 @@ import (
 // UpgradeToFulu updates inputs a generic state to return the version Fulu state.
 // https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/fork.md#upgrading-the-state
 func UpgradeToFulu(ctx context.Context, beaconState state.BeaconState) (state.BeaconState, error) {
-	s, err := ConvertToFulu(beaconState)
-	if err != nil {
-		return nil, errors.Wrap(err, "could not convert to fulu")
-	}
-	proposerLookahead, err := helpers.InitializeProposerLookahead(ctx, beaconState, slots.ToEpoch(beaconState.Slot()))
-	if err != nil {
-		return nil, err
-	}
-	pl := make([]primitives.ValidatorIndex, len(proposerLookahead))
-	for i, v := range proposerLookahead {
-		pl[i] = primitives.ValidatorIndex(v)
-	}
-	if err := s.SetProposerLookahead(pl); err != nil {
-		return nil, errors.Wrap(err, "failed to set proposer lookahead")
-	}
-	return s, nil
-}
-
-func ConvertToFulu(beaconState state.BeaconState) (state.BeaconState, error) {
 	currentSyncCommittee, err := beaconState.CurrentSyncCommittee()
 	if err != nil {
 		return nil, err
@@ -125,6 +105,11 @@ func ConvertToFulu(beaconState state.BeaconState) (state.BeaconState, error) {
 	if err != nil {
 		return nil, err
 	}
+	proposerLookahead, err := helpers.InitializeProposerLookahead(ctx, beaconState, slots.ToEpoch(beaconState.Slot()))
+	if err != nil {
+		return nil, err
+	}
+
 	s := &ethpb.BeaconStateFulu{
 		GenesisTime:           uint64(beaconState.GenesisTime().Unix()),
 		GenesisValidatorsRoot: beaconState.GenesisValidatorsRoot(),
@@ -186,6 +171,14 @@ func ConvertToFulu(beaconState state.BeaconState) (state.BeaconState, error) {
 		PendingDeposits:               pendingDeposits,
 		PendingPartialWithdrawals:     pendingPartialWithdrawals,
 		PendingConsolidations:         pendingConsolidations,
+		ProposerLookahead:             proposerLookahead,
 	}
-	return state_native.InitializeFromProtoUnsafeFulu(s)
+
+	// Need to cast the beaconState to use in helper functions
+	post, err := state_native.InitializeFromProtoUnsafeFulu(s)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to initialize post fulu beaconState")
+	}
+
+	return post, nil
 }

beacon-chain/core/helpers/validators.go

@@ -401,7 +401,7 @@ func ComputeProposerIndex(bState state.ReadOnlyBeaconState, activeIndices []prim
 		return 0, errors.New("empty active indices list")
 	}
 	hashFunc := hash.CustomSHA256Hasher()
-	cfg := params.BeaconConfig()
+	beaconConfig := params.BeaconConfig()
 	seedBuffer := make([]byte, len(seed)+8)
 	copy(seedBuffer, seed[:])
 
@@ -426,14 +426,14 @@ func ComputeProposerIndex(bState state.ReadOnlyBeaconState, activeIndices []prim
 			offset := (i % 16) * 2
 			randomValue := uint64(randomBytes[offset]) | uint64(randomBytes[offset+1])<<8
 
-			if effectiveBal*fieldparams.MaxRandomValueElectra >= cfg.MaxEffectiveBalanceElectra*randomValue {
+			if effectiveBal*fieldparams.MaxRandomValueElectra >= beaconConfig.MaxEffectiveBalanceElectra*randomValue {
 				return candidateIndex, nil
 			}
 		} else {
 			binary.LittleEndian.PutUint64(seedBuffer[len(seed):], i/32)
 			randomByte := hashFunc(seedBuffer)[i%32]
 
-			if effectiveBal*fieldparams.MaxRandomByte >= cfg.MaxEffectiveBalance*uint64(randomByte) {
+			if effectiveBal*fieldparams.MaxRandomByte >= beaconConfig.MaxEffectiveBalance*uint64(randomByte) {
 				return candidateIndex, nil
 			}
 		}

beacon-chain/core/helpers/weak_subjectivity.go

@@ -201,3 +201,14 @@ func ParseWeakSubjectivityInputString(wsCheckpointString string) (*v1alpha1.Chec
 		Root:  bRoot,
 	}, nil
 }
+
+// MinEpochsForBlockRequests computes the number of epochs of block history that we need to maintain,
+// relative to the current epoch, per the p2p specs. This is used to compute the slot where backfill is complete.
+// value defined:
+// https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/p2p-interface.md#configuration
+// MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2 (= 33024, ~5 months)
+// detailed rationale: https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/p2p-interface.md#why-are-blocksbyrange-requests-only-required-to-be-served-for-the-latest-min_epochs_for_block_requests-epochs
+func MinEpochsForBlockRequests() primitives.Epoch {
+	return params.BeaconConfig().MinValidatorWithdrawabilityDelay +
+		primitives.Epoch(params.BeaconConfig().ChurnLimitQuotient/2)
+}

beacon-chain/core/helpers/weak_subjectivity_test.go

@@ -286,3 +286,20 @@ func genState(t *testing.T, valCount, avgBalance uint64) state.BeaconState {
 	return beaconState
 }
 
+func TestMinEpochsForBlockRequests(t *testing.T) {
+	helpers.ClearCache()
+
+	params.SetActiveTestCleanup(t, params.MainnetConfig())
+	var expected primitives.Epoch = 33024
+	// expected value of 33024 via spec commentary:
+	// https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/p2p-interface.md#why-are-blocksbyrange-requests-only-required-to-be-served-for-the-latest-min_epochs_for_block_requests-epochs
+	//	MIN_EPOCHS_FOR_BLOCK_REQUESTS is calculated using the arithmetic from compute_weak_subjectivity_period found in the weak subjectivity guide. Specifically to find this max epoch range, we use the worst case event of a very large validator size (>= MIN_PER_EPOCH_CHURN_LIMIT * CHURN_LIMIT_QUOTIENT).
+	//
+	//	MIN_EPOCHS_FOR_BLOCK_REQUESTS = (
+	//	    MIN_VALIDATOR_WITHDRAWABILITY_DELAY
+	//	    + MAX_SAFETY_DECAY * CHURN_LIMIT_QUOTIENT // (2 * 100)
+	//	)
+	//
+	//	Where MAX_SAFETY_DECAY = 100 and thus MIN_EPOCHS_FOR_BLOCK_REQUESTS = 33024 (~5 months).
+	require.Equal(t, expected, helpers.MinEpochsForBlockRequests())
+}

beacon-chain/core/peerdas/das_core.go

@@ -89,14 +89,14 @@ func CustodyGroups(nodeId enode.ID, custodyGroupCount uint64) ([]uint64, error)
 // ComputeColumnsForCustodyGroup computes the columns for a given custody group.
 // https://github.com/ethereum/consensus-specs/blob/master/specs/fulu/das-core.md#compute_columns_for_custody_group
 func ComputeColumnsForCustodyGroup(custodyGroup uint64) ([]uint64, error) {
-	cfg := params.BeaconConfig()
-	numberOfCustodyGroups := cfg.NumberOfCustodyGroups
+	beaconConfig := params.BeaconConfig()
+	numberOfCustodyGroups := beaconConfig.NumberOfCustodyGroups
 
 	if custodyGroup >= numberOfCustodyGroups {
 		return nil, ErrCustodyGroupTooLarge
 	}
 
-	numberOfColumns := cfg.NumberOfColumns
+	numberOfColumns := beaconConfig.NumberOfColumns
 
 	columnsPerGroup := numberOfColumns / numberOfCustodyGroups
 
@@ -112,9 +112,9 @@ func ComputeColumnsForCustodyGroup(custodyGroup uint64) ([]uint64, error) {
 // ComputeCustodyGroupForColumn computes the custody group for a given column.
 // It is the reciprocal function of ComputeColumnsForCustodyGroup.
 func ComputeCustodyGroupForColumn(columnIndex uint64) (uint64, error) {
-	cfg := params.BeaconConfig()
-	numberOfColumns := cfg.NumberOfColumns
-	numberOfCustodyGroups := cfg.NumberOfCustodyGroups
+	beaconConfig := params.BeaconConfig()
+	numberOfColumns := beaconConfig.NumberOfColumns
+	numberOfCustodyGroups := beaconConfig.NumberOfCustodyGroups
 
 	if columnIndex >= numberOfColumns {
 		return 0, ErrIndexTooLarge

beacon-chain/core/peerdas/p2p_interface.go

@@ -79,30 +79,10 @@ func VerifyDataColumnsSidecarKZGProofs(sidecars []blocks.RODataColumn) error {
 
 	for _, sidecar := range sidecars {
 		for i := range sidecar.Column {
-			var (
-				commitment kzg.Bytes48
-				cell       kzg.Cell
-				proof      kzg.Bytes48
-			)
-
-			commitmentBytes := sidecar.KzgCommitments[i]
-			cellBytes := sidecar.Column[i]
-			proofBytes := sidecar.KzgProofs[i]
-
-			if len(commitmentBytes) != len(commitment) ||
-				len(cellBytes) != len(cell) ||
-				len(proofBytes) != len(proof) {
-				return ErrMismatchLength
-			}
-
-			copy(commitment[:], commitmentBytes)
-			copy(cell[:], cellBytes)
-			copy(proof[:], proofBytes)
-
-			commitments = append(commitments, commitment)
+			commitments = append(commitments, kzg.Bytes48(sidecar.KzgCommitments[i]))
 			indices = append(indices, sidecar.Index)
-			cells = append(cells, cell)
-			proofs = append(proofs, proof)
+			cells = append(cells, kzg.Cell(sidecar.Column[i]))
+			proofs = append(proofs, kzg.Bytes48(sidecar.KzgProofs[i]))
 		}
 	}
 

beacon-chain/core/peerdas/p2p_interface_test.go

@@ -68,14 +68,6 @@ func TestVerifyDataColumnSidecarKZGProofs(t *testing.T) {
 	err := kzg.Start()
 	require.NoError(t, err)
 
-	t.Run("size mismatch", func(t *testing.T) {
-		sidecars := generateRandomSidecars(t, seed, blobCount)
-		sidecars[0].Column[0] = sidecars[0].Column[0][:len(sidecars[0].Column[0])-1] // Remove one byte to create size mismatch
-
-		err := peerdas.VerifyDataColumnsSidecarKZGProofs(sidecars)
-		require.ErrorIs(t, err, peerdas.ErrMismatchLength)
-	})
-
 	t.Run("invalid proof", func(t *testing.T) {
 		sidecars := generateRandomSidecars(t, seed, blobCount)
 		sidecars[0].Column[0][0]++ // It is OK to overflow

beacon-chain/core/peerdas/validator.go

@@ -84,10 +84,10 @@ func ValidatorsCustodyRequirement(state beaconState.ReadOnlyBeaconState, validat
 		totalNodeBalance += validator.EffectiveBalance()
 	}
 
-	cfg := params.BeaconConfig()
-	numberOfCustodyGroups := cfg.NumberOfCustodyGroups
-	validatorCustodyRequirement := cfg.ValidatorCustodyRequirement
-	balancePerAdditionalCustodyGroup := cfg.BalancePerAdditionalCustodyGroup
+	beaconConfig := params.BeaconConfig()
+	numberOfCustodyGroups := beaconConfig.NumberOfCustodyGroups
+	validatorCustodyRequirement := beaconConfig.ValidatorCustodyRequirement
+	balancePerAdditionalCustodyGroup := beaconConfig.BalancePerAdditionalCustodyGroup
 
 	count := totalNodeBalance / balancePerAdditionalCustodyGroup
 	return min(max(count, validatorCustodyRequirement), numberOfCustodyGroups), nil

beacon-chain/core/time/slot_epoch_test.go

@@ -196,7 +196,7 @@ func TestAltairCompatible(t *testing.T) {
 }
 
 func TestCanUpgradeTo(t *testing.T) {
-	cfg := params.BeaconConfig()
+	beaconConfig := params.BeaconConfig()
 
 	outerTestCases := []struct {
 		name        string
@@ -205,32 +205,32 @@ func TestCanUpgradeTo(t *testing.T) {
 	}{
 		{
 			name:        "Altair",
-			forkEpoch:   &cfg.AltairForkEpoch,
+			forkEpoch:   &beaconConfig.AltairForkEpoch,
 			upgradeFunc: time.CanUpgradeToAltair,
 		},
 		{
 			name:        "Bellatrix",
-			forkEpoch:   &cfg.BellatrixForkEpoch,
+			forkEpoch:   &beaconConfig.BellatrixForkEpoch,
 			upgradeFunc: time.CanUpgradeToBellatrix,
 		},
 		{
 			name:        "Capella",
-			forkEpoch:   &cfg.CapellaForkEpoch,
+			forkEpoch:   &beaconConfig.CapellaForkEpoch,
 			upgradeFunc: time.CanUpgradeToCapella,
 		},
 		{
 			name:        "Deneb",
-			forkEpoch:   &cfg.DenebForkEpoch,
+			forkEpoch:   &beaconConfig.DenebForkEpoch,
 			upgradeFunc: time.CanUpgradeToDeneb,
 		},
 		{
 			name:        "Electra",
-			forkEpoch:   &cfg.ElectraForkEpoch,
+			forkEpoch:   &beaconConfig.ElectraForkEpoch,
 			upgradeFunc: time.CanUpgradeToElectra,
 		},
 		{
 			name:        "Fulu",
-			forkEpoch:   &cfg.FuluForkEpoch,
+			forkEpoch:   &beaconConfig.FuluForkEpoch,
 			upgradeFunc: time.CanUpgradeToFulu,
 		},
 	}
@@ -238,7 +238,7 @@ func TestCanUpgradeTo(t *testing.T) {
 	for _, otc := range outerTestCases {
 		params.SetupTestConfigCleanup(t)
 		*otc.forkEpoch = 5
-		params.OverrideBeaconConfig(cfg)
+		params.OverrideBeaconConfig(beaconConfig)
 
 		innerTestCases := []struct {
 			name string

beacon-chain/db/filesystem/data_column.go

@@ -200,7 +200,6 @@ func (dcs *DataColumnStorage) WarmCache() {
 		fileMetadata, err := extractFileMetadata(path)
 		if err != nil {
 			log.WithError(err).Error("Error encountered while extracting file metadata")
-			return nil
 		}
 
 		// Open the data column filesystem file.
@@ -989,8 +988,8 @@ func filePath(root [fieldparams.RootLength]byte, epoch primitives.Epoch) string
 // extractFileMetadata extracts the metadata from a file path.
 // If the path is not a leaf, it returns nil.
 func extractFileMetadata(path string) (*fileMetadata, error) {
-	// Use filepath.Separator to handle both Windows (\) and Unix (/) path separators
-	parts := strings.Split(path, string(filepath.Separator))
+	// Is this Windows friendly?
+	parts := strings.Split(path, "/")
 	if len(parts) != 3 {
 		return nil, errors.Errorf("unexpected file %s", path)
 	}
@@ -1033,5 +1032,5 @@ func extractFileMetadata(path string) (*fileMetadata, error) {
 
 // period computes the period of a given epoch.
 func period(epoch primitives.Epoch) uint64 {
-	return uint64(epoch / params.BeaconConfig().MinEpochsForDataColumnSidecarsRequest)
+	return uint64(epoch / params.BeaconConfig().MinEpochsForBlobsSidecarsRequest)
 }

beacon-chain/db/filesystem/data_column_cache.go

@@ -35,9 +35,8 @@ func (s DataColumnStorageSummary) HasIndex(index uint64) bool {
 
 // HasAtLeastOneIndex returns true if at least one of the DataColumnSidecars at the given indices is available in the filesystem.
 func (s DataColumnStorageSummary) HasAtLeastOneIndex(indices []uint64) bool {
-	size := uint64(len(s.mask))
 	for _, index := range indices {
-		if index < size && s.mask[index] {
+		if s.mask[index] {
 			return true
 		}
 	}

beacon-chain/db/filesystem/data_column_cache_test.go

@@ -25,11 +25,11 @@ func TestHasIndex(t *testing.T) {
 func TestHasAtLeastOneIndex(t *testing.T) {
 	summary := NewDataColumnStorageSummary(0, [fieldparams.NumberOfColumns]bool{false, true})
 
-	actual := summary.HasAtLeastOneIndex([]uint64{3, 1, fieldparams.NumberOfColumns, 2})
-	require.Equal(t, true, actual)
+	hasAtLeastOneIndex := summary.HasAtLeastOneIndex([]uint64{3, 1, 2})
+	require.Equal(t, true, hasAtLeastOneIndex)
 
-	actual = summary.HasAtLeastOneIndex([]uint64{3, 4, fieldparams.NumberOfColumns, 2})
-	require.Equal(t, false, actual)
+	hasAtLeastOneIndex = summary.HasAtLeastOneIndex([]uint64{3, 4, 2})
+	require.Equal(t, false, hasAtLeastOneIndex)
 }
 
 func TestCount(t *testing.T) {

beacon-chain/db/filesystem/data_column_test.go

@@ -3,7 +3,6 @@ package filesystem
 import (
 	"encoding/binary"
 	"os"
-	"path/filepath"
 	"testing"
 
 	fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams"
@@ -726,37 +725,3 @@ func TestPrune(t *testing.T) {
 		require.Equal(t, true, compareSlices([]string{"0x0de28a18cae63cbc6f0b20dc1afb0b1df38da40824a5f09f92d485ade04de97f.sszs"}, dirs))
 	})
 }
-
-func TestExtractFileMetadata(t *testing.T) {
-	t.Run("Unix", func(t *testing.T) {
-		// Test with Unix-style path separators (/)
-		path := "12/1234/0x8bb2f09de48c102635622dc27e6de03ae2b22639df7c33edbc8222b2ec423746.sszs"
-		metadata, err := extractFileMetadata(path)
-		if filepath.Separator == '/' {
-			// On Unix systems, this should succeed
-			require.NoError(t, err)
-			require.Equal(t, uint64(12), metadata.period)
-			require.Equal(t, primitives.Epoch(1234), metadata.epoch)
-			return
-		}
-
-		// On Windows systems, this should fail because it uses the wrong separator
-		require.NotNil(t, err)
-	})
-
-	t.Run("Windows", func(t *testing.T) {
-		// Test with Windows-style path separators (\)
-		path := "12\\1234\\0x8bb2f09de48c102635622dc27e6de03ae2b22639df7c33edbc8222b2ec423746.sszs"
-		metadata, err := extractFileMetadata(path)
-		if filepath.Separator == '\\' {
-			// On Windows systems, this should succeed
-			require.NoError(t, err)
-			require.Equal(t, uint64(12), metadata.period)
-			require.Equal(t, primitives.Epoch(1234), metadata.epoch)
-			return
-		}
-
-		// On Unix systems, this should fail because it uses the wrong separator
-		require.NotNil(t, err)
-	})
-}

beacon-chain/db/filesystem/iteration.go

@@ -212,8 +212,7 @@ func filterNoop(_ string) bool {
 	return true
 }
 
-// IsBlockRootDir returns true if the path segment looks like a block root directory.
-func IsBlockRootDir(p string) bool {
+func isRootDir(p string) bool {
 	dir := filepath.Base(p)
 	return len(dir) == rootStringLen && strings.HasPrefix(dir, "0x")
 }

beacon-chain/db/filesystem/iteration_test.go

@@ -188,7 +188,7 @@ func TestListDir(t *testing.T) {
 			name:     "root filter",
 			dirPath:  ".",
 			expected: []string{childlessBlob.name, blobWithSsz.name, blobWithSszAndTmp.name},
-			filter:   IsBlockRootDir,
+			filter:   isRootDir,
 		},
 		{
 			name:     "ssz filter",

beacon-chain/db/filesystem/layout.go

@@ -19,14 +19,12 @@ import (
 const (
 	// Full root in directory will be 66 chars, eg:
 	// >>> len('0x0002fb4db510b8618b04dc82d023793739c26346a8b02eb73482e24b0fec0555') == 66
-	rootStringLen = 66
-	sszExt        = "ssz"
-	partExt       = "part"
+	rootStringLen        = 66
+	sszExt               = "ssz"
+	partExt              = "part"
+	periodicEpochBaseDir = "by-epoch"
 )
 
-// PeriodicEpochBaseDir is the name of the base directory for the by-epoch layout.
-const PeriodicEpochBaseDir = "by-epoch"
-
 const (
 	LayoutNameFlat    = "flat"
 	LayoutNameByEpoch = "by-epoch"
@@ -132,11 +130,11 @@ func migrateLayout(fs afero.Fs, from, to fsLayout, cache *blobStorageSummaryCach
 	if iter.atEOF() {
 		return errLayoutNotDetected
 	}
+	log.WithField("fromLayout", from.name()).WithField("toLayout", to.name()).Info("Migrating blob filesystem layout. This one-time operation can take extra time (up to a few minutes for systems with extended blob storage and a cold disk cache).")
 	lastMoved := ""
 	parentDirs := make(map[string]bool) // this map should have < 65k keys by design
 	moved := 0
 	dc := newDirCleaner()
-	migrationLogged := false
 	for ident, err := iter.next(); !errors.Is(err, io.EOF); ident, err = iter.next() {
 		if err != nil {
 			if errors.Is(err, errIdentFailure) {
@@ -148,11 +146,6 @@ func migrateLayout(fs afero.Fs, from, to fsLayout, cache *blobStorageSummaryCach
 			}
 			return errors.Wrapf(errMigrationFailure, "failed to iterate previous layout structure while migrating blobs, err=%s", err.Error())
 		}
-		if !migrationLogged {
-			log.WithField("fromLayout", from.name()).WithField("toLayout", to.name()).
-				Info("Migrating blob filesystem layout. This one-time operation can take extra time (up to a few minutes for systems with extended blob storage and a cold disk cache).")
-			migrationLogged = true
-		}
 		src := from.dir(ident)
 		target := to.dir(ident)
 		if src != lastMoved {

beacon-chain/db/filesystem/layout_by_epoch.go

@@ -34,7 +34,7 @@ func (l *periodicEpochLayout) name() string {
 
 func (l *periodicEpochLayout) blockParentDirs(ident blobIdent) []string {
 	return []string{
-		PeriodicEpochBaseDir,
+		periodicEpochBaseDir,
 		l.periodDir(ident.epoch),
 		l.epochDir(ident.epoch),
 	}
@@ -50,28 +50,28 @@ func (l *periodicEpochLayout) notify(ident blobIdent) error {
 
 // If before == 0, it won't be used as a filter and all idents will be returned.
 func (l *periodicEpochLayout) iterateIdents(before primitives.Epoch) (*identIterator, error) {
-	_, err := l.fs.Stat(PeriodicEpochBaseDir)
+	_, err := l.fs.Stat(periodicEpochBaseDir)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return &identIterator{eof: true}, nil // The directory is non-existent, which is fine; stop iteration.
 		}
-		return nil, errors.Wrapf(err, "error reading path %s", PeriodicEpochBaseDir)
+		return nil, errors.Wrapf(err, "error reading path %s", periodicEpochBaseDir)
 	}
 	// iterate root, which should have directories named by "period"
-	entries, err := listDir(l.fs, PeriodicEpochBaseDir)
+	entries, err := listDir(l.fs, periodicEpochBaseDir)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to list %s", PeriodicEpochBaseDir)
+		return nil, errors.Wrapf(err, "failed to list %s", periodicEpochBaseDir)
 	}
 
 	return &identIterator{
 		fs:   l.fs,
-		path: PeriodicEpochBaseDir,
+		path: periodicEpochBaseDir,
 		// Please see comments on the `layers` field in `identIterator`` if the role of the layers is unclear.
 		layers: []layoutLayer{
 			{populateIdent: populateNoop, filter: isBeforePeriod(before)},
 			{populateIdent: populateEpoch, filter: isBeforeEpoch(before)},
-			{populateIdent: populateRoot, filter: IsBlockRootDir}, // extract root from path
-			{populateIdent: populateIndex, filter: isSszFile},     // extract index from filename
+			{populateIdent: populateRoot, filter: isRootDir},  // extract root from path
+			{populateIdent: populateIndex, filter: isSszFile}, // extract index from filename
 		},
 		entries: entries,
 	}, nil
@@ -98,7 +98,7 @@ func (l *periodicEpochLayout) epochDir(epoch primitives.Epoch) string {
 }
 
 func (l *periodicEpochLayout) periodDir(epoch primitives.Epoch) string {
-	return filepath.Join(PeriodicEpochBaseDir, fmt.Sprintf("%d", periodForEpoch(epoch)))
+	return filepath.Join(periodicEpochBaseDir, fmt.Sprintf("%d", periodForEpoch(epoch)))
 }
 
 func (l *periodicEpochLayout) sszPath(n blobIdent) string {

beacon-chain/db/filesystem/layout_flat.go

@@ -30,7 +30,7 @@ func (l *flatLayout) iterateIdents(before primitives.Epoch) (*identIterator, err
 		if os.IsNotExist(err) {
 			return &identIterator{eof: true}, nil // The directory is non-existent, which is fine; stop iteration.
 		}
-		return nil, errors.Wrap(err, "error reading blob base dir")
+		return nil, errors.Wrapf(err, "error reading path %s", periodicEpochBaseDir)
 	}
 	entries, err := listDir(l.fs, ".")
 	if err != nil {
@@ -199,10 +199,10 @@ func (l *flatSlotReader) isSSZAndBefore(fname string) bool {
 // the epoch can be determined.
 func isFlatCachedAndBefore(cache *blobStorageSummaryCache, before primitives.Epoch) func(string) bool {
 	if before == 0 {
-		return IsBlockRootDir
+		return isRootDir
 	}
 	return func(p string) bool {
-		if !IsBlockRootDir(p) {
+		if !isRootDir(p) {
 			return false
 		}
 		root, err := rootFromPath(p)

beacon-chain/db/filesystem/mock.go

@@ -126,7 +126,7 @@ func NewWarmedEphemeralDataColumnStorageUsingFs(t testing.TB, fs afero.Fs, opts
 
 func NewEphemeralDataColumnStorageUsingFs(t testing.TB, fs afero.Fs, opts ...DataColumnStorageOption) *DataColumnStorage {
 	opts = append(opts,
-		WithDataColumnRetentionEpochs(params.BeaconConfig().MinEpochsForDataColumnSidecarsRequest),
+		WithDataColumnRetentionEpochs(params.BeaconConfig().MinEpochsForBlobsSidecarsRequest),
 		WithDataColumnFs(fs),
 	)
 

beacon-chain/db/iface/interface.go

@@ -129,7 +129,6 @@ type NoHeadAccessDatabase interface {
 	// Custody operations.
 	UpdateSubscribedToAllDataSubnets(ctx context.Context, subscribed bool) (bool, error)
 	UpdateCustodyInfo(ctx context.Context, earliestAvailableSlot primitives.Slot, custodyGroupCount uint64) (primitives.Slot, uint64, error)
-	UpdateEarliestAvailableSlot(ctx context.Context, earliestAvailableSlot primitives.Slot) error
 
 	// P2P Metadata operations.
 	SaveMetadataSeqNum(ctx context.Context, seqNum uint64) error

beacon-chain/db/kv/checkpoint.go

@@ -132,6 +132,6 @@ func recoverStateSummary(ctx context.Context, tx *bolt.Tx, root []byte) error {
 	if err != nil {
 		return err
 	}
-	summaryBucket := tx.Bucket(stateSummaryBucket)
+	summaryBucket := tx.Bucket(stateBucket)
 	return summaryBucket.Put(root, summaryEnc)
 }

beacon-chain/db/kv/checkpoint_test.go

@@ -137,32 +137,3 @@ func TestStore_FinalizedCheckpoint_StateMustExist(t *testing.T) {
 
 	require.ErrorContains(t, errMissingStateForCheckpoint.Error(), db.SaveFinalizedCheckpoint(ctx, cp))
 }
-
-// Regression test: verify that saving a checkpoint triggers recovery which writes
-// the state summary into the correct stateSummaryBucket so that HasStateSummary/StateSummary see it.
-func TestRecoverStateSummary_WritesToStateSummaryBucket(t *testing.T) {
-	db := setupDB(t)
-	ctx := t.Context()
-
-	// Create a block without saving a state or summary, so recovery is needed.
-	blk := util.HydrateSignedBeaconBlock(&ethpb.SignedBeaconBlock{})
-	root, err := blk.Block.HashTreeRoot()
-	require.NoError(t, err)
-	wsb, err := blocks.NewSignedBeaconBlock(blk)
-	require.NoError(t, err)
-	require.NoError(t, db.SaveBlock(ctx, wsb))
-
-	// Precondition: summary not present yet.
-	require.Equal(t, false, db.HasStateSummary(ctx, root))
-
-	// Saving justified checkpoint should trigger recovery path calling recoverStateSummary.
-	cp := &ethpb.Checkpoint{Epoch: 2, Root: root[:]}
-	require.NoError(t, db.SaveJustifiedCheckpoint(ctx, cp))
-
-	// Postcondition: summary is visible via the public summary APIs (which read stateSummaryBucket).
-	require.Equal(t, true, db.HasStateSummary(ctx, root))
-	summary, err := db.StateSummary(ctx, root)
-	require.NoError(t, err)
-	require.NotNil(t, summary)
-	assert.DeepEqual(t, &ethpb.StateSummary{Slot: blk.Block.Slot, Root: root[:]}, summary)
-}

beacon-chain/db/kv/custody.go

@@ -2,19 +2,16 @@ package kv
 
 import (
 	"context"
-	"time"
 
-	"github.com/OffchainLabs/prysm/v6/config/params"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
 	"github.com/OffchainLabs/prysm/v6/monitoring/tracing/trace"
-	"github.com/OffchainLabs/prysm/v6/time/slots"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 )
 
-// UpdateCustodyInfo atomically updates the custody group count only if it is greater than the stored one.
+// UpdateCustodyInfo atomically updates the custody group count only it is greater than the stored one.
 // In this case, it also updates the earliest available slot with the provided value.
 // It returns the (potentially updated) custody group count and earliest available slot.
 func (s *Store) UpdateCustodyInfo(ctx context.Context, earliestAvailableSlot primitives.Slot, custodyGroupCount uint64) (primitives.Slot, uint64, error) {
@@ -73,79 +70,6 @@ func (s *Store) UpdateCustodyInfo(ctx context.Context, earliestAvailableSlot pri
 	return storedEarliestAvailableSlot, storedGroupCount, nil
 }
 
-// UpdateEarliestAvailableSlot updates the earliest available slot.
-func (s *Store) UpdateEarliestAvailableSlot(ctx context.Context, earliestAvailableSlot primitives.Slot) error {
-	_, span := trace.StartSpan(ctx, "BeaconDB.UpdateEarliestAvailableSlot")
-	defer span.End()
-
-	storedEarliestAvailableSlot := primitives.Slot(0)
-	if err := s.db.Update(func(tx *bolt.Tx) error {
-		// Retrieve the custody bucket.
-		bucket, err := tx.CreateBucketIfNotExists(custodyBucket)
-		if err != nil {
-			return errors.Wrap(err, "create custody bucket")
-		}
-
-		// Retrieve the stored earliest available slot.
-		storedEarliestAvailableSlotBytes := bucket.Get(earliestAvailableSlotKey)
-		if len(storedEarliestAvailableSlotBytes) != 0 {
-			storedEarliestAvailableSlot = primitives.Slot(bytesutil.BytesToUint64BigEndian(storedEarliestAvailableSlotBytes))
-		}
-
-		// Allow decrease (for backfill scenarios)
-		if earliestAvailableSlot <= storedEarliestAvailableSlot {
-			storedEarliestAvailableSlot = earliestAvailableSlot
-			bytes := bytesutil.Uint64ToBytesBigEndian(uint64(earliestAvailableSlot))
-			if err := bucket.Put(earliestAvailableSlotKey, bytes); err != nil {
-				return errors.Wrap(err, "put earliest available slot")
-			}
-			return nil
-		}
-
-		// Prevent increase within the MIN_EPOCHS_FOR_BLOCK_REQUESTS period
-		// This ensures we don't voluntarily refuse to serve mandatory block data
-		genesisTime := time.Unix(int64(params.BeaconConfig().MinGenesisTime+params.BeaconConfig().GenesisDelay), 0)
-		currentSlot := slots.CurrentSlot(genesisTime)
-		currentEpoch := slots.ToEpoch(currentSlot)
-		minEpochsForBlocks := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
-
-		// Calculate the minimum required epoch (or 0 if we're early in the chain)
-		minRequiredEpoch := primitives.Epoch(0)
-		if currentEpoch > minEpochsForBlocks {
-			minRequiredEpoch = currentEpoch - minEpochsForBlocks
-		}
-
-		// Convert to slot to ensure we compare at slot-level granularity
-		minRequiredSlot, err := slots.EpochStart(minRequiredEpoch)
-		if err != nil {
-			return errors.Wrap(err, "calculate minimum required slot")
-		}
-
-		// Prevent any increase that would put earliest available slot beyond the minimum required slot
-		if earliestAvailableSlot > minRequiredSlot {
-			return errors.Errorf(
-				"cannot increase earliest available slot to %d (epoch %d) as it exceeds minimum required slot %d (epoch %d)",
-				earliestAvailableSlot, slots.ToEpoch(earliestAvailableSlot),
-				minRequiredSlot, minRequiredEpoch,
-			)
-		}
-
-		storedEarliestAvailableSlot = earliestAvailableSlot
-		bytes := bytesutil.Uint64ToBytesBigEndian(uint64(earliestAvailableSlot))
-		if err := bucket.Put(earliestAvailableSlotKey, bytes); err != nil {
-			return errors.Wrap(err, "put earliest available slot")
-		}
-
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	log.WithField("earliestAvailableSlot", storedEarliestAvailableSlot).Debug("Updated earliest available slot")
-
-	return nil
-}
-
 // UpdateSubscribedToAllDataSubnets updates the "subscribed to all data subnets" status in the database
 // only if `subscribed` is `true`.
 // It returns the previous subscription status.

beacon-chain/db/kv/custody_test.go

@@ -3,13 +3,10 @@ package kv
 import (
 	"context"
 	"testing"
-	"time"
 
-	"github.com/OffchainLabs/prysm/v6/config/params"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
 	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/time/slots"
 	bolt "go.etcd.io/bbolt"
 )
 
@@ -135,131 +132,6 @@ func TestUpdateCustodyInfo(t *testing.T) {
 	})
 }
 
-func TestUpdateEarliestAvailableSlot(t *testing.T) {
-	ctx := t.Context()
-
-	t.Run("allow decreasing earliest slot (backfill scenario)", func(t *testing.T) {
-		const (
-			initialSlot  = primitives.Slot(300)
-			initialCount = uint64(10)
-			earliestSlot = primitives.Slot(200) // Lower than initial (backfill discovered earlier blocks)
-		)
-
-		db := setupDB(t)
-
-		// Initialize custody info
-		_, _, err := db.UpdateCustodyInfo(ctx, initialSlot, initialCount)
-		require.NoError(t, err)
-
-		// Update with a lower slot (should update for backfill)
-		err = db.UpdateEarliestAvailableSlot(ctx, earliestSlot)
-		require.NoError(t, err)
-
-		storedSlot, storedCount := getCustodyInfoFromDB(t, db)
-		require.Equal(t, earliestSlot, storedSlot)
-		require.Equal(t, initialCount, storedCount)
-	})
-
-	t.Run("allow increasing slot within MIN_EPOCHS_FOR_BLOCK_REQUESTS (pruning scenario)", func(t *testing.T) {
-		db := setupDB(t)
-
-		// Calculate the current slot and minimum required slot based on actual current time
-		genesisTime := time.Unix(int64(params.BeaconConfig().MinGenesisTime+params.BeaconConfig().GenesisDelay), 0)
-		currentSlot := slots.CurrentSlot(genesisTime)
-		currentEpoch := slots.ToEpoch(currentSlot)
-		minEpochsForBlocks := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
-
-		var minRequiredEpoch primitives.Epoch
-		if currentEpoch > minEpochsForBlocks {
-			minRequiredEpoch = currentEpoch - minEpochsForBlocks
-		} else {
-			minRequiredEpoch = 0
-		}
-
-		minRequiredSlot, err := slots.EpochStart(minRequiredEpoch)
-		require.NoError(t, err)
-
-		// Initial setup: set earliest slot well before minRequiredSlot
-		const groupCount = uint64(5)
-		initialSlot := primitives.Slot(1000)
-
-		_, _, err = db.UpdateCustodyInfo(ctx, initialSlot, groupCount)
-		require.NoError(t, err)
-
-		// Try to increase to a slot that's still BEFORE minRequiredSlot (should succeed)
-		validSlot := minRequiredSlot - 100
-
-		err = db.UpdateEarliestAvailableSlot(ctx, validSlot)
-		require.NoError(t, err)
-
-		// Verify the database was updated
-		storedSlot, storedCount := getCustodyInfoFromDB(t, db)
-		require.Equal(t, validSlot, storedSlot)
-		require.Equal(t, groupCount, storedCount)
-	})
-
-	t.Run("prevent increasing slot beyond MIN_EPOCHS_FOR_BLOCK_REQUESTS", func(t *testing.T) {
-		db := setupDB(t)
-
-		// Calculate the current slot and minimum required slot based on actual current time
-		genesisTime := time.Unix(int64(params.BeaconConfig().MinGenesisTime+params.BeaconConfig().GenesisDelay), 0)
-		currentSlot := slots.CurrentSlot(genesisTime)
-		currentEpoch := slots.ToEpoch(currentSlot)
-		minEpochsForBlocks := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
-
-		var minRequiredEpoch primitives.Epoch
-		if currentEpoch > minEpochsForBlocks {
-			minRequiredEpoch = currentEpoch - minEpochsForBlocks
-		} else {
-			minRequiredEpoch = 0
-		}
-
-		minRequiredSlot, err := slots.EpochStart(minRequiredEpoch)
-		require.NoError(t, err)
-
-		// Initial setup: set a valid earliest slot (well before minRequiredSlot)
-		const initialCount = uint64(5)
-		initialSlot := primitives.Slot(1000)
-
-		_, _, err = db.UpdateCustodyInfo(ctx, initialSlot, initialCount)
-		require.NoError(t, err)
-
-		// Try to set earliest slot beyond the minimum required slot
-		invalidSlot := minRequiredSlot + 100
-
-		// This should fail
-		err = db.UpdateEarliestAvailableSlot(ctx, invalidSlot)
-		require.ErrorContains(t, "cannot increase earliest available slot", err)
-		require.ErrorContains(t, "exceeds minimum required slot", err)
-
-		// Verify the database wasn't updated
-		storedSlot, storedCount := getCustodyInfoFromDB(t, db)
-		require.Equal(t, initialSlot, storedSlot)
-		require.Equal(t, initialCount, storedCount)
-	})
-
-	t.Run("no change when slot equals current slot", func(t *testing.T) {
-		const (
-			initialSlot  = primitives.Slot(100)
-			initialCount = uint64(5)
-		)
-
-		db := setupDB(t)
-
-		// Initialize custody info
-		_, _, err := db.UpdateCustodyInfo(ctx, initialSlot, initialCount)
-		require.NoError(t, err)
-
-		// Update with the same slot
-		err = db.UpdateEarliestAvailableSlot(ctx, initialSlot)
-		require.NoError(t, err)
-
-		storedSlot, storedCount := getCustodyInfoFromDB(t, db)
-		require.Equal(t, initialSlot, storedSlot)
-		require.Equal(t, initialCount, storedCount)
-	})
-}
-
 func TestUpdateSubscribedToAllDataSubnets(t *testing.T) {
 	ctx := context.Background()
 

beacon-chain/db/pruner/BUILD.bazel

@@ -8,6 +8,7 @@ go_library(
         "//beacon-chain:__subpackages__",
     ],
     deps = [
+        "//beacon-chain/core/helpers:go_default_library",
         "//beacon-chain/db:go_default_library",
         "//beacon-chain/db/iface:go_default_library",
         "//config/params:go_default_library",
@@ -28,7 +29,6 @@ go_test(
         "//consensus-types/blocks:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
-        "//testing/assert:go_default_library",
         "//testing/require:go_default_library",
         "//testing/util:go_default_library",
         "//time/slots/testing:go_default_library",

beacon-chain/db/pruner/pruner.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/db"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/db/iface"
 	"github.com/OffchainLabs/prysm/v6/config/params"
@@ -24,24 +25,17 @@ const (
 	defaultNumBatchesToPrune = 15
 )
 
-// custodyUpdater is a tiny interface that p2p service implements; kept here to avoid
-// importing the p2p package and creating a cycle.
-type custodyUpdater interface {
-	UpdateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error
-}
-
 type ServiceOption func(*Service)
 
 // WithRetentionPeriod allows the user to specify a different data retention period than the spec default.
 // The retention period is specified in epochs, and must be >= MIN_EPOCHS_FOR_BLOCK_REQUESTS.
 func WithRetentionPeriod(retentionEpochs primitives.Epoch) ServiceOption {
 	return func(s *Service) {
-		defaultRetentionEpochs := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests) + 1
+		defaultRetentionEpochs := helpers.MinEpochsForBlockRequests() + 1
 		if retentionEpochs < defaultRetentionEpochs {
 			log.WithField("userEpochs", retentionEpochs).
 				WithField("minRequired", defaultRetentionEpochs).
-				Warn("Retention period too low, ignoring and using minimum required value")
-			retentionEpochs = defaultRetentionEpochs
+				Warn("Retention period too low, using minimum required value")
 		}
 
 		s.ps = pruneStartSlotFunc(retentionEpochs)
@@ -64,23 +58,17 @@ type Service struct {
 	slotTicker     slots.Ticker
 	backfillWaiter func() error
 	initSyncWaiter func() error
-	custody        custodyUpdater
 }
 
-func New(ctx context.Context, db iface.Database, genesisTime time.Time, initSyncWaiter, backfillWaiter func() error, custody custodyUpdater, opts ...ServiceOption) (*Service, error) {
-	if custody == nil {
-		return nil, errors.New("custody updater is required for pruner but was not provided")
-	}
-
+func New(ctx context.Context, db iface.Database, genesisTime time.Time, initSyncWaiter, backfillWaiter func() error, opts ...ServiceOption) (*Service, error) {
 	p := &Service{
 		ctx:            ctx,
 		db:             db,
-		ps:             pruneStartSlotFunc(primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests) + 1), // Default retention epochs is MIN_EPOCHS_FOR_BLOCK_REQUESTS + 1 from the current slot.
+		ps:             pruneStartSlotFunc(helpers.MinEpochsForBlockRequests() + 1), // Default retention epochs is MIN_EPOCHS_FOR_BLOCK_REQUESTS + 1 from the current slot.
 		done:           make(chan struct{}),
 		slotTicker:     slots.NewSlotTicker(slots.UnsafeStartTime(genesisTime, 0), params.BeaconConfig().SecondsPerSlot),
 		initSyncWaiter: initSyncWaiter,
 		backfillWaiter: backfillWaiter,
-		custody:        custody,
 	}
 
 	for _, o := range opts {
@@ -169,45 +157,17 @@ func (p *Service) prune(slot primitives.Slot) error {
 		return errors.Wrap(err, "failed to prune batches")
 	}
 
-	earliestAvailableSlot := pruneUpto + 1
+	log.WithFields(logrus.Fields{
+		"prunedUpto":  pruneUpto,
+		"duration":    time.Since(tt),
+		"currentSlot": slot,
+		"batchSize":   defaultPrunableBatchSize,
+		"numBatches":  numBatches,
+	}).Debug("Successfully pruned chain data")
 
 	// Update pruning checkpoint.
 	p.prunedUpto = pruneUpto
 
-	// Update the earliest available slot after pruning
-	if err := p.updateEarliestAvailableSlot(earliestAvailableSlot); err != nil {
-		return errors.Wrap(err, "update earliest available slot")
-	}
-
-	log.WithFields(logrus.Fields{
-		"prunedUpto":            pruneUpto,
-		"earliestAvailableSlot": earliestAvailableSlot,
-		"duration":              time.Since(tt),
-		"currentSlot":           slot,
-		"batchSize":             defaultPrunableBatchSize,
-		"numBatches":            numBatches,
-	}).Debug("Successfully pruned chain data")
-
-	return nil
-}
-
-// updateEarliestAvailableSlot updates the earliest available slot via the injected custody updater
-// and also persists it to the database.
-func (p *Service) updateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error {
-	if !params.FuluEnabled() {
-		return nil
-	}
-
-	// Update the p2p in-memory state
-	if err := p.custody.UpdateEarliestAvailableSlot(earliestAvailableSlot); err != nil {
-		return errors.Wrapf(err, "update earliest available slot after pruning to %d", earliestAvailableSlot)
-	}
-
-	// Persist to database to ensure it survives restarts
-	if err := p.db.UpdateEarliestAvailableSlot(p.ctx, earliestAvailableSlot); err != nil {
-		return errors.Wrapf(err, "update earliest available slot in database for slot %d", earliestAvailableSlot)
-	}
-
 	return nil
 }
 

beacon-chain/db/pruner/pruner_test.go

@@ -2,7 +2,6 @@ package pruner
 
 import (
 	"context"
-	"errors"
 	"testing"
 	"time"
 
@@ -16,7 +15,6 @@ import (
 
 	dbtest "github.com/OffchainLabs/prysm/v6/beacon-chain/db/testing"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
 	"github.com/OffchainLabs/prysm/v6/testing/require"
 	logTest "github.com/sirupsen/logrus/hooks/test"
 )
@@ -64,9 +62,7 @@ func TestPruner_PruningConditions(t *testing.T) {
 			if !tt.backfillCompleted {
 				backfillWaiter = waiter
 			}
-
-			mockCustody := &mockCustodyUpdater{}
-			p, err := New(ctx, beaconDB, time.Now(), initSyncWaiter, backfillWaiter, mockCustody, WithSlotTicker(slotTicker))
+			p, err := New(ctx, beaconDB, time.Now(), initSyncWaiter, backfillWaiter, WithSlotTicker(slotTicker))
 			require.NoError(t, err)
 
 			go p.Start()
@@ -101,14 +97,12 @@ func TestPruner_PruneSuccess(t *testing.T) {
 	retentionEpochs := primitives.Epoch(2)
 	slotTicker := &slottest.MockTicker{Channel: make(chan primitives.Slot)}
 
-	mockCustody := &mockCustodyUpdater{}
 	p, err := New(
 		ctx,
 		beaconDB,
 		time.Now(),
 		nil,
 		nil,
-		mockCustody,
 		WithSlotTicker(slotTicker),
 	)
 	require.NoError(t, err)
@@ -139,242 +133,3 @@ func TestPruner_PruneSuccess(t *testing.T) {
 
 	require.NoError(t, p.Stop())
 }
-
-// Mock custody updater for testing
-type mockCustodyUpdater struct {
-	custodyGroupCount     uint64
-	earliestAvailableSlot primitives.Slot
-	updateCallCount       int
-}
-
-func (m *mockCustodyUpdater) UpdateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error {
-	m.updateCallCount++
-	m.earliestAvailableSlot = earliestAvailableSlot
-	return nil
-}
-
-func TestPruner_UpdatesEarliestAvailableSlot(t *testing.T) {
-	params.SetupTestConfigCleanup(t)
-	config := params.BeaconConfig()
-	config.FuluForkEpoch = 0 // Enable Fulu from epoch 0
-	params.OverrideBeaconConfig(config)
-
-	logrus.SetLevel(logrus.DebugLevel)
-	hook := logTest.NewGlobal()
-	ctx, cancel := context.WithCancel(t.Context())
-	defer cancel()
-
-	beaconDB := dbtest.SetupDB(t)
-	retentionEpochs := primitives.Epoch(2)
-
-	slotTicker := &slottest.MockTicker{Channel: make(chan primitives.Slot)}
-
-	// Create mock custody updater
-	mockCustody := &mockCustodyUpdater{
-		custodyGroupCount:     4,
-		earliestAvailableSlot: 0,
-	}
-
-	// Create pruner with mock custody updater
-	p, err := New(
-		ctx,
-		beaconDB,
-		time.Now(),
-		nil,
-		nil,
-		mockCustody,
-		WithSlotTicker(slotTicker),
-	)
-	require.NoError(t, err)
-
-	p.ps = func(current primitives.Slot) primitives.Slot {
-		return current - primitives.Slot(retentionEpochs)*params.BeaconConfig().SlotsPerEpoch
-	}
-
-	// Save some blocks to be pruned
-	for i := primitives.Slot(1); i <= 32; i++ {
-		blk := util.NewBeaconBlock()
-		blk.Block.Slot = i
-		wsb, err := blocks.NewSignedBeaconBlock(blk)
-		require.NoError(t, err)
-		require.NoError(t, beaconDB.SaveBlock(ctx, wsb))
-	}
-
-	// Start pruner and trigger at slot 80 (middle of 3rd epoch)
-	go p.Start()
-	currentSlot := primitives.Slot(80)
-	slotTicker.Channel <- currentSlot
-
-	// Wait for pruning to complete
-	time.Sleep(100 * time.Millisecond)
-
-	// Check that UpdateEarliestAvailableSlot was called
-	assert.Equal(t, true, mockCustody.updateCallCount > 0, "UpdateEarliestAvailableSlot should have been called")
-
-	// The earliest available slot should be pruneUpto + 1
-	// pruneUpto = currentSlot - retentionEpochs*slotsPerEpoch = 80 - 2*32 = 16
-	// So earliest available slot should be 16 + 1 = 17
-	expectedEarliestSlot := primitives.Slot(17)
-	require.Equal(t, expectedEarliestSlot, mockCustody.earliestAvailableSlot, "Earliest available slot should be updated correctly")
-	require.Equal(t, uint64(4), mockCustody.custodyGroupCount, "Custody group count should be preserved")
-
-	// Verify that no error was logged
-	for _, entry := range hook.AllEntries() {
-		if entry.Level == logrus.ErrorLevel {
-			t.Errorf("Unexpected error log: %s", entry.Message)
-		}
-	}
-
-	require.NoError(t, p.Stop())
-}
-
-// Mock custody updater that returns an error for UpdateEarliestAvailableSlot
-type mockCustodyUpdaterWithUpdateError struct {
-	updateCallCount int
-}
-
-func (m *mockCustodyUpdaterWithUpdateError) UpdateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error {
-	m.updateCallCount++
-	return errors.New("failed to update earliest available slot")
-}
-
-func TestWithRetentionPeriod_EnforcesMinimum(t *testing.T) {
-	// Use minimal config for testing
-	params.SetupTestConfigCleanup(t)
-	config := params.MinimalSpecConfig()
-	params.OverrideBeaconConfig(config)
-
-	ctx := t.Context()
-	beaconDB := dbtest.SetupDB(t)
-
-	// Get the minimum required epochs (272 + 1 = 273 for minimal)
-	minRequiredEpochs := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests + 1)
-
-	// Use a slot that's guaranteed to be after the minimum retention period
-	currentSlot := primitives.Slot(minRequiredEpochs+100) * (params.BeaconConfig().SlotsPerEpoch)
-
-	tests := []struct {
-		name                string
-		userRetentionEpochs primitives.Epoch
-		expectedPruneSlot   primitives.Slot
-		description         string
-	}{
-		{
-			name:                "User value below minimum - should use minimum",
-			userRetentionEpochs: 2, // Way below minimum
-			expectedPruneSlot:   currentSlot - primitives.Slot(minRequiredEpochs)*params.BeaconConfig().SlotsPerEpoch,
-			description:         "Should use minimum when user value is too low",
-		},
-		{
-			name:                "User value at minimum",
-			userRetentionEpochs: minRequiredEpochs,
-			expectedPruneSlot:   currentSlot - primitives.Slot(minRequiredEpochs)*params.BeaconConfig().SlotsPerEpoch,
-			description:         "Should use user value when at minimum",
-		},
-		{
-			name:                "User value above minimum",
-			userRetentionEpochs: minRequiredEpochs + 10,
-			expectedPruneSlot:   currentSlot - primitives.Slot(minRequiredEpochs+10)*params.BeaconConfig().SlotsPerEpoch,
-			description:         "Should use user value when above minimum",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			hook := logTest.NewGlobal()
-			logrus.SetLevel(logrus.WarnLevel)
-
-			mockCustody := &mockCustodyUpdater{}
-			// Create pruner with retention period
-			p, err := New(
-				ctx,
-				beaconDB,
-				time.Now(),
-				nil,
-				nil,
-				mockCustody,
-				WithRetentionPeriod(tt.userRetentionEpochs),
-			)
-			require.NoError(t, err)
-
-			// Test the pruning calculation
-			pruneUptoSlot := p.ps(currentSlot)
-
-			// Verify the pruning slot
-			assert.Equal(t, tt.expectedPruneSlot, pruneUptoSlot, tt.description)
-
-			// Check if warning was logged when value was too low
-			if tt.userRetentionEpochs < minRequiredEpochs {
-				assert.LogsContain(t, hook, "Retention period too low, ignoring and using minimum required value")
-			}
-		})
-	}
-}
-
-func TestPruner_UpdateEarliestSlotError(t *testing.T) {
-	params.SetupTestConfigCleanup(t)
-	config := params.BeaconConfig()
-	config.FuluForkEpoch = 0 // Enable Fulu from epoch 0
-	params.OverrideBeaconConfig(config)
-
-	logrus.SetLevel(logrus.DebugLevel)
-	hook := logTest.NewGlobal()
-	ctx, cancel := context.WithCancel(t.Context())
-	defer cancel()
-
-	beaconDB := dbtest.SetupDB(t)
-	retentionEpochs := primitives.Epoch(2)
-
-	slotTicker := &slottest.MockTicker{Channel: make(chan primitives.Slot)}
-
-	// Create mock custody updater that returns an error for UpdateEarliestAvailableSlot
-	mockCustody := &mockCustodyUpdaterWithUpdateError{}
-
-	// Create pruner with mock custody updater
-	p, err := New(
-		ctx,
-		beaconDB,
-		time.Now(),
-		nil,
-		nil,
-		mockCustody,
-		WithSlotTicker(slotTicker),
-	)
-	require.NoError(t, err)
-
-	p.ps = func(current primitives.Slot) primitives.Slot {
-		return current - primitives.Slot(retentionEpochs)*params.BeaconConfig().SlotsPerEpoch
-	}
-
-	// Save some blocks to be pruned
-	for i := primitives.Slot(1); i <= 32; i++ {
-		blk := util.NewBeaconBlock()
-		blk.Block.Slot = i
-		wsb, err := blocks.NewSignedBeaconBlock(blk)
-		require.NoError(t, err)
-		require.NoError(t, beaconDB.SaveBlock(ctx, wsb))
-	}
-
-	// Start pruner and trigger at slot 80
-	go p.Start()
-	currentSlot := primitives.Slot(80)
-	slotTicker.Channel <- currentSlot
-
-	// Wait for pruning to complete
-	time.Sleep(100 * time.Millisecond)
-
-	// Should have called UpdateEarliestAvailableSlot
-	assert.Equal(t, 1, mockCustody.updateCallCount, "UpdateEarliestAvailableSlot should be called")
-
-	// Check that error was logged by the prune function
-	found := false
-	for _, entry := range hook.AllEntries() {
-		if entry.Level == logrus.ErrorLevel && entry.Message == "Failed to prune database" {
-			found = true
-			break
-		}
-	}
-	assert.Equal(t, true, found, "Should log error when UpdateEarliestAvailableSlot fails")
-
-	require.NoError(t, p.Stop())
-}

beacon-chain/light-client/BUILD.bazel

@@ -6,7 +6,6 @@ go_library(
         "cache.go",
         "helpers.go",
         "lightclient.go",
-        "log.go",
         "store.go",
     ],
     importpath = "github.com/OffchainLabs/prysm/v6/beacon-chain/light-client",

beacon-chain/light-client/log.go

@@ -1,5 +0,0 @@
-package light_client
-
-import "github.com/sirupsen/logrus"
-
-var log = logrus.WithField("prefix", "light-client")

beacon-chain/light-client/store.go

@@ -14,6 +14,7 @@ import (
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"github.com/OffchainLabs/prysm/v6/time/slots"
 	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 var ErrLightClientBootstrapNotFound = errors.New("light client bootstrap not found")

beacon-chain/node/BUILD.bazel

@@ -58,6 +58,7 @@ go_library(
         "//config/params:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//container/slice:go_default_library",
+        "//encoding/bytesutil:go_default_library",
         "//genesis:go_default_library",
         "//monitoring/prometheus:go_default_library",
         "//monitoring/tracing:go_default_library",

beacon-chain/node/clear_db.go

@@ -2,13 +2,11 @@ package node
 
 import (
 	"context"
-	"os"
 
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/db/filesystem"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/db/kv"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/db/slasherkv"
 	"github.com/OffchainLabs/prysm/v6/cmd"
-	"github.com/OffchainLabs/prysm/v6/genesis"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 )
@@ -38,22 +36,6 @@ func (c *dbClearer) clearKV(ctx context.Context, db *kv.Store) (*kv.Store, error
 	return kv.NewKVStore(ctx, db.DatabasePath())
 }
 
-func (c *dbClearer) clearGenesis(dir string) error {
-	if !c.shouldProceed() {
-		return nil
-	}
-
-	gfile, err := genesis.FindStateFile(dir)
-	if err != nil {
-		return nil
-	}
-
-	if err := os.Remove(gfile.FilePath()); err != nil {
-		return errors.Wrapf(err, "genesis state file not removed: %s", gfile.FilePath())
-	}
-	return nil
-}
-
 func (c *dbClearer) clearBlobs(bs *filesystem.BlobStorage) error {
 	if !c.shouldProceed() {
 		return nil

beacon-chain/node/node.go

@@ -60,6 +60,7 @@ import (
 	"github.com/OffchainLabs/prysm/v6/config/params"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"github.com/OffchainLabs/prysm/v6/container/slice"
+	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
 	"github.com/OffchainLabs/prysm/v6/genesis"
 	"github.com/OffchainLabs/prysm/v6/monitoring/prometheus"
 	"github.com/OffchainLabs/prysm/v6/runtime"
@@ -177,9 +178,6 @@ func New(cliCtx *cli.Context, cancel context.CancelFunc, opts ...Option) (*Beaco
 	}
 	beacon.db = kvdb
 
-	if err := dbClearer.clearGenesis(dataDir); err != nil {
-		return nil, errors.Wrap(err, "could not clear genesis state")
-	}
 	providers := append(beacon.GenesisProviders, kv.NewLegacyGenesisProvider(kvdb))
 	if err := genesis.Initialize(ctx, dataDir, providers...); err != nil {
 		return nil, errors.Wrap(err, "could not initialize genesis state")
@@ -600,7 +598,22 @@ func (b *BeaconNode) startStateGen(ctx context.Context, bfs coverage.AvailableBl
 		return err
 	}
 
-	b.finalizedStateAtStartUp, err = sg.StateByRoot(ctx, [32]byte(cp.Root))
+	r := bytesutil.ToBytes32(cp.Root)
+	// Consider edge case where finalized root are zeros instead of genesis root hash.
+	if r == params.BeaconConfig().ZeroHash {
+		genesisBlock, err := b.db.GenesisBlock(ctx)
+		if err != nil {
+			return err
+		}
+		if genesisBlock != nil && !genesisBlock.IsNil() {
+			r, err = genesisBlock.Block().HashTreeRoot()
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	b.finalizedStateAtStartUp, err = sg.StateByRoot(ctx, r)
 	if err != nil {
 		return err
 	}
@@ -1108,7 +1121,6 @@ func (b *BeaconNode) registerPrunerService(cliCtx *cli.Context) error {
 		genesis,
 		initSyncWaiter(cliCtx.Context, b.initialSyncComplete),
 		backfillService.WaitForCompletion,
-		b.fetchP2P(),
 		opts...,
 	)
 	if err != nil {

beacon-chain/operations/attestations/prune_expired.go

@@ -10,13 +10,11 @@ import (
 
 // pruneExpired prunes attestations pool on every slot interval.
 func (s *Service) pruneExpired() {
-	secondsPerSlot := params.BeaconConfig().SecondsPerSlot
-	offset := time.Duration(secondsPerSlot-1) * time.Second
-	slotTicker := slots.NewSlotTickerWithOffset(s.genesisTime, offset, secondsPerSlot)
-	defer slotTicker.Done()
+	ticker := time.NewTicker(s.cfg.pruneInterval)
+	defer ticker.Stop()
 	for {
 		select {
-		case <-slotTicker.C():
+		case <-ticker.C:
 			s.pruneExpiredAtts()
 			s.updateMetrics()
 		case <-s.ctx.Done():

beacon-chain/operations/attestations/prune_expired_test.go

@@ -17,9 +17,7 @@ import (
 )
 
 func TestPruneExpired_Ticker(t *testing.T) {
-	// Need timeout longer than the offset (secondsPerSlot - 1) + some buffer
-	timeout := time.Duration(params.BeaconConfig().SecondsPerSlot+5) * time.Second
-	ctx, cancel := context.WithTimeout(t.Context(), timeout)
+	ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)
 	defer cancel()
 
 	s, err := NewService(ctx, &Config{

beacon-chain/p2p/custody.go

@@ -115,57 +115,6 @@ func (s *Service) UpdateCustodyInfo(earliestAvailableSlot primitives.Slot, custo
 	return earliestAvailableSlot, custodyGroupCount, nil
 }
 
-// UpdateEarliestAvailableSlot updates the earliest available slot.
-//
-// IMPORTANT: This function should only be called when Fulu is enabled. The caller is responsible
-// for checking params.FuluEnabled() before calling this function.
-func (s *Service) UpdateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error {
-	s.custodyInfoLock.Lock()
-	defer s.custodyInfoLock.Unlock()
-
-	if s.custodyInfo == nil {
-		return errors.New("no custody info available")
-	}
-
-	currentSlot := slots.CurrentSlot(s.genesisTime)
-	currentEpoch := slots.ToEpoch(currentSlot)
-
-	// Allow decrease (for backfill scenarios)
-	if earliestAvailableSlot < s.custodyInfo.earliestAvailableSlot {
-		s.custodyInfo.earliestAvailableSlot = earliestAvailableSlot
-		return nil
-	}
-
-	// Prevent increase within the MIN_EPOCHS_FOR_BLOCK_REQUESTS period
-	// This ensures we don't voluntarily refuse to serve mandatory block data
-	// This check applies regardless of whether we're early or late in the chain
-	minEpochsForBlocks := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
-
-	// Calculate the minimum required epoch (or 0 if we're early in the chain)
-	minRequiredEpoch := primitives.Epoch(0)
-	if currentEpoch > minEpochsForBlocks {
-		minRequiredEpoch = currentEpoch - minEpochsForBlocks
-	}
-
-	// Convert to slot to ensure we compare at slot-level granularity, not epoch-level
-	// This prevents allowing increases to slots within minRequiredEpoch that are after its first slot
-	minRequiredSlot, err := slots.EpochStart(minRequiredEpoch)
-	if err != nil {
-		return errors.Wrap(err, "epoch start")
-	}
-
-	// Prevent any increase that would put earliest slot beyond the minimum required slot
-	if earliestAvailableSlot > s.custodyInfo.earliestAvailableSlot && earliestAvailableSlot > minRequiredSlot {
-		return errors.Errorf(
-			"cannot increase earliest available slot to %d (epoch %d) as it exceeds minimum required slot %d (epoch %d)",
-			earliestAvailableSlot, slots.ToEpoch(earliestAvailableSlot), minRequiredSlot, minRequiredEpoch,
-		)
-	}
-
-	s.custodyInfo.earliestAvailableSlot = earliestAvailableSlot
-	return nil
-}
-
 // CustodyGroupCountFromPeer retrieves custody group count from a peer.
 // It first tries to get the custody group count from the peer's metadata,
 // then falls back to the ENR value if the metadata is not available, then
@@ -259,11 +208,11 @@ func (s *Service) custodyGroupCountFromPeerENR(pid peer.ID) uint64 {
 }
 
 func fuluForkSlot() (primitives.Slot, error) {
-	cfg := params.BeaconConfig()
+	beaconConfig := params.BeaconConfig()
 
-	fuluForkEpoch := cfg.FuluForkEpoch
-	if fuluForkEpoch == cfg.FarFutureEpoch {
-		return cfg.FarFutureSlot, nil
+	fuluForkEpoch := beaconConfig.FuluForkEpoch
+	if fuluForkEpoch == beaconConfig.FarFutureEpoch {
+		return beaconConfig.FarFutureSlot, nil
 	}
 
 	forkFuluSlot, err := slots.EpochStart(fuluForkEpoch)

beacon-chain/p2p/custody_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/core/peerdas"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/peers"
@@ -168,148 +167,6 @@ func TestUpdateCustodyInfo(t *testing.T) {
 	}
 }
 
-func TestUpdateEarliestAvailableSlot(t *testing.T) {
-	params.SetupTestConfigCleanup(t)
-	config := params.BeaconConfig()
-	config.FuluForkEpoch = 0 // Enable Fulu from epoch 0
-	params.OverrideBeaconConfig(config)
-
-	t.Run("Valid update", func(t *testing.T) {
-		const (
-			initialSlot primitives.Slot = 50
-			newSlot     primitives.Slot = 100
-			groupCount  uint64          = 5
-		)
-
-		// Set up a scenario where we're far enough in the chain that increasing to newSlot is valid
-		minEpochsForBlocks := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
-		currentEpoch := minEpochsForBlocks + 100 // Well beyond MIN_EPOCHS_FOR_BLOCK_REQUESTS
-		currentSlot := primitives.Slot(currentEpoch) * primitives.Slot(params.BeaconConfig().SlotsPerEpoch)
-
-		service := &Service{
-			// Set genesis time in the past so currentSlot is the "current" slot
-			genesisTime: time.Now().Add(-time.Duration(currentSlot) * time.Duration(params.BeaconConfig().SecondsPerSlot) * time.Second),
-			custodyInfo: &custodyInfo{
-				earliestAvailableSlot: initialSlot,
-				groupCount:            groupCount,
-			},
-		}
-
-		err := service.UpdateEarliestAvailableSlot(newSlot)
-
-		require.NoError(t, err)
-		require.Equal(t, newSlot, service.custodyInfo.earliestAvailableSlot)
-		require.Equal(t, groupCount, service.custodyInfo.groupCount) // Should preserve group count
-	})
-
-	t.Run("Earlier slot - allowed for backfill", func(t *testing.T) {
-		const initialSlot primitives.Slot = 100
-		const earlierSlot primitives.Slot = 50
-
-		service := &Service{
-			genesisTime: time.Now(),
-			custodyInfo: &custodyInfo{
-				earliestAvailableSlot: initialSlot,
-				groupCount:            5,
-			},
-		}
-
-		err := service.UpdateEarliestAvailableSlot(earlierSlot)
-
-		require.NoError(t, err)
-		require.Equal(t, earlierSlot, service.custodyInfo.earliestAvailableSlot) // Should decrease for backfill
-	})
-
-	t.Run("Prevent increase within MIN_EPOCHS_FOR_BLOCK_REQUESTS - late in chain", func(t *testing.T) {
-		// Set current time far enough in the future to have a meaningful MIN_EPOCHS_FOR_BLOCK_REQUESTS period
-		minEpochsForBlocks := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
-		currentEpoch := minEpochsForBlocks + 100 // Well beyond the minimum
-		currentSlot := primitives.Slot(currentEpoch) * primitives.Slot(params.BeaconConfig().SlotsPerEpoch)
-
-		// Calculate the minimum allowed epoch
-		minRequiredEpoch := currentEpoch - minEpochsForBlocks
-		minRequiredSlot := primitives.Slot(minRequiredEpoch) * primitives.Slot(params.BeaconConfig().SlotsPerEpoch)
-
-		// Try to set earliest slot to a value within the MIN_EPOCHS_FOR_BLOCK_REQUESTS period (should fail)
-		attemptedSlot := minRequiredSlot + 1000 // Within the mandatory retention period
-
-		service := &Service{
-			genesisTime: time.Now().Add(-time.Duration(currentSlot) * time.Duration(params.BeaconConfig().SecondsPerSlot) * time.Second),
-			custodyInfo: &custodyInfo{
-				earliestAvailableSlot: minRequiredSlot - 100, // Current value is before the min required
-				groupCount:            5,
-			},
-		}
-
-		err := service.UpdateEarliestAvailableSlot(attemptedSlot)
-
-		require.NotNil(t, err)
-		require.Equal(t, true, strings.Contains(err.Error(), "cannot increase earliest available slot"))
-	})
-
-	t.Run("Prevent increase at epoch boundary - slot precision matters", func(t *testing.T) {
-		minEpochsForBlocks := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
-		currentEpoch := minEpochsForBlocks + 976 // Current epoch
-		currentSlot := primitives.Slot(currentEpoch) * primitives.Slot(params.BeaconConfig().SlotsPerEpoch)
-
-		minRequiredEpoch := currentEpoch - minEpochsForBlocks                                                              // = 976
-		storedEarliestSlot := primitives.Slot(minRequiredEpoch)*primitives.Slot(params.BeaconConfig().SlotsPerEpoch) - 232 // Before minRequired
-
-		// Try to set earliest to slot 8 of the minRequiredEpoch (should fail with slot comparison)
-		attemptedSlot := primitives.Slot(minRequiredEpoch)*primitives.Slot(params.BeaconConfig().SlotsPerEpoch) + 8
-
-		service := &Service{
-			genesisTime: time.Now().Add(-time.Duration(currentSlot) * time.Duration(params.BeaconConfig().SecondsPerSlot) * time.Second),
-			custodyInfo: &custodyInfo{
-				earliestAvailableSlot: storedEarliestSlot,
-				groupCount:            5,
-			},
-		}
-
-		err := service.UpdateEarliestAvailableSlot(attemptedSlot)
-
-		require.NotNil(t, err, "Should prevent increasing earliest slot beyond the minimum required SLOT (not just epoch)")
-		require.Equal(t, true, strings.Contains(err.Error(), "cannot increase earliest available slot"))
-	})
-
-	t.Run("Prevent increase within MIN_EPOCHS_FOR_BLOCK_REQUESTS - early in chain", func(t *testing.T) {
-		minEpochsForBlocks := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
-		currentEpoch := minEpochsForBlocks - 10 // Early in chain, BEFORE we have MIN_EPOCHS_FOR_BLOCK_REQUESTS of history
-		currentSlot := primitives.Slot(currentEpoch) * primitives.Slot(params.BeaconConfig().SlotsPerEpoch)
-
-		// Current earliest slot is at slot 100
-		currentEarliestSlot := primitives.Slot(100)
-
-		// Try to increase earliest slot to slot 1000 (which would be within the mandatory window from currentSlot)
-		attemptedSlot := primitives.Slot(1000)
-
-		service := &Service{
-			genesisTime: time.Now().Add(-time.Duration(currentSlot) * time.Duration(params.BeaconConfig().SecondsPerSlot) * time.Second),
-			custodyInfo: &custodyInfo{
-				earliestAvailableSlot: currentEarliestSlot,
-				groupCount:            5,
-			},
-		}
-
-		err := service.UpdateEarliestAvailableSlot(attemptedSlot)
-
-		require.NotNil(t, err, "Should prevent increasing earliest slot within the mandatory retention window, even early in chain")
-		require.Equal(t, true, strings.Contains(err.Error(), "cannot increase earliest available slot"))
-	})
-
-	t.Run("Nil custody info - should return error", func(t *testing.T) {
-		service := &Service{
-			genesisTime: time.Now(),
-			custodyInfo: nil, // No custody info set
-		}
-
-		err := service.UpdateEarliestAvailableSlot(100)
-
-		require.NotNil(t, err)
-		require.Equal(t, true, strings.Contains(err.Error(), "no custody info available"))
-	})
-}
-
 func TestCustodyGroupCountFromPeer(t *testing.T) {
 	const (
 		expectedENR      uint64 = 7

beacon-chain/p2p/interfaces.go

@@ -126,7 +126,6 @@ type (
 		EarliestAvailableSlot(ctx context.Context) (primitives.Slot, error)
 		CustodyGroupCount(ctx context.Context) (uint64, error)
 		UpdateCustodyInfo(earliestAvailableSlot primitives.Slot, custodyGroupCount uint64) (primitives.Slot, uint64, error)
-		UpdateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error
 		CustodyGroupCountFromPeer(peer.ID) uint64
 	}
 )

beacon-chain/p2p/rpc_topic_mappings.go

@@ -345,17 +345,17 @@ func TopicFromMessage(msg string, epoch primitives.Epoch) (string, error) {
 		return "", errors.Errorf("%s: %s", invalidRPCMessageType, msg)
 	}
 
-	cfg := params.BeaconConfig()
+	beaconConfig := params.BeaconConfig()
 
 	// Check if the message is to be updated in fulu.
-	if epoch >= cfg.FuluForkEpoch {
+	if epoch >= beaconConfig.FuluForkEpoch {
 		if version, ok := fuluMapping[msg]; ok {
 			return protocolPrefix + msg + version, nil
 		}
 	}
 
 	// Check if the message is to be updated in altair.
-	if epoch >= cfg.AltairForkEpoch {
+	if epoch >= beaconConfig.AltairForkEpoch {
 		if version, ok := altairMapping[msg]; ok {
 			return protocolPrefix + msg + version, nil
 		}

beacon-chain/p2p/subnets.go

@@ -514,26 +514,17 @@ func initializePersistentSubnets(id enode.ID, epoch primitives.Epoch) error {
 //
 //	return [compute_subscribed_subnet(node_id, epoch, index) for index in range(SUBNETS_PER_NODE)]
 func computeSubscribedSubnets(nodeID enode.ID, epoch primitives.Epoch) ([]uint64, error) {
-	cfg := params.BeaconConfig()
+	subnetsPerNode := params.BeaconConfig().SubnetsPerNode
+	subs := make([]uint64, 0, subnetsPerNode)
 
-	if flags.Get().SubscribeToAllSubnets {
-		subnets := make([]uint64, 0, cfg.AttestationSubnetCount)
-		for i := range cfg.AttestationSubnetCount {
-			subnets = append(subnets, i)
-		}
-		return subnets, nil
-	}
-
-	subnets := make([]uint64, 0, cfg.SubnetsPerNode)
-	for i := range cfg.SubnetsPerNode {
+	for i := uint64(0); i < subnetsPerNode; i++ {
 		sub, err := computeSubscribedSubnet(nodeID, epoch, i)
 		if err != nil {
-			return nil, errors.Wrap(err, "compute subscribed subnet")
+			return nil, err
 		}
-		subnets = append(subnets, sub)
+		subs = append(subs, sub)
 	}
-
-	return subnets, nil
+	return subs, nil
 }
 
 //	Spec pseudocode definition:

beacon-chain/p2p/subnets_test.go

@@ -514,39 +514,17 @@ func TestDataColumnSubnets(t *testing.T) {
 
 func TestSubnetComputation(t *testing.T) {
 	db, err := enode.OpenDB("")
-	require.NoError(t, err)
+	assert.NoError(t, err)
 	defer db.Close()
-
 	priv, _, err := crypto.GenerateSecp256k1Key(rand.Reader)
-	require.NoError(t, err)
-
+	assert.NoError(t, err)
 	convertedKey, err := ecdsaprysm.ConvertFromInterfacePrivKey(priv)
-	require.NoError(t, err)
-
+	assert.NoError(t, err)
 	localNode := enode.NewLocalNode(db, convertedKey)
-	cfg := params.BeaconConfig()
-
-	t.Run("standard", func(t *testing.T) {
-		retrievedSubnets, err := computeSubscribedSubnets(localNode.ID(), 1000)
-		require.NoError(t, err)
-		require.Equal(t, cfg.SubnetsPerNode, uint64(len(retrievedSubnets)))
-		require.Equal(t, retrievedSubnets[0]+1, retrievedSubnets[1])
-	})
-
-	t.Run("subscribed to all", func(t *testing.T) {
-		gFlags := new(flags.GlobalFlags)
-		gFlags.SubscribeToAllSubnets = true
-		flags.Init(gFlags)
-		defer flags.Init(new(flags.GlobalFlags))
-
-		retrievedSubnets, err := computeSubscribedSubnets(localNode.ID(), 1000)
-		require.NoError(t, err)
-		require.Equal(t, cfg.AttestationSubnetCount, uint64(len(retrievedSubnets)))
-		for i := range cfg.AttestationSubnetCount {
-			require.Equal(t, i, retrievedSubnets[i])
-		}
-	})
 
+	retrievedSubnets, err := computeSubscribedSubnets(localNode.ID(), 1000)
+	assert.NoError(t, err)
+	assert.Equal(t, retrievedSubnets[0]+1, retrievedSubnets[1])
 }
 
 func TestInitializePersistentSubnets(t *testing.T) {

beacon-chain/p2p/testing/fuzz_p2p.go

@@ -213,11 +213,6 @@ func (s *FakeP2P) UpdateCustodyInfo(earliestAvailableSlot primitives.Slot, custo
 	return earliestAvailableSlot, custodyGroupCount, nil
 }
 
-// UpdateEarliestAvailableSlot -- fake.
-func (*FakeP2P) UpdateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error {
-	return nil
-}
-
 // CustodyGroupCountFromPeer -- fake.
 func (*FakeP2P) CustodyGroupCountFromPeer(peer.ID) uint64 {
 	return 0

beacon-chain/p2p/testing/p2p.go

@@ -499,15 +499,6 @@ func (s *TestP2P) UpdateCustodyInfo(earliestAvailableSlot primitives.Slot, custo
 	return s.earliestAvailableSlot, s.custodyGroupCount, nil
 }
 
-// UpdateEarliestAvailableSlot .
-func (s *TestP2P) UpdateEarliestAvailableSlot(earliestAvailableSlot primitives.Slot) error {
-	s.custodyInfoMut.Lock()
-	defer s.custodyInfoMut.Unlock()
-
-	s.earliestAvailableSlot = earliestAvailableSlot
-	return nil
-}
-
 // CustodyGroupCountFromPeer retrieves custody group count from a peer.
 // It first tries to get the custody group count from the peer's metadata,
 // then falls back to the ENR value if the metadata is not available, then

beacon-chain/p2p/utils.go

@@ -68,10 +68,7 @@ func privKey(cfg *Config) (*ecdsa.PrivateKey, error) {
 	}
 
 	if defaultKeysExist {
-		if !params.FuluEnabled() {
-			log.WithField("filePath", defaultKeyPath).Info("Reading static P2P private key from a file. To generate a new random private key at every start, please remove this file.")
-		}
-
+		log.WithField("filePath", defaultKeyPath).Info("Reading static P2P private key from a file. To generate a new random private key at every start, please remove this file.")
 		return privKeyFromFile(defaultKeyPath)
 	}
 

beacon-chain/rpc/core/BUILD.bazel

@@ -12,7 +12,6 @@ go_library(
     importpath = "github.com/OffchainLabs/prysm/v6/beacon-chain/rpc/core",
     visibility = ["//visibility:public"],
     deps = [
-        "//api/server:go_default_library",
         "//beacon-chain/blockchain:go_default_library",
         "//beacon-chain/cache:go_default_library",
         "//beacon-chain/core/altair:go_default_library",

beacon-chain/rpc/core/validator.go

@@ -7,7 +7,6 @@ import (
 	"sort"
 	"time"
 
-	"github.com/OffchainLabs/prysm/v6/api/server"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/cache"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/core/altair"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/core/epoch/precompute"
@@ -37,6 +36,24 @@ import (
 
 var errOptimisticMode = errors.New("the node is currently optimistic and cannot serve validators")
 
+// AggregateBroadcastFailedError represents an error scenario where
+// broadcasting an aggregate selection proof failed.
+type AggregateBroadcastFailedError struct {
+	err error
+}
+
+// NewAggregateBroadcastFailedError creates a new error instance.
+func NewAggregateBroadcastFailedError(err error) AggregateBroadcastFailedError {
+	return AggregateBroadcastFailedError{
+		err: err,
+	}
+}
+
+// Error returns the underlying error message.
+func (e *AggregateBroadcastFailedError) Error() string {
+	return fmt.Sprintf("could not broadcast signed aggregated attestation: %s", e.err.Error())
+}
+
 // ComputeValidatorPerformance reports the validator's latest balance along with other important metrics on
 // rewards and penalties throughout its lifecycle in the beacon chain.
 func (s *Service) ComputeValidatorPerformance(
@@ -343,8 +360,7 @@ func (s *Service) SubmitSignedContributionAndProof(
 	// Wait for p2p broadcast to complete and return the first error (if any)
 	err := errs.Wait()
 	if err != nil {
-		log.WithError(err).Debug("Could not broadcast signed contribution and proof")
-		return &RpcError{Err: server.NewBroadcastFailedError("SignedContributionAndProof", err), Reason: Internal}
+		return &RpcError{Err: err, Reason: Internal}
 	}
 
 	s.OperationNotifier.OperationFeed().Send(&feed.Event{
@@ -395,8 +411,7 @@ func (s *Service) SubmitSignedAggregateSelectionProof(
 	}
 
 	if err := s.Broadcaster.Broadcast(ctx, agg); err != nil {
-		log.WithError(err).Debug("Could not broadcast signed aggregate att and proof")
-		return &RpcError{Err: server.NewBroadcastFailedError("SignedAggregateAttAndProof", err), Reason: Internal}
+		return &RpcError{Err: &AggregateBroadcastFailedError{err: err}, Reason: Internal}
 	}
 
 	if logrus.GetLevel() >= logrus.DebugLevel {

beacon-chain/rpc/endpoints.go

@@ -97,7 +97,7 @@ func (s *Service) endpoints(
 	endpoints = append(endpoints, s.beaconEndpoints(ch, stater, blocker, validatorServer, coreService)...)
 	endpoints = append(endpoints, s.configEndpoints()...)
 	endpoints = append(endpoints, s.eventsEndpoints()...)
-	endpoints = append(endpoints, s.prysmBeaconEndpoints(ch, stater, blocker, coreService)...)
+	endpoints = append(endpoints, s.prysmBeaconEndpoints(ch, stater, coreService)...)
 	endpoints = append(endpoints, s.prysmNodeEndpoints()...)
 	endpoints = append(endpoints, s.prysmValidatorEndpoints(stater, coreService)...)
 
@@ -1184,7 +1184,6 @@ func (s *Service) eventsEndpoints() []endpoint {
 func (s *Service) prysmBeaconEndpoints(
 	ch *stategen.CanonicalHistory,
 	stater lookup.Stater,
-	blocker lookup.Blocker,
 	coreService *core.Service,
 ) []endpoint {
 	server := &beaconprysm.Server{
@@ -1195,7 +1194,6 @@ func (s *Service) prysmBeaconEndpoints(
 		CanonicalHistory:      ch,
 		BeaconDB:              s.cfg.BeaconDB,
 		Stater:                stater,
-		Blocker:               blocker,
 		ChainInfoFetcher:      s.cfg.ChainInfoFetcher,
 		FinalizationFetcher:   s.cfg.FinalizationFetcher,
 		CoreService:           coreService,
@@ -1268,28 +1266,6 @@ func (s *Service) prysmBeaconEndpoints(
 			handler: server.PublishBlobs,
 			methods: []string{http.MethodPost},
 		},
-		{
-			template: "/prysm/v1/beacon/states/{state_id}/query",
-			name:     namespace + ".QueryBeaconState",
-			middleware: []middleware.Middleware{
-				middleware.ContentTypeHandler([]string{api.JsonMediaType}),
-				middleware.AcceptHeaderHandler([]string{api.OctetStreamMediaType}),
-				middleware.AcceptEncodingHeaderHandler(),
-			},
-			handler: server.QueryBeaconState,
-			methods: []string{http.MethodPost},
-		},
-		{
-			template: "/prysm/v1/beacon/blocks/{block_id}/query",
-			name:     namespace + ".QueryBeaconBlock",
-			middleware: []middleware.Middleware{
-				middleware.ContentTypeHandler([]string{api.JsonMediaType}),
-				middleware.AcceptHeaderHandler([]string{api.OctetStreamMediaType}),
-				middleware.AcceptEncodingHeaderHandler(),
-			},
-			handler: server.QueryBeaconBlock,
-			methods: []string{http.MethodPost},
-		},
 	}
 }
 

beacon-chain/rpc/endpoints_test.go

@@ -127,8 +127,6 @@ func Test_endpoints(t *testing.T) {
 		"/prysm/v1/beacon/states/{state_id}/validator_count": {http.MethodGet},
 		"/prysm/v1/beacon/chain_head":                        {http.MethodGet},
 		"/prysm/v1/beacon/blobs":                             {http.MethodPost},
-		"/prysm/v1/beacon/states/{state_id}/query":           {http.MethodPost},
-		"/prysm/v1/beacon/blocks/{block_id}/query":           {http.MethodPost},
 	}
 
 	prysmNodeRoutes := map[string][]string{

beacon-chain/rpc/eth/beacon/handlers_pool.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/OffchainLabs/prysm/v6/api"
@@ -29,7 +31,6 @@ import (
 	"github.com/OffchainLabs/prysm/v6/runtime/version"
 	"github.com/OffchainLabs/prysm/v6/time/slots"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 )
 
 const broadcastBLSChangesRateLimit = 128
@@ -199,23 +200,22 @@ func (s *Server) SubmitAttestations(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if len(failedBroadcasts) > 0 {
+		httputil.HandleError(
+			w,
+			fmt.Sprintf("Attestations at index %s could not be broadcasted", strings.Join(failedBroadcasts, ", ")),
+			http.StatusInternalServerError,
+		)
+		return
+	}
+
 	if len(attFailures) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
+		failuresErr := &server.IndexedVerificationFailureError{
 			Code:     http.StatusBadRequest,
-			Message:  server.ErrIndexedValidationFail,
+			Message:  "One or more attestations failed validation",
 			Failures: attFailures,
 		}
 		httputil.WriteError(w, failuresErr)
-		return
-	}
-	if len(failedBroadcasts) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
-			Code:     http.StatusInternalServerError,
-			Message:  server.ErrIndexedBroadcastFail,
-			Failures: failedBroadcasts,
-		}
-		httputil.WriteError(w, failuresErr)
-		return
 	}
 }
 
@@ -247,8 +247,8 @@ func (s *Server) SubmitAttestationsV2(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var attFailures []*server.IndexedError
-	var failedBroadcasts []*server.IndexedError
+	var attFailures []*server.IndexedVerificationFailure
+	var failedBroadcasts []string
 
 	if v >= version.Electra {
 		attFailures, failedBroadcasts, err = s.handleAttestationsElectra(ctx, req.Data)
@@ -260,30 +260,29 @@ func (s *Server) SubmitAttestationsV2(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if len(failedBroadcasts) > 0 {
+		httputil.HandleError(
+			w,
+			fmt.Sprintf("Attestations at index %s could not be broadcasted", strings.Join(failedBroadcasts, ", ")),
+			http.StatusInternalServerError,
+		)
+		return
+	}
+
 	if len(attFailures) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
+		failuresErr := &server.IndexedVerificationFailureError{
 			Code:     http.StatusBadRequest,
-			Message:  server.ErrIndexedValidationFail,
+			Message:  "One or more attestations failed validation",
 			Failures: attFailures,
 		}
 		httputil.WriteError(w, failuresErr)
-		return
-	}
-	if len(failedBroadcasts) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
-			Code:     http.StatusInternalServerError,
-			Message:  server.ErrIndexedBroadcastFail,
-			Failures: failedBroadcasts,
-		}
-		httputil.WriteError(w, failuresErr)
-		return
 	}
 }
 
 func (s *Server) handleAttestationsElectra(
 	ctx context.Context,
 	data json.RawMessage,
-) (attFailures []*server.IndexedError, failedBroadcasts []*server.IndexedError, err error) {
+) (attFailures []*server.IndexedVerificationFailure, failedBroadcasts []string, err error) {
 	var sourceAttestations []*structs.SingleAttestation
 	currentEpoch := slots.ToEpoch(s.TimeFetcher.CurrentSlot())
 	if currentEpoch < params.BeaconConfig().ElectraForkEpoch {
@@ -302,14 +301,14 @@ func (s *Server) handleAttestationsElectra(
 	for i, sourceAtt := range sourceAttestations {
 		att, err := sourceAtt.ToConsensus()
 		if err != nil {
-			attFailures = append(attFailures, &server.IndexedError{
+			attFailures = append(attFailures, &server.IndexedVerificationFailure{
 				Index:   i,
 				Message: "Could not convert request attestation to consensus attestation: " + err.Error(),
 			})
 			continue
 		}
 		if _, err = bls.SignatureFromBytes(att.Signature); err != nil {
-			attFailures = append(attFailures, &server.IndexedError{
+			attFailures = append(attFailures, &server.IndexedVerificationFailure{
 				Index:   i,
 				Message: "Incorrect attestation signature: " + err.Error(),
 			})
@@ -318,13 +317,6 @@ func (s *Server) handleAttestationsElectra(
 		validAttestations = append(validAttestations, att)
 	}
 
-	// We store the error for the first failed broadcast and use it in the log message in case
-	// there are broadcast issues. Having a single log at the end instead of logging
-	// for every failed broadcast prevents log noise in case there are many failures.
-	// Even though we only retain the first error, there is a very good chance that all
-	// broadcasts fail for the same reason, so this should be sufficient in most cases.
-	var broadcastErr error
-
 	for i, singleAtt := range validAttestations {
 		s.OperationNotifier.OperationFeed().Send(&feed.Event{
 			Type: operation.SingleAttReceived,
@@ -346,45 +338,31 @@ func (s *Server) handleAttestationsElectra(
 		wantedEpoch := slots.ToEpoch(att.Data.Slot)
 		vals, err := s.HeadFetcher.HeadValidatorsIndices(ctx, wantedEpoch)
 		if err != nil {
-			return nil, nil, errors.Wrap(err, "could not get head validator indices")
+			failedBroadcasts = append(failedBroadcasts, strconv.Itoa(i))
+			continue
 		}
 		subnet := corehelpers.ComputeSubnetFromCommitteeAndSlot(uint64(len(vals)), att.GetCommitteeIndex(), att.Data.Slot)
 		if err = s.Broadcaster.BroadcastAttestation(ctx, subnet, singleAtt); err != nil {
-			failedBroadcasts = append(failedBroadcasts, &server.IndexedError{
-				Index:   i,
-				Message: server.NewBroadcastFailedError("SingleAttestation", err).Error(),
-			})
-			if broadcastErr == nil {
-				broadcastErr = err
-			}
+			log.WithError(err).Errorf("could not broadcast attestation at index %d", i)
+			failedBroadcasts = append(failedBroadcasts, strconv.Itoa(i))
 			continue
 		}
 
 		if features.Get().EnableExperimentalAttestationPool {
 			if err = s.AttestationCache.Add(att); err != nil {
-				log.WithError(err).Error("Could not save attestation")
+				log.WithError(err).Error("could not save attestation")
 			}
 		} else {
 			if err = s.AttestationsPool.SaveUnaggregatedAttestation(att); err != nil {
-				log.WithError(err).Error("Could not save attestation")
+				log.WithError(err).Error("could not save attestation")
 			}
 		}
 	}
 
-	if len(failedBroadcasts) > 0 {
-		log.WithFields(logrus.Fields{
-			"failedCount": len(failedBroadcasts),
-			"totalCount":  len(validAttestations),
-		}).WithError(broadcastErr).Error("Some attestations failed to be broadcast")
-	}
-
 	return attFailures, failedBroadcasts, nil
 }
 
-func (s *Server) handleAttestations(
-	ctx context.Context,
-	data json.RawMessage,
-) (attFailures []*server.IndexedError, failedBroadcasts []*server.IndexedError, err error) {
+func (s *Server) handleAttestations(ctx context.Context, data json.RawMessage) (attFailures []*server.IndexedVerificationFailure, failedBroadcasts []string, err error) {
 	var sourceAttestations []*structs.Attestation
 
 	if slots.ToEpoch(s.TimeFetcher.CurrentSlot()) >= params.BeaconConfig().ElectraForkEpoch {
@@ -403,14 +381,14 @@ func (s *Server) handleAttestations(
 	for i, sourceAtt := range sourceAttestations {
 		att, err := sourceAtt.ToConsensus()
 		if err != nil {
-			attFailures = append(attFailures, &server.IndexedError{
+			attFailures = append(attFailures, &server.IndexedVerificationFailure{
 				Index:   i,
 				Message: "Could not convert request attestation to consensus attestation: " + err.Error(),
 			})
 			continue
 		}
 		if _, err = bls.SignatureFromBytes(att.Signature); err != nil {
-			attFailures = append(attFailures, &server.IndexedError{
+			attFailures = append(attFailures, &server.IndexedVerificationFailure{
 				Index:   i,
 				Message: "Incorrect attestation signature: " + err.Error(),
 			})
@@ -419,13 +397,6 @@ func (s *Server) handleAttestations(
 		validAttestations = append(validAttestations, att)
 	}
 
-	// We store the error for the first failed broadcast and use it in the log message in case
-	// there are broadcast issues. Having a single log at the end instead of logging
-	// for every failed broadcast prevents log noise in case there are many failures.
-	// Even though we only retain the first error, there is a very good chance that all
-	// broadcasts fail for the same reason, so this should be sufficient in most cases.
-	var broadcastErr error
-
 	for i, att := range validAttestations {
 		// Broadcast the unaggregated attestation on a feed to notify other services in the beacon node
 		// of a received unaggregated attestation.
@@ -442,43 +413,32 @@ func (s *Server) handleAttestations(
 		wantedEpoch := slots.ToEpoch(att.Data.Slot)
 		vals, err := s.HeadFetcher.HeadValidatorsIndices(ctx, wantedEpoch)
 		if err != nil {
-			return nil, nil, errors.Wrap(err, "could not get head validator indices")
+			failedBroadcasts = append(failedBroadcasts, strconv.Itoa(i))
+			continue
 		}
 
 		subnet := corehelpers.ComputeSubnetFromCommitteeAndSlot(uint64(len(vals)), att.Data.CommitteeIndex, att.Data.Slot)
 		if err = s.Broadcaster.BroadcastAttestation(ctx, subnet, att); err != nil {
-			failedBroadcasts = append(failedBroadcasts, &server.IndexedError{
-				Index:   i,
-				Message: server.NewBroadcastFailedError("Attestation", err).Error(),
-			})
-			if broadcastErr == nil {
-				broadcastErr = err
-			}
+			log.WithError(err).Errorf("could not broadcast attestation at index %d", i)
+			failedBroadcasts = append(failedBroadcasts, strconv.Itoa(i))
 			continue
 		}
 
 		if features.Get().EnableExperimentalAttestationPool {
 			if err = s.AttestationCache.Add(att); err != nil {
-				log.WithError(err).Error("Could not save attestation")
+				log.WithError(err).Error("could not save attestation")
 			}
 		} else if att.IsAggregated() {
 			if err = s.AttestationsPool.SaveAggregatedAttestation(att); err != nil {
-				log.WithError(err).Error("Could not save aggregated attestation")
+				log.WithError(err).Error("could not save aggregated attestation")
 			}
 		} else {
 			if err = s.AttestationsPool.SaveUnaggregatedAttestation(att); err != nil {
-				log.WithError(err).Error("Could not save unaggregated attestation")
+				log.WithError(err).Error("could not save unaggregated attestation")
 			}
 		}
 	}
 
-	if len(failedBroadcasts) > 0 {
-		log.WithFields(logrus.Fields{
-			"failedCount": len(failedBroadcasts),
-			"totalCount":  len(validAttestations),
-		}).WithError(broadcastErr).Error("Some attestations failed to be broadcast")
-	}
-
 	return attFailures, failedBroadcasts, nil
 }
 
@@ -581,11 +541,11 @@ func (s *Server) SubmitSyncCommitteeSignatures(w http.ResponseWriter, r *http.Re
 	}
 
 	var validMessages []*eth.SyncCommitteeMessage
-	var msgFailures []*server.IndexedError
+	var msgFailures []*server.IndexedVerificationFailure
 	for i, sourceMsg := range req.Data {
 		msg, err := sourceMsg.ToConsensus()
 		if err != nil {
-			msgFailures = append(msgFailures, &server.IndexedError{
+			msgFailures = append(msgFailures, &server.IndexedVerificationFailure{
 				Index:   i,
 				Message: "Could not convert request message to consensus message: " + err.Error(),
 			})
@@ -602,7 +562,7 @@ func (s *Server) SubmitSyncCommitteeSignatures(w http.ResponseWriter, r *http.Re
 	}
 
 	if len(msgFailures) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
+		failuresErr := &server.IndexedVerificationFailureError{
 			Code:     http.StatusBadRequest,
 			Message:  "One or more messages failed validation",
 			Failures: msgFailures,
@@ -621,7 +581,7 @@ func (s *Server) SubmitBLSToExecutionChanges(w http.ResponseWriter, r *http.Requ
 		httputil.HandleError(w, fmt.Sprintf("Could not get head state: %v", err), http.StatusInternalServerError)
 		return
 	}
-	var failures []*server.IndexedError
+	var failures []*server.IndexedVerificationFailure
 	var toBroadcast []*eth.SignedBLSToExecutionChange
 
 	var req []*structs.SignedBLSToExecutionChange
@@ -642,7 +602,7 @@ func (s *Server) SubmitBLSToExecutionChanges(w http.ResponseWriter, r *http.Requ
 	for i, change := range req {
 		sbls, err := change.ToConsensus()
 		if err != nil {
-			failures = append(failures, &server.IndexedError{
+			failures = append(failures, &server.IndexedVerificationFailure{
 				Index:   i,
 				Message: "Unable to decode SignedBLSToExecutionChange: " + err.Error(),
 			})
@@ -650,14 +610,14 @@ func (s *Server) SubmitBLSToExecutionChanges(w http.ResponseWriter, r *http.Requ
 		}
 		_, err = blocks.ValidateBLSToExecutionChange(st, sbls)
 		if err != nil {
-			failures = append(failures, &server.IndexedError{
+			failures = append(failures, &server.IndexedVerificationFailure{
 				Index:   i,
 				Message: "Could not validate SignedBLSToExecutionChange: " + err.Error(),
 			})
 			continue
 		}
 		if err := blocks.VerifyBLSChangeSignature(st, sbls); err != nil {
-			failures = append(failures, &server.IndexedError{
+			failures = append(failures, &server.IndexedVerificationFailure{
 				Index:   i,
 				Message: "Could not validate signature: " + err.Error(),
 			})
@@ -676,9 +636,9 @@ func (s *Server) SubmitBLSToExecutionChanges(w http.ResponseWriter, r *http.Requ
 	}
 	go s.broadcastBLSChanges(context.Background(), toBroadcast)
 	if len(failures) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
+		failuresErr := &server.IndexedVerificationFailureError{
 			Code:     http.StatusBadRequest,
-			Message:  server.ErrIndexedValidationFail,
+			Message:  "One or more BLSToExecutionChange failed validation",
 			Failures: failures,
 		}
 		httputil.WriteError(w, failuresErr)
@@ -695,18 +655,18 @@ func (s *Server) broadcastBLSBatch(ctx context.Context, ptr *[]*eth.SignedBLSToE
 	}
 	st, err := s.ChainInfoFetcher.HeadStateReadOnly(ctx)
 	if err != nil {
-		log.WithError(err).Error("Could not get head state")
+		log.WithError(err).Error("could not get head state")
 		return
 	}
 	for _, ch := range (*ptr)[:limit] {
 		if ch != nil {
 			_, err := blocks.ValidateBLSToExecutionChange(st, ch)
 			if err != nil {
-				log.WithError(err).Error("Could not validate BLS to execution change")
+				log.WithError(err).Error("could not validate BLS to execution change")
 				continue
 			}
 			if err := s.Broadcaster.Broadcast(ctx, ch); err != nil {
-				log.WithError(err).Error("Could not broadcast BLS to execution changes.")
+				log.WithError(err).Error("could not broadcast BLS to execution changes.")
 			}
 		}
 	}

beacon-chain/rpc/eth/beacon/handlers_pool_test.go

@@ -638,7 +638,7 @@ func TestSubmitAttestations(t *testing.T) {
 
 			s.SubmitAttestations(writer, request)
 			assert.Equal(t, http.StatusBadRequest, writer.Code)
-			e := &server.IndexedErrorContainer{}
+			e := &server.IndexedVerificationFailureError{}
 			require.NoError(t, json.Unmarshal(writer.Body.Bytes(), e))
 			assert.Equal(t, http.StatusBadRequest, e.Code)
 			require.Equal(t, 1, len(e.Failures))
@@ -772,7 +772,7 @@ func TestSubmitAttestations(t *testing.T) {
 
 				s.SubmitAttestationsV2(writer, request)
 				assert.Equal(t, http.StatusBadRequest, writer.Code)
-				e := &server.IndexedErrorContainer{}
+				e := &server.IndexedVerificationFailureError{}
 				require.NoError(t, json.Unmarshal(writer.Body.Bytes(), e))
 				assert.Equal(t, http.StatusBadRequest, e.Code)
 				require.Equal(t, 1, len(e.Failures))
@@ -873,7 +873,7 @@ func TestSubmitAttestations(t *testing.T) {
 
 				s.SubmitAttestationsV2(writer, request)
 				assert.Equal(t, http.StatusBadRequest, writer.Code)
-				e := &server.IndexedErrorContainer{}
+				e := &server.IndexedVerificationFailureError{}
 				require.NoError(t, json.Unmarshal(writer.Body.Bytes(), e))
 				assert.Equal(t, http.StatusBadRequest, e.Code)
 				require.Equal(t, 1, len(e.Failures))
@@ -1538,7 +1538,7 @@ func TestSubmitSignedBLSToExecutionChanges_Failures(t *testing.T) {
 	s.SubmitBLSToExecutionChanges(writer, request)
 	assert.Equal(t, http.StatusBadRequest, writer.Code)
 	time.Sleep(10 * time.Millisecond) // Delay to allow the routine to start
-	require.StringContains(t, "One or more messages failed validation", writer.Body.String())
+	require.StringContains(t, "One or more BLSToExecutionChange failed validation", writer.Body.String())
 	assert.Equal(t, true, broadcaster.BroadcastCalled.Load())
 	assert.Equal(t, numValidators, len(broadcaster.BroadcastMessages)+1)
 

beacon-chain/rpc/eth/validator/BUILD.bazel

@@ -12,7 +12,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//api:go_default_library",
-        "//api/server:go_default_library",
         "//api/server/structs:go_default_library",
         "//beacon-chain/blockchain:go_default_library",
         "//beacon-chain/builder:go_default_library",

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

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/OffchainLabs/prysm/v6/api"
-	"github.com/OffchainLabs/prysm/v6/api/server"
 	"github.com/OffchainLabs/prysm/v6/api/server/structs"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/builder"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/cache"
@@ -269,61 +268,22 @@ func (s *Server) SubmitContributionAndProofs(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	var failures []*server.IndexedError
-	var failedBroadcasts []*server.IndexedError
-
-	for i, item := range reqData {
+	for _, item := range reqData {
 		var contribution structs.SignedContributionAndProof
 		if err := json.Unmarshal(item, &contribution); err != nil {
-			failures = append(failures, &server.IndexedError{
-				Index:   i,
-				Message: "Could not unmarshal message: " + err.Error(),
-			})
-			continue
+			httputil.HandleError(w, "Could not decode item: "+err.Error(), http.StatusBadRequest)
+			return
 		}
 		consensusItem, err := contribution.ToConsensus()
 		if err != nil {
-			failures = append(failures, &server.IndexedError{
-				Index:   i,
-				Message: "Could not convert request contribution to consensus contribution: " + err.Error(),
-			})
-			continue
+			httputil.HandleError(w, "Could not convert contribution to consensus format: "+err.Error(), http.StatusBadRequest)
+			return
 		}
-
-		rpcError := s.CoreService.SubmitSignedContributionAndProof(ctx, consensusItem)
-		if rpcError != nil {
-			var broadcastFailedErr *server.BroadcastFailedError
-			if errors.As(rpcError.Err, &broadcastFailedErr) {
-				failedBroadcasts = append(failedBroadcasts, &server.IndexedError{
-					Index:   i,
-					Message: rpcError.Err.Error(),
-				})
-				continue
-			} else {
-				httputil.HandleError(w, rpcError.Err.Error(), core.ErrorReasonToHTTP(rpcError.Reason))
-				return
-			}
+		if rpcError := s.CoreService.SubmitSignedContributionAndProof(ctx, consensusItem); rpcError != nil {
+			httputil.HandleError(w, rpcError.Err.Error(), core.ErrorReasonToHTTP(rpcError.Reason))
+			return
 		}
 	}
-
-	if len(failures) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
-			Code:     http.StatusBadRequest,
-			Message:  server.ErrIndexedValidationFail,
-			Failures: failures,
-		}
-		httputil.WriteError(w, failuresErr)
-		return
-	}
-	if len(failedBroadcasts) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
-			Code:     http.StatusInternalServerError,
-			Message:  server.ErrIndexedBroadcastFail,
-			Failures: failedBroadcasts,
-		}
-		httputil.WriteError(w, failuresErr)
-		return
-	}
 }
 
 // Deprecated: use SubmitAggregateAndProofsV2 instead
@@ -362,8 +322,8 @@ func (s *Server) SubmitAggregateAndProofs(w http.ResponseWriter, r *http.Request
 		}
 		rpcError := s.CoreService.SubmitSignedAggregateSelectionProof(ctx, consensusItem)
 		if rpcError != nil {
-			var broadcastFailedErr *server.BroadcastFailedError
-			ok := errors.As(rpcError.Err, &broadcastFailedErr)
+			var aggregateBroadcastFailedError *core.AggregateBroadcastFailedError
+			ok := errors.As(rpcError.Err, &aggregateBroadcastFailedError)
 			if ok {
 				broadcastFailed = true
 			} else {
@@ -408,83 +368,49 @@ func (s *Server) SubmitAggregateAndProofsV2(w http.ResponseWriter, r *http.Reque
 		return
 	}
 
-	var failures []*server.IndexedError
-	var failedBroadcasts []*server.IndexedError
-
+	broadcastFailed := false
 	var rpcError *core.RpcError
-	for i, raw := range reqData {
+	for _, raw := range reqData {
 		if v >= version.Electra {
 			var signedAggregate structs.SignedAggregateAttestationAndProofElectra
 			err = json.Unmarshal(raw, &signedAggregate)
 			if err != nil {
-				failures = append(failures, &server.IndexedError{
-					Index:   i,
-					Message: "Could not parse message: " + err.Error(),
-				})
-				continue
+				httputil.HandleError(w, "Failed to parse aggregate attestation and proof: "+err.Error(), http.StatusBadRequest)
+				return
 			}
 			consensusItem, err := signedAggregate.ToConsensus()
 			if err != nil {
-				failures = append(failures, &server.IndexedError{
-					Index:   i,
-					Message: "Could not convert request aggregate to consensus aggregate: " + err.Error(),
-				})
-				continue
+				httputil.HandleError(w, "Could not convert request aggregate to consensus aggregate: "+err.Error(), http.StatusBadRequest)
+				return
 			}
 			rpcError = s.CoreService.SubmitSignedAggregateSelectionProof(ctx, consensusItem)
 		} else {
 			var signedAggregate structs.SignedAggregateAttestationAndProof
 			err = json.Unmarshal(raw, &signedAggregate)
 			if err != nil {
-				failures = append(failures, &server.IndexedError{
-					Index:   i,
-					Message: "Could not parse message: " + err.Error(),
-				})
-				continue
+				httputil.HandleError(w, "Failed to parse aggregate attestation and proof: "+err.Error(), http.StatusBadRequest)
+				return
 			}
 			consensusItem, err := signedAggregate.ToConsensus()
 			if err != nil {
-				failures = append(failures, &server.IndexedError{
-					Index:   i,
-					Message: "Could not convert request aggregate to consensus aggregate: " + err.Error(),
-				})
-				continue
+				httputil.HandleError(w, "Could not convert request aggregate to consensus aggregate: "+err.Error(), http.StatusBadRequest)
+				return
 			}
 			rpcError = s.CoreService.SubmitSignedAggregateSelectionProof(ctx, consensusItem)
 		}
 
 		if rpcError != nil {
-			var broadcastFailedErr *server.BroadcastFailedError
-			if errors.As(rpcError.Err, &broadcastFailedErr) {
-				failedBroadcasts = append(failedBroadcasts, &server.IndexedError{
-					Index:   i,
-					Message: rpcError.Err.Error(),
-				})
-				continue
+			var aggregateBroadcastFailedError *core.AggregateBroadcastFailedError
+			if errors.As(rpcError.Err, &aggregateBroadcastFailedError) {
+				broadcastFailed = true
 			} else {
 				httputil.HandleError(w, rpcError.Err.Error(), core.ErrorReasonToHTTP(rpcError.Reason))
 				return
 			}
 		}
 	}
-
-	if len(failures) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
-			Code:     http.StatusBadRequest,
-			Message:  server.ErrIndexedValidationFail,
-			Failures: failures,
-		}
-		httputil.WriteError(w, failuresErr)
-		return
-	}
-	if len(failedBroadcasts) > 0 {
-		failuresErr := &server.IndexedErrorContainer{
-			Code:     http.StatusInternalServerError,
-			Message:  server.ErrIndexedBroadcastFail,
-			Failures: failedBroadcasts,
-		}
-		httputil.WriteError(w, failuresErr)
-		return
+	if broadcastFailed {
+		httputil.HandleError(w, "Could not broadcast one or more signed aggregated attestations", http.StatusInternalServerError)
 	}
 }
 
@@ -597,18 +523,7 @@ func (s *Server) SubmitSyncCommitteeSubscription(w http.ResponseWriter, r *http.
 		epochDuration := time.Duration(params.BeaconConfig().SlotsPerEpoch.Mul(params.BeaconConfig().SecondsPerSlot)) * time.Second
 		totalDuration := epochDuration * time.Duration(epochsToWatch)
 
-		subcommitteeSize := params.BeaconConfig().SyncCommitteeSize / params.BeaconConfig().SyncCommitteeSubnetCount
-		seen := make(map[uint64]bool)
-		var subnetIndices []uint64
-
-		for _, idx := range sub.SyncCommitteeIndices {
-			subnetIdx := idx / subcommitteeSize
-			if !seen[subnetIdx] {
-				seen[subnetIdx] = true
-				subnetIndices = append(subnetIndices, subnetIdx)
-			}
-		}
-		cache.SyncSubnetIDs.AddSyncCommitteeSubnets(pubkey48[:], startEpoch, subnetIndices, totalDuration)
+		cache.SyncSubnetIDs.AddSyncCommitteeSubnets(pubkey48[:], startEpoch, sub.SyncCommitteeIndices, totalDuration)
 	}
 }
 

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

@@ -1049,8 +1049,9 @@ func TestSubmitSyncCommitteeSubscription(t *testing.T) {
 		s.SubmitSyncCommitteeSubscription(writer, request)
 		assert.Equal(t, http.StatusOK, writer.Code)
 		subnets, _, _, _ := cache.SyncSubnetIDs.GetSyncCommitteeSubnets(pubkeys[1], 0)
-		require.Equal(t, 1, len(subnets))
+		require.Equal(t, 2, len(subnets))
 		assert.Equal(t, uint64(0), subnets[0])
+		assert.Equal(t, uint64(2), subnets[1])
 	})
 	t.Run("multiple", func(t *testing.T) {
 		cache.SyncSubnetIDs.EmptyAllCaches()
@@ -1069,7 +1070,7 @@ func TestSubmitSyncCommitteeSubscription(t *testing.T) {
 		assert.Equal(t, uint64(0), subnets[0])
 		subnets, _, _, _ = cache.SyncSubnetIDs.GetSyncCommitteeSubnets(pubkeys[1], 0)
 		require.Equal(t, 1, len(subnets))
-		assert.Equal(t, uint64(0), subnets[0])
+		assert.Equal(t, uint64(2), subnets[0])
 	})
 	t.Run("no body", func(t *testing.T) {
 		request := httptest.NewRequest(http.MethodPost, "http://example.com", nil)

beacon-chain/rpc/lookup/blocker.go

@@ -3,7 +3,6 @@ package lookup
 import (
 	"context"
 	"fmt"
-	"math"
 	"strconv"
 
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain"
@@ -284,13 +283,9 @@ func (p *BeaconDbBlocker) Blobs(ctx context.Context, id string, opts ...options.
 		return make([]*blocks.VerifiedROBlob, 0), nil
 	}
 
-	// Compute the first Fulu slot.
-	fuluForkSlot := primitives.Slot(math.MaxUint64)
-	if fuluForkEpoch := params.BeaconConfig().FuluForkEpoch; fuluForkEpoch != primitives.Epoch(math.MaxUint64) {
-		fuluForkSlot, err = slots.EpochStart(fuluForkEpoch)
-		if err != nil {
-			return nil, &core.RpcError{Err: errors.Wrap(err, "could not calculate Fulu start slot"), Reason: core.Internal}
-		}
+	fuluForkSlot, err := slots.EpochStart(params.BeaconConfig().FuluForkEpoch)
+	if err != nil {
+		return nil, &core.RpcError{Err: errors.Wrap(err, "could not calculate Fulu start slot"), Reason: core.Internal}
 	}
 
 	// Convert versioned hashes to indices if provided

beacon-chain/rpc/lookup/blocker_test.go

@@ -587,51 +587,6 @@ func TestGetBlob(t *testing.T) {
 		require.Equal(t, http.StatusBadRequest, core.ErrorReasonToHTTP(rpcErr.Reason))
 		require.StringContains(t, "not supported before", rpcErr.Err.Error())
 	})
-
-	t.Run("fulu fork epoch not set (MaxUint64)", func(t *testing.T) {
-		// Setup with Deneb fork enabled but Fulu fork epoch set to MaxUint64 (not set/far future)
-		params.SetupTestConfigCleanup(t)
-		cfg := params.BeaconConfig().Copy()
-		cfg.DenebForkEpoch = 1
-		cfg.FuluForkEpoch = primitives.Epoch(math.MaxUint64) // Not set / far future
-		params.OverrideBeaconConfig(cfg)
-
-		// Create and save Deneb block and blob sidecars
-		denebSlot := util.SlotAtEpoch(t, cfg.DenebForkEpoch)
-		_, tempBlobStorage := filesystem.NewEphemeralBlobStorageAndFs(t)
-
-		denebBlockWithBlobs, denebBlobSidecars := util.GenerateTestDenebBlockWithSidecar(t, [fieldparams.RootLength]byte{}, denebSlot, 2, util.WithDenebSlot(denebSlot))
-		denebBlockRoot := denebBlockWithBlobs.Root()
-
-		verifiedDenebBlobs := verification.FakeVerifySliceForTest(t, denebBlobSidecars)
-		for i := range verifiedDenebBlobs {
-			err := tempBlobStorage.Save(verifiedDenebBlobs[i])
-			require.NoError(t, err)
-		}
-
-		err := db.SaveBlock(t.Context(), denebBlockWithBlobs)
-		require.NoError(t, err)
-
-		blocker := &BeaconDbBlocker{
-			GenesisTimeFetcher: &testutil.MockGenesisTimeFetcher{
-				Genesis: time.Now(),
-			},
-			BeaconDB:    db,
-			BlobStorage: tempBlobStorage,
-		}
-
-		// Should successfully retrieve blobs even when FuluForkEpoch is not set
-		retrievedBlobs, rpcErr := blocker.Blobs(ctx, hexutil.Encode(denebBlockRoot[:]))
-		require.IsNil(t, rpcErr)
-		require.Equal(t, 2, len(retrievedBlobs))
-
-		// Verify blob content matches
-		for i, retrievedBlob := range retrievedBlobs {
-			require.NotNil(t, retrievedBlob.BlobSidecar)
-			require.DeepEqual(t, denebBlobSidecars[i].Blob, retrievedBlob.Blob)
-			require.DeepEqual(t, denebBlobSidecars[i].KzgCommitment, retrievedBlob.KzgCommitment)
-		}
-	})
 }
 
 func TestBlobs_CommitmentOrdering(t *testing.T) {

beacon-chain/rpc/prysm/beacon/BUILD.bazel

@@ -5,13 +5,11 @@ go_library(
     srcs = [
         "handlers.go",
         "server.go",
-        "ssz_query.go",
         "validator_count.go",
     ],
     importpath = "github.com/OffchainLabs/prysm/v6/beacon-chain/rpc/prysm/beacon",
     visibility = ["//visibility:public"],
     deps = [
-        "//api:go_default_library",
         "//api/server/structs:go_default_library",
         "//beacon-chain/blockchain:go_default_library",
         "//beacon-chain/core/helpers:go_default_library",
@@ -29,13 +27,10 @@ go_library(
         "//consensus-types/primitives:go_default_library",
         "//consensus-types/validator:go_default_library",
         "//encoding/bytesutil:go_default_library",
-        "//encoding/ssz/query:go_default_library",
         "//monitoring/tracing/trace:go_default_library",
         "//network/httputil:go_default_library",
         "//proto/eth/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
-        "//proto/ssz_query:go_default_library",
-        "//runtime/version:go_default_library",
         "//time/slots:go_default_library",
         "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
@@ -46,12 +41,10 @@ go_test(
     name = "go_default_test",
     srcs = [
         "handlers_test.go",
-        "ssz_query_test.go",
         "validator_count_test.go",
     ],
     embed = [":go_default_library"],
     deps = [
-        "//api:go_default_library",
         "//api/server/structs:go_default_library",
         "//beacon-chain/blockchain/testing:go_default_library",
         "//beacon-chain/core/helpers:go_default_library",
@@ -70,13 +63,10 @@ go_test(
         "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/blocks:go_default_library",
-        "//consensus-types/interfaces:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//encoding/bytesutil:go_default_library",
         "//network/httputil:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",
-        "//proto/ssz_query:go_default_library",
-        "//runtime/version:go_default_library",
         "//testing/assert:go_default_library",
         "//testing/require:go_default_library",
         "//testing/util:go_default_library",

beacon-chain/rpc/prysm/beacon/server.go

@@ -18,7 +18,6 @@ type Server struct {
 	CanonicalHistory      *stategen.CanonicalHistory
 	BeaconDB              beacondb.ReadOnlyDatabase
 	Stater                lookup.Stater
-	Blocker               lookup.Blocker
 	ChainInfoFetcher      blockchain.ChainInfoFetcher
 	FinalizationFetcher   blockchain.FinalizationFetcher
 	CoreService           *core.Service

beacon-chain/rpc/prysm/beacon/ssz_query.go

@@ -1,202 +0,0 @@
-package beacon
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"net/http"
-
-	"github.com/OffchainLabs/prysm/v6/api"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	"github.com/OffchainLabs/prysm/v6/beacon-chain/rpc/eth/shared"
-	"github.com/OffchainLabs/prysm/v6/beacon-chain/rpc/lookup"
-	"github.com/OffchainLabs/prysm/v6/encoding/ssz/query"
-	"github.com/OffchainLabs/prysm/v6/monitoring/tracing/trace"
-	"github.com/OffchainLabs/prysm/v6/network/httputil"
-	sszquerypb "github.com/OffchainLabs/prysm/v6/proto/ssz_query"
-	"github.com/OffchainLabs/prysm/v6/runtime/version"
-)
-
-// QueryBeaconState handles SSZ Query request for BeaconState.
-// Returns as bytes serialized SSZQueryResponse.
-func (s *Server) QueryBeaconState(w http.ResponseWriter, r *http.Request) {
-	ctx, span := trace.StartSpan(r.Context(), "beacon.QueryBeaconState")
-	defer span.End()
-
-	stateID := r.PathValue("state_id")
-	if stateID == "" {
-		httputil.HandleError(w, "state_id is required in URL params", http.StatusBadRequest)
-		return
-	}
-
-	// Validate path before lookup: it might be expensive.
-	var req structs.SSZQueryRequest
-	err := json.NewDecoder(r.Body).Decode(&req)
-	switch {
-	case errors.Is(err, io.EOF):
-		httputil.HandleError(w, "No data submitted", http.StatusBadRequest)
-		return
-	case err != nil:
-		httputil.HandleError(w, "Could not decode request body: "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	if len(req.Query) == 0 {
-		httputil.HandleError(w, "Empty query submitted", http.StatusBadRequest)
-		return
-	}
-
-	path, err := query.ParsePath(req.Query)
-	if err != nil {
-		httputil.HandleError(w, "Could not parse path '"+req.Query+"': "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	stateRoot, err := s.Stater.StateRoot(ctx, []byte(stateID))
-	if err != nil {
-		var rootNotFoundErr *lookup.StateRootNotFoundError
-		if errors.As(err, &rootNotFoundErr) {
-			httputil.HandleError(w, "State root not found: "+rootNotFoundErr.Error(), http.StatusNotFound)
-			return
-		}
-		httputil.HandleError(w, "Could not get state root: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	st, err := s.Stater.State(ctx, []byte(stateID))
-	if err != nil {
-		shared.WriteStateFetchError(w, err)
-		return
-	}
-
-	// NOTE: Using unsafe conversion to proto is acceptable here,
-	// as we play with a copy of the state returned by Stater.
-	sszObject, ok := st.ToProtoUnsafe().(query.SSZObject)
-	if !ok {
-		httputil.HandleError(w, "Unsupported state version for querying: "+version.String(st.Version()), http.StatusBadRequest)
-		return
-	}
-
-	info, err := query.AnalyzeObject(sszObject)
-	if err != nil {
-		httputil.HandleError(w, "Could not analyze state object: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	_, offset, length, err := query.CalculateOffsetAndLength(info, path)
-	if err != nil {
-		httputil.HandleError(w, "Could not calculate offset and length for path '"+req.Query+"': "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	encodedState, err := st.MarshalSSZ()
-	if err != nil {
-		httputil.HandleError(w, "Could not marshal state to SSZ: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	response := &sszquerypb.SSZQueryResponse{
-		Root:   stateRoot,
-		Result: encodedState[offset : offset+length],
-	}
-
-	responseSsz, err := response.MarshalSSZ()
-	if err != nil {
-		httputil.HandleError(w, "Could not marshal response to SSZ: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set(api.VersionHeader, version.String(st.Version()))
-	httputil.WriteSsz(w, responseSsz)
-}
-
-// QueryBeaconState handles SSZ Query request for BeaconState.
-// Returns as bytes serialized SSZQueryResponse.
-func (s *Server) QueryBeaconBlock(w http.ResponseWriter, r *http.Request) {
-	ctx, span := trace.StartSpan(r.Context(), "beacon.QueryBeaconBlock")
-	defer span.End()
-
-	blockId := r.PathValue("block_id")
-	if blockId == "" {
-		httputil.HandleError(w, "block_id is required in URL params", http.StatusBadRequest)
-		return
-	}
-
-	// Validate path before lookup: it might be expensive.
-	var req structs.SSZQueryRequest
-	err := json.NewDecoder(r.Body).Decode(&req)
-	switch {
-	case errors.Is(err, io.EOF):
-		httputil.HandleError(w, "No data submitted", http.StatusBadRequest)
-		return
-	case err != nil:
-		httputil.HandleError(w, "Could not decode request body: "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	if len(req.Query) == 0 {
-		httputil.HandleError(w, "Empty query submitted", http.StatusBadRequest)
-		return
-	}
-
-	path, err := query.ParsePath(req.Query)
-	if err != nil {
-		httputil.HandleError(w, "Could not parse path '"+req.Query+"': "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	signedBlock, err := s.Blocker.Block(ctx, []byte(blockId))
-	if !shared.WriteBlockFetchError(w, signedBlock, err) {
-		return
-	}
-
-	protoBlock, err := signedBlock.Block().Proto()
-	if err != nil {
-		httputil.HandleError(w, "Could not convert block to proto: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	block, ok := protoBlock.(query.SSZObject)
-	if !ok {
-		httputil.HandleError(w, "Unsupported block version for querying: "+version.String(signedBlock.Version()), http.StatusBadRequest)
-		return
-	}
-
-	info, err := query.AnalyzeObject(block)
-	if err != nil {
-		httputil.HandleError(w, "Could not analyze block object: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	_, offset, length, err := query.CalculateOffsetAndLength(info, path)
-	if err != nil {
-		httputil.HandleError(w, "Could not calculate offset and length for path '"+req.Query+"': "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	encodedBlock, err := signedBlock.Block().MarshalSSZ()
-	if err != nil {
-		httputil.HandleError(w, "Could not marshal block to SSZ: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	blockRoot, err := block.HashTreeRoot()
-	if err != nil {
-		httputil.HandleError(w, "Could not compute block root: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	response := &sszquerypb.SSZQueryResponse{
-		Root:   blockRoot[:],
-		Result: encodedBlock[offset : offset+length],
-	}
-
-	responseSsz, err := response.MarshalSSZ()
-	if err != nil {
-		httputil.HandleError(w, "Could not marshal response to SSZ: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set(api.VersionHeader, version.String(signedBlock.Version()))
-	httputil.WriteSsz(w, responseSsz)
-}

beacon-chain/rpc/prysm/beacon/ssz_query_test.go

@@ -1,335 +0,0 @@
-package beacon
-
-import (
-	"bytes"
-	"context"
-	"encoding/binary"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v6/api"
-	"github.com/OffchainLabs/prysm/v6/api/server/structs"
-	chainMock "github.com/OffchainLabs/prysm/v6/beacon-chain/blockchain/testing"
-	"github.com/OffchainLabs/prysm/v6/beacon-chain/rpc/testutil"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/blocks"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/interfaces"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	sszquerypb "github.com/OffchainLabs/prysm/v6/proto/ssz_query"
-	"github.com/OffchainLabs/prysm/v6/runtime/version"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/testing/util"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/prysmaticlabs/go-bitfield"
-)
-
-func TestQueryBeaconState(t *testing.T) {
-	ctx := context.Background()
-
-	st, _ := util.DeterministicGenesisState(t, 16)
-	require.NoError(t, st.SetSlot(primitives.Slot(42)))
-	stateRoot, err := st.HashTreeRoot(ctx)
-	require.NoError(t, err)
-	require.NoError(t, st.UpdateBalancesAtIndex(0, 42000000000))
-
-	tests := []struct {
-		path          string
-		expectedValue []byte
-	}{
-		{
-			path: ".slot",
-			expectedValue: func() []byte {
-				slot := st.Slot()
-				result, _ := slot.MarshalSSZ()
-				return result
-			}(),
-		},
-		{
-			path: ".latest_block_header",
-			expectedValue: func() []byte {
-				header := st.LatestBlockHeader()
-				result, _ := header.MarshalSSZ()
-				return result
-			}(),
-		},
-		{
-			path: ".validators",
-			expectedValue: func() []byte {
-				b := make([]byte, 0)
-				validators := st.Validators()
-				for _, v := range validators {
-					vBytes, _ := v.MarshalSSZ()
-					b = append(b, vBytes...)
-				}
-				return b
-
-			}(),
-		},
-		{
-			path: ".validators[0]",
-			expectedValue: func() []byte {
-				v, _ := st.ValidatorAtIndex(0)
-				result, _ := v.MarshalSSZ()
-				return result
-			}(),
-		},
-		{
-			path: ".validators[0].withdrawal_credentials",
-			expectedValue: func() []byte {
-				v, _ := st.ValidatorAtIndex(0)
-				return v.WithdrawalCredentials
-			}(),
-		},
-		{
-			path: ".validators[0].effective_balance",
-			expectedValue: func() []byte {
-				v, _ := st.ValidatorAtIndex(0)
-				b := make([]byte, 8)
-				binary.LittleEndian.PutUint64(b, uint64(v.EffectiveBalance))
-				return b
-			}(),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.path, func(t *testing.T) {
-			chainService := &chainMock.ChainService{Optimistic: false, FinalizedRoots: make(map[[32]byte]bool)}
-			s := &Server{
-				OptimisticModeFetcher: chainService,
-				FinalizationFetcher:   chainService,
-				Stater: &testutil.MockStater{
-					BeaconStateRoot: stateRoot[:],
-					BeaconState:     st,
-				},
-			}
-
-			requestBody := &structs.SSZQueryRequest{
-				Query: tt.path,
-			}
-			var buf bytes.Buffer
-			require.NoError(t, json.NewEncoder(&buf).Encode(requestBody))
-
-			request := httptest.NewRequest(http.MethodPost, "http://example.com/prysm/v1/beacon/states/{state_id}/query", &buf)
-			request.SetPathValue("state_id", "head")
-			writer := httptest.NewRecorder()
-			writer.Body = &bytes.Buffer{}
-
-			s.QueryBeaconState(writer, request)
-			require.Equal(t, http.StatusOK, writer.Code)
-			assert.Equal(t, version.String(version.Phase0), writer.Header().Get(api.VersionHeader))
-
-			expectedResponse := &sszquerypb.SSZQueryResponse{
-				Root:   stateRoot[:],
-				Result: tt.expectedValue,
-			}
-			sszExpectedResponse, err := expectedResponse.MarshalSSZ()
-			require.NoError(t, err)
-			assert.DeepEqual(t, sszExpectedResponse, writer.Body.Bytes())
-		})
-	}
-}
-
-func TestQueryBeaconStateInvalidRequest(t *testing.T) {
-	ctx := context.Background()
-
-	st, _ := util.DeterministicGenesisState(t, 16)
-	require.NoError(t, st.SetSlot(primitives.Slot(42)))
-	stateRoot, err := st.HashTreeRoot(ctx)
-	require.NoError(t, err)
-
-	tests := []struct {
-		name        string
-		stateId     string
-		path        string
-		code        int
-		errorString string
-	}{
-		{
-			name:        "empty query submitted",
-			stateId:     "head",
-			path:        "",
-			errorString: "Empty query submitted",
-		},
-		{
-			name:        "invalid path",
-			stateId:     "head",
-			path:        ".invalid[]]",
-			errorString: "Could not parse path",
-		},
-		{
-			name:        "non-existent field",
-			stateId:     "head",
-			path:        ".non_existent_field",
-			code:        http.StatusInternalServerError,
-			errorString: "Could not calculate offset and length for path",
-		},
-		{
-			name:    "empty state ID",
-			stateId: "",
-			path:    "",
-		},
-		{
-			name:    "far future slot",
-			stateId: "1000000000000",
-			path:    "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.path, func(t *testing.T) {
-			chainService := &chainMock.ChainService{Optimistic: false, FinalizedRoots: make(map[[32]byte]bool)}
-			s := &Server{
-				OptimisticModeFetcher: chainService,
-				FinalizationFetcher:   chainService,
-				Stater: &testutil.MockStater{
-					BeaconStateRoot: stateRoot[:],
-					BeaconState:     st,
-				},
-			}
-
-			requestBody := &structs.SSZQueryRequest{
-				Query: tt.path,
-			}
-			var buf bytes.Buffer
-			require.NoError(t, json.NewEncoder(&buf).Encode(requestBody))
-
-			request := httptest.NewRequest(http.MethodPost, "http://example.com/prysm/v1/beacon/states/{state_id}/query", &buf)
-			request.SetPathValue("state_id", tt.stateId)
-			writer := httptest.NewRecorder()
-			writer.Body = &bytes.Buffer{}
-
-			s.QueryBeaconState(writer, request)
-
-			if tt.code == 0 {
-				tt.code = http.StatusBadRequest
-			}
-			require.Equal(t, tt.code, writer.Code)
-			if tt.errorString != "" {
-				errorString := writer.Body.String()
-				require.Equal(t, true, strings.Contains(errorString, tt.errorString))
-			}
-		})
-	}
-}
-
-func TestQueryBeaconBlock(t *testing.T) {
-	randaoReveal, err := hexutil.Decode("0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505")
-	require.NoError(t, err)
-	root, err := hexutil.Decode("0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2")
-	require.NoError(t, err)
-	signature, err := hexutil.Decode("0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505")
-	require.NoError(t, err)
-	att := &eth.Attestation{
-		AggregationBits: bitfield.Bitlist{0x01},
-		Data: &eth.AttestationData{
-			Slot:            1,
-			CommitteeIndex:  1,
-			BeaconBlockRoot: root,
-			Source: &eth.Checkpoint{
-				Epoch: 1,
-				Root:  root,
-			},
-			Target: &eth.Checkpoint{
-				Epoch: 1,
-				Root:  root,
-			},
-		},
-		Signature: signature,
-	}
-
-	tests := []struct {
-		name          string
-		path          string
-		block         interfaces.ReadOnlySignedBeaconBlock
-		expectedValue []byte
-	}{
-		{
-			name: "slot",
-			path: ".slot",
-			block: func() interfaces.ReadOnlySignedBeaconBlock {
-				b := util.NewBeaconBlock()
-				b.Block.Slot = 123
-				sb, err := blocks.NewSignedBeaconBlock(b)
-				require.NoError(t, err)
-				return sb
-			}(),
-			expectedValue: func() []byte {
-				b := make([]byte, 8)
-				binary.LittleEndian.PutUint64(b, 123)
-				return b
-			}(),
-		},
-		{
-			name: "randao_reveal",
-			path: ".body.randao_reveal",
-			block: func() interfaces.ReadOnlySignedBeaconBlock {
-				b := util.NewBeaconBlock()
-				b.Block.Body.RandaoReveal = randaoReveal
-				sb, err := blocks.NewSignedBeaconBlock(b)
-				require.NoError(t, err)
-				return sb
-			}(),
-			expectedValue: randaoReveal,
-		},
-		{
-			name: "attestations",
-			path: ".body.attestations",
-			block: func() interfaces.ReadOnlySignedBeaconBlock {
-				b := util.NewBeaconBlock()
-				b.Block.Body.Attestations = []*eth.Attestation{
-					att,
-				}
-				sb, err := blocks.NewSignedBeaconBlock(b)
-				require.NoError(t, err)
-				return sb
-			}(),
-			expectedValue: func() []byte {
-				b, err := att.MarshalSSZ()
-				require.NoError(t, err)
-				return b
-			}(),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			mockBlockFetcher := &testutil.MockBlocker{BlockToReturn: tt.block}
-			mockChainService := &chainMock.ChainService{
-				FinalizedRoots: map[[32]byte]bool{},
-			}
-			s := &Server{
-				FinalizationFetcher: mockChainService,
-				Blocker:             mockBlockFetcher,
-			}
-			requestBody := &structs.SSZQueryRequest{
-				Query: tt.path,
-			}
-			var buf bytes.Buffer
-			require.NoError(t, json.NewEncoder(&buf).Encode(requestBody))
-
-			request := httptest.NewRequest(http.MethodPost, "http://example.com/prysm/v1/beacon/blocks/{block_id}/query", &buf)
-			request.SetPathValue("block_id", "head")
-			writer := httptest.NewRecorder()
-			writer.Body = &bytes.Buffer{}
-
-			s.QueryBeaconBlock(writer, request)
-			require.Equal(t, http.StatusOK, writer.Code)
-			assert.Equal(t, version.String(version.Phase0), writer.Header().Get(api.VersionHeader))
-
-			blockRoot, err := tt.block.Block().HashTreeRoot()
-			require.NoError(t, err)
-
-			expectedResponse := &sszquerypb.SSZQueryResponse{
-				Root:   blockRoot[:],
-				Result: tt.expectedValue,
-			}
-			sszExpectedResponse, err := expectedResponse.MarshalSSZ()
-			require.NoError(t, err)
-			assert.DeepEqual(t, sszExpectedResponse, writer.Body.Bytes())
-		})
-	}
-}

beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go

@@ -229,7 +229,7 @@ func (vs *Server) BuildBlockParallel(ctx context.Context, sBlk interfaces.Signed
 		sBlk.SetVoluntaryExits(vs.getExits(head, sBlk.Block().Slot()))
 
 		// Set sync aggregate. New in Altair.
-		vs.setSyncAggregate(ctx, sBlk, head)
+		vs.setSyncAggregate(ctx, sBlk)
 
 		// Set bls to execution change. New in Capella.
 		vs.setBlsToExecData(sBlk, head)
@@ -312,14 +312,14 @@ func (vs *Server) ProposeBeaconBlock(ctx context.Context, req *ethpb.GenericSign
 	rob, err := blocks.NewROBlockWithRoot(block, root)
 	if block.IsBlinded() {
 		block, blobSidecars, err = vs.handleBlindedBlock(ctx, block)
-		if errors.Is(err, builderapi.ErrBadGateway) {
-			log.WithError(err).Info("Optimistically proposed block - builder relay temporarily unavailable, block may arrive over P2P")
-			return &ethpb.ProposeResponse{BlockRoot: root[:]}, nil
-		}
 	} else if block.Version() >= version.Deneb {
 		blobSidecars, dataColumnSidecars, err = vs.handleUnblindedBlock(rob, req)
 	}
 	if err != nil {
+		if errors.Is(err, builderapi.ErrBadGateway) && block.IsBlinded() {
+			log.WithError(err).Info("Optimistically proposed block - builder relay temporarily unavailable, block may arrive over P2P")
+			return &ethpb.ProposeResponse{BlockRoot: root[:]}, nil
+		}
 		return nil, status.Errorf(codes.Internal, "%s: %v", "handle block failed", err)
 	}
 

beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair.go

@@ -5,7 +5,6 @@ import (
 	"context"
 
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers"
-	"github.com/OffchainLabs/prysm/v6/beacon-chain/state"
 	"github.com/OffchainLabs/prysm/v6/config/params"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/interfaces"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
@@ -21,12 +20,12 @@ import (
 	"github.com/prysmaticlabs/go-bitfield"
 )
 
-func (vs *Server) setSyncAggregate(ctx context.Context, blk interfaces.SignedBeaconBlock, headState state.BeaconState) {
+func (vs *Server) setSyncAggregate(ctx context.Context, blk interfaces.SignedBeaconBlock) {
 	if blk.Version() < version.Altair {
 		return
 	}
 
-	syncAggregate, err := vs.getSyncAggregate(ctx, slots.PrevSlot(blk.Block().Slot()), blk.Block().ParentRoot(), headState)
+	syncAggregate, err := vs.getSyncAggregate(ctx, slots.PrevSlot(blk.Block().Slot()), blk.Block().ParentRoot())
 	if err != nil {
 		log.WithError(err).Error("Could not get sync aggregate")
 		emptySig := [96]byte{0xC0}
@@ -48,7 +47,7 @@ func (vs *Server) setSyncAggregate(ctx context.Context, blk interfaces.SignedBea
 
 // getSyncAggregate retrieves the sync contributions from the pool to construct the sync aggregate object.
 // The contributions are filtered based on matching of the input root and slot then profitability.
-func (vs *Server) getSyncAggregate(ctx context.Context, slot primitives.Slot, root [32]byte, headState state.BeaconState) (*ethpb.SyncAggregate, error) {
+func (vs *Server) getSyncAggregate(ctx context.Context, slot primitives.Slot, root [32]byte) (*ethpb.SyncAggregate, error) {
 	_, span := trace.StartSpan(ctx, "ProposerServer.getSyncAggregate")
 	defer span.End()
 
@@ -63,7 +62,7 @@ func (vs *Server) getSyncAggregate(ctx context.Context, slot primitives.Slot, ro
 	// Contributions have to match the input root
 	proposerContributions := proposerSyncContributions(poolContributions).filterByBlockRoot(root)
 
-	aggregatedContributions, err := vs.aggregatedSyncCommitteeMessages(ctx, slot, root, poolContributions, headState)
+	aggregatedContributions, err := vs.aggregatedSyncCommitteeMessages(ctx, slot, root, poolContributions)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not get aggregated sync committee messages")
 	}
@@ -124,7 +123,6 @@ func (vs *Server) aggregatedSyncCommitteeMessages(
 	slot primitives.Slot,
 	root [32]byte,
 	poolContributions []*ethpb.SyncCommitteeContribution,
-	st state.BeaconState,
 ) ([]*ethpb.SyncCommitteeContribution, error) {
 	subcommitteeCount := params.BeaconConfig().SyncCommitteeSubnetCount
 	subcommitteeSize := params.BeaconConfig().SyncCommitteeSize / subcommitteeCount
@@ -148,7 +146,10 @@ func (vs *Server) aggregatedSyncCommitteeMessages(
 			messageSigs = append(messageSigs, msg.Signature)
 		}
 	}
-
+	st, err := vs.HeadFetcher.HeadState(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "could not get head state")
+	}
 	positions, err := helpers.CurrentPeriodPositions(st, messageIndices)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not get sync committee positions")

beacon-chain/rpc/prysm/v1alpha1/validator/proposer_altair_test.go

@@ -9,7 +9,6 @@ import (
 	mockSync "github.com/OffchainLabs/prysm/v6/beacon-chain/sync/initial-sync/testing"
 	"github.com/OffchainLabs/prysm/v6/config/params"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/blocks"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"github.com/OffchainLabs/prysm/v6/crypto/bls"
 	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
 	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
@@ -52,15 +51,15 @@ func TestProposer_GetSyncAggregate_OK(t *testing.T) {
 		require.NoError(t, proposerServer.SyncCommitteePool.SaveSyncCommitteeContribution(cont))
 	}
 
-	aggregate, err := proposerServer.getSyncAggregate(t.Context(), 1, bytesutil.ToBytes32(conts[0].BlockRoot), st)
+	aggregate, err := proposerServer.getSyncAggregate(t.Context(), 1, bytesutil.ToBytes32(conts[0].BlockRoot))
 	require.NoError(t, err)
 	require.DeepEqual(t, bitfield.Bitvector32{0xf, 0xf, 0xf, 0xf}, aggregate.SyncCommitteeBits)
 
-	aggregate, err = proposerServer.getSyncAggregate(t.Context(), 2, bytesutil.ToBytes32(conts[0].BlockRoot), st)
+	aggregate, err = proposerServer.getSyncAggregate(t.Context(), 2, bytesutil.ToBytes32(conts[0].BlockRoot))
 	require.NoError(t, err)
 	require.DeepEqual(t, bitfield.Bitvector32{0xaa, 0xaa, 0xaa, 0xaa}, aggregate.SyncCommitteeBits)
 
-	aggregate, err = proposerServer.getSyncAggregate(t.Context(), 3, bytesutil.ToBytes32(conts[0].BlockRoot), st)
+	aggregate, err = proposerServer.getSyncAggregate(t.Context(), 3, bytesutil.ToBytes32(conts[0].BlockRoot))
 	require.NoError(t, err)
 	require.DeepEqual(t, bitfield.NewBitvector32(), aggregate.SyncCommitteeBits)
 }
@@ -69,7 +68,7 @@ func TestServer_SetSyncAggregate_EmptyCase(t *testing.T) {
 	b, err := blocks.NewSignedBeaconBlock(util.NewBeaconBlockAltair())
 	require.NoError(t, err)
 	s := &Server{} // Sever is not initialized with sync committee pool.
-	s.setSyncAggregate(t.Context(), b, nil)
+	s.setSyncAggregate(t.Context(), b)
 	agg, err := b.Block().Body().SyncAggregate()
 	require.NoError(t, err)
 
@@ -139,7 +138,7 @@ func TestProposer_GetSyncAggregate_IncludesSyncCommitteeMessages(t *testing.T) {
 	}
 
 	// The final sync aggregates must have indexes [0,1,2,3] set for both subcommittees
-	sa, err := proposerServer.getSyncAggregate(t.Context(), 1, r, st)
+	sa, err := proposerServer.getSyncAggregate(t.Context(), 1, r)
 	require.NoError(t, err)
 	assert.Equal(t, true, sa.SyncCommitteeBits.BitAt(0))
 	assert.Equal(t, true, sa.SyncCommitteeBits.BitAt(1))
@@ -195,99 +194,8 @@ func Test_aggregatedSyncCommitteeMessages_NoIntersectionWithPoolContributions(t
 		BlockRoot:         r[:],
 	}
 
-	aggregated, err := proposerServer.aggregatedSyncCommitteeMessages(t.Context(), 1, r, []*ethpb.SyncCommitteeContribution{cont}, st)
+	aggregated, err := proposerServer.aggregatedSyncCommitteeMessages(t.Context(), 1, r, []*ethpb.SyncCommitteeContribution{cont})
 	require.NoError(t, err)
 	require.Equal(t, 1, len(aggregated))
 	assert.Equal(t, false, aggregated[0].AggregationBits.BitAt(3))
 }
-
-func TestGetSyncAggregate_CorrectStateAtSyncCommitteePeriodBoundary(t *testing.T) {
-	helpers.ClearCache()
-	syncPeriodBoundaryEpoch := primitives.Epoch(274176) // Real epoch from the bug report
-	slotsPerEpoch := params.BeaconConfig().SlotsPerEpoch
-
-	preEpochState, keys := util.DeterministicGenesisStateAltair(t, 100)
-	require.NoError(t, preEpochState.SetSlot(primitives.Slot(syncPeriodBoundaryEpoch)*slotsPerEpoch-1)) // Last slot of previous epoch
-
-	postEpochState := preEpochState.Copy()
-	require.NoError(t, postEpochState.SetSlot(primitives.Slot(syncPeriodBoundaryEpoch)*slotsPerEpoch+2)) // After 2 missed slots
-
-	oldCommittee := &ethpb.SyncCommittee{
-		Pubkeys: make([][]byte, params.BeaconConfig().SyncCommitteeSize),
-	}
-	newCommittee := &ethpb.SyncCommittee{
-		Pubkeys: make([][]byte, params.BeaconConfig().SyncCommitteeSize),
-	}
-
-	for i := 0; i < int(params.BeaconConfig().SyncCommitteeSize); i++ {
-		if i < len(keys) {
-			oldCommittee.Pubkeys[i] = keys[i%len(keys)].PublicKey().Marshal()
-			// Use different keys for new committee to simulate rotation
-			newCommittee.Pubkeys[i] = keys[(i+10)%len(keys)].PublicKey().Marshal()
-		}
-	}
-
-	require.NoError(t, preEpochState.SetCurrentSyncCommittee(oldCommittee))
-	require.NoError(t, postEpochState.SetCurrentSyncCommittee(newCommittee))
-
-	mockChainService := &chainmock.ChainService{
-		State: postEpochState,
-	}
-
-	proposerServer := &Server{
-		HeadFetcher:       mockChainService,
-		SyncChecker:       &mockSync.Sync{IsSyncing: false},
-		SyncCommitteePool: synccommittee.NewStore(),
-	}
-
-	slot := primitives.Slot(syncPeriodBoundaryEpoch)*slotsPerEpoch + 1 // First slot of new epoch
-	blockRoot := [32]byte{0x01, 0x02, 0x03}
-
-	msg1 := &ethpb.SyncCommitteeMessage{
-		Slot:           slot,
-		BlockRoot:      blockRoot[:],
-		ValidatorIndex: 0, // This validator is in position 0 of OLD committee
-		Signature:      bls.NewAggregateSignature().Marshal(),
-	}
-	msg2 := &ethpb.SyncCommitteeMessage{
-		Slot:           slot,
-		BlockRoot:      blockRoot[:],
-		ValidatorIndex: 1, // This validator is in position 1 of OLD committee
-		Signature:      bls.NewAggregateSignature().Marshal(),
-	}
-
-	require.NoError(t, proposerServer.SyncCommitteePool.SaveSyncCommitteeMessage(msg1))
-	require.NoError(t, proposerServer.SyncCommitteePool.SaveSyncCommitteeMessage(msg2))
-
-	aggregateWrongState, err := proposerServer.getSyncAggregate(t.Context(), slot, blockRoot, postEpochState)
-	require.NoError(t, err)
-
-	aggregateCorrectState, err := proposerServer.getSyncAggregate(t.Context(), slot, blockRoot, preEpochState)
-	require.NoError(t, err)
-
-	wrongStateBits := bitfield.Bitlist(aggregateWrongState.SyncCommitteeBits)
-	correctStateBits := bitfield.Bitlist(aggregateCorrectState.SyncCommitteeBits)
-
-	wrongStateHasValidators := false
-	correctStateHasValidators := false
-
-	for i := 0; i < len(wrongStateBits); i++ {
-		if wrongStateBits[i] != 0 {
-			wrongStateHasValidators = true
-			break
-		}
-	}
-
-	for i := 0; i < len(correctStateBits); i++ {
-		if correctStateBits[i] != 0 {
-			correctStateHasValidators = true
-			break
-		}
-	}
-
-	assert.Equal(t, true, correctStateHasValidators, "Correct state should include validators that sent messages")
-	assert.Equal(t, false, wrongStateHasValidators, "Wrong state should not find validators in incorrect sync committee")
-
-	t.Logf("Wrong state aggregate bits: %x (has validators: %v)", wrongStateBits, wrongStateHasValidators)
-	t.Logf("Correct state aggregate bits: %x (has validators: %v)", correctStateBits, correctStateHasValidators)
-}

beacon-chain/state/interfaces.go

@@ -266,8 +266,6 @@ type WriteOnlyEth1Data interface {
 	SetEth1DepositIndex(val uint64) error
 	ExitEpochAndUpdateChurn(exitBalance primitives.Gwei) (primitives.Epoch, error)
 	ExitEpochAndUpdateChurnForTotalBal(totalActiveBalance primitives.Gwei, exitBalance primitives.Gwei) (primitives.Epoch, error)
-	SetExitBalanceToConsume(val primitives.Gwei) error
-	SetEarliestExitEpoch(val primitives.Epoch) error
 }
 
 // WriteOnlyValidators defines a struct which only has write access to validators methods.
@@ -335,7 +333,6 @@ type WriteOnlyWithdrawals interface {
 	DequeuePendingPartialWithdrawals(num uint64) error
 	SetNextWithdrawalIndex(i uint64) error
 	SetNextWithdrawalValidatorIndex(i primitives.ValidatorIndex) error
-	SetPendingPartialWithdrawals(val []*ethpb.PendingPartialWithdrawal) error
 }
 
 type WriteOnlyConsolidations interface {

beacon-chain/state/state-native/setters_churn.go

@@ -91,33 +91,3 @@ func (b *BeaconState) exitEpochAndUpdateChurn(totalActiveBalance primitives.Gwei
 
 	return b.earliestExitEpoch, nil
 }
-
-// SetExitBalanceToConsume sets the exit balance to consume. This method mutates the state.
-func (b *BeaconState) SetExitBalanceToConsume(exitBalanceToConsume primitives.Gwei) error {
-	if b.version < version.Electra {
-		return errNotSupported("SetExitBalanceToConsume", b.version)
-	}
-
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	b.exitBalanceToConsume = exitBalanceToConsume
-	b.markFieldAsDirty(types.ExitBalanceToConsume)
-
-	return nil
-}
-
-// SetEarliestExitEpoch sets the earliest exit epoch. This method mutates the state.
-func (b *BeaconState) SetEarliestExitEpoch(earliestExitEpoch primitives.Epoch) error {
-	if b.version < version.Electra {
-		return errNotSupported("SetEarliestExitEpoch", b.version)
-	}
-
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	b.earliestExitEpoch = earliestExitEpoch
-	b.markFieldAsDirty(types.EarliestExitEpoch)
-
-	return nil
-}

beacon-chain/state/state-native/setters_withdrawal.go

@@ -100,24 +100,3 @@ func (b *BeaconState) DequeuePendingPartialWithdrawals(n uint64) error {
 
 	return nil
 }
-
-// SetPendingPartialWithdrawals sets the pending partial withdrawals. This method mutates the state.
-func (b *BeaconState) SetPendingPartialWithdrawals(pendingPartialWithdrawals []*eth.PendingPartialWithdrawal) error {
-	if b.version < version.Electra {
-		return errNotSupported("SetPendingPartialWithdrawals", b.version)
-	}
-
-	b.lock.Lock()
-	defer b.lock.Unlock()
-
-	if pendingPartialWithdrawals == nil {
-		return errors.New("cannot set nil pending partial withdrawals")
-	}
-	b.sharedFieldReferences[types.PendingPartialWithdrawals].MinusRef()
-	b.sharedFieldReferences[types.PendingPartialWithdrawals] = stateutil.NewRef(1)
-
-	b.pendingPartialWithdrawals = pendingPartialWithdrawals
-	b.markFieldAsDirty(types.PendingPartialWithdrawals)
-
-	return nil
-}

beacon-chain/state/state-native/state_trie.go

@@ -650,11 +650,6 @@ func InitializeFromProtoUnsafeFulu(st *ethpb.BeaconStateFulu) (state.BeaconState
 	for i, v := range st.ProposerLookahead {
 		proposerLookahead[i] = primitives.ValidatorIndex(v)
 	}
-	// Proposer lookahead must be exactly 2 * SLOTS_PER_EPOCH in length. We fill in with zeroes instead of erroring out here
-	for i := len(proposerLookahead); i < 2*fieldparams.SlotsPerEpoch; i++ {
-		proposerLookahead = append(proposerLookahead, 0)
-	}
-
 	fieldCount := params.BeaconConfig().BeaconStateFuluFieldCount
 	b := &BeaconState{
 		version:                           version.Fulu,

beacon-chain/sync/backfill/BUILD.bazel

@@ -17,6 +17,7 @@ go_library(
     importpath = "github.com/OffchainLabs/prysm/v6/beacon-chain/sync/backfill",
     visibility = ["//visibility:public"],
     deps = [
+        "//beacon-chain/core/helpers:go_default_library",
         "//beacon-chain/core/signing:go_default_library",
         "//beacon-chain/das:go_default_library",
         "//beacon-chain/db:go_default_library",
@@ -60,6 +61,7 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
+        "//beacon-chain/core/helpers:go_default_library",
         "//beacon-chain/core/signing:go_default_library",
         "//beacon-chain/das:go_default_library",
         "//beacon-chain/db:go_default_library",

beacon-chain/sync/backfill/service.go

@@ -3,12 +3,12 @@ package backfill
 import (
 	"context"
 
+	"github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/db/filesystem"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/p2p"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/startup"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/sync"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/verification"
-	"github.com/OffchainLabs/prysm/v6/config/params"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/blocks"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
@@ -348,7 +348,7 @@ func (*Service) Status() error {
 // minimumBackfillSlot determines the lowest slot that backfill needs to download based on looking back
 // MIN_EPOCHS_FOR_BLOCK_REQUESTS from the current slot.
 func minimumBackfillSlot(current primitives.Slot) primitives.Slot {
-	oe := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
+	oe := helpers.MinEpochsForBlockRequests()
 	if oe > slots.MaxSafeEpoch() {
 		oe = slots.MaxSafeEpoch()
 	}

beacon-chain/sync/backfill/service_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/OffchainLabs/prysm/v6/beacon-chain/core/helpers"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/db/filesystem"
 	p2ptest "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/testing"
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/startup"
@@ -83,7 +84,7 @@ func TestServiceInit(t *testing.T) {
 }
 
 func TestMinimumBackfillSlot(t *testing.T) {
-	oe := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
+	oe := helpers.MinEpochsForBlockRequests()
 
 	currSlot := (oe + 100).Mul(uint64(params.BeaconConfig().SlotsPerEpoch))
 	minSlot := minimumBackfillSlot(primitives.Slot(currSlot))
@@ -108,7 +109,7 @@ func testReadN(ctx context.Context, t *testing.T, c chan batch, n int, into []ba
 }
 
 func TestBackfillMinSlotDefault(t *testing.T) {
-	oe := primitives.Epoch(params.BeaconConfig().MinEpochsForBlockRequests)
+	oe := helpers.MinEpochsForBlockRequests()
 	current := primitives.Slot((oe + 100).Mul(uint64(params.BeaconConfig().SlotsPerEpoch)))
 	s := &Service{}
 	specMin := minimumBackfillSlot(current)

beacon-chain/sync/batch_verifier.go

@@ -14,7 +14,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-const signatureVerificationInterval = 5 * time.Millisecond
+const signatureVerificationInterval = 50 * time.Millisecond
 
 type signatureVerifier struct {
 	set     *bls.SignatureBatch

beacon-chain/sync/custody.go

@@ -90,10 +90,10 @@ func (s *Service) updateCustodyInfoIfNeeded() error {
 // custodyGroupCount computes the custody group count based on the custody requirement,
 // the validators custody requirement, and whether the node is subscribed to all data subnets.
 func (s *Service) custodyGroupCount(context.Context) (uint64, error) {
-	cfg := params.BeaconConfig()
+	beaconConfig := params.BeaconConfig()
 
 	if flags.Get().SubscribeAllDataSubnets {
-		return cfg.NumberOfCustodyGroups, nil
+		return beaconConfig.NumberOfCustodyGroups, nil
 	}
 
 	validatorsCustodyRequirement, err := s.validatorsCustodyRequirement()
@@ -101,7 +101,7 @@ func (s *Service) custodyGroupCount(context.Context) (uint64, error) {
 		return 0, errors.Wrap(err, "validators custody requirement")
 	}
 
-	return max(cfg.CustodyRequirement, validatorsCustodyRequirement), nil
+	return max(beaconConfig.CustodyRequirement, validatorsCustodyRequirement), nil
 }
 
 // validatorsCustodyRequirements computes the custody requirements based on the

beacon-chain/sync/custody_test.go

@@ -116,11 +116,11 @@ func withSubscribeAllDataSubnets(t *testing.T, fn func()) {
 
 func TestUpdateCustodyInfoIfNeeded(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
-	cfg := params.BeaconConfig()
-	cfg.NumberOfCustodyGroups = 128
-	cfg.CustodyRequirement = 4
-	cfg.SamplesPerSlot = 8
-	params.OverrideBeaconConfig(cfg)
+	beaconConfig := params.BeaconConfig()
+	beaconConfig.NumberOfCustodyGroups = 128
+	beaconConfig.CustodyRequirement = 4
+	beaconConfig.SamplesPerSlot = 8
+	params.OverrideBeaconConfig(beaconConfig)
 
 	t.Run("Skip update when actual custody count >= target", func(t *testing.T) {
 		setup := setupCustodyTest(t, false)
@@ -159,7 +159,7 @@ func TestUpdateCustodyInfoIfNeeded(t *testing.T) {
 			require.NoError(t, err)
 
 			const expectedSlot = primitives.Slot(100)
-			setup.assertCustodyInfo(t, expectedSlot, cfg.NumberOfCustodyGroups)
+			setup.assertCustodyInfo(t, expectedSlot, beaconConfig.NumberOfCustodyGroups)
 		})
 	})
 }

beacon-chain/sync/data_column_sidecars.go

@@ -1122,26 +1122,19 @@ func randomPeer(
 			}
 		}
 
-		if len(nonRateLimitedPeers) > 0 {
-			slices.Sort(nonRateLimitedPeers)
-			randomIndex := randomSource.Intn(len(nonRateLimitedPeers))
-			return nonRateLimitedPeers[randomIndex], nil
+		slices.Sort(nonRateLimitedPeers)
+
+		if len(nonRateLimitedPeers) == 0 {
+			log.WithFields(logrus.Fields{
+				"peerCount": peerCount,
+				"delay":     waitPeriod,
+			}).Debug("Waiting for a peer with enough bandwidth for data column sidecars")
+			time.Sleep(waitPeriod)
+			continue
 		}
 
-		log.WithFields(logrus.Fields{
-			"peerCount": peerCount,
-			"delay":     waitPeriod,
-		}).Debug("Waiting for a peer with enough bandwidth for data column sidecars")
-
-		timer := time.NewTimer(waitPeriod)
-		select {
-		case <-timer.C:
-			// Timer expired, retry the loop
-		case <-ctx.Done():
-			// Context cancelled - stop timer to prevent leak
-			timer.Stop()
-			return "", ctx.Err()
-		}
+		randomIndex := randomSource.Intn(len(nonRateLimitedPeers))
+		return nonRateLimitedPeers[randomIndex], nil
 	}
 
 	return "", ctx.Err()

beacon-chain/sync/data_column_sidecars_test.go

@@ -45,7 +45,6 @@ func TestFetchDataColumnSidecars(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
 	cfg := params.BeaconConfig().Copy()
 	cfg.FuluForkEpoch = 0
-	cfg.BlobSchedule = []params.BlobScheduleEntry{{Epoch: 0, MaxBlobsPerBlock: 10}}
 	params.OverrideBeaconConfig(cfg)
 
 	// Start the trusted setup.
@@ -761,12 +760,6 @@ func TestVerifyDataColumnSidecarsByPeer(t *testing.T) {
 	err := kzg.Start()
 	require.NoError(t, err)
 
-	params.SetupTestConfigCleanup(t)
-	cfg := params.BeaconConfig()
-	cfg.FuluForkEpoch = 0
-	cfg.BlobSchedule = []params.BlobScheduleEntry{{Epoch: 0, MaxBlobsPerBlock: 2}}
-	params.OverrideBeaconConfig(cfg)
-
 	t.Run("nominal", func(t *testing.T) {
 		const (
 			start, stop = 0, 15

beacon-chain/sync/initial-sync/blocks_fetcher_test.go

@@ -1366,16 +1366,16 @@ func TestFetchSidecars(t *testing.T) {
 	})
 
 	t.Run("Nominal", func(t *testing.T) {
-		cfg := params.BeaconConfig()
-		numberOfColumns := cfg.NumberOfColumns
-		samplesPerSlot := cfg.SamplesPerSlot
+		beaconConfig := params.BeaconConfig()
+		numberOfColumns := beaconConfig.NumberOfColumns
+		samplesPerSlot := beaconConfig.SamplesPerSlot
 
 		// Define "now" to be one epoch after genesis time + retention period.
 		genesisTime := time.Date(2025, time.August, 10, 0, 0, 0, 0, time.UTC)
-		secondsPerSlot := cfg.SecondsPerSlot
-		slotsPerEpoch := cfg.SlotsPerEpoch
+		secondsPerSlot := beaconConfig.SecondsPerSlot
+		slotsPerEpoch := beaconConfig.SlotsPerEpoch
 		secondsPerEpoch := uint64(slotsPerEpoch.Mul(secondsPerSlot))
-		retentionEpochs := cfg.MinEpochsForDataColumnSidecarsRequest
+		retentionEpochs := beaconConfig.MinEpochsForDataColumnSidecarsRequest
 		nowWrtGenesisSecs := retentionEpochs.Add(1).Mul(secondsPerEpoch)
 		now := genesisTime.Add(time.Duration(nowWrtGenesisSecs) * time.Second)
 

beacon-chain/sync/initial-sync/service_test.go

@@ -530,12 +530,12 @@ func TestOriginOutsideRetention(t *testing.T) {
 func TestFetchOriginSidecars(t *testing.T) {
 	ctx := t.Context()
 
-	cfg := params.BeaconConfig()
+	beaconConfig := params.BeaconConfig()
 	genesisTime := time.Date(2025, time.August, 10, 0, 0, 0, 0, time.UTC)
-	secondsPerSlot := cfg.SecondsPerSlot
-	slotsPerEpoch := cfg.SlotsPerEpoch
+	secondsPerSlot := beaconConfig.SecondsPerSlot
+	slotsPerEpoch := beaconConfig.SlotsPerEpoch
 	secondsPerEpoch := uint64(slotsPerEpoch.Mul(secondsPerSlot))
-	retentionEpochs := cfg.MinEpochsForDataColumnSidecarsRequest
+	retentionEpochs := beaconConfig.MinEpochsForDataColumnSidecarsRequest
 
 	genesisValidatorRoot := [fieldparams.RootLength]byte{}
 
@@ -683,7 +683,6 @@ func TestFetchOriginColumns(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
 	cfg := params.BeaconConfig().Copy()
 	cfg.FuluForkEpoch = 0
-	cfg.BlobSchedule = []params.BlobScheduleEntry{{Epoch: 0, MaxBlobsPerBlock: 10}}
 	params.OverrideBeaconConfig(cfg)
 
 	const (

beacon-chain/sync/metrics.go

@@ -192,13 +192,6 @@ var (
 		},
 	)
 
-	dataColumnsRecoveredFromELTotal = promauto.NewCounter(
-		prometheus.CounterOpts{
-			Name: "data_columns_recovered_from_el_total",
-			Help: "Count the number of times data columns have been recovered from the execution layer.",
-		},
-	)
-
 	// Data column sidecar validation, beacon metrics specs
 	dataColumnSidecarVerificationRequestsCounter = promauto.NewCounter(prometheus.CounterOpts{
 		Name: "beacon_data_column_sidecar_processing_requests_total",

beacon-chain/sync/rpc_blob_sidecars_by_root.go

@@ -113,19 +113,19 @@ func (s *Service) blobSidecarByRootRPCHandler(ctx context.Context, msg interface
 }
 
 func validateBlobByRootRequest(blobIdents types.BlobSidecarsByRootReq, slot primitives.Slot) error {
-	cfg := params.BeaconConfig()
+	beaconConfig := params.BeaconConfig()
 	epoch := slots.ToEpoch(slot)
 	blobIdentCount := uint64(len(blobIdents))
 
-	if epoch >= cfg.ElectraForkEpoch {
-		if blobIdentCount > cfg.MaxRequestBlobSidecarsElectra {
+	if epoch >= beaconConfig.ElectraForkEpoch {
+		if blobIdentCount > beaconConfig.MaxRequestBlobSidecarsElectra {
 			return types.ErrMaxBlobReqExceeded
 		}
 
 		return nil
 	}
 
-	if blobIdentCount > cfg.MaxRequestBlobSidecars {
+	if blobIdentCount > beaconConfig.MaxRequestBlobSidecars {
 		return types.ErrMaxBlobReqExceeded
 	}
 

beacon-chain/sync/rpc_data_column_sidecars_by_range.go

@@ -38,8 +38,8 @@ func (s *Service) dataColumnSidecarsByRangeRPCHandler(ctx context.Context, msg i
 	defer cancel()
 
 	SetRPCStreamDeadlines(stream)
-	cfg := params.BeaconConfig()
-	maxRequestDataColumnSidecars := cfg.MaxRequestDataColumnSidecars
+	beaconConfig := params.BeaconConfig()
+	maxRequestDataColumnSidecars := beaconConfig.MaxRequestDataColumnSidecars
 	remotePeer := stream.Conn().RemotePeer()
 
 	log := log.WithFields(logrus.Fields{
@@ -70,7 +70,6 @@ func (s *Service) dataColumnSidecarsByRangeRPCHandler(ctx context.Context, msg i
 	log.Trace("Serving data column sidecars by range")
 
 	if rangeParameters == nil {
-		closeStream(stream, log)
 		return nil
 	}
 
@@ -102,7 +101,7 @@ func (s *Service) dataColumnSidecarsByRangeRPCHandler(ctx context.Context, msg i
 
 		// Once the quota is reached, we're done serving the request.
 		if maxRequestDataColumnSidecars == 0 {
-			log.WithField("initialQuota", cfg.MaxRequestDataColumnSidecars).Trace("Reached quota for data column sidecars by range request")
+			log.WithField("initialQuota", beaconConfig.MaxRequestDataColumnSidecars).Trace("Reached quota for data column sidecars by range request")
 			break
 		}
 	}

beacon-chain/sync/rpc_data_column_sidecars_by_range_test.go

@@ -23,17 +23,18 @@ import (
 	fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams"
 	"github.com/OffchainLabs/prysm/v6/config/params"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/blocks"
+	consensusblocks "github.com/OffchainLabs/prysm/v6/consensus-types/blocks"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	pb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/testing/assert"
 	"github.com/OffchainLabs/prysm/v6/testing/util"
 )
 
 func TestDataColumnSidecarsByRangeRPCHandler(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
-	cfg := params.BeaconConfig()
-	cfg.FuluForkEpoch = 0
-	params.OverrideBeaconConfig(cfg)
+	beaconConfig := params.BeaconConfig()
+	//beaconConfig.FuluForkEpoch = beaconConfig.ElectraForkEpoch + 100
+	beaconConfig.FuluForkEpoch = 0
+	params.OverrideBeaconConfig(beaconConfig)
 	params.BeaconConfig().InitializeForkSchedule()
 	ctx := context.Background()
 	t.Run("wrong message type", func(t *testing.T) {
@@ -46,7 +47,6 @@ func TestDataColumnSidecarsByRangeRPCHandler(t *testing.T) {
 
 	ctxMap, err := ContextByteVersionsForValRoot(params.BeaconConfig().GenesisValidatorsRoot)
 	require.NoError(t, err)
-
 	t.Run("invalid request", func(t *testing.T) {
 		slot := primitives.Slot(400)
 		mockNower.SetSlot(t, clock, slot)
@@ -72,8 +72,8 @@ func TestDataColumnSidecarsByRangeRPCHandler(t *testing.T) {
 		remoteP2P.BHost.SetStreamHandler(protocolID, func(stream network.Stream) {
 			defer wg.Done()
 			code, _, err := readStatusCodeNoDeadline(stream, localP2P.Encoding())
-			assert.NoError(t, err)
-			assert.Equal(t, responseCodeInvalidRequest, code)
+			require.NoError(t, err)
+			require.Equal(t, responseCodeInvalidRequest, code)
 		})
 
 		localP2P.Connect(remoteP2P)
@@ -94,48 +94,6 @@ func TestDataColumnSidecarsByRangeRPCHandler(t *testing.T) {
 		}
 	})
 
-	t.Run("in the future", func(t *testing.T) {
-		slot := primitives.Slot(400)
-		mockNower.SetSlot(t, clock, slot)
-
-		localP2P, remoteP2P := p2ptest.NewTestP2P(t), p2ptest.NewTestP2P(t)
-		protocolID := protocol.ID(fmt.Sprintf("%s/ssz_snappy", p2p.RPCDataColumnSidecarsByRangeTopicV1))
-
-		service := &Service{
-			cfg: &config{
-				p2p: localP2P,
-				chain: &chainMock.ChainService{
-					Slot: &slot,
-				},
-				clock: clock,
-			},
-			rateLimiter: newRateLimiter(localP2P),
-		}
-
-		var wg sync.WaitGroup
-		wg.Add(1)
-
-		remoteP2P.BHost.SetStreamHandler(protocolID, func(stream network.Stream) {
-			defer wg.Done()
-
-			_, err := readChunkedDataColumnSidecar(stream, remoteP2P, ctxMap)
-			assert.Equal(t, true, errors.Is(err, io.EOF))
-		})
-
-		localP2P.Connect(remoteP2P)
-		stream, err := localP2P.BHost.NewStream(ctx, remoteP2P.BHost.ID(), protocolID)
-		require.NoError(t, err)
-
-		msg := &pb.DataColumnSidecarsByRangeRequest{
-			StartSlot: slot + 1,
-			Count:     50,
-			Columns:   []uint64{1, 2, 3, 4, 6, 7, 8, 9, 10},
-		}
-
-		err = service.dataColumnSidecarsByRangeRPCHandler(ctx, msg, stream)
-		require.NoError(t, err)
-	})
-
 	t.Run("nominal", func(t *testing.T) {
 		slot := primitives.Slot(400)
 
@@ -175,12 +133,12 @@ func TestDataColumnSidecarsByRangeRPCHandler(t *testing.T) {
 				signedBeaconBlockPb.Block.ParentRoot = roots[i-1][:]
 			}
 
-			signedBeaconBlock, err := blocks.NewSignedBeaconBlock(signedBeaconBlockPb)
+			signedBeaconBlock, err := consensusblocks.NewSignedBeaconBlock(signedBeaconBlockPb)
 			require.NoError(t, err)
 
 			// There is a discrepancy between the root of the beacon block and the rodata column root,
 			// but for the sake of this test, we actually don't care.
-			roblock, err := blocks.NewROBlockWithRoot(signedBeaconBlock, roots[i])
+			roblock, err := consensusblocks.NewROBlockWithRoot(signedBeaconBlock, roots[i])
 			require.NoError(t, err)
 
 			roBlocks = append(roBlocks, roblock)
@@ -220,28 +178,28 @@ func TestDataColumnSidecarsByRangeRPCHandler(t *testing.T) {
 					break
 				}
 
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				sidecars = append(sidecars, sidecar)
 			}
 
-			assert.Equal(t, 8, len(sidecars))
-			assert.Equal(t, root0, sidecars[0].BlockRoot())
-			assert.Equal(t, root0, sidecars[1].BlockRoot())
-			assert.Equal(t, root0, sidecars[2].BlockRoot())
-			assert.Equal(t, root3, sidecars[3].BlockRoot())
-			assert.Equal(t, root3, sidecars[4].BlockRoot())
-			assert.Equal(t, root5, sidecars[5].BlockRoot())
-			assert.Equal(t, root5, sidecars[6].BlockRoot())
-			assert.Equal(t, root5, sidecars[7].BlockRoot())
+			require.Equal(t, 8, len(sidecars))
+			require.Equal(t, root0, sidecars[0].BlockRoot())
+			require.Equal(t, root0, sidecars[1].BlockRoot())
+			require.Equal(t, root0, sidecars[2].BlockRoot())
+			require.Equal(t, root3, sidecars[3].BlockRoot())
+			require.Equal(t, root3, sidecars[4].BlockRoot())
+			require.Equal(t, root5, sidecars[5].BlockRoot())
+			require.Equal(t, root5, sidecars[6].BlockRoot())
+			require.Equal(t, root5, sidecars[7].BlockRoot())
 
-			assert.Equal(t, uint64(1), sidecars[0].Index)
-			assert.Equal(t, uint64(2), sidecars[1].Index)
-			assert.Equal(t, uint64(3), sidecars[2].Index)
-			assert.Equal(t, uint64(4), sidecars[3].Index)
-			assert.Equal(t, uint64(6), sidecars[4].Index)
-			assert.Equal(t, uint64(7), sidecars[5].Index)
-			assert.Equal(t, uint64(8), sidecars[6].Index)
-			assert.Equal(t, uint64(9), sidecars[7].Index)
+			require.Equal(t, uint64(1), sidecars[0].Index)
+			require.Equal(t, uint64(2), sidecars[1].Index)
+			require.Equal(t, uint64(3), sidecars[2].Index)
+			require.Equal(t, uint64(4), sidecars[3].Index)
+			require.Equal(t, uint64(6), sidecars[4].Index)
+			require.Equal(t, uint64(7), sidecars[5].Index)
+			require.Equal(t, uint64(8), sidecars[6].Index)
+			require.Equal(t, uint64(9), sidecars[7].Index)
 		})
 
 		localP2P.Connect(remoteP2P)
@@ -257,6 +215,7 @@ func TestDataColumnSidecarsByRangeRPCHandler(t *testing.T) {
 		err = service.dataColumnSidecarsByRangeRPCHandler(ctx, msg, stream)
 		require.NoError(t, err)
 	})
+
 }
 
 func TestValidateDataColumnsByRange(t *testing.T) {

beacon-chain/sync/rpc_data_column_sidecars_by_root.go

@@ -163,9 +163,9 @@ func dataColumnsRPCMinValidSlot(currentSlot primitives.Slot) (primitives.Slot, e
 		return primitives.Slot(math.MaxUint64), nil
 	}
 
-	cfg := params.BeaconConfig()
-	minReqEpochs := cfg.MinEpochsForDataColumnSidecarsRequest
-	minStartEpoch := cfg.FuluForkEpoch
+	beaconConfig := params.BeaconConfig()
+	minReqEpochs := beaconConfig.MinEpochsForDataColumnSidecarsRequest
+	minStartEpoch := beaconConfig.FuluForkEpoch
 
 	currEpoch := slots.ToEpoch(currentSlot)
 	if currEpoch > minReqEpochs && currEpoch-minReqEpochs > minStartEpoch {

beacon-chain/sync/rpc_data_column_sidecars_by_root_test.go

@@ -28,9 +28,9 @@ import (
 
 func TestDataColumnSidecarsByRootRPCHandler(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
-	cfg := params.BeaconConfig()
-	cfg.FuluForkEpoch = 0
-	params.OverrideBeaconConfig(cfg)
+	beaconConfig := params.BeaconConfig()
+	beaconConfig.FuluForkEpoch = 0
+	params.OverrideBeaconConfig(beaconConfig)
 	params.BeaconConfig().InitializeForkSchedule()
 	ctxMap, err := ContextByteVersionsForValRoot(params.BeaconConfig().GenesisValidatorsRoot)
 	require.NoError(t, err)
@@ -43,9 +43,9 @@ func TestDataColumnSidecarsByRootRPCHandler(t *testing.T) {
 
 	t.Run("invalid request", func(t *testing.T) {
 		params.SetupTestConfigCleanup(t)
-		cfg := params.BeaconConfig()
-		cfg.MaxRequestDataColumnSidecars = 1
-		params.OverrideBeaconConfig(cfg)
+		beaconConfig := params.BeaconConfig()
+		beaconConfig.MaxRequestDataColumnSidecars = 1
+		params.OverrideBeaconConfig(beaconConfig)
 
 		localP2P := p2ptest.NewTestP2P(t)
 		service := &Service{cfg: &config{p2p: localP2P}}
@@ -96,9 +96,9 @@ func TestDataColumnSidecarsByRootRPCHandler(t *testing.T) {
 		}()
 
 		params.SetupTestConfigCleanup(t)
-		cfg := params.BeaconConfig()
-		cfg.FuluForkEpoch = 1
-		params.OverrideBeaconConfig(cfg)
+		beaconConfig := params.BeaconConfig()
+		beaconConfig.FuluForkEpoch = 1
+		params.OverrideBeaconConfig(beaconConfig)
 
 		localP2P := p2ptest.NewTestP2P(t)
 		clock := startup.NewClock(time.Now(), [fieldparams.RootLength]byte{})