expose HdiffSerialized fields

WORKSPACE

@@ -255,7 +255,7 @@ filegroup(
     url = "https://github.com/ethereum/EIPs/archive/5480440fe51742ed23342b68cf106cefd427e39d.tar.gz",
 )
 
-consensus_spec_version = "v1.5.0"
+consensus_spec_version = "v1.5.0-beta.5"
 
 bls_test_version = "v0.1.1"
 
@@ -271,7 +271,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-JljxS/if/t0qvGWcf5CgsX+72fj90yGTg/uEgC56y7U=",
+    integrity = "sha256-H+Pt4z+HCVDnEBAv814yvsjR7f5l1IpumjFoTj2XnLE=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/general.tar.gz" % consensus_spec_version,
 )
 
@@ -287,7 +287,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-NRba2h4zqb2LAXyDPglHTtkT4gVyuwpY708XmwXKXV8=",
+    integrity = "sha256-Dqiwf5BG7yYyURGf+i87AIdArAyztvcgjoi2kSxrGvo=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/minimal.tar.gz" % consensus_spec_version,
 )
 
@@ -303,7 +303,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-hpbtKUbc3NHtVcUPk/Zm+Hn57G2ijI9qvXJwl9hc/tM=",
+    integrity = "sha256-xrmsFF243pzXHAjh1EQYKS9gtcwmtHK3wRZDSLlVVRk=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/mainnet.tar.gz" % consensus_spec_version,
 )
 
@@ -318,7 +318,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-Wy3YcJxoXiKQwrGgJecrtjtdokc4X/VUNBmyQXJf0Oc=",
+    integrity = "sha256-c+gGapqifCvFtmtxfhOwieBDO2Syxp13GECWEpWM/Ho=",
     strip_prefix = "consensus-specs-" + consensus_spec_version[1:],
     url = "https://github.com/ethereum/consensus-specs/archive/refs/tags/%s.tar.gz" % consensus_spec_version,
 )

beacon-chain/core/helpers/beacon_committee.go

@@ -18,7 +18,6 @@ import (
 	"github.com/OffchainLabs/prysm/v6/crypto/hash"
 	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
 	"github.com/OffchainLabs/prysm/v6/math"
-	"github.com/OffchainLabs/prysm/v6/monitoring/tracing/trace"
 	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/OffchainLabs/prysm/v6/runtime/version"
 	"github.com/OffchainLabs/prysm/v6/time/slots"
@@ -298,9 +297,6 @@ func verifyAssignmentEpoch(epoch primitives.Epoch, state state.BeaconState) erro
 // It verifies the validity of the epoch, then iterates through each slot in the epoch to determine the
 // proposer for that slot and assigns them accordingly.
 func ProposerAssignments(ctx context.Context, state state.BeaconState, epoch primitives.Epoch) (map[primitives.ValidatorIndex][]primitives.Slot, error) {
-	ctx, span := trace.StartSpan(ctx, "helpers.ProposerAssignments")
-	defer span.End()
-
 	// Verify if the epoch is valid for assignment based on the provided state.
 	if err := verifyAssignmentEpoch(epoch, state); err != nil {
 		return nil, err
@@ -349,9 +345,6 @@ func ProposerAssignments(ctx context.Context, state state.BeaconState, epoch pri
 // It retrieves active validator indices, determines the number of committees per slot, and computes
 // assignments for each validator based on their presence in the provided validators slice.
 func CommitteeAssignments(ctx context.Context, state state.BeaconState, epoch primitives.Epoch, validators []primitives.ValidatorIndex) (map[primitives.ValidatorIndex]*CommitteeAssignment, error) {
-	ctx, span := trace.StartSpan(ctx, "helpers.CommitteeAssignments")
-	defer span.End()
-
 	// Verify if the epoch is valid for assignment based on the provided state.
 	if err := verifyAssignmentEpoch(epoch, state); err != nil {
 		return nil, err

beacon-chain/db/iface/interface.go

@@ -41,8 +41,6 @@ type ReadOnlyDatabase interface {
 	StateSummary(ctx context.Context, blockRoot [32]byte) (*ethpb.StateSummary, error)
 	HasStateSummary(ctx context.Context, blockRoot [32]byte) bool
 	HighestSlotStatesBelow(ctx context.Context, slot primitives.Slot) ([]state.ReadOnlyBeaconState, error)
-	// StateDiff related methods.
-	StateDiff(ctx context.Context, slot primitives.Slot) (state.BeaconState, error)
 	// Checkpoint operations.
 	JustifiedCheckpoint(ctx context.Context) (*ethpb.Checkpoint, error)
 	FinalizedCheckpoint(ctx context.Context) (*ethpb.Checkpoint, error)
@@ -85,8 +83,6 @@ type NoHeadAccessDatabase interface {
 	DeleteStates(ctx context.Context, blockRoots [][32]byte) error
 	SaveStateSummary(ctx context.Context, summary *ethpb.StateSummary) error
 	SaveStateSummaries(ctx context.Context, summaries []*ethpb.StateSummary) error
-	// Statediff related methods.
-	SaveStateDiff(ctx context.Context, state state.ReadOnlyBeaconState) error
 	// Checkpoint operations.
 	SaveJustifiedCheckpoint(ctx context.Context, checkpoint *ethpb.Checkpoint) error
 	SaveFinalizedCheckpoint(ctx context.Context, checkpoint *ethpb.Checkpoint) error

beacon-chain/db/kv/BUILD.bazel

@@ -25,7 +25,6 @@ go_library(
         "migration_state_validators.go",
         "schema.go",
         "state.go",
-        "state_diff.go",
         "state_summary.go",
         "state_summary_cache.go",
         "utils.go",
@@ -45,7 +44,6 @@ go_library(
         "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/blocks:go_default_library",
-        "//consensus-types/hdiff:go_default_library",
         "//consensus-types/interfaces:go_default_library",
         "//consensus-types/light-client:go_default_library",
         "//consensus-types/primitives:go_default_library",
@@ -96,7 +94,6 @@ go_test(
         "migration_archived_index_test.go",
         "migration_block_slot_index_test.go",
         "migration_state_validators_test.go",
-        "state_diff_test.go",
         "state_summary_test.go",
         "state_test.go",
         "utils_test.go",
@@ -119,7 +116,6 @@ go_test(
         "//consensus-types/light-client:go_default_library",
         "//consensus-types/primitives:go_default_library",
         "//encoding/bytesutil:go_default_library",
-        "//math:go_default_library",
         "//proto/dbval:go_default_library",
         "//proto/engine/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",

beacon-chain/db/kv/kv.go

@@ -112,7 +112,6 @@ var Buckets = [][]byte{
 	lightClientUpdatesBucket,
 	lightClientBootstrapBucket,
 	lightClientSyncCommitteeBucket,
-	stateDiffBucket,
 	// Indices buckets.
 	blockSlotIndicesBucket,
 	stateSlotIndicesBucket,

beacon-chain/db/kv/schema.go

@@ -16,7 +16,6 @@ var (
 	stateValidatorsBucket = []byte("state-validators")
 	feeRecipientBucket    = []byte("fee-recipient")
 	registrationBucket    = []byte("registration")
-	stateDiffBucket       = []byte("state-diff")
 
 	// Light Client Updates Bucket
 	lightClientUpdatesBucket       = []byte("light-client-updates")

beacon-chain/db/kv/state_diff.go

@@ -1,272 +0,0 @@
-package kv
-
-import (
-	"context"
-
-	"github.com/OffchainLabs/prysm/v6/beacon-chain/state"
-	"github.com/OffchainLabs/prysm/v6/config/params"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/hdiff"
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/math"
-	"github.com/OffchainLabs/prysm/v6/monitoring/tracing/trace"
-	"github.com/pkg/errors"
-	bolt "go.etcd.io/bbolt"
-)
-
-/*
-	We use a level-based approach to save state diffs. The levels are 0-6, where each level corresponds to an exponent of 2 (exponents[lvl]).
-	The data at level 0 is saved every 2**exponent[0] slots and always contains a full state snapshot that is used as a base for the delta saved at other levels.
-*/
-
-var (
-	anchorCache = make(map[int]state.ReadOnlyBeaconState, len(params.StateHierarchyExponents())) // cache full states at the last node at each level
-)
-
-// SaveStateDiff takes a state and decides between saving a full state snapshot or a diff.
-func (s *Store) SaveStateDiff(ctx context.Context, st state.ReadOnlyBeaconState) error {
-	ctx, span := trace.StartSpan(ctx, "BeaconDB.SaveStateDiff")
-	defer span.End()
-
-	slot := st.Slot()
-	offset, err := s.loadOrInitOffset(slot)
-	if err != nil {
-		return err
-	}
-	if uint64(slot) < offset {
-		return ErrSlotBeforeOffset
-	}
-
-	// Find the level to save the state.
-	lvl := computeLevel(offset, slot)
-	if lvl == -1 {
-		return nil
-	}
-
-	// Save full state if level is 0.
-	if lvl == 0 {
-		return s.saveFullSnapshot(lvl, st)
-	}
-
-	// Get anchor state to compute the diff from.
-	anchorState, err := s.getAnchorState(offset, lvl, slot)
-	if err != nil {
-		return err
-	}
-
-	err = s.saveHdiff(lvl, anchorState, st)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// StateDiff retrieves the full state for a given slot.
-func (s *Store) StateDiff(ctx context.Context, slot primitives.Slot) (state.BeaconState, error) {
-	offset, err := s.getOffset()
-	if err != nil {
-		return nil, err
-	}
-	if uint64(slot) < offset {
-		return nil, ErrSlotBeforeOffset
-	}
-
-	snapshot, diffChain, err := s.getBaseAndDiffChain(offset, slot)
-
-	// TODO: apply the diff chain to the snapshot and return the final state.
-
-	return nil, nil
-}
-
-// SaveHdiff computes the diff between the anchor state and the current state and saves it to the database.
-func (s *Store) saveHdiff(lvl int, anchor, st state.ReadOnlyBeaconState) error {
-	slot := uint64(st.Slot())
-	key := makeKey(lvl, slot)
-
-	// TODO: compute actual diff
-	diff := hdiff.HdiffSerialized{}
-
-	err := s.db.Update(func(tx *bolt.Tx) error {
-		bucket := tx.Bucket(stateDiffBucket)
-		if bucket == nil {
-			return bolt.ErrBucketNotFound
-		}
-		// TODO: save the diff bytes per field with suffix
-		buf := make([]byte, len(key)+len("_s"))
-		copy(buf, key)
-		copy(buf[len(key):], "_s")
-		if err := bucket.Put(buf, diff); err != nil {
-			return err
-		}
-		copy(buf[len(key):], "_v")
-		if err := bucket.Put(buf, diff); err != nil {
-			return err
-		}
-		copy(buf[len(key):], "_b")
-		if err := bucket.Put(buf, diff); err != nil {
-			return err
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	// Save the full state to the cache (if not the last level).
-	if lvl != len(params.StateHierarchyExponents())-1 {
-		anchorCache[lvl] = st
-	}
-
-	return nil
-}
-
-// SaveFullSnapshot saves the full level 0 state snapshot to the database.
-func (s *Store) saveFullSnapshot(lvl int, st state.ReadOnlyBeaconState) error {
-	slot := uint64(st.Slot())
-	key := makeKey(lvl, slot)
-	stateBytes, err := st.MarshalSSZ()
-	// add version key to value
-	enc, err := addKey(st.Version(), stateBytes)
-	if err != nil {
-		return err
-	}
-
-	err = s.db.Update(func(tx *bolt.Tx) error {
-		bucket := tx.Bucket(stateDiffBucket)
-		if bucket == nil {
-			return bolt.ErrBucketNotFound
-		}
-
-		if err := bucket.Put(key, enc); err != nil {
-			return err
-		}
-
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	// Save the full state to the cache.
-	anchorCache[lvl] = st
-	return nil
-}
-
-func addKey(v int, bytes []byte) ([]byte, error) {
-	key, err := keyForSnapshot(v)
-	if err != nil {
-		return nil, err
-	}
-	enc := make([]byte, len(key)+len(bytes))
-	copy(enc, key)
-	copy(enc[len(key):], bytes)
-	return enc, nil
-}
-
-func (s *Store) getBaseAndDiffChain(offset uint64, slot primitives.Slot) (state.BeaconState, []*hdiff.HdiffSerialized, error) {
-	rel := uint64(slot) - offset
-	lvl := computeLevel(offset, slot)
-	if lvl == -1 {
-		return nil, nil, errors.New("slot not in tree")
-	}
-
-	exponents := params.StateHierarchyExponents()
-
-	baseSpan := math.PowerOf2(exponents[0])
-	baseAnchorSlot := (rel / baseSpan * baseSpan) + offset
-
-	var diffChainIndices []uint64
-	for i := 1; i < lvl; i++ {
-		span := math.PowerOf2(exponents[i])
-		diffSlot := rel / span * span
-		if diffSlot == baseAnchorSlot {
-			continue
-		}
-		diffChainIndices = appendUnique(diffChainIndices, diffSlot+offset)
-	}
-
-	baseSnapshot, err := s.getFullSnapshot(lvl, baseAnchorSlot)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	diffChain := make([]*hdiff.HdiffSerialized, len(diffChainIndices))
-	for _, diffSlot := range diffChainIndices {
-		diff, err := s.getDiff(computeLevel(offset, primitives.Slot(diffSlot)), diffSlot)
-		if err != nil {
-			return nil, nil, err
-		}
-		diffChain = append(diffChain, diff)
-	}
-
-	return baseSnapshot, diffChain, nil
-}
-
-func (s *Store) getDiff(lvl int, slot uint64) (*hdiff.HdiffSerialized, error) {
-	key := makeKey(lvl, slot)
-	var stateDiff []byte
-	var validatorDiff []byte
-	var balancesDiff []byte
-
-	err := s.db.View(func(tx *bolt.Tx) error {
-		bucket := tx.Bucket(stateDiffBucket)
-		if bucket == nil {
-			return bolt.ErrBucketNotFound
-		}
-		buf := make([]byte, len(key)+len("_s"))
-		copy(buf, key)
-		copy(buf[len(key):], "_s")
-		stateDiff = bucket.Get(buf)
-		if stateDiff == nil {
-			return errors.New("state diff not found")
-		}
-		copy(buf[len(key):], "_v")
-		validatorDiff = bucket.Get(buf)
-		if validatorDiff == nil {
-			return errors.New("validator diff not found")
-		}
-		copy(buf[len(key):], "_b")
-		balancesDiff = bucket.Get(buf)
-		if balancesDiff == nil {
-			return errors.New("balances diff not found")
-		}
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return &hdiff.HdiffSerialized{}, nil
-}
-
-func (s *Store) getFullSnapshot(lvl int, slot uint64) (state.BeaconState, error) {
-	key := makeKey(lvl, slot)
-	var enc []byte
-
-	err := s.db.View(func(tx *bolt.Tx) error {
-		bucket := tx.Bucket(stateDiffBucket)
-		if bucket == nil {
-			return bolt.ErrBucketNotFound
-		}
-		enc = bucket.Get(key)
-		if enc == nil {
-			return errors.New("state not found")
-		}
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return s.decodeStateSnapshot(enc)
-}
-
-func appendUnique(s []uint64, v uint64) []uint64 {
-	for _, x := range s {
-		if x == v {
-			return s
-		}
-	}
-	return append(s, v)
-}

beacon-chain/db/kv/state_diff_helpers.go

@@ -1,167 +0,0 @@
-package kv
-
-import (
-	"context"
-	"encoding/binary"
-	"errors"
-	"fmt"
-
-	"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"
-	"github.com/OffchainLabs/prysm/v6/math"
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-	"github.com/OffchainLabs/prysm/v6/runtime/version"
-	"go.etcd.io/bbolt"
-)
-
-var (
-	offsetKey           = []byte("offset")
-	ErrSlotBeforeOffset = errors.New("slot is before root offset")
-)
-
-func makeKey(level int, slot uint64) []byte {
-	buf := make([]byte, 1+8)
-	buf[0] = byte(level)
-	binary.BigEndian.PutUint64(buf[1:], slot)
-	return buf
-}
-
-func (s *Store) getAnchorState(offset uint64, lvl int, slot primitives.Slot) (anchor state.ReadOnlyBeaconState, err error) {
-	if lvl == 0 {
-		return nil, errors.New("no anchor for level 0")
-	}
-
-	relSlot := uint64(slot) - offset
-	prevExp := params.StateHierarchyExponents()[lvl-1]
-	span := math.PowerOf2(prevExp)
-	anchorSlot := primitives.Slot((relSlot / span * span) + offset)
-
-	anchorLvl := computeLevel(offset, anchorSlot)
-	if anchorLvl == -1 {
-		return nil, errors.New("could not compute anchor level")
-	}
-
-	// Check if we have the anchor in cache.
-	anchor, ok := anchorCache[anchorLvl]
-	if ok {
-		return anchor, nil
-	}
-
-	// If not, load it from the database.
-	anchor, err = s.StateDiff(context.Background(), anchorSlot)
-	if err != nil {
-		return nil, err
-	}
-
-	// Save it in the cache.
-	anchorCache[anchorLvl] = anchor
-	return anchor, nil
-}
-
-// ComputeLevel computes the level in the diff tree. Returns -1 in case slot should not be in tree.
-func computeLevel(offset uint64, slot primitives.Slot) int {
-	rel := uint64(slot) - offset
-	for i, exp := range params.StateHierarchyExponents() {
-		span := math.PowerOf2(exp)
-		if rel%span == 0 {
-			return i
-		}
-	}
-	// If rel isn’t on any of the boundaries, we should ignore saving it.
-	return -1
-}
-
-func (s *Store) loadOrInitOffset(slot primitives.Slot) (offset uint64, err error) {
-	return offset, s.db.Update(func(tx *bbolt.Tx) error {
-		bucket := tx.Bucket(stateDiffBucket)
-		if bucket == nil {
-			return bbolt.ErrBucketNotFound
-		}
-
-		offsetBytes := bucket.Get(offsetKey)
-		if offsetBytes != nil {
-			offset = binary.BigEndian.Uint64(offsetBytes)
-			return nil
-		}
-
-		offset = uint64(slot)
-		offsetBytes = make([]byte, 8)
-		binary.BigEndian.PutUint64(offsetBytes, offset)
-		if err := bucket.Put(offsetKey, offsetBytes); err != nil {
-			return err
-		}
-		return nil
-	})
-}
-
-func (s *Store) getOffset() (offset uint64, err error) {
-	return offset, s.db.View(func(tx *bbolt.Tx) error {
-		bucket := tx.Bucket(stateDiffBucket)
-		if bucket == nil {
-			return bbolt.ErrBucketNotFound
-		}
-
-		offsetBytes := bucket.Get(offsetKey)
-		if offsetBytes != nil {
-			offset = binary.BigEndian.Uint64(offsetBytes)
-			return nil
-		}
-		return bbolt.ErrIncompatibleValue
-	})
-}
-
-func keyForSnapshot(v int) ([]byte, error) {
-	switch v {
-	case version.Electra:
-		return ElectraKey, nil
-	case version.Deneb:
-		return denebKey, nil
-	case version.Capella:
-		return capellaKey, nil
-	case version.Bellatrix:
-		return bellatrixKey, nil
-	case version.Altair:
-		return altairKey, nil
-	default:
-		return nil, fmt.Errorf("unsupported version %s", version.String(v))
-	}
-}
-
-func (s *Store) decodeStateSnapshot(enc []byte) (state.BeaconState, error) {
-	switch {
-	case HasElectraKey(enc):
-		var electraState ethpb.BeaconStateElectra
-		if err := electraState.UnmarshalSSZ(enc[len(ElectraKey):]); err != nil {
-			return nil, err
-		}
-		return state_native.InitializeFromProtoElectra(&electraState)
-	case hasDenebKey(enc):
-		var denebState ethpb.BeaconStateDeneb
-		if err := denebState.UnmarshalSSZ(enc[len(denebKey):]); err != nil {
-			return nil, err
-		}
-		return state_native.InitializeFromProtoDeneb(&denebState)
-	case hasCapellaKey(enc):
-		var capellaState ethpb.BeaconStateCapella
-		if err := capellaState.UnmarshalSSZ(enc[len(capellaKey):]); err != nil {
-			return nil, err
-		}
-		return state_native.InitializeFromProtoCapella(&capellaState)
-	case hasBellatrixKey(enc):
-		var bellatrixState ethpb.BeaconStateBellatrix
-		if err := bellatrixState.UnmarshalSSZ(enc[len(bellatrixKey):]); err != nil {
-			return nil, err
-		}
-		return state_native.InitializeFromProtoBellatrix(&bellatrixState)
-	case hasAltairKey(enc):
-		var altairState ethpb.BeaconStateAltair
-		if err := altairState.UnmarshalSSZ(enc[len(altairKey):]); err != nil {
-			return nil, err
-		}
-		return state_native.InitializeFromProtoAltair(&altairState)
-	default:
-		return nil, fmt.Errorf("unsupported encoding %x", enc)
-	}
-}

beacon-chain/db/kv/state_diff_test.go

@@ -1,163 +0,0 @@
-package kv
-
-import (
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/math"
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/testing/util"
-	"go.etcd.io/bbolt"
-)
-
-func TestStateDiff_LoadOrInitOffset(t *testing.T) {
-	db := setupDB(t)
-
-	offset, err := loadOrInitOffset(db, 10)
-	require.NoError(t, err)
-	require.Equal(t, uint64(10), offset)
-
-	offset, err = loadOrInitOffset(db, 20)
-	require.NoError(t, err)
-	require.Equal(t, uint64(10), offset)
-
-	offset, err = loadOrInitOffset(db, 5)
-	require.NoError(t, err)
-	require.Equal(t, uint64(10), offset)
-}
-
-func TestStateDiff_ComputeLevel(t *testing.T) {
-	db := setupDB(t)
-
-	offset, err := loadOrInitOffset(db, 0)
-	require.NoError(t, err)
-	require.Equal(t, uint64(0), offset)
-
-	// 2 ** 21
-	lvl, shouldSave := computeLevel(math.PowerOf2(21))
-	require.Equal(t, 0, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 21 * 3
-	lvl, shouldSave = computeLevel(math.PowerOf2(21) * 3)
-	require.Equal(t, 0, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 18
-	lvl, shouldSave = computeLevel(math.PowerOf2(18))
-	require.Equal(t, 1, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 18 * 3
-	lvl, shouldSave = computeLevel(math.PowerOf2(18) * 3)
-	require.Equal(t, 1, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 16
-	lvl, shouldSave = computeLevel(math.PowerOf2(16))
-	require.Equal(t, 2, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 16 * 3
-	lvl, shouldSave = computeLevel(math.PowerOf2(16) * 3)
-	require.Equal(t, 2, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 13
-	lvl, shouldSave = computeLevel(math.PowerOf2(13))
-	require.Equal(t, 3, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 13 * 3
-	lvl, shouldSave = computeLevel(math.PowerOf2(13) * 3)
-	require.Equal(t, 3, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 11
-	lvl, shouldSave = computeLevel(math.PowerOf2(11))
-	require.Equal(t, 4, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 11 * 3
-	lvl, shouldSave = computeLevel(math.PowerOf2(11) * 3)
-	require.Equal(t, 4, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 9
-	lvl, shouldSave = computeLevel(math.PowerOf2(9))
-	require.Equal(t, 5, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 9 * 3
-	lvl, shouldSave = computeLevel(math.PowerOf2(9) * 3)
-	require.Equal(t, 5, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 5
-	lvl, shouldSave = computeLevel(math.PowerOf2(5))
-	require.Equal(t, 6, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 5 * 3
-	lvl, shouldSave = computeLevel(math.PowerOf2(5) * 3)
-	require.Equal(t, 6, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 7
-	lvl, shouldSave = computeLevel(math.PowerOf2(7))
-	require.Equal(t, 6, lvl)
-	require.Equal(t, true, shouldSave)
-
-	// 2 ** 5 + 1
-	lvl, shouldSave = computeLevel(math.PowerOf2(5) + 1)
-	require.Equal(t, false, shouldSave)
-
-	// 2 ** 5 + 16
-	lvl, shouldSave = computeLevel(math.PowerOf2(5) + 16)
-	require.Equal(t, false, shouldSave)
-
-	// 2 ** 5 + 32
-	lvl, shouldSave = computeLevel(math.PowerOf2(5) + 32)
-	require.Equal(t, true, shouldSave)
-	require.Equal(t, 6, lvl)
-
-}
-
-func TestStateDiff_SaveFullSnapshot(t *testing.T) {
-	db := setupDB(t)
-
-	// Set offset to zero
-	offset, err := loadOrInitOffset(db, 0)
-	require.NoError(t, err)
-	require.Equal(t, uint64(0), offset)
-
-	// Create state with slot 2**21 * 3
-	st, err := util.NewBeaconStateElectra()
-	require.NoError(t, err)
-	slot := primitives.Slot(math.PowerOf2(21))
-	err = st.SetSlot(slot)
-	require.NoError(t, err)
-	stssz, err := st.MarshalSSZ()
-	require.NoError(t, err)
-
-	err = db.SaveStateDiff(nil, st)
-	require.NoError(t, err)
-
-	err = db.db.View(func(tx *bbolt.Tx) error {
-		bucket := tx.Bucket(stateDiffBucket)
-		if bucket == nil {
-			return bbolt.ErrBucketNotFound
-		}
-		for i := 6; i >= 0; i-- {
-			s := bucket.Get(makeKey(i, uint64(slot)))
-			require.NotNil(t, s, "key not found")
-			if i > 0 {
-				require.DeepEqual(t, EmptyNodeMarker, s, "node not marked as empty")
-			} else {
-				require.DeepSSZEqual(t, stssz, s, "retrieved state does not match saved state")
-			}
-		}
-		return nil
-	})
-	require.NoError(t, err)
-}

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

@@ -9,7 +9,6 @@ import (
 	"github.com/OffchainLabs/prysm/v6/beacon-chain/rpc/core"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
-	"github.com/OffchainLabs/prysm/v6/monitoring/tracing/trace"
 	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 	"github.com/OffchainLabs/prysm/v6/time/slots"
 	"google.golang.org/grpc/codes"
@@ -81,11 +80,9 @@ func (vs *Server) duties(ctx context.Context, req *ethpb.DutiesRequest) (*ethpb.
 		return nil, status.Errorf(codes.Internal, "Could not compute proposer slots: %v", err)
 	}
 
-	ctx, span := trace.StartSpan(ctx, "getDuties.BuildResponse")
-	defer span.End()
-
 	validatorAssignments := make([]*ethpb.DutiesResponse_Duty, 0, len(req.PublicKeys))
 	nextValidatorAssignments := make([]*ethpb.DutiesResponse_Duty, 0, len(req.PublicKeys))
+
 	for _, pubKey := range req.PublicKeys {
 		if ctx.Err() != nil {
 			return nil, status.Errorf(codes.Aborted, "Could not continue fetching assignments: %v", ctx.Err())

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

@@ -39,7 +39,7 @@ const (
 	// This specifies the limit till which we process all dirty indices for a certain field.
 	// If we have more dirty indices than the threshold, then we rebuild the whole trie. This
 	// comes due to the fact that O(alogn) > O(n) beyond a certain value of a.
-	indicesLimit = 20000
+	indicesLimit = 8000
 )
 
 // SetGenesisTime for the beacon state.

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

@@ -400,11 +400,11 @@ func TestDuplicateDirtyIndices(t *testing.T) {
 	newState.dirtyIndices[types.Balances] = append(newState.dirtyIndices[types.Balances], []uint64{0, 1, 2, 3, 4}...)
 
 	// We would remove the duplicates and stay under the threshold
-	newState.addDirtyIndices(types.Balances, []uint64{20997, 20998})
+	newState.addDirtyIndices(types.Balances, []uint64{9997, 9998})
 	assert.Equal(t, false, newState.rebuildTrie[types.Balances])
 
 	// We would trigger above the threshold.
-	newState.addDirtyIndices(types.Balances, []uint64{21000, 21001, 21002, 21003})
+	newState.addDirtyIndices(types.Balances, []uint64{10000, 10001, 10002, 10003})
 	assert.Equal(t, true, newState.rebuildTrie[types.Balances])
 }
 

changelog/nisdas_increase_limit.md

@@ -1,3 +0,0 @@
-### Changed
-
-- Increase indices limit in field trie rebuilding.

changelog/pvl-duties-spans.md

@@ -1,3 +0,0 @@
-### Added
-
-- Added additional tracing spans for the GetDuties routine

changelog/tt_rice.md

@@ -1,3 +0,0 @@
-### Changed
-
-- Increase sepolia gas limit to 60M.

changelog/tt_udon.md

@@ -1,3 +0,0 @@
-### Changed
-
-- Update spec to v1.5.0 compliance which changes minimal execution requests size.

config/params/loader_test.go

@@ -37,12 +37,9 @@ var placeholderFields = []string{
 	"EIP7805_FORK_EPOCH",
 	"EIP7805_FORK_VERSION",
 	"EPOCHS_PER_SHUFFLING_PHASE",
-	"MAX_BYTES_PER_INCLUSION_LIST",
 	"MAX_REQUEST_BLOB_SIDECARS_FULU",
-	"MAX_REQUEST_INCLUSION_LIST",
 	"MAX_REQUEST_PAYLOADS", // Compile time constant on BeaconBlockBody.ExecutionRequests
 	"PROPOSER_INCLUSION_LIST_CUT_OFF",
-	"PROPOSER_SCORE_BOOST_EIP7732",
 	"PROPOSER_SELECTION_GAP",
 	"TARGET_NUMBER_OF_PEERS",
 	"UPDATE_TIMEOUT",

config/params/minimal_config.go

@@ -112,6 +112,8 @@ func MinimalSpecConfig() *BeaconChainConfig {
 	minimalConfig.MaxPerEpochActivationExitChurnLimit = 128000000000
 	minimalConfig.PendingConsolidationsLimit = 64
 	minimalConfig.MaxPartialWithdrawalsPerPayload = 1
+	minimalConfig.MaxWithdrawalRequestsPerPayload = 2
+	minimalConfig.MaxDepositRequestsPerPayload = 4
 	minimalConfig.PendingPartialWithdrawalsLimit = 64
 	minimalConfig.MaxPendingPartialsPerWithdrawalsSweep = 2
 	minimalConfig.PendingDepositsLimit = 134217728

config/params/state_diff_config.go

@@ -1,9 +0,0 @@
-package params
-
-var (
-	stateHierarchyExponents = []uint64{21, 18, 16, 13, 11, 9, 5}
-)
-
-func StateHierarchyExponents() []uint64 {
-	return stateHierarchyExponents
-}

config/params/testnet_sepolia_config.go

@@ -50,7 +50,6 @@ func SepoliaConfig() *BeaconChainConfig {
 	cfg.FuluForkVersion = []byte{0x90, 0x00, 0x00, 0x75} // TODO: Define sepolia fork version for fulu. This is a placeholder value.
 	cfg.TerminalTotalDifficulty = "17000000000000000"
 	cfg.DepositContractAddress = "0x7f02C3E3c98b133055B8B348B2Ac625669Ed295D"
-	cfg.DefaultBuilderGasLimit = uint64(60000000)
 	cfg.InitializeForkSchedule()
 	return cfg
 }

consensus-types/hdiff/state_diff.go

@@ -79,9 +79,9 @@ type Hdiff struct {
 }
 
 type HdiffSerialized struct {
-	stateDiff      []byte
-	validatorDiffs []byte
-	balancesDiff   []byte
+	StateDiff      []byte
+	ValidatorDiffs []byte
+	BalancesDiff   []byte
 }
 
 // validatorDiff is a type that represents a difference between two validators.
@@ -116,19 +116,19 @@ const (
 	pendingConsolidationLength     = 8 + 8
 )
 
-// NewHdiff deserializes a new Hdiff object from the given serialized data.
+// NewHdiff desrializes a new Hdiff object from the given seialized data.
 func NewHdiff(data HdiffSerialized) (*Hdiff, error) {
-	stateDiff, err := newStateDiff(data.stateDiff)
+	stateDiff, err := newStateDiff(data.StateDiff)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create state diff")
 	}
 
-	validatorDiffs, err := newValidatorDiffs(data.validatorDiffs)
+	validatorDiffs, err := newValidatorDiffs(data.ValidatorDiffs)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create validator diffs")
 	}
 
-	balancesDiff, err := newBalancesDiff(data.balancesDiff)
+	balancesDiff, err := newBalancesDiff(data.BalancesDiff)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create balances diff")
 	}
@@ -999,9 +999,9 @@ func (h Hdiff) Serialize() HdiffSerialized {
 		bals = binary.LittleEndian.AppendUint64(bals, uint64(b))
 	}
 	return HdiffSerialized{
-		stateDiff:      h.stateDiff.serialize(),
-		validatorDiffs: vals,
-		balancesDiff:   bals,
+		StateDiff:      h.stateDiff.serialize(),
+		ValidatorDiffs: vals,
+		BalancesDiff:   bals,
 	}
 }
 

proto/ssz_proto_library.bzl

@@ -65,8 +65,8 @@ minimal = {
     "max_blob_commitments.size": "32",
     "max_cell_proofs_length.size": "524288",  # CELLS_PER_EXT_BLOB * MAX_BLOB_COMMITMENTS_PER_BLOCK
     "kzg_commitment_inclusion_proof_depth.size": "10",
-    "max_withdrawal_requests_per_payload.size": "16",
-    "max_deposit_requests_per_payload.size": "8192",
+    "max_withdrawal_requests_per_payload.size": "2",
+    "max_deposit_requests_per_payload.size": "4",
     "max_attesting_indices.size": "8192",
     "max_committees_per_slot.size": "4",
     "committee_bits.size": "1",